This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
[gui][PATCH] FYI: ScrollBars + Separators
- From: Kim Ho <kho at redhat dot com>
- To: java-patches <java-patches at gcc dot gnu dot org>
- Date: 26 Feb 2004 09:15:53 -0500
- Subject: [gui][PATCH] FYI: ScrollBars + Separators
- Organization:
Hi,
This patch implements JScrollBar and JSeparator. Also some minor fixes
to slider + progressbar.
Cheers,
Kim
2004-02-26 Kim Ho <kho@redhat.com>
* Makefile.am: Add new files.
* Makefile.in: Re-generate.
* javax/swing/JProgressBar.java:
(JProgressBar(int, int int)): Throw
IllegalArgumentException if orientation is
invalid.
(JProgressBar(BoundedRangeModel)): Create
ChangeListener and register it. UpdateUI.
(getChangeListeners): Implement.
(setModel): Reset ChangeListener.
* javax/swing/JScrollBar.java: Implement.
* javax/swing/JSeparator.java: Implement.
* javax/swing/JSlider.java:
(JSlider(int, int, int, int)): Throw
IllegalArgumentException if orientation
is invalid.
(getChangeListeners): Fix method name.
* javax/swing/SwingUtilities.java:
(layoutCompoundLabel): If there is no text,
set the text rectangle dimensions to 0.
* javax/swing/plaf/basic/BasicButtonUI.java:
(paint): If there is no text, don't paint it.
* javax/swing/plaf/basic/BasicScrollBarUI.java:
Implement.
* javax/swing/plaf/basic/BasicSeparatorUI.java:
Implement.
* javax/swing/plaf/basic/BasicSliderUI.java:
(propertyChange): If the model changes, change
the listeners accordingly.
Index: Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/libjava/Makefile.am,v
retrieving revision 1.361.2.3
diff -u -r1.361.2.3 Makefile.am
--- Makefile.am 23 Feb 2004 23:20:44 -0000 1.361.2.3
+++ Makefile.am 26 Feb 2004 14:12:19 -0000
@@ -1299,7 +1299,9 @@
javax/swing/plaf/basic/BasicProgressBarUI.java \
javax/swing/plaf/basic/BasicRootPaneUI.java \
javax/swing/plaf/basic/BasicRadioButtonUI.java \
+javax/swing/plaf/basic/BasicScrollBarUI.java \
javax/swing/plaf/basic/BasicScrollPaneUI.java \
+javax/swing/plaf/basic/BasicSeparatorUI.java \
javax/swing/plaf/basic/BasicSliderUI.java \
javax/swing/plaf/basic/BasicSplitPaneDivider.java \
javax/swing/plaf/basic/BasicSplitPaneUI.java \
Index: javax/swing/JProgressBar.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JProgressBar.java,v
retrieving revision 1.3.8.1
diff -u -r1.3.8.1 JProgressBar.java
--- javax/swing/JProgressBar.java 19 Feb 2004 18:59:11 -0000 1.3.8.1
+++ javax/swing/JProgressBar.java 26 Feb 2004 14:12:22 -0000
@@ -255,6 +255,8 @@
public JProgressBar(int minimum, int maximum, int orientation)
{
model = new DefaultBoundedRangeModel(minimum, 0, minimum, maximum);
+ if (orientation != HORIZONTAL && orientation != VERTICAL)
+ throw new IllegalArgumentException(orientation + " is not a legal orientation");
this.orientation = orientation;
changeListener = createChangeListener();
model.addChangeListener(changeListener);
@@ -271,6 +273,10 @@
public JProgressBar(BoundedRangeModel model)
{
this.model = model;
+ changeListener = createChangeListener();
+ model.addChangeListener(changeListener);
+ changeListenerList = new EventListenerList();
+ updateUI();
}
/**
@@ -516,6 +522,17 @@
{
changeListenerList.remove(ChangeListener.class, listener);
}
+
+ /**
+ * This method returns an array of all ChangeListeners listening to this
+ * progress bar.
+ *
+ * @return An array of ChangeListeners listening to this progress bar.
+ */
+ public ChangeListener[] getChangeListeners()
+ {
+ return (ChangeListener[]) changeListenerList.getListenerList();
+ }
/**
* This method is called when the JProgressBar receives a ChangeEvent
@@ -553,7 +570,9 @@
{
if (model != this.model)
{
+ this.model.removeChangeListener(changeListener);
this.model = model;
+ this.model.addChangeListener(changeListener);
fireStateChanged();
}
}
Index: javax/swing/JScrollBar.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JScrollBar.java,v
retrieving revision 1.2
diff -u -r1.2 JScrollBar.java
--- javax/swing/JScrollBar.java 11 Jun 2003 13:20:39 -0000 1.2
+++ javax/swing/JScrollBar.java 26 Feb 2004 14:12:23 -0000
@@ -1,5 +1,5 @@
-/* JScrollBar.java --
- Copyright (C) 2002 Free Software Foundation, Inc.
+/* JScrollBar.java --
+ Copyright (C) 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -35,13 +35,707 @@
obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */
-
package javax.swing;
import java.awt.Adjustable;
+import java.awt.Dimension;
+import java.awt.event.AdjustmentEvent;
import java.awt.event.AdjustmentListener;
import javax.accessibility.Accessible;
+import javax.accessibility.AccessibleContext;
+import javax.accessibility.AccessibleRole;
+import javax.accessibility.AccessibleStateSet;
+import javax.accessibility.AccessibleValue;
+import javax.swing.SwingConstants;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import javax.swing.event.EventListenerList;
+import javax.swing.plaf.ProgressBarUI;
+import javax.swing.plaf.ScrollBarUI;
+
-public class JScrollBar extends JComponent
+/**
+ * The JScrollBar. Two buttons control how the values that the
+ * scroll bar can take. You can also drag the thumb or click the track
+ * to move the scroll bar. Typically, the JScrollBar is used with
+ * other components to translate the value of the bar to the viewable
+ * contents of the other components.
+ */
+public class JScrollBar extends JComponent implements Adjustable, Accessible
{
+ /**
+ * DOCUMENT ME!
+ */
+ protected class AccessibleJScrollBar extends JComponent.AccessibleJComponent
+ implements AccessibleValue
+ {
+ /**
+ * Creates a new AccessibleJSlider object.
+ *
+ * @param value0 DOCUMENT ME!
+ */
+ protected AccessibleJScrollBar(JScrollBar value0)
+ {
+ super(value0);
+ }
+
+ /**
+ * DOCUMENT ME!
+ *
+ * @return DOCUMENT ME!
+ */
+ public AccessibleStateSet getAccessibleStateSet()
+ {
+ return null;
+ }
+
+ /**
+ * DOCUMENT ME!
+ *
+ * @return DOCUMENT ME!
+ */
+ public AccessibleRole getAccessibleRole()
+ {
+ return null;
+ }
+
+ /**
+ * DOCUMENT ME!
+ *
+ * @return DOCUMENT ME!
+ */
+ public AccessibleValue getAccessibleValue()
+ {
+ return null;
+ }
+
+ /**
+ * DOCUMENT ME!
+ *
+ * @return DOCUMENT ME!
+ */
+ public Number getCurrentAccessibleValue()
+ {
+ return null;
+ }
+
+ /**
+ * setCurrentAccessibleValue
+ *
+ * @param value0 TODO
+ *
+ * @return boolean
+ */
+ public boolean setCurrentAccessibleValue(Number value0)
+ {
+ return false;
+ }
+
+ /**
+ * getMinimumAccessibleValue
+ *
+ * @return Number
+ */
+ public Number getMinimumAccessibleValue()
+ {
+ return null;
+ }
+
+ /**
+ * getMaximumAccessibleValue
+ *
+ * @return Number
+ */
+ public Number getMaximumAccessibleValue()
+ {
+ return null;
+ }
+ }
+
+ /** Fired in a PropertyChangeEvent when the "blockIncrement" changes. */
+ public static final String BLOCK_INCREMENT_CHANGED_PROPERTY = "blockIncrement";
+
+ /** Fired in a PropertyChangeEvent when the "model" changes. */
+ public static final String MODEL_CHANGED_PROPERTY = "model";
+
+ /** Fired in a PropertyChangeEvent when the "orientation" changes. */
+ public static final String ORIENTATION_CHANGED_PROPERTY = "orientation";
+
+ /** Fired in a PropertyChangeEvent when the "unitIncrement" changes. */
+ public static final String UNIT_INCREMENT_CHANGED_PROPERTY = "unitIncrement";
+
+ /** How much the thumb moves when moving in a block. */
+ protected int blockIncrement = 10;
+
+ /** The model that holds the scroll bar's data. */
+ protected BoundedRangeModel model;
+
+ /** The orientation of the scroll bar. */
+ protected int orientation = SwingConstants.HORIZONTAL;
+
+ /** How much the thumb moves when moving in a unit. */
+ protected int unitIncrement = 1;
+
+ /** A list of all ChangeListeners attached to the scroll bar. */
+ private transient EventListenerList changeListenerList;
+
+ /** A list of all AdjustmentListeners attached to the scroll bar. */
+ private transient EventListenerList adjustmentListenerList;
+
+ /** The ChangeListener that listens to the model. */
+ private transient ChangeListener changeListener;
+
+ /** The ChangeEvent that's fired. */
+ private transient ChangeEvent changeEvent;
+
+ /**
+ * Creates a new horizontal JScrollBar object with a minimum
+ * of 0, a maxmium of 100, a value of 0 and an extent of 10.
+ */
+ public JScrollBar()
+ {
+ this(SwingConstants.HORIZONTAL, 0, 10, 0, 100);
+ }
+
+ /**
+ * Creates a new JScrollBar object with a minimum of 0, a
+ * maximum of 100, a value of 0, an extent of 10 and the given
+ * orientation.
+ *
+ * @param orientation The orientation of the JScrollBar.
+ */
+ public JScrollBar(int orientation)
+ {
+ this(orientation, 0, 10, 0, 100);
+ }
+
+ /**
+ * Creates a new JScrollBar object with the given orientation,
+ * value, min, max, and extent.
+ *
+ * @param orientation The orientation to use.
+ * @param value The value to use.
+ * @param extent The extent to use.
+ * @param min The minimum value of the scrollbar.
+ * @param max The maximum value of the scrollbar.
+ */
+ public JScrollBar(int orientation, int value, int extent, int min, int max)
+ {
+ model = new DefaultBoundedRangeModel(value, extent, min, max);
+ if (orientation != SwingConstants.HORIZONTAL
+ && orientation != SwingConstants.VERTICAL)
+ throw new IllegalArgumentException(orientation
+ + " is not a legal orientation");
+ this.orientation = orientation;
+ changeListener = createChangeListener();
+ changeListenerList = new EventListenerList();
+ adjustmentListenerList = new EventListenerList();
+ model.addChangeListener(changeListener);
+ updateUI();
+ }
+
+ /**
+ * This method sets the UI of this scrollbar to
+ * the given UI.
+ *
+ * @param ui The UI to use with this scrollbar.
+ */
+ public void setUI(ScrollBarUI ui)
+ {
+ super.setUI(ui);
+ }
+
+ /**
+ * This method returns the UI that is being used
+ * with this scrollbar.
+ *
+ * @return The scrollbar's current UI.
+ */
+ public ScrollBarUI getUI()
+ {
+ return (ScrollBarUI) ui;
+ }
+
+ /**
+ * This method changes the UI to be the
+ * default for the current look and feel.
+ */
+ public void updateUI()
+ {
+ setUI((ScrollBarUI) UIManager.getUI(this));
+ invalidate();
+ repaint();
+ }
+
+ /**
+ * This method returns an identifier to
+ * choose the correct UI delegate for the
+ * scrollbar.
+ *
+ * @return The identifer to choose the UI delegate; "ScrollBarUI"
+ */
+ public String getUIClassID()
+ {
+ return "ScrollBarUI";
+ }
+
+ /**
+ * This method returns the orientation of the scrollbar.
+ *
+ * @return The orientation of the scrollbar.
+ */
+ public int getOrientation()
+ {
+ return orientation;
+ }
+
+ /**
+ * This method sets the orientation of the scrollbar.
+ *
+ * @param orientation The orientation of the scrollbar.
+ */
+ public void setOrientation(int orientation)
+ {
+ if (orientation != SwingConstants.HORIZONTAL
+ && orientation != SwingConstants.VERTICAL)
+ throw new IllegalArgumentException("orientation must be one of HORIZONTAL or VERTICAL");
+ if (orientation != this.orientation)
+ {
+ int oldOrientation = this.orientation;
+ this.orientation = orientation;
+ firePropertyChange(ORIENTATION_CHANGED_PROPERTY, oldOrientation,
+ this.orientation);
+ }
+ }
+
+ /**
+ * This method returns the model being used with
+ * the scrollbar.
+ *
+ * @return The scrollbar's model.
+ */
+ public BoundedRangeModel getModel()
+ {
+ return model;
+ }
+
+ /**
+ * This method sets the model to use with
+ * the scrollbar.
+ *
+ * @param newModel The new model to use with the scrollbar.
+ */
+ public void setModel(BoundedRangeModel newModel)
+ {
+ if (model != newModel)
+ {
+ BoundedRangeModel oldModel = model;
+ model = newModel;
+ oldModel.removeChangeListener(changeListener);
+ model.addChangeListener(changeListener);
+ firePropertyChange(MODEL_CHANGED_PROPERTY, oldModel, model);
+ }
+ }
+
+ /**
+ * This method returns how much the scrollbar's value
+ * should change for a unit increment depending on the
+ * given direction.
+ *
+ * @param direction The direction to scroll in.
+ *
+ * @return The amount the scrollbar's value will change given the direction.
+ */
+ public int getUnitIncrement(int direction)
+ {
+ return direction * unitIncrement;
+ }
+
+ /**
+ * This method sets the unitIncrement property.
+ *
+ * @param unitIncrement The new unitIncrement.
+ */
+ public void setUnitIncrement(int unitIncrement)
+ {
+ if (unitIncrement != this.unitIncrement)
+ {
+ int oldInc = this.unitIncrement;
+ this.unitIncrement = unitIncrement;
+ firePropertyChange(UNIT_INCREMENT_CHANGED_PROPERTY, oldInc,
+ this.unitIncrement);
+ }
+ }
+
+ /**
+ * The method returns how much the scrollbar's value
+ * should change for a block increment depending on
+ * the given direction.
+ *
+ * @param direction The direction to scroll in.
+ *
+ * @return The amount the scrollbar's value will change given the direction.
+ */
+ public int getBlockIncrement(int direction)
+ {
+ return direction * blockIncrement;
+ }
+
+ /**
+ * This method sets the blockIncrement property.
+ *
+ * @param blockIncrement The new blockIncrement.
+ */
+ public void setBlockIncrement(int blockIncrement)
+ {
+ if (blockIncrement != this.blockIncrement)
+ {
+ int oldInc = this.blockIncrement;
+ this.blockIncrement = blockIncrement;
+ firePropertyChange(BLOCK_INCREMENT_CHANGED_PROPERTY, oldInc,
+ this.blockIncrement);
+ }
+ }
+
+ /**
+ * This method returns the unitIncrement.
+ *
+ * @return The unitIncrement.
+ */
+ public int getUnitIncrement()
+ {
+ return unitIncrement;
+ }
+
+ /**
+ * This method returns the blockIncrement.
+ *
+ * @return The blockIncrement.
+ */
+ public int getBlockIncrement()
+ {
+ return blockIncrement;
+ }
+
+ /**
+ * This method returns the value of the scrollbar.
+ *
+ * @return The value of the scrollbar.
+ */
+ public int getValue()
+ {
+ return model.getValue();
+ }
+
+ /**
+ * This method changes the value of the scrollbar.
+ *
+ * @param value The new value of the scrollbar.
+ */
+ public void setValue(int value)
+ {
+ if (isEnabled() && value != getValue())
+ {
+ model.setValue(value);
+ fireAdjustmentValueChanged(AdjustmentEvent.ADJUSTMENT_VALUE_CHANGED,
+ AdjustmentEvent.TRACK, value);
+ }
+ }
+
+ /**
+ * This method returns the visible amount (AKA extent).
+ * The visible amount can be used by UI delegates to
+ * determine the size of the thumb.
+ *
+ * @return The visible amount (AKA extent).
+ */
+ public int getVisibleAmount()
+ {
+ return model.getExtent();
+ }
+
+ /**
+ * This method sets the visible amount (AKA extent).
+ *
+ * @param extent The visible amount (AKA extent).
+ */
+ public void setVisibleAmount(int extent)
+ {
+ if (extent != getVisibleAmount())
+ {
+ model.setExtent(extent);
+ fireAdjustmentValueChanged(AdjustmentEvent.ADJUSTMENT_VALUE_CHANGED,
+ AdjustmentEvent.TRACK, extent);
+ }
+ }
+
+ /**
+ * This method returns the minimum value of the scrollbar.
+ *
+ * @return The minimum value of the scrollbar.
+ */
+ public int getMinimum()
+ {
+ return model.getMinimum();
+ }
+
+ /**
+ * This method sets the minimum value of the scrollbar.
+ *
+ * @param minimum The minimum value of the scrollbar.
+ */
+ public void setMinimum(int minimum)
+ {
+ if (minimum != getMinimum())
+ {
+ model.setMinimum(minimum);
+ fireAdjustmentValueChanged(AdjustmentEvent.ADJUSTMENT_VALUE_CHANGED,
+ AdjustmentEvent.TRACK, minimum);
+ }
+ }
+
+ /**
+ * This method returns the maximum value of the scrollbar.
+ *
+ * @return The maximum value of the scrollbar.
+ */
+ public int getMaximum()
+ {
+ return model.getMaximum();
+ }
+
+ /**
+ * This method sets the maximum value of the scrollbar.
+ *
+ * @param maximum The maximum value of the scrollbar.
+ */
+ public void setMaximum(int maximum)
+ {
+ if (maximum != getMaximum())
+ {
+ model.setMaximum(maximum);
+ fireAdjustmentValueChanged(AdjustmentEvent.ADJUSTMENT_VALUE_CHANGED,
+ AdjustmentEvent.TRACK, maximum);
+ }
+ }
+
+ /**
+ * This method returns the model's isAjusting value.
+ *
+ * @return The model's isAdjusting value.
+ */
+ public boolean getValueIsAdjusting()
+ {
+ return model.getValueIsAdjusting();
+ }
+
+ /**
+ * This method sets the model's isAdjusting value.
+ *
+ * @param b The new isAdjusting value.
+ */
+ public void setValueIsAdjusting(boolean b)
+ {
+ model.setValueIsAdjusting(b);
+ }
+
+ /**
+ * This method sets the value, extent, minimum and
+ * maximum.
+ *
+ * @param newValue The new value.
+ * @param newExtent The new extent.
+ * @param newMin The new minimum.
+ * @param newMax The new maximum.
+ */
+ public void setValue(int newValue, int newExtent, int newMin, int newMax)
+ {
+ if (!isEnabled())
+ newValue = model.getValue();
+ // It seems to be that on any change the value is fired.
+ if (newValue != getValue() || newExtent != getVisibleAmount() ||
+ newMin != getMinimum() || newMax != getMaximum())
+ {
+ model.setRangeProperties(newValue, newExtent, newMin, newMax,
+ model.getValueIsAdjusting());
+ fireAdjustmentValueChanged(AdjustmentEvent.ADJUSTMENT_VALUE_CHANGED,
+ AdjustmentEvent.TRACK, newValue);
+ }
+ }
+
+ /**
+ * This method creates a new ChangeListener.
+ *
+ * @return A new ChangeListener.
+ */
+ private ChangeListener createChangeListener()
+ {
+ return new ChangeListener()
+ {
+ public void stateChanged(ChangeEvent e)
+ {
+ fireStateChanged();
+ }
+ };
+ }
+
+ /**
+ * This method is called whenever the model fires a ChangeEvent. It should
+ * propagate the ChangeEvent to its listeners with a new ChangeEvent that
+ * identifies the scroll bar as the source.
+ */
+ private void fireStateChanged()
+ {
+ Object[] changeListeners = changeListenerList.getListenerList();
+ if (changeEvent == null)
+ changeEvent = new ChangeEvent(this);
+ for (int i = changeListeners.length - 2; i >= 0; i -= 2)
+ {
+ if (changeListeners[i] == ChangeListener.class)
+ ((ChangeListener) changeListeners[i + 1]).stateChanged(changeEvent);
+ }
+ }
+
+ /**
+ * This method adds a ChangeListener to the scroll bar.
+ *
+ * @param listener The listener to add.
+ */
+ public void addChangeListener(ChangeListener listener)
+ {
+ changeListenerList.add(ChangeListener.class, listener);
+ }
+
+ /**
+ * This method removes a ChangeListener from the scroll bar.
+ *
+ * @param listener The listener to remove.
+ */
+ public void removeChangeListener(ChangeListener listener)
+ {
+ changeListenerList.remove(ChangeListener.class, listener);
+ }
+
+ /**
+ * This method returns an array of all ChangeListeners listening to this
+ * scroll bar.
+ *
+ * @return An array of ChangeListeners listening to this scroll bar.
+ */
+ public ChangeListener[] getChangeListeners()
+ {
+ return (ChangeListener[]) changeListenerList.getListenerList();
+ }
+
+ /**
+ * This method adds an AdjustmentListener to the scroll bar.
+ *
+ * @param listener The listener to add.
+ */
+ public void addAdjustmentListener(AdjustmentListener listener)
+ {
+ adjustmentListenerList.add(AdjustmentListener.class, listener);
+ }
+
+ /**
+ * This method removes an AdjustmentListener from the scroll bar.
+ *
+ * @param listener The listener to remove.
+ */
+ public void removeAdjustmentListener(AdjustmentListener listener)
+ {
+ adjustmentListenerList.remove(AdjustmentListener.class, listener);
+ }
+
+ /**
+ * This method returns an arry of all AdjustmentListeners listening to
+ * this scroll bar.
+ *
+ * @return An array of AdjustmentListeners listening to this scroll bar.
+ */
+ public AdjustmentListener[] getAdjustmentListeners()
+ {
+ return (AdjustmentListener[]) adjustmentListenerList.getListenerList();
+ }
+
+ /**
+ * This method is called to fired AdjustmentEvents to the listeners
+ * of this scroll bar. All AdjustmentEvents that are fired
+ * will have an ID of ADJUSTMENT_VALUE_CHANGED and a type of
+ * TRACK.
+ *
+ * @param id The ID of the adjustment event.
+ * @param type The Type of change.
+ * @param value The new value for the property that was changed..
+ */
+ protected void fireAdjustmentValueChanged(int id, int type, int value)
+ {
+ Object[] adjustmentListeners = adjustmentListenerList.getListenerList();
+ AdjustmentEvent adjustmentEvent = new AdjustmentEvent(this,
+ AdjustmentEvent.ADJUSTMENT_VALUE_CHANGED,
+ AdjustmentEvent.TRACK,
+ value);
+ for (int i = adjustmentListeners.length - 2; i >= 0; i -= 2)
+ {
+ if (adjustmentListeners[i] == AdjustmentListener.class)
+ ((AdjustmentListener) adjustmentListeners[i + 1]).adjustmentValueChanged(adjustmentEvent);
+ }
+ }
+
+ /**
+ * This method returns the minimum size for this scroll bar.
+ *
+ * @return The minimum size.
+ */
+ public Dimension getMinimumSize()
+ {
+ return ui.getMinimumSize(this);
+ }
+
+ /**
+ * This method returns the maximum size for this scroll bar.
+ *
+ * @return The maximum size.
+ */
+ public Dimension getMaximumSize()
+ {
+ return ui.getMaximumSize(this);
+ }
+
+ /**
+ * This method overrides the setEnabled in JComponent.
+ * When the scroll bar is disabled, the knob cannot
+ * be moved.
+ *
+ * @param x Whether the scrollbar is enabled.
+ */
+ public void setEnabled(boolean x)
+ {
+ // nothing special needs to be done here since we
+ // just check the enabled setting before changing the value.
+ super.setEnabled(x);
+ }
+
+ /**
+ * A string that describes this JScrollBar. Normally only used
+ * for debugging.
+ *
+ * @return A string describing this JScrollBar.
+ */
+ protected String paramString()
+ {
+ return "JScrollBar";
+ }
+
+ /**
+ * DOCUMENT ME!
+ *
+ * @return DOCUMENT ME!
+ */
+ public AccessibleContext getAccessibleContext()
+ {
+ if (accessibleContext == null)
+ accessibleContext = new AccessibleJScrollBar(this);
+ return accessibleContext;
+ }
}
Index: javax/swing/JSeparator.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JSeparator.java,v
retrieving revision 1.3
diff -u -r1.3 JSeparator.java
--- javax/swing/JSeparator.java 10 Jan 2004 21:07:43 -0000 1.3
+++ javax/swing/JSeparator.java 26 Feb 2004 14:12:23 -0000
@@ -44,183 +44,166 @@
import javax.accessibility.AccessibleRole;
import javax.swing.plaf.SeparatorUI;
+
/**
- * JSeparator
- * @author Andrew Selkirk
- * @version 1.0
+ * The JSeparator. It is mostly used to divide/space out
+ * components.
*/
-public class JSeparator extends JComponent
- implements SwingConstants, Accessible
+public class JSeparator extends JComponent implements SwingConstants,
+ Accessible
{
-
- //-------------------------------------------------------------
- // Classes ----------------------------------------------------
- //-------------------------------------------------------------
-
- /**
- * AccessibleJSeparator
- */
- protected class AccessibleJSeparator extends AccessibleJComponent {
-
- //-------------------------------------------------------------
- // Variables --------------------------------------------------
- //-------------------------------------------------------------
-
-
- //-------------------------------------------------------------
- // Initialization ---------------------------------------------
- //-------------------------------------------------------------
-
- /**
- * Constructor AccessibleJSeparator
- * @param component TODO
- */
- protected AccessibleJSeparator(JSeparator component) {
- super(component);
- // TODO
- } // AccessibleJSeparator()
-
-
- //-------------------------------------------------------------
- // Methods ----------------------------------------------------
- //-------------------------------------------------------------
-
- /**
- * getAccessibleRole
- * @returns AccessibleRole
- */
- public AccessibleRole getAccessibleRole() {
- return AccessibleRole.SEPARATOR;
- } // getAccessibleRole()
-
-
- } // AccessibleJSeparator
-
-
- //-------------------------------------------------------------
- // Variables --------------------------------------------------
- //-------------------------------------------------------------
-
- /**
- * uiClassID
- */
- private static final String uiClassID = "SeparatorUI";
-
- /**
- * orientation
- */
- private int orientation;
-
-
- //-------------------------------------------------------------
- // Initialization ---------------------------------------------
- //-------------------------------------------------------------
-
- /**
- * Constructor JSeparator
- */
- public JSeparator() {
- this(HORIZONTAL);
- } // JSeparator()
-
- /**
- * Constructor JSeparator
- * @param value0 TODO
- */
- public JSeparator(int orientation) {
- this.orientation = orientation;
- // TODO
- } // JSeparator()
-
-
- //-------------------------------------------------------------
- // Methods ----------------------------------------------------
- //-------------------------------------------------------------
-
- /**
- * writeObject
- * @param stream TODO
- * @exception IOException TODO
- */
- private void writeObject(ObjectOutputStream stream) throws IOException {
- // TODO
- } // writeObject()
-
- /**
- * getUI
- * @returns SeparatorUI
- */
- public SeparatorUI getUI() {
- return (SeparatorUI) ui;
- } // getUI()
-
- /**
- * setUI
- * @param ui TODO
- */
- public void setUI(SeparatorUI ui) {
- super.setUI(ui);
- } // setUI()
-
- /**
- * updateUI
- */
- public void updateUI() {
- setUI((SeparatorUI) UIManager.get(this));
- invalidate();
- } // updateUI()
-
- /**
- * getUIClassID
- * @returns String
- */
- public String getUIClassID() {
- return uiClassID;
- } // getUIClassID()
-
- /**
- * getOrientation
- * @returns int
- */
- public int getOrientation() {
- return orientation;
- } // getOrientation()
-
- /**
- * setOrientation
- * @param orientation TODO
- */
- public void setOrientation(int orientation) {
- this.orientation = orientation;
- // TODO
- } // setOrientation()
-
- /**
- * paramString
- * @returns String
- */
- protected String paramString() {
- return null; // TODO
- } // paramString()
-
- /**
- * isFocusTraversable
- * @returns boolean
- */
- public boolean isFocusTraversable() {
- return false;
- } // isFocusTraversable()
-
- /**
- * getAccessibleContext
- * @returns AccessibleContext
- */
- public AccessibleContext getAccessibleContext() {
- if (accessibleContext == null) {
- accessibleContext = new AccessibleJSeparator(this);
- } // if
- return accessibleContext;
- } // getAccessibleContext()
-
-
-} // JSeparator
+ /**
+ * AccessibleJSeparator
+ */
+ protected class AccessibleJSeparator extends AccessibleJComponent
+ {
+ /**
+ * Constructor AccessibleJSeparator
+ *
+ * @param component TODO
+ */
+ protected AccessibleJSeparator(JSeparator component)
+ {
+ super(component);
+ }
+
+ /**
+ * getAccessibleRole
+ *
+ * @return AccessibleRole
+ */
+ public AccessibleRole getAccessibleRole()
+ {
+ return AccessibleRole.SEPARATOR;
+ }
+ }
+
+ /** The orientation of the JSeparator. */
+ private transient int orientation = HORIZONTAL;
+
+ /**
+ * Creates a new horizontal JSeparator object.
+ */
+ public JSeparator()
+ {
+ this(HORIZONTAL);
+ }
+
+ /**
+ * Creates a new JSeparator object with the given orientation.
+ *
+ * @param orientation The orientation of the JSeparator.
+ */
+ public JSeparator(int orientation)
+ {
+ System.out.println("MAKING IT");
+ if (orientation != HORIZONTAL && orientation != VERTICAL)
+ throw new IllegalArgumentException(orientation
+ + " is not a valid orientation.");
+ this.orientation = orientation;
+ updateUI();
+ }
+
+ /**
+ * This method returns the UI delegate being
+ * used with the JSeparator.
+ *
+ * @return SeparatorUI The JSeparator's UI delegate.
+ */
+ public SeparatorUI getUI()
+ {
+ return (SeparatorUI) ui;
+ }
+
+ /**
+ * This method sets the UI delegate to use
+ * with the JSeparator.
+ *
+ * @param ui The UI delegate to use.
+ */
+ public void setUI(SeparatorUI ui)
+ {
+ super.setUI(ui);
+ }
+
+ /**
+ * This method resets the UI delegate to the
+ * default for the current look and feel.
+ */
+ public void updateUI()
+ {
+ setUI((SeparatorUI) UIManager.getUI(this));
+ invalidate();
+ if (ui == null)
+ System.out.println("CRAP");
+ }
+
+ /**
+ * This method returns the identifier string
+ * that is used to determine the UI delegate
+ * from the current look and feel.
+ *
+ * @return String The identifier string for the UI.
+ */
+ public String getUIClassID()
+ {
+ return "SeparatorUI";
+ }
+
+ /**
+ * This method returns the JSeparator's orientation.
+ *
+ * @return int The JSeparator's orientation.
+ */
+ public int getOrientation()
+ {
+ return orientation;
+ }
+
+ /**
+ * This method changes the JSeparator's orientation.
+ *
+ * @param orientation The JSeparator's orientation.
+ */
+ public void setOrientation(int orientation)
+ {
+ if (orientation != HORIZONTAL && orientation != VERTICAL)
+ throw new IllegalArgumentException(orientation
+ + " is not a valid orientation.");
+ this.orientation = orientation;
+ }
+
+ /**
+ * This method returns a string desribing the JSeparator.
+ * Normally only used in debugging.
+ *
+ * @return String A string describing the JSeparator.
+ */
+ protected String paramString()
+ {
+ return "JSeparator";
+ }
+
+ /**
+ * This method overrides the isFocusTraversable method from
+ * Component to false. JSeparator cannot be focused on.
+ *
+ * @return boolean False.
+ */
+ public boolean isFocusTraversable()
+ {
+ return false;
+ }
+
+ /**
+ * getAccessibleContext
+ *
+ * @return AccessibleContext
+ */
+ public AccessibleContext getAccessibleContext()
+ {
+ if (accessibleContext == null)
+ accessibleContext = new AccessibleJSeparator(this);
+ return accessibleContext;
+ }
+}
Index: javax/swing/JSlider.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JSlider.java,v
retrieving revision 1.3.18.4
diff -u -r1.3.18.4 JSlider.java
--- javax/swing/JSlider.java 18 Feb 2004 14:43:42 -0000 1.3.18.4
+++ javax/swing/JSlider.java 26 Feb 2004 14:12:23 -0000
@@ -338,8 +338,9 @@
public JSlider(int orientation, int minimum, int maximum, int value)
{
sliderModel = new DefaultBoundedRangeModel(value, 0, minimum, maximum);
- if (orientation == HORIZONTAL || orientation == VERTICAL)
- this.orientation = orientation;
+ if (orientation != HORIZONTAL && orientation != VERTICAL)
+ throw new IllegalArgumentException(orientation + " is not a legal orientation");
+ this.orientation = orientation;
changeListener = createChangeListener();
changeListenerList = new EventListenerList();
sliderModel.addChangeListener(changeListener);
@@ -488,7 +489,7 @@
*
* @return An array of ChangeListeners listening to this slider.
*/
- public ChangeListener[] getChangeListener()
+ public ChangeListener[] getChangeListeners()
{
return (ChangeListener[]) changeListenerList.getListenerList();
}
Index: javax/swing/SwingUtilities.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/SwingUtilities.java,v
retrieving revision 1.6.2.1
diff -u -r1.6.2.1 SwingUtilities.java
--- javax/swing/SwingUtilities.java 13 Feb 2004 16:21:46 -0000 1.6.2.1
+++ javax/swing/SwingUtilities.java 26 Feb 2004 14:12:23 -0000
@@ -670,8 +670,17 @@
iconR.width = icon.getIconWidth();
iconR.height = icon.getIconHeight();
}
- textR.width = fm.stringWidth(text);
- textR.height = fm.getHeight();
+ if (text == null)
+ {
+ textIconGap = 0;
+ textR.width = 0;
+ textR.height = 0;
+ }
+ else
+ {
+ textR.width = fm.stringWidth(text);
+ textR.height = fm.getHeight();
+ }
// Work out the position of text and icon, assuming the top-left coord
// starts at (0,0). We will fix that up momentarily, after these
Index: javax/swing/plaf/basic/BasicButtonUI.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/plaf/basic/BasicButtonUI.java,v
retrieving revision 1.6
diff -u -r1.6 BasicButtonUI.java
--- javax/swing/plaf/basic/BasicButtonUI.java 12 Feb 2004 00:17:24 -0000 1.6
+++ javax/swing/plaf/basic/BasicButtonUI.java 26 Feb 2004 14:12:23 -0000
@@ -250,7 +250,8 @@
paintButtonNormal(g, br, c);
paintIcon(g, c, ir);
- paintText(g, c, tr, b.getText());
+ if (text != null)
+ paintText(g, c, tr, b.getText());
paintFocus(g, c, vr, tr, ir);
}
Index: javax/swing/plaf/basic/BasicScrollBarUI.java
===================================================================
RCS file: javax/swing/plaf/basic/BasicScrollBarUI.java
diff -N javax/swing/plaf/basic/BasicScrollBarUI.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ javax/swing/plaf/basic/BasicScrollBarUI.java 26 Feb 2004 14:12:23 -0000
@@ -0,0 +1,1372 @@
+/* BasicScrollBarUI.java
+ Copyright (C) 2004 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version. */
+
+package javax.swing.plaf.basic;
+
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Container;
+import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.FontMetrics;
+import java.awt.Graphics;
+import java.awt.Insets;
+import java.awt.LayoutManager;
+import java.awt.Point;
+import java.awt.Polygon;
+import java.awt.Rectangle;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseMotionListener;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import javax.swing.BoundedRangeModel;
+import javax.swing.Icon;
+import javax.swing.JButton;
+import javax.swing.JComponent;
+import javax.swing.JScrollBar;
+import javax.swing.SwingConstants;
+import javax.swing.SwingUtilities;
+import javax.swing.Timer;
+import javax.swing.UIDefaults;
+import javax.swing.UIManager;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import javax.swing.plaf.ComponentUI;
+import javax.swing.plaf.ScrollBarUI;
+
+
+/**
+ * The Basic Look and Feel UI delegate for JScrollBar.
+ */
+public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager,
+ SwingConstants
+{
+ /**
+ * A helper class that listens to the two JButtons on each end
+ * of the JScrollBar.
+ */
+ protected class ArrowButtonListener extends MouseAdapter
+ {
+ /**
+ * Move the thumb in the direction specified by the
+ * button's arrow. If this button is held down, then
+ * it should keep moving the thumb.
+ *
+ * @param e The MouseEvent fired by the JButton.
+ */
+ public void mousePressed(MouseEvent e)
+ {
+ scrollListener.setScrollByBlock(false);
+ if (e.getSource() == incrButton)
+ scrollListener.setDirection(POSITIVE_SCROLL);
+ else
+ scrollListener.setDirection(NEGATIVE_SCROLL);
+ scrollTimer.start();
+ }
+
+ /**
+ * Stops the thumb when the JButton is released.
+ *
+ * @param e The MouseEvent fired by the JButton.
+ */
+ public void mouseReleased(MouseEvent e)
+ {
+ scrollTimer.stop();
+ }
+ }
+
+ /**
+ * A helper class that listens to the ScrollBar's model
+ * for ChangeEvents.
+ */
+ protected class ModelListener implements ChangeListener
+ {
+ /**
+ * Called when the model changes.
+ *
+ * @param e The ChangeEvent fired by the model.
+ */
+ public void stateChanged(ChangeEvent e)
+ {
+ getThumbBounds();
+ scrollbar.repaint();
+ }
+ }
+
+ /**
+ * A helper class that listens to the ScrollBar's properties.
+ */
+ public class PropertyChangeHandler implements PropertyChangeListener
+ {
+ /**
+ * Called when one of the ScrollBar's properties change.
+ *
+ * @param e The PropertyChangeEvent fired by the ScrollBar.
+ */
+ public void propertyChange(PropertyChangeEvent e)
+ {
+ if (e.getPropertyName().equals(JScrollBar.MODEL_CHANGED_PROPERTY))
+ {
+ ((BoundedRangeModel) e.getOldValue()).removeChangeListener(modelListener);
+ scrollbar.getModel().addChangeListener(modelListener);
+ getThumbBounds();
+ }
+ else if (e.getPropertyName().equals(JScrollBar.ORIENTATION_CHANGED_PROPERTY))
+ {
+ incrButton.removeMouseListener(buttonListener);
+ decrButton.removeMouseListener(buttonListener);
+ incrButton = createIncreaseButton(scrollbar.getOrientation());
+ decrButton = createDecreaseButton(scrollbar.getOrientation());
+ incrButton.addMouseListener(buttonListener);
+ decrButton.addMouseListener(buttonListener);
+ calculatePreferredSize();
+ layoutContainer(scrollbar);
+ }
+ layoutContainer(scrollbar);
+ scrollbar.repaint();
+ }
+ }
+
+ /**
+ * A helper class that listens for events from
+ * the timer that is used to move the thumb.
+ */
+ protected class ScrollListener implements ActionListener
+ {
+ /** The direction the thumb moves in. */
+ private transient int direction;
+
+ /** Whether movement will be in blocks. */
+ private transient boolean block;
+
+ /**
+ * Creates a new ScrollListener object.
+ * The default is scrolling positively with block movement.
+ */
+ public ScrollListener()
+ {
+ direction = POSITIVE_SCROLL;
+ block = true;
+ }
+
+ /**
+ * Creates a new ScrollListener object using
+ * the given direction and block.
+ *
+ * @param dir The direction to move in.
+ * @param block Whether movement will be in blocks.
+ */
+ public ScrollListener(int dir, boolean block)
+ {
+ direction = dir;
+ this.block = block;
+ }
+
+ /**
+ * Sets the direction to scroll in.
+ *
+ * @param direction The direction to scroll in.
+ */
+ public void setDirection(int direction)
+ {
+ this.direction = direction;
+ }
+
+ /**
+ * Sets whether scrolling will be done in blocks.
+ *
+ * @param block Whether scrolling will be in blocks.
+ */
+ public void setScrollByBlock(boolean block)
+ {
+ this.block = block;
+ }
+
+ /**
+ * Called every time the timer reaches its interval.
+ *
+ * @param e The ActionEvent fired by the timer.
+ */
+ public void actionPerformed(ActionEvent e)
+ {
+ if (block)
+ {
+ // Only need to check it if it's block scrolling
+ // We only block scroll if the click occurs
+ // in the track.
+
+ if (!trackListener.shouldScroll(direction))
+ {
+ trackHighlight = NO_HIGHLIGHT;
+ scrollbar.repaint();
+ return;
+ }
+ scrollByBlock(direction);
+ }
+ else
+ scrollByUnit(direction);
+ }
+ }
+
+ /**
+ * Helper class that listens for movement on the track.
+ */
+ protected class TrackListener extends MouseAdapter
+ implements MouseMotionListener
+ {
+ /** The current X coordinate of the mouse. */
+ protected int currentMouseX;
+
+ /** The current Y coordinate of the mouse. */
+ protected int currentMouseY;
+
+ /** FIXME: use for something */
+ protected int offset;
+
+ /**
+ * This method is called when the mouse is being
+ * dragged.
+ *
+ * @param e The MouseEvent given.
+ */
+ public void mouseDragged(MouseEvent e)
+ {
+ // FIXME: implement.
+ System.out.println("DRAGGING");
+ }
+
+ /**
+ * This method is called when the mouse is moved.
+ *
+ * @param e The MouseEvent given.
+ */
+ public void mouseMoved(MouseEvent e)
+ {
+ // FIXME: implement.
+ System.out.println("MOVING");
+ }
+
+ /**
+ * This method is called when the mouse is
+ * pressed. When it is pressed, the thumb should
+ * move in blocks towards the cursor.
+ *
+ * @param e The MouseEvent given.
+ */
+ public void mousePressed(MouseEvent e)
+ {
+ currentMouseX = e.getX();
+ currentMouseY = e.getY();
+
+ int value;
+ if (scrollbar.getOrientation() == SwingConstants.HORIZONTAL)
+ value = valueForXPosition(currentMouseX);
+ else
+ value = valueForYPosition(currentMouseY);
+
+ if (value == scrollbar.getValue())
+ return;
+
+ if (thumbRect.contains(e.getPoint()))
+ scrollbar.setValue(value);
+ else
+ {
+ scrollListener.setScrollByBlock(true);
+ if (value > scrollbar.getValue())
+ {
+ trackHighlight = INCREASE_HIGHLIGHT;
+ scrollListener.setDirection(POSITIVE_SCROLL);
+ }
+ else
+ {
+ trackHighlight = DECREASE_HIGHLIGHT;
+ scrollListener.setDirection(NEGATIVE_SCROLL);
+ }
+ scrollTimer.start();
+ }
+ scrollbar.repaint();
+ }
+
+ /**
+ * This method is called when the mouse is released.
+ * It should stop movement on the thumb
+ *
+ * @param e The MouseEvent given.
+ */
+ public void mouseReleased(MouseEvent e)
+ {
+ trackHighlight = NO_HIGHLIGHT;
+ scrollTimer.stop();
+ scrollbar.repaint();
+ }
+
+ /**
+ * A helper method that decides whether we should
+ * keep scrolling in the given direction.
+ *
+ * @param direction The direction to check for.
+ *
+ * @return Whether the thumb should keep scrolling.
+ */
+ public boolean shouldScroll (int direction)
+ {
+ int value;
+ if (scrollbar.getOrientation() == HORIZONTAL)
+ value = valueForXPosition(currentMouseX);
+ else
+ value = valueForYPosition(currentMouseY);
+
+ if (direction == POSITIVE_SCROLL)
+ return (value > scrollbar.getValue());
+ else
+ return (value < scrollbar.getValue());
+ }
+ }
+
+ /** The listener that listens to the JButtons. */
+ protected ArrowButtonListener buttonListener;
+
+ /** The listener that listens to the model. */
+ protected ModelListener modelListener;
+
+ /** The listener that listens to the scrollbar for property
+ changes. */
+ protected PropertyChangeListener propertyChangeListener;
+
+ /** The listener that listens to the timer. */
+ protected ScrollListener scrollListener;
+
+ /** The listener that listens for MouseEvents on the track. */
+ protected TrackListener trackListener;
+
+ /** The JButton that decrements the scrollbar's value. */
+ protected JButton decrButton;
+
+ /** The JButton that increments the scrollbar's value. */
+ protected JButton incrButton;
+
+ /** The dimensions of the maximum thumb size. */
+ protected static Dimension maximumThumbSize;
+
+ /** The dimensions of the minimum thumb size. */
+ protected static Dimension minimumThumbSize;
+
+ /** The color of the thumb. */
+ protected Color thumbColor;
+
+ /** The outer shadow of the thumb. */
+ protected Color thumbDarkShadowColor;
+
+ /** The top and left edge color for the thumb. */
+ protected Color thumbHighlightColor;
+
+ /** The outer light shadow for the thumb. */
+ protected Color thumbLightShadowColor;
+
+ /** The color that is used when the mouse press
+ occurs in the track. */
+ protected Color trackHighlightColor;
+
+ /** The color of the track. */
+ protected Color trackColor;
+
+ /** The size and position of the track. */
+ protected Rectangle trackRect;
+
+ /** The size and position of the thumb. */
+ protected Rectangle thumbRect;
+
+ /** Indicates that the decrease highlight should be painted. */
+ protected static int DECREASE_HIGHLIGHT = 1;
+
+ /** Indicates that the increase highlight should be painted. */
+ protected static int INCREASE_HIGHLIGHT = 2;
+
+ /** Indicates that no highlight should be painted. */
+ protected static int NO_HIGHLIGHT = 0;
+
+ /** Indicates that the scrolling direction is positive. */
+ private static int POSITIVE_SCROLL = 1;
+
+ /** Indicates that the scrolling direction is negative. */
+ private static int NEGATIVE_SCROLL = -1;
+
+ /** The cached preferred size for the scrollbar. */
+ private transient Dimension preferredSize;
+
+ /** The current highlight status. */
+ protected int trackHighlight;
+
+ /** FIXME: Use this for something (presumably mouseDragged) */
+ protected boolean isDragging;
+
+ /** The timer used to move the thumb when the mouse is held. */
+ protected Timer scrollTimer;
+
+ /** The scrollbar this UI is acting for. */
+ protected JScrollBar scrollbar;
+
+ /**
+ * A helper class that allows us to draw icons for
+ * the JButton.
+ */
+ private class arrowIcon implements Icon
+ {
+ /** The polygon that describes the icon. */
+ private Polygon arrow;
+
+ /**
+ * Creates a new arrowIcon object.
+ *
+ * @param arrow The polygon that describes the arrow.
+ */
+ public arrowIcon(Polygon arrow)
+ {
+ this.arrow = arrow;
+ }
+
+ /**
+ * Returns the height of the icon.
+ *
+ * @return The height of the icon.
+ */
+ public int getIconHeight()
+ {
+ return 10;
+ }
+
+ /**
+ * Returns the width of the icon.
+ *
+ * @return The width of the icon.
+ */
+ public int getIconWidth()
+ {
+ return 10;
+ }
+
+ /**
+ * Paints the icon.
+ *
+ * @param c The Component to paint for.
+ * @param g The Graphics object to draw with.
+ * @param x The X coordinate to draw at.
+ * @param y The Y coordinate to draw at.
+ */
+ public void paintIcon(Component c, Graphics g, int x, int y)
+ {
+ g.translate(x, y);
+
+ Color saved = g.getColor();
+
+ g.setColor(Color.BLACK);
+
+ g.fillPolygon(arrow);
+
+ g.setColor(saved);
+ g.translate(-x, -y);
+ }
+ }
+
+ /** The Icon that points up. */
+ private static Icon upIcon = new arrowIcon(new Polygon(new int[] { 2, 5, 8 },
+ new int[] { 7, 3, 7 },
+ 3));
+
+ /** The Icon that points down. */
+ private static Icon downIcon = new arrowIcon(new Polygon(new int[] { 2, 5, 8 },
+ new int[] { 3, 7, 3 },
+ 3));
+
+ /** The Icon that points left. */
+ private static Icon leftIcon = new arrowIcon(new Polygon(new int[] { 7, 3, 7 },
+ new int[] { 2, 5, 8 },
+ 3));
+
+ /** The Icon that points right. */
+ private static Icon rightIcon = new arrowIcon(new Polygon(new int[]
+ {
+ 3, 7, 3
+ },
+ new int[]
+ {
+ 2, 5, 8
+ }, 3));
+
+ /**
+ * This method adds a component to the layout.
+ *
+ * @param name The name to associate with the component that is added.
+ * @param child The Component to add.
+ */
+ public void addLayoutComponent(String name, Component child)
+ {
+ // You should not be adding stuff to this component.
+ // The contents are fixed.
+ }
+
+ /**
+ * This method configures the scrollbar's colors. This can be
+ * done by looking up the standard colors from the L&F defaults.
+ */
+ protected void configureScrollBarColors()
+ {
+ UIDefaults defaults = UIManager.getLookAndFeelDefaults();
+
+ trackColor = defaults.getColor("ScrollBar.track");
+ trackHighlightColor = defaults.getColor("ScrollBar.trackHighlight");
+ thumbColor = defaults.getColor("ScrollBar.thumb");
+ thumbHighlightColor = defaults.getColor("ScrollBar.thumbHighlight");
+ thumbDarkShadowColor = defaults.getColor("ScrollBar.thumbDarkShadow");
+ thumbLightShadowColor = defaults.getColor("ScrollBar.thumbLightShadow");
+ }
+
+ /**
+ * This method creates an ArrowButtonListener.
+ *
+ * @return A new ArrowButtonListener.
+ */
+ protected ArrowButtonListener createArrowButtonListener()
+ {
+ return new ArrowButtonListener();
+ }
+
+ /**
+ * This method creates a new JButton with the appropriate
+ * icon for the orientation.
+ *
+ * @param orientation The orientation this JButton uses.
+ *
+ * @return The increase JButton.
+ */
+ protected JButton createIncreaseButton(int orientation)
+ {
+ if (incrButton == null)
+ incrButton = new JButton();
+ if (orientation == SwingConstants.HORIZONTAL)
+ incrButton.setIcon(rightIcon);
+ else
+ incrButton.setIcon(upIcon);
+
+ return incrButton;
+ }
+
+ /**
+ * This method creates a new JButton with the appropriate
+ * icon for the orientation.
+ *
+ * @param orientation The orientation this JButton uses.
+ *
+ * @return The decrease JButton.
+ */
+ protected JButton createDecreaseButton(int orientation)
+ {
+ if (decrButton == null)
+ decrButton = new JButton();
+ if (orientation == SwingConstants.HORIZONTAL)
+ decrButton.setIcon(leftIcon);
+ else
+ decrButton.setIcon(downIcon);
+
+ return decrButton;
+ }
+
+ /**
+ * This method creates a new ModelListener.
+ *
+ * @return A new ModelListener.
+ */
+ protected ModelListener createModelListener()
+ {
+ return new ModelListener();
+ }
+
+ /**
+ * This method creates a new PropertyChangeListener.
+ *
+ * @return A new PropertyChangeListener.
+ */
+ protected PropertyChangeListener createPropertyChangeListener()
+ {
+ return new PropertyChangeHandler();
+ }
+
+ /**
+ * This method creates a new ScrollListener.
+ *
+ * @return A new ScrollListener.
+ */
+ protected ScrollListener createScrollListener()
+ {
+ return new ScrollListener();
+ }
+
+ /**
+ * This method creates a new TrackListener.
+ *
+ * @return A new TrackListener.
+ */
+ protected TrackListener createTrackListener()
+ {
+ return new TrackListener();
+ }
+
+ /**
+ * This method returns a new BasicScrollBarUI.
+ *
+ * @param c The JComponent to create a UI for.
+ *
+ * @return A new BasicScrollBarUI.
+ */
+ public static ComponentUI createUI(JComponent c)
+ {
+ return new BasicScrollBarUI();
+ }
+
+ /**
+ * This method returns the maximum size for this JComponent.
+ *
+ * @param c The JComponent to measure the maximum size for.
+ *
+ * @return The maximum size for the component.
+ */
+ public Dimension getMaximumSize(JComponent c)
+ {
+ return getPreferredSize(c);
+ }
+
+ /**
+ * This method returns the maximum thumb size.
+ *
+ * @return The maximum thumb size.
+ */
+ protected Dimension getMaximumThumbSize()
+ {
+ return maximumThumbSize;
+ }
+
+ /**
+ * This method returns the minimum size for this JComponent.
+ *
+ * @param c The JComponent to measure the minimum size for.
+ *
+ * @return The minimum size for the component.
+ */
+ public Dimension getMinimumSize(JComponent c)
+ {
+ return getPreferredSize(c);
+ }
+
+ /**
+ * This method returns the minimum thumb size.
+ *
+ * @return The minimum thumb size.
+ */
+ protected Dimension getMinimumThumbSize()
+ {
+ return minimumThumbSize;
+ }
+
+ /**
+ * This method calculates the preferred size since
+ * calling getPreferredSize() returns a cached value.
+ */
+ private void calculatePreferredSize()
+ {
+ int height;
+ int width;
+ height = width = 0;
+
+ if (scrollbar.getOrientation() == SwingConstants.HORIZONTAL)
+ {
+ width += incrButton.getPreferredSize().getWidth();
+ width += decrButton.getPreferredSize().getWidth();
+
+ width += Math.max(200, scrollbar.getVisibleAmount());
+
+ height = Math.max(incrButton.getPreferredSize().height,
+ decrButton.getPreferredSize().height);
+ height = Math.max(getMinimumThumbSize().height, height);
+ height = Math.max(20, height);
+ height = Math.min(getMaximumThumbSize().height, height);
+ }
+ else
+ {
+ height += incrButton.getPreferredSize().getHeight();
+ height += decrButton.getPreferredSize().getHeight();
+
+ height += Math.max(200, scrollbar.getVisibleAmount());
+
+ width = Math.max(incrButton.getPreferredSize().width,
+ decrButton.getPreferredSize().width);
+ width = Math.max(getMinimumThumbSize().width, width);
+ width = Math.max(20, width);
+ width = Math.min(getMaximumThumbSize().height, height);
+ }
+
+ Insets insets = scrollbar.getInsets();
+
+ height += insets.top + insets.bottom;
+ width += insets.left + insets.right;
+
+ preferredSize = new Dimension(width, height);
+ }
+
+ /**
+ * This method returns a cached value of the preferredSize.
+ * The only restrictions are: If the scrollbar is horizontal, the
+ * height should be the maximum of the height of the JButtons and
+ * the minimum width of the thumb. For vertical scrollbars, the
+ * calculation is similar (swap width for height and vice versa).
+ *
+ * @param c The JComponent to measure.
+ *
+ * @return The preferredSize.
+ */
+ public Dimension getPreferredSize(JComponent c)
+ {
+ layoutContainer(scrollbar);
+ return preferredSize;
+ }
+
+ /**
+ * This method returns the thumb's bounds based on the
+ * current value of the scrollbar. This method updates the
+ * cached value and returns that.
+ *
+ * @return The thumb bounds.
+ */
+ protected Rectangle getThumbBounds()
+ {
+ int max = scrollbar.getMaximum();
+ int min = scrollbar.getMinimum();
+ int value = scrollbar.getValue();
+ int extent = scrollbar.getVisibleAmount();
+
+ if (max == min)
+ {
+ thumbRect.x = trackRect.x;
+ thumbRect.y = trackRect.y;
+ if (scrollbar.getOrientation() == HORIZONTAL)
+ {
+ thumbRect.width = getMinimumThumbSize().width;
+ thumbRect.height = trackRect.height;
+ }
+ else
+ {
+ thumbRect.width = trackRect.width;
+ thumbRect.height = getMinimumThumbSize().height;
+ }
+ return thumbRect;
+ }
+
+
+ if (scrollbar.getOrientation() == HORIZONTAL)
+ {
+ thumbRect.x = trackRect.x;
+ thumbRect.x += (value - min) * trackRect.width / (max - min);
+ thumbRect.y = trackRect.y;
+
+ thumbRect.width = extent * trackRect.width / (max - min);
+ thumbRect.height = trackRect.height;
+ }
+ else
+ {
+ thumbRect.x = trackRect.x;
+ thumbRect.y = trackRect.y
+ + (max - value - extent) * trackRect.height / (max - min);
+
+ thumbRect.width = trackRect.width;
+ thumbRect.height = extent * trackRect.height / (max - min);
+ }
+ return thumbRect;
+ }
+
+ /**
+ * This method calculates the bounds of the track. This method
+ * updates the cached value and returns it.
+ *
+ * @return The track's bounds.
+ */
+ protected Rectangle getTrackBounds()
+ {
+ SwingUtilities.calculateInnerArea(scrollbar, trackRect);
+
+ if (scrollbar.getOrientation() == SwingConstants.HORIZONTAL)
+ {
+ trackRect.width -= incrButton.getPreferredSize().getWidth();
+ trackRect.width -= decrButton.getPreferredSize().getWidth();
+
+ trackRect.x += decrButton.getPreferredSize().getWidth();
+ }
+ else
+ {
+ trackRect.height -= incrButton.getPreferredSize().getHeight();
+ trackRect.height -= decrButton.getPreferredSize().getHeight();
+
+ trackRect.y += incrButton.getPreferredSize().getHeight();
+ }
+ return trackRect;
+ }
+
+ /**
+ * This method installs any addition Components that
+ * are a part of or related to this scrollbar.
+ */
+ protected void installComponents()
+ {
+ incrButton = createIncreaseButton(scrollbar.getOrientation());
+ scrollbar.add(incrButton);
+ decrButton = createDecreaseButton(scrollbar.getOrientation());
+ scrollbar.add(decrButton);
+ }
+
+ /**
+ * This method installs the defaults for the scrollbar specified
+ * by the Basic L&F.
+ */
+ protected void installDefaults()
+ {
+ UIDefaults defaults = UIManager.getLookAndFeelDefaults();
+
+ scrollbar.setForeground(defaults.getColor("ScrollBar.foreground"));
+ scrollbar.setBackground(defaults.getColor("ScrollBar.background"));
+
+ scrollbar.setBorder(defaults.getBorder("ScrollBar.border"));
+
+ maximumThumbSize = defaults.getDimension("ScrollBar.maximumThumbSize");
+ minimumThumbSize = defaults.getDimension("ScrollBar.minimumThumbSize");
+ }
+
+ /**
+ * This method installs the keyboard actions for the scrollbar.
+ */
+ protected void installKeyboardActions()
+ {
+ // FIXME: implement.
+ }
+
+ /**
+ * This method installs any listeners for the scrollbar.
+ * This method also installs listeners for things such as
+ * the JButtons and the timer.
+ */
+ protected void installListeners()
+ {
+ scrollListener = createScrollListener();
+ trackListener = createTrackListener();
+ buttonListener = createArrowButtonListener();
+ modelListener = createModelListener();
+ propertyChangeListener = createPropertyChangeListener();
+
+ scrollbar.addMouseMotionListener(trackListener);
+ scrollbar.addMouseListener(trackListener);
+
+ incrButton.addMouseListener(buttonListener);
+ decrButton.addMouseListener(buttonListener);
+
+ scrollbar.addPropertyChangeListener(propertyChangeListener);
+ scrollbar.getModel().addChangeListener(modelListener);
+
+ scrollTimer.addActionListener(scrollListener);
+ }
+
+ /**
+ * This method installs the UI for the component.
+ * This can include setting up listeners, defaults,
+ * and components. This also includes initializing any data
+ * objects.
+ *
+ * @param c The JComponent to install.
+ */
+ public void installUI(JComponent c)
+ {
+ super.installUI(c);
+ if (c instanceof JScrollBar)
+ {
+ scrollbar = (JScrollBar) c;
+
+ trackRect = new Rectangle();
+ thumbRect = new Rectangle();
+
+ scrollTimer = new Timer();
+ scrollTimer.setDelay(200);
+ scrollTimer.setRepeats(true);
+
+ installComponents();
+ installListeners();
+ installDefaults();
+ configureScrollBarColors();
+
+ calculatePreferredSize();
+ layoutContainer(scrollbar);
+ }
+ }
+
+ /**
+ * This method lays out the scrollbar.
+ *
+ * @param scrollbarContainer The Container to layout.
+ */
+ public void layoutContainer(Container scrollbarContainer)
+ {
+ if (scrollbarContainer instanceof JScrollBar)
+ {
+ if (scrollbar.getOrientation() == SwingConstants.HORIZONTAL)
+ layoutHScrollbar((JScrollBar) scrollbarContainer);
+ else
+ layoutVScrollbar((JScrollBar) scrollbarContainer);
+ }
+ }
+
+ /**
+ * This method lays out the scrollbar horizontally.
+ *
+ * @param sb The JScrollBar to layout.
+ */
+ protected void layoutHScrollbar(JScrollBar sb)
+ {
+ // All we have to do is layout the 2 buttons?
+ Rectangle vr = new Rectangle();
+ SwingUtilities.calculateInnerArea(scrollbar, vr);
+
+ // Update the rectangles.
+ getTrackBounds();
+ getThumbBounds();
+
+ Dimension incrDims = incrButton.getPreferredSize();
+ Dimension decrDims = decrButton.getPreferredSize();
+
+ decrButton.setBounds(vr.x, vr.y, decrDims.width, trackRect.height);
+ incrButton.setBounds(trackRect.x + trackRect.width, vr.y, incrDims.width,
+ trackRect.height);
+ }
+
+ /**
+ * This method lays out the scrollbar vertically.
+ *
+ * @param sb The JScrollBar to layout.
+ */
+ protected void layoutVScrollbar(JScrollBar sb)
+ {
+ Rectangle vr = new Rectangle();
+ SwingUtilities.calculateInnerArea(scrollbar, vr);
+
+ // Update rectangles
+ getTrackBounds();
+ getThumbBounds();
+
+ Dimension incrDims = incrButton.getPreferredSize();
+ Dimension decrDims = decrButton.getPreferredSize();
+
+ incrButton.setBounds(vr.x, vr.y, trackRect.width, incrDims.height);
+ decrButton.setBounds(vr.x, trackRect.y + trackRect.height,
+ trackRect.width, decrDims.height);
+ }
+
+ /**
+ * This method returns the minimum size required for the layout.
+ *
+ * @param scrollbarContainer The Container that is laid out.
+ *
+ * @return The minimum size.
+ */
+ public Dimension minimumLayoutSize(Container scrollbarContainer)
+ {
+ return preferredLayoutSize(scrollbarContainer);
+ }
+
+ /**
+ * This method is called when the component is painted.
+ *
+ * @param g The Graphics object to paint with.
+ * @param c The JComponent to paint.
+ */
+ public void paint(Graphics g, JComponent c)
+ {
+ layoutContainer(scrollbar);
+
+// Rectangle r = incrButton.getBounds();
+// SwingUtilities.paintComponent(g, incrButton, scrollbar, r.x, r.y, r.width,
+// r.height);
+// r = decrButton.getBounds();
+// SwingUtilities.paintComponent(g, decrButton, scrollbar, r.x, r.y, r.width,
+// r.height);
+
+ paintTrack(g, c, getTrackBounds());
+ paintThumb(g, c, getThumbBounds());
+
+ if (trackHighlight == INCREASE_HIGHLIGHT)
+ paintIncreaseHighlight(g);
+ else if (trackHighlight == DECREASE_HIGHLIGHT)
+ paintDecreaseHighlight(g);
+ }
+
+ /**
+ * This method is called when repainting and the mouse is
+ * pressed in the track. It paints the track below the thumb
+ * with the trackHighlight color.
+ *
+ * @param g The Graphics object to paint with.
+ */
+ protected void paintDecreaseHighlight(Graphics g)
+ {
+ Color saved = g.getColor();
+
+ g.setColor(trackHighlightColor);
+ if (scrollbar.getOrientation() == HORIZONTAL)
+ g.fillRect(trackRect.x, trackRect.y, thumbRect.x - trackRect.x,
+ trackRect.height);
+ else
+ g.fillRect(trackRect.x, thumbRect.y + thumbRect.height,
+ trackRect.width,
+ trackRect.y + trackRect.height - thumbRect.y -
+ thumbRect.height);
+ g.setColor(saved);
+ }
+
+ /**
+ * This method is called when repainting and the mouse is
+ * pressed in the track. It paints the track above the thumb
+ * with the trackHighlight color.
+ *
+ * @param g The Graphics objet to paint with.
+ */
+ protected void paintIncreaseHighlight(Graphics g)
+ {
+ Color saved = g.getColor();
+
+ g.setColor(trackHighlightColor);
+ if (scrollbar.getOrientation() == HORIZONTAL)
+ g.fillRect(thumbRect.x + thumbRect.width, trackRect.y,
+ trackRect.x + trackRect.width - thumbRect.x - thumbRect.width,
+ trackRect.height);
+ else
+ g.fillRect(trackRect.x, trackRect.y, trackRect.width,
+ thumbRect.y - trackRect.y);
+ g.setColor(saved);
+ }
+
+ /**
+ * This method paints the thumb.
+ *
+ * @param g The Graphics object to paint with.
+ * @param c The Component that is being painted.
+ * @param thumbBounds The thumb bounds.
+ */
+ protected void paintThumb(Graphics g, JComponent c, Rectangle thumbBounds)
+ {
+ Color saved = g.getColor();
+ Point x;
+ Point y;
+ Point z;
+ Polygon lines;
+
+ g.setColor(thumbHighlightColor);
+ x = new Point(thumbBounds.x + 1, thumbBounds.y + 1);
+ y = new Point(x);
+ y.translate(thumbBounds.width - 2, 0);
+ z = new Point(x);
+ z.translate(0, thumbBounds.height - 2);
+
+ lines = new Polygon(new int[] { x.x, y.x, z.x },
+ new int[] { x.y, y.y, z.y }, 3);
+
+ g.drawPolygon(lines);
+
+ g.setColor(thumbLightShadowColor);
+ x = new Point(thumbBounds.x + thumbBounds.width - 1,
+ thumbBounds.y + thumbBounds.height - 1);
+ y = new Point(x);
+ y.translate(-(thumbBounds.width - 2), 0);
+ z = new Point(x);
+ z.translate(0, -(thumbBounds.height - 2));
+
+ lines = new Polygon(new int[] { x.x, y.x, z.x },
+ new int[] { x.y, y.y, z.y }, 3);
+ g.drawPolygon(lines);
+
+ g.setColor(thumbDarkShadowColor);
+ x = new Point(thumbBounds.x + thumbBounds.width,
+ thumbBounds.y + thumbBounds.height);
+ y = new Point(x);
+ y.translate(-thumbBounds.width, 0);
+ z = new Point(x);
+ z.translate(0, -thumbBounds.height);
+
+ lines = new Polygon(new int[] { x.x, y.x, z.x },
+ new int[] { x.y, y.y, z.y }, 3);
+ g.drawPolygon(lines);
+
+ g.setColor(thumbColor);
+ g.fillRect(thumbBounds.x, thumbBounds.y, thumbBounds.width,
+ thumbBounds.height);
+
+ g.setColor(saved);
+ }
+
+ /**
+ * This method paints the track.
+ *
+ * @param g The Graphics object to paint with.
+ * @param c The JComponent being painted.
+ * @param trackBounds The track's bounds.
+ */
+ protected void paintTrack(Graphics g, JComponent c, Rectangle trackBounds)
+ {
+ Color saved = g.getColor();
+ g.setColor(trackColor);
+ g.fill3DRect(trackBounds.x, trackBounds.y, trackBounds.width,
+ trackBounds.height, false);
+ g.setColor(saved);
+ }
+
+ /**
+ * This method returns the preferred size for the layout.
+ *
+ * @param scrollbarContainer The Container to find a size for.
+ *
+ * @return The preferred size for the layout.
+ */
+ public Dimension preferredLayoutSize(Container scrollbarContainer)
+ {
+ if (scrollbarContainer instanceof JComponent)
+ return getPreferredSize((JComponent) scrollbarContainer);
+ else
+ return null;
+ }
+
+ /**
+ * This method removes a child component from the layout.
+ *
+ * @param child The child to remove.
+ */
+ public void removeLayoutComponent(Component child)
+ {
+ // You should not be removing stuff from this component.
+ }
+
+ /**
+ * The method scrolls the thumb by a block in the
+ * direction specified.
+ *
+ * @param direction The direction to scroll.
+ */
+ protected void scrollByBlock(int direction)
+ {
+ scrollbar.setValue(scrollbar.getValue() + scrollbar.getBlockIncrement(direction));
+ }
+
+ /**
+ * The method scrolls the thumb by a unit in the
+ * direction specified.
+ *
+ * @param direction The direction to scroll.
+ */
+ protected void scrollByUnit(int direction)
+ {
+ scrollbar.setValue(scrollbar.getValue() + scrollbar.getUnitIncrement(direction));
+ }
+
+ /**
+ * This method sets the thumb's bounds.
+ *
+ * @param x The X position of the thumb.
+ * @param y The Y position of the thumb.
+ * @param width The width of the thumb.
+ * @param height The height of the thumb.
+ */
+ protected void setThumbBounds(int x, int y, int width, int height)
+ {
+ thumbRect.x = x;
+ thumbRect.y = y;
+ thumbRect.width = width;
+ thumbRect.height = height;
+ }
+
+ /**
+ * This method uninstalls any components that
+ * are a part of or related to this scrollbar.
+ */
+ protected void uninstallComponents()
+ {
+ scrollbar.remove(incrButton);
+ scrollbar.remove(decrButton);
+ incrButton = null;
+ decrButton = null;
+ }
+
+ /**
+ * This method uninstalls any defaults that this
+ * scrollbar acquired from the Basic L&F defaults.
+ */
+ protected void uninstallDefaults()
+ {
+ scrollbar.setForeground(null);
+ scrollbar.setBackground(null);
+ scrollbar.setBorder(null);
+ }
+
+ /**
+ * This method uninstalls any keyboard
+ * actions this scrollbar acquired during install.
+ */
+ protected void uninstallKeyboardActions()
+ {
+ // FIXME: implement.
+ }
+
+ /**
+ * This method uninstalls any listeners that
+ * were registered during install.
+ */
+ protected void uninstallListeners()
+ {
+ scrollTimer.removeActionListener(scrollListener);
+
+ scrollbar.getModel().removeChangeListener(modelListener);
+ scrollbar.removePropertyChangeListener(propertyChangeListener);
+
+ decrButton.removeMouseListener(buttonListener);
+ incrButton.removeMouseListener(buttonListener);
+
+ scrollbar.removeMouseListener(trackListener);
+ scrollbar.removeMouseMotionListener(trackListener);
+
+ propertyChangeListener = null;
+ modelListener = null;
+ buttonListener = null;
+ trackListener = null;
+ scrollListener = null;
+ }
+
+ /**
+ * This method uninstalls the UI. This includes
+ * removing any defaults, listeners, and components
+ * that this UI may have initialized. It also nulls
+ * any instance data.
+ *
+ * @param c The Component to uninstall for.
+ */
+ public void uninstallUI(JComponent c)
+ {
+ uninstallDefaults();
+ uninstallListeners();
+ uninstallComponents();
+
+ scrollTimer = null;
+
+ thumbRect = null;
+ trackRect = null;
+
+ trackColor = null;
+ trackHighlightColor = null;
+ thumbColor = null;
+ thumbHighlightColor = null;
+ thumbDarkShadowColor = null;
+ thumbLightShadowColor = null;
+
+ scrollbar = null;
+ }
+
+ /**
+ * This method returns the value in the scrollbar's range given the y
+ * coordinate. If the value is out of range, it will return the closest
+ * legal value.
+ *
+ * @param yPos The y coordinate to calculate a value for.
+ *
+ * @return The value for the y coordinate.
+ */
+ private int valueForYPosition(int yPos)
+ {
+ int min = scrollbar.getMinimum();
+ int max = scrollbar.getMaximum();
+ int len = trackRect.height;
+
+ int value;
+
+ // If the length is 0, you shouldn't be able to even see where the thumb is.
+ // This really shouldn't ever happen, but just in case, we'll return the middle.
+ if (len == 0)
+ return ((max - min) / 2);
+
+ value = ((len - (yPos - trackRect.y)) * (max - min) / len + min);
+
+ // If this isn't a legal value, then we'll have to move to one now.
+ if (value > max)
+ value = max;
+ else if (value < min)
+ value = min;
+ return value;
+ }
+
+ /**
+ * This method returns the value in the scrollbar's range given the x
+ * coordinate. If the value is out of range, it will return the closest
+ * legal value.
+ *
+ * @param xPos The x coordinate to calculate a value for.
+ *
+ * @return The value for the x coordinate.
+ */
+ private int valueForXPosition(int xPos)
+ {
+ int min = scrollbar.getMinimum();
+ int max = scrollbar.getMaximum();
+ int len = trackRect.width;
+
+ int value;
+
+ // If the length is 0, you shouldn't be able to even see where the slider is.
+ // This really shouldn't ever happen, but just in case, we'll return the middle.
+ if (len == 0)
+ return ((max - min) / 2);
+
+ value = ((xPos - trackRect.x) * (max - min) / len + min);
+
+ // If this isn't a legal value, then we'll have to move to one now.
+ if (value > max)
+ value = max;
+ else if (value < min)
+ value = min;
+ return value;
+ }
+}
Index: javax/swing/plaf/basic/BasicSeparatorUI.java
===================================================================
RCS file: javax/swing/plaf/basic/BasicSeparatorUI.java
diff -N javax/swing/plaf/basic/BasicSeparatorUI.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ javax/swing/plaf/basic/BasicSeparatorUI.java 26 Feb 2004 14:12:23 -0000
@@ -0,0 +1,266 @@
+/* BasicSeparatorUI.java
+ Copyright (C) 2004 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version. */
+
+package javax.swing.plaf.basic;
+
+import java.awt.Dimension;
+import java.awt.Color;
+import java.awt.Rectangle;
+import java.awt.Graphics;
+import java.awt.Insets;
+import javax.swing.plaf.ComponentUI;
+import javax.swing.plaf.SeparatorUI;
+import javax.swing.UIDefaults;
+import javax.swing.UIManager;
+import javax.swing.JComponent;
+import javax.swing.JSeparator;
+import javax.swing.SwingUtilities;
+
+/**
+ * The Basic L&F UI delegate for JSeparator.
+ */
+public class BasicSeparatorUI extends SeparatorUI
+{
+ /** The shadow color. */
+ protected Color shadow;
+
+ /** The highlight color. */
+ protected Color highlight;
+
+ /**
+ * Creates a new UI delegate for the given JComponent.
+ *
+ * @param c The JComponent to create a delegate for.
+ *
+ * @return A new BasicSeparatorUI.
+ */
+ public static ComponentUI createUI(JComponent c)
+ {
+ return new BasicSeparatorUI();
+ }
+
+ /**
+ * This method installs the UI for the given JComponent.
+ * This can include installing defaults, listeners, and
+ * initializing any instance data.
+ *
+ * @param c The JComponent that is having this UI installed.
+ */
+ public void installUI(JComponent c)
+ {
+ super.installUI(c);
+
+ if (c instanceof JSeparator)
+ {
+ JSeparator s = (JSeparator) c;
+
+ installDefaults(s);
+ installListeners(s);
+ }
+ }
+
+ /**
+ * Uninstalls the UI for the given JComponent. This
+ * method reverses what was done when installing
+ * the UI on the JComponent.
+ *
+ * @param c The JComponent that is having this UI uninstalled.
+ */
+ public void uninstallUI(JComponent c)
+ {
+ if (c instanceof JSeparator)
+ {
+ JSeparator s = (JSeparator) c;
+
+ uninstallListeners(s);
+ uninstallDefaults(s);
+ }
+ }
+
+ /**
+ * This method installs the defaults that are given by
+ * the Basic L&F.
+ *
+ * @param s The JSeparator that is being installed.
+ */
+ protected void installDefaults(JSeparator s)
+ {
+ UIDefaults defaults = UIManager.getLookAndFeelDefaults();
+
+ shadow = defaults.getColor("Separator.shadow");
+ highlight = defaults.getColor("Separator.highlight");
+ }
+
+ /**
+ * This method removes the defaults that were given
+ * by the Basic L&F.
+ *
+ * @param s The JSeparator that is being uninstalled.
+ */
+ protected void uninstallDefaults(JSeparator s)
+ {
+ shadow = null;
+ highlight = null;
+ }
+
+ /**
+ * This method installs any listeners that need
+ * to be attached to the JSeparator or any of its
+ * components.
+ *
+ * @param s The JSeparator that is being installed.
+ */
+ protected void installListeners(JSeparator s)
+ {
+ // Separators don't receive events.
+ }
+
+ /**
+ * This method uninstalls any listeners that
+ * were installed during the install UI process.
+ *
+ * @param s The JSeparator that is being uninstalled.
+ */
+ protected void uninstallListeners(JSeparator s)
+ {
+ // Separators don't receive events.
+ }
+
+ /**
+ * The separator is made of two lines. The top line will be
+ * the highlight color (or left line if it's vertical). The bottom
+ * or right line will be the shadow color. The two lines will
+ * be centered inside the bounds box. If the separator is horizontal,
+ * then it will be vertically centered, or if it's vertical, it will
+ * be horizontally centered.
+ *
+ * @param g The Graphics object to paint with
+ * @param c The JComponent to paint.
+ */
+ public void paint(Graphics g, JComponent c)
+ {
+ Rectangle r = new Rectangle();
+ SwingUtilities.calculateInnerArea(c, r);
+ Color saved = g.getColor();
+
+ int midAB = r.width / 2 + r.x;
+ int midAD = r.height / 2 + r.y;
+
+ JSeparator s;
+ if (c instanceof JSeparator)
+ s = (JSeparator) c;
+ else
+ return;
+
+ if (s.getOrientation() == JSeparator.HORIZONTAL)
+ {
+ g.setColor(highlight);
+ g.drawLine(r.x, midAD, r.x + r.width, midAD);
+
+ g.setColor(shadow);
+ g.drawLine(r.x, midAD + 1, r.x + r.width, midAD + 1);
+ }
+ else
+ {
+ g.setColor(highlight);
+ g.drawLine(midAB, r.y, midAB, r.y + r.height);
+
+ g.setColor(shadow);
+ g.drawLine(midAB + 1, r.y, midAB + 1, r.y + r.height);
+ }
+ }
+
+ /**
+ * This method returns the preferred size of the
+ * JComponent.
+ *
+ * @param c The JComponent to measure.
+ *
+ * @return The preferred size.
+ */
+ public Dimension getPreferredSize(JComponent c)
+ {
+ Dimension dims = new Dimension(0, 0);
+ Insets insets = c.getInsets();
+
+ if (c instanceof JSeparator)
+ {
+ JSeparator s = (JSeparator) c;
+
+ if (s.getOrientation() == JSeparator.HORIZONTAL)
+ {
+ dims.height = 2;
+ dims.width = 40;
+ }
+ else
+ {
+ dims.width = 2;
+ dims.height = 40;
+ }
+ }
+ dims.width += insets.left + insets.right;
+ dims.height += insets.top + insets.bottom;
+
+ return dims;
+ }
+
+ /**
+ * This method returns the minimum size of the
+ * JComponent.
+ *
+ * @param c The JComponent to measure.
+ *
+ * @return The minimum size.
+ */
+ public Dimension getMinimumSize(JComponent c)
+ {
+ return getPreferredSize(c);
+ }
+
+ /**
+ * This method returns the maximum size of the
+ * JComponent.
+ *
+ * @param c The JComponent to measure.
+ *
+ * @return The maximum size.
+ */
+ public Dimension getMaximumSize(JComponent c)
+ {
+ return getPreferredSize(c);
+ }
+}
Index: javax/swing/plaf/basic/BasicSliderUI.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/plaf/basic/Attic/BasicSliderUI.java,v
retrieving revision 1.1.2.4
diff -u -r1.1.2.4 BasicSliderUI.java
--- javax/swing/plaf/basic/BasicSliderUI.java 19 Feb 2004 18:59:11 -0000 1.1.2.4
+++ javax/swing/plaf/basic/BasicSliderUI.java 26 Feb 2004 14:12:25 -0000
@@ -69,6 +69,7 @@
import javax.swing.Timer;
import javax.swing.UIDefaults;
import javax.swing.UIManager;
+import javax.swing.BoundedRangeModel;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import javax.swing.event.MouseInputAdapter;
@@ -227,6 +228,13 @@
// Check for orientation changes.
if (e.getPropertyName().equals(JSlider.ORIENTATION_CHANGED_PROPERTY))
recalculateIfOrientationChanged();
+ else if (e.getPropertyName().equals(JSlider.MODEL_CHANGED_PROPERTY))
+ {
+ BoundedRangeModel oldModel = (BoundedRangeModel) e.getOldValue();
+ oldModel.removeChangeListener(changeListener);
+ slider.getModel().addChangeListener(changeListener);
+ calculateThumbLocation();
+ }
// elif the componentOrientation changes (this is a bound property,
// just undocumented) we change leftToRightCache. In Sun's
// implementation, the LTR cache changes on a repaint. This is strange