2005-11-01 Andrew John Hughes <gnu_andrew@member.fsf.org>

	* Merge from HEAD --> generics for 2005/09/20 - 2005/11/01.

1 files changed, 164 insertions, 151 deletions

diff --git a/javax/swing/plaf/basic/BasicScrollBarUI.java b/javax/swing/plaf/basic/BasicScrollBarUI.java
index 58d8fc1f7..2f5eaf391 100644
--- a/javax/swing/plaf/basic/BasicScrollBarUI.java
+++ b/javax/swing/plaf/basic/BasicScrollBarUI.java
@@ -58,6 +58,7 @@ import javax.swing.BoundedRangeModel;
 import javax.swing.JButton;
 import javax.swing.JComponent;
 import javax.swing.JScrollBar;
+import javax.swing.LookAndFeel;
 import javax.swing.SwingConstants;
 import javax.swing.SwingUtilities;
 import javax.swing.Timer;
@@ -80,6 +81,7 @@ public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager,
    */
   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.
@@ -91,9 +93,10 @@ public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager,
       scrollTimer.stop();
       scrollListener.setScrollByBlock(false);
       if (e.getSource() == incrButton)
-	scrollListener.setDirection(POSITIVE_SCROLL);
-      else
-	scrollListener.setDirection(NEGATIVE_SCROLL);
+          scrollListener.setDirection(POSITIVE_SCROLL);
+      else if (e.getSource() == decrButton)
+          scrollListener.setDirection(NEGATIVE_SCROLL);
+      scrollTimer.setDelay(100);
       scrollTimer.start();
     }
 
@@ -105,6 +108,11 @@ public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager,
     public void mouseReleased(MouseEvent e)
     {
       scrollTimer.stop();
+      scrollTimer.setDelay(300);
+      if (e.getSource() == incrButton)
+          scrollByUnit(POSITIVE_SCROLL);
+      else if (e.getSource() == decrButton)
+        scrollByUnit(NEGATIVE_SCROLL);
     }
   }
 
@@ -120,9 +128,8 @@ public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager,
      */
     public void stateChanged(ChangeEvent e)
     {
-      //       System.err.println(this + ".stateChanged()");
       calculatePreferredSize();
-      getThumbBounds();
+      updateThumbRect();
       scrollbar.repaint();
     }
   }
@@ -141,31 +148,27 @@ public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager,
     {
       if (e.getPropertyName().equals("model"))
         {
-	  ((BoundedRangeModel) e.getOldValue()).removeChangeListener(modelListener);
-	  scrollbar.getModel().addChangeListener(modelListener);
-	  getThumbBounds();
+          ((BoundedRangeModel) e.getOldValue()).removeChangeListener(modelListener);
+          scrollbar.getModel().addChangeListener(modelListener);
+          updateThumbRect();
         }
       else if (e.getPropertyName().equals("orientation"))
         {
-	  incrButton.removeMouseListener(buttonListener);
-	  decrButton.removeMouseListener(buttonListener);
-          int orientation = scrollbar.getOrientation();
-          switch (orientation)
-            {
-            case (JScrollBar.HORIZONTAL):
-              incrButton = createIncreaseButton(EAST);
-              decrButton = createDecreaseButton(WEST);
-              break;
-            default:
-              incrButton = createIncreaseButton(SOUTH);
-              decrButton = createDecreaseButton(NORTH);
-              break;
-            }
-	  incrButton.addMouseListener(buttonListener);
-	  decrButton.addMouseListener(buttonListener);
-	  calculatePreferredSize();
+          uninstallListeners();
+          uninstallComponents();
+          uninstallDefaults();
+          installDefaults();
+          installComponents();
+          installListeners();
+        }
+      else if (e.getPropertyName().equals("enabled"))
+        {
+          Boolean b = (Boolean) e.getNewValue();
+          if (incrButton != null)
+            incrButton.setEnabled(b.booleanValue());
+          if (decrButton != null)
+            decrButton.setEnabled(b.booleanValue());
         }
-      scrollbar.repaint();
     }
   }
 
@@ -242,7 +245,7 @@ public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager,
               scrollbar.repaint();
               return;
             }
-          scrollByBlock(direction);
+            scrollByBlock(direction);
         }
       else
         scrollByUnit(direction);
@@ -316,9 +319,6 @@ public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager,
       else
 	value = valueForYPosition(currentMouseY);
 
-      if (value == scrollbar.getValue())
-	return;
-
       if (! thumbRect.contains(e.getPoint()))
         {
 	  scrollTimer.stop();
@@ -333,6 +333,7 @@ public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager,
 	      trackHighlight = DECREASE_HIGHLIGHT;
 	      scrollListener.setDirection(NEGATIVE_SCROLL);
 	    }
+      scrollTimer.setDelay(100);
 	  scrollTimer.start();
         }
       else
@@ -343,8 +344,10 @@ public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager,
 	  // "lower" edge of the thumb. The value at which
 	  // the cursor is at must be greater or equal
 	  // to that value.
+
+      scrollListener.setScrollByBlock(false);
 	  scrollbar.setValueIsAdjusting(true);
-	  offset = value - scrollbar.getValue();
+      offset = value - scrollbar.getValue();
         }
       scrollbar.repaint();
     }
@@ -357,11 +360,19 @@ public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager,
      */
     public void mouseReleased(MouseEvent e)
     {
-      trackHighlight = NO_HIGHLIGHT;
       scrollTimer.stop();
+      scrollTimer.setDelay(300);
+      currentMouseX = e.getX();
+      currentMouseY = e.getY();
 
-      if (scrollbar.getValueIsAdjusting())
-	scrollbar.setValueIsAdjusting(false);
+      if (shouldScroll(POSITIVE_SCROLL))
+        scrollByBlock(POSITIVE_SCROLL);
+      else if (shouldScroll(NEGATIVE_SCROLL))
+        scrollByBlock(NEGATIVE_SCROLL);
+
+      trackHighlight = NO_HIGHLIGHT;
+      scrollListener.setScrollByBlock(false);
+      scrollbar.setValueIsAdjusting(true);
       scrollbar.repaint();
     }
 
@@ -381,6 +392,9 @@ public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager,
       else
 	value = valueForYPosition(currentMouseY);
 
+      if (thumbRect.contains(currentMouseX, currentMouseY))
+        return false;
+      
       if (direction == POSITIVE_SCROLL)
 	return (value > scrollbar.getValue());
       else
@@ -517,11 +531,7 @@ public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager,
    */
   protected JButton createIncreaseButton(int orientation)
   {
-    if (incrButton == null)
-      incrButton = new BasicArrowButton(orientation);
-    else
-      ((BasicArrowButton) incrButton).setDirection(orientation);
-    return incrButton;
+    return new BasicArrowButton(orientation);
   }
 
   /**
@@ -534,11 +544,7 @@ public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager,
    */
   protected JButton createDecreaseButton(int orientation)
   {
-    if (decrButton == null)
-      decrButton = new BasicArrowButton(orientation);
-    else
-      ((BasicArrowButton) decrButton).setDirection(orientation);
-    return decrButton;
+    return new BasicArrowButton(orientation);
   }
 
   /**
@@ -602,7 +608,7 @@ public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager,
    */
   public Dimension getMaximumSize(JComponent c)
   {
-    return getPreferredSize(c);
+    return new Dimension(Integer.MAX_VALUE, Integer.MAX_VALUE);
   }
 
   /**
@@ -644,7 +650,6 @@ public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager,
    */
   void calculatePreferredSize()
   {
-    // System.err.println(this + ".calculatePreferredSize()");
     int height;
     int width;
     height = width = 0;
@@ -707,48 +712,6 @@ public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager,
    */
   protected Rectangle getThumbBounds()
   {
-    int max = scrollbar.getMaximum();
-    int min = scrollbar.getMinimum();
-    int value = scrollbar.getValue();
-    int extent = scrollbar.getVisibleAmount();
-
-    // System.err.println(this + ".getThumbBounds()");
-    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 = Math.max(extent * trackRect.width / (max - min),
-                                   getMinimumThumbSize().width);
-	thumbRect.height = trackRect.height;
-      }
-    else
-      {
-	thumbRect.x = trackRect.x;
-	thumbRect.y = trackRect.y + value * trackRect.height / (max - min);
-
-	thumbRect.width = trackRect.width;
-	thumbRect.height = Math.max(extent * trackRect.height / (max - min),
-                                    getMinimumThumbSize().height);
-      }
     return thumbRect;
   }
 
@@ -760,22 +723,6 @@ public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager,
    */
   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;
   }
 
@@ -785,6 +732,18 @@ public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager,
    */
   protected void installComponents()
   {
+    if (incrButton != null)
+      scrollbar.add(incrButton);
+    if (decrButton != null)
+      scrollbar.add(decrButton);
+  }
+
+  /**
+   * This method installs the defaults for the scrollbar specified by the
+   * Basic Look and Feel.
+   */
+  protected void installDefaults()
+  {
     int orientation = scrollbar.getOrientation();
     switch (orientation)
       {
@@ -797,31 +756,20 @@ public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager,
         decrButton = createDecreaseButton(NORTH);
         break;
       }
-    scrollbar.add(incrButton);
-    scrollbar.add(decrButton);
-  }
 
-  /**
-   * This method installs the defaults for the scrollbar specified by the
-   * Basic Look and Feel.
-   */
-  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"));
+    LookAndFeel.installColors(scrollbar, "ScrollBar.background",
+                              "ScrollBar.foreground");
+    LookAndFeel.installBorder(scrollbar, "ScrollBar.border");
     scrollbar.setOpaque(true);
     scrollbar.setLayout(this);
 
-    thumbColor = defaults.getColor("ScrollBar.thumb");
-    thumbDarkShadowColor = defaults.getColor("ScrollBar.thumbDarkShadow");
-    thumbHighlightColor = defaults.getColor("ScrollBar.thumbHighlight");
-    thumbLightShadowColor = defaults.getColor("ScrollBar.thumbShadow");
+    thumbColor = UIManager.getColor("ScrollBar.thumb");
+    thumbDarkShadowColor = UIManager.getColor("ScrollBar.thumbDarkShadow");
+    thumbHighlightColor = UIManager.getColor("ScrollBar.thumbHighlight");
+    thumbLightShadowColor = UIManager.getColor("ScrollBar.thumbShadow");
 
-    maximumThumbSize = defaults.getDimension("ScrollBar.maximumThumbSize");
-    minimumThumbSize = defaults.getDimension("ScrollBar.minimumThumbSize");
+    maximumThumbSize = UIManager.getDimension("ScrollBar.maximumThumbSize");
+    minimumThumbSize = UIManager.getDimension("ScrollBar.minimumThumbSize");
   }
 
   /**
@@ -873,11 +821,10 @@ public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager,
 	trackRect = new Rectangle();
 	thumbRect = new Rectangle();
 
-	scrollTimer = new Timer(50, null);
-	scrollTimer.setRepeats(true);
+	scrollTimer = new Timer(300, null);
 
+        installDefaults();
 	installComponents();
-	installDefaults();
 	configureScrollBarColors();
 	installListeners();
 
@@ -908,17 +855,20 @@ public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager,
    */
   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();
+    
+    // calculate and update the track bounds
+    SwingUtilities.calculateInnerArea(scrollbar, trackRect);
+    trackRect.width -= incrDims.getWidth();
+    trackRect.width -= decrDims.getWidth();
+    trackRect.x += decrDims.getWidth();
 
+    updateThumbRect();
+    
     decrButton.setBounds(vr.x, vr.y, decrDims.width, trackRect.height);
     incrButton.setBounds(trackRect.x + trackRect.width, vr.y, incrDims.width,
                          trackRect.height);
@@ -934,12 +884,16 @@ public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager,
     Rectangle vr = new Rectangle();
     SwingUtilities.calculateInnerArea(scrollbar, vr);
 
-    // Update rectangles
-    getTrackBounds();
-    getThumbBounds();
-
     Dimension incrDims = incrButton.getPreferredSize();
     Dimension decrDims = decrButton.getPreferredSize();
+    
+    // Update rectangles
+    SwingUtilities.calculateInnerArea(scrollbar, trackRect);
+    trackRect.height -= incrDims.getHeight();
+    trackRect.height -= decrDims.getHeight();
+    trackRect.y += decrDims.getHeight();
+    
+    updateThumbRect();
 
     decrButton.setBounds(vr.x, vr.y, trackRect.width, decrDims.height);
     incrButton.setBounds(vr.x, trackRect.y + trackRect.height,
@@ -947,6 +901,58 @@ public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager,
   }
 
   /**
+   * Updates the thumb rect.
+   */
+  void updateThumbRect()
+  {
+    int max = scrollbar.getMaximum();
+    int min = scrollbar.getMinimum();
+    int value = scrollbar.getValue();
+    int extent = scrollbar.getVisibleAmount();
+    if (max - extent <= min)
+      {
+        if (scrollbar.getOrientation() == JScrollBar.HORIZONTAL)
+          {
+            thumbRect.x = trackRect.x;
+            thumbRect.y = trackRect.y;
+            thumbRect.width = getMinimumThumbSize().width;
+            thumbRect.height = trackRect.height;
+          }
+        else
+          {
+            thumbRect.x = trackRect.x;
+            thumbRect.y = trackRect.y;
+            thumbRect.width = trackRect.width;
+            thumbRect.height = getMinimumThumbSize().height;
+          }
+      }
+    else
+      {
+        if (scrollbar.getOrientation() == JScrollBar.HORIZONTAL)
+          {
+            thumbRect.x = trackRect.x;
+            thumbRect.width = Math.max(extent * trackRect.width / (max - min),
+                getMinimumThumbSize().width);
+            int availableWidth = trackRect.width - thumbRect.width;
+            thumbRect.x += (value - min) * availableWidth / (max - min - extent);
+            thumbRect.y = trackRect.y;
+            thumbRect.height = trackRect.height;
+          }
+        else
+          {
+            thumbRect.x = trackRect.x;
+            thumbRect.height = Math.max(extent * trackRect.height / (max - min),
+                    getMinimumThumbSize().height);
+            int availableHeight = trackRect.height - thumbRect.height;
+            thumbRect.y = trackRect.y 
+              + (value - min) * availableHeight / (max - min - extent);
+            thumbRect.width = trackRect.width;
+          }
+      }
+
+  }
+  
+  /**
    * This method returns the minimum size required for the layout.
    *
    * @param scrollbarContainer The Container that is laid out.
@@ -1124,10 +1130,10 @@ public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager,
    */
   protected void uninstallComponents()
   {
-    scrollbar.remove(incrButton);
-    scrollbar.remove(decrButton);
-    incrButton = null;
-    decrButton = null;
+    if (incrButton != null)
+      scrollbar.remove(incrButton);
+    if (decrButton != null)
+      scrollbar.remove(decrButton);
   }
 
   /**
@@ -1138,7 +1144,9 @@ public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager,
   {
     scrollbar.setForeground(null);
     scrollbar.setBackground(null);
-    scrollbar.setBorder(null);
+    LookAndFeel.uninstallBorder(scrollbar);
+    incrButton = null;
+    decrButton = null;
   }
 
   /**
@@ -1155,17 +1163,22 @@ public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager,
    */
   protected void uninstallListeners()
   {
-    scrollTimer.removeActionListener(scrollListener);
+    if (scrollTimer != null)
+      scrollTimer.removeActionListener(scrollListener);
 
-    scrollbar.getModel().removeChangeListener(modelListener);
-    scrollbar.removePropertyChangeListener(propertyChangeListener);
-
-    decrButton.removeMouseListener(buttonListener);
-    incrButton.removeMouseListener(buttonListener);
-
-    scrollbar.removeMouseListener(trackListener);
-    scrollbar.removeMouseMotionListener(trackListener);
+    if (scrollbar != null)
+      {
+        scrollbar.getModel().removeChangeListener(modelListener);
+        scrollbar.removePropertyChangeListener(propertyChangeListener);
+        scrollbar.removeMouseListener(trackListener);
+        scrollbar.removeMouseMotionListener(trackListener);
+      }
 
+    if (decrButton != null)
+      decrButton.removeMouseListener(buttonListener);
+    if (incrButton != null)
+      incrButton.removeMouseListener(buttonListener);
+    
     propertyChangeListener = null;
     modelListener = null;
     buttonListener = null;
@@ -1182,8 +1195,8 @@ public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager,
    */
   public void uninstallUI(JComponent c)
   {
-    uninstallDefaults();
     uninstallListeners();
+    uninstallDefaults();
     uninstallComponents();
 
     scrollTimer = null;