1 files changed, 38 insertions, 18 deletions

diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicToolBarUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicToolBarUI.java
index 8be89efcfa6..ef4ed835f86 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicToolBarUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicToolBarUI.java
@@ -65,10 +65,11 @@ import javax.swing.JComponent;
 import javax.swing.JDialog;
 import javax.swing.JFrame;
 import javax.swing.JToolBar;
+import javax.swing.KeyStroke;
+import javax.swing.LookAndFeel;
 import javax.swing.RootPaneContainer;
 import javax.swing.SwingConstants;
 import javax.swing.SwingUtilities;
-import javax.swing.UIDefaults;
 import javax.swing.UIManager;
 import javax.swing.border.Border;
 import javax.swing.event.MouseInputListener;
@@ -133,6 +134,26 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants
   protected FocusListener toolBarFocusListener;
 
   /**
+   * @deprecated since JDK1.3.
+   */
+  protected KeyStroke leftKey;
+
+  /**
+   * @deprecated since JDK1.3.
+   */
+  protected KeyStroke rightKey;
+
+  /**
+   * @deprecated since JDK1.3.
+   */
+  protected KeyStroke upKey;
+
+  /**
+   * @deprecated since JDK1.3.
+   */
+  protected KeyStroke downKey;
+
+  /**
    * The floating window that is responsible for holding the JToolBar when it
    * is dragged outside of its original parent.
    */
@@ -566,18 +587,16 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants
    */
   protected void installDefaults()
   {
-    UIDefaults defaults = UIManager.getLookAndFeelDefaults();
+    LookAndFeel.installBorder(toolBar, "ToolBar.border");
+    LookAndFeel.installColorsAndFont(toolBar, "ToolBar.background",
+                                     "ToolBar.foreground", "ToolBar.font");
 
-    toolBar.setBorder(new ToolBarBorder());
-    toolBar.setBackground(defaults.getColor("ToolBar.background"));
-    toolBar.setForeground(defaults.getColor("ToolBar.foreground"));
-    toolBar.setFont(defaults.getFont("ToolBar.font"));
+    dockingBorderColor = UIManager.getColor("ToolBar.dockingForeground");
+    dockingColor = UIManager.getColor("ToolBar.dockingBackground");
 
-    dockingBorderColor = defaults.getColor("ToolBar.dockingForeground");
-    dockingColor = defaults.getColor("ToolBar.dockingBackground");
-
-    floatingBorderColor = defaults.getColor("ToolBar.floatingForeground");
-    floatingColor = defaults.getColor("ToolBar.floatingBackground");
+    floatingBorderColor = UIManager.getColor("ToolBar.floatingForeground");
+    floatingColor = UIManager.getColor("ToolBar.floatingBackground");
+    setRolloverBorders(toolBar.isRollover());
   }
 
   /**
@@ -591,10 +610,8 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants
 
   /**
    * This method installs listeners for the JToolBar.
-   *
-   * @param toolbar The JToolBar to register listeners for.
    */
-  protected void installListeners(JToolBar toolbar)
+  protected void installListeners()
   {
     dockingListener = createDockingListener();
     toolBar.addMouseListener(dockingListener);
@@ -694,7 +711,7 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants
 	toolBar.setOpaque(true);
 	installDefaults();
 	installComponents();
-	installListeners(toolBar);
+	installListeners();
 	installKeyboardActions();
       }
   }
@@ -1000,6 +1017,7 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants
      */
     public void mouseMoved(MouseEvent e)
     {
+      // TODO: What should be done here, if anything?
     }
 
     /**
@@ -1030,13 +1048,15 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants
         }
 
       origin = new Point(0, 0);
-      SwingUtilities.convertPointToScreen(ssd, toolBar);
+      if (toolBar.isShowing())
+        SwingUtilities.convertPointToScreen(ssd, toolBar);
 
       if (! (SwingUtilities.getAncestorOfClass(Window.class, toolBar) instanceof UIResource))
 	// Need to know who keeps the toolBar if it gets dragged back into it.
 	origParent = toolBar.getParent();
-
-      SwingUtilities.convertPointToScreen(origin, toolBar);
+      
+      if (toolBar.isShowing())
+        SwingUtilities.convertPointToScreen(origin, toolBar);
 
       isDragging = true;