Index: javax/swing/plaf/basic/BasicScrollBarUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicScrollBarUI.java,v
retrieving revision 1.28
diff -u -r1.28 BasicScrollBarUI.java
--- javax/swing/plaf/basic/BasicScrollBarUI.java	24 Oct 2005 20:30:54 -0000	1.28
+++ javax/swing/plaf/basic/BasicScrollBarUI.java	27 Oct 2005 12:40:46 -0000
@@ -154,23 +154,12 @@
         }
       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"))
         {
@@ -375,17 +364,12 @@
       scrollTimer.setDelay(300);
       currentMouseX = e.getX();
       currentMouseY = e.getY();
-      
-      int value;
-      if (scrollbar.getOrientation() == SwingConstants.HORIZONTAL)
-        value = valueForXPosition(currentMouseX);
-      else
-        value = valueForYPosition(currentMouseY);
+
       if (shouldScroll(POSITIVE_SCROLL))
         scrollByBlock(POSITIVE_SCROLL);
       else if (shouldScroll(NEGATIVE_SCROLL))
         scrollByBlock(NEGATIVE_SCROLL);
-      
+
       trackHighlight = NO_HIGHLIGHT;
       scrollListener.setScrollByBlock(false);
       scrollbar.setValueIsAdjusting(true);
@@ -547,11 +531,7 @@
    */
   protected JButton createIncreaseButton(int orientation)
   {
-    if (incrButton == null)
-      incrButton = new BasicArrowButton(orientation);
-    else
-      ((BasicArrowButton) incrButton).setDirection(orientation);
-    return incrButton;
+    return new BasicArrowButton(orientation);
   }
 
   /**
@@ -564,11 +544,7 @@
    */
   protected JButton createDecreaseButton(int orientation)
   {
-    if (decrButton == null)
-      decrButton = new BasicArrowButton(orientation);
-    else
-      ((BasicArrowButton) decrButton).setDirection(orientation);
-    return decrButton;
+    return new BasicArrowButton(orientation);
   }
 
   /**
@@ -756,6 +732,18 @@
    */
   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)
       {
@@ -768,16 +756,7 @@
         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()
-  {
     LookAndFeel.installColors(scrollbar, "ScrollBar.background",
                               "ScrollBar.foreground");
     LookAndFeel.installBorder(scrollbar, "ScrollBar.border");
@@ -1151,10 +1130,10 @@
    */
   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);
   }
 
   /**
@@ -1165,7 +1144,9 @@
   {
     scrollbar.setForeground(null);
     scrollbar.setBackground(null);
-    scrollbar.setBorder(null);
+    LookAndFeel.uninstallBorder(scrollbar);
+    incrButton = null;
+    decrButton = null;
   }
 
   /**
@@ -1182,17 +1163,22 @@
    */
   protected void uninstallListeners()
   {
-    scrollTimer.removeActionListener(scrollListener);
-
-    scrollbar.getModel().removeChangeListener(modelListener);
-    scrollbar.removePropertyChangeListener(propertyChangeListener);
+    if (scrollTimer != null)
+      scrollTimer.removeActionListener(scrollListener);
 
-    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;
@@ -1209,8 +1195,8 @@
    */
   public void uninstallUI(JComponent c)
   {
-    uninstallDefaults();
     uninstallListeners();
+    uninstallDefaults();
     uninstallComponents();
 
     scrollTimer = null;