1 files changed, 23 insertions, 24 deletions

diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicPopupMenuUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicPopupMenuUI.java
index 247117bc983..e15a17bab28 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicPopupMenuUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicPopupMenuUI.java
@@ -53,12 +53,11 @@ import javax.swing.JLayeredPane;
 import javax.swing.JMenu;
 import javax.swing.JMenuItem;
 import javax.swing.JPopupMenu;
+import javax.swing.LookAndFeel;
 import javax.swing.MenuElement;
 import javax.swing.MenuSelectionManager;
 import javax.swing.RootPaneContainer;
 import javax.swing.SwingUtilities;
-import javax.swing.UIDefaults;
-import javax.swing.UIManager;
 import javax.swing.event.MouseInputListener;
 import javax.swing.event.PopupMenuEvent;
 import javax.swing.event.PopupMenuListener;
@@ -131,12 +130,9 @@ public class BasicPopupMenuUI extends PopupMenuUI
    */
   public void installDefaults()
   {
-    UIDefaults defaults = UIManager.getLookAndFeelDefaults();
-
-    popupMenu.setBackground(defaults.getColor("PopupMenu.background"));
-    popupMenu.setBorder(defaults.getBorder("PopupMenu.border"));
-    popupMenu.setFont(defaults.getFont("PopupMenu.font"));
-    popupMenu.setForeground(defaults.getColor("PopupMenu.foreground"));
+    LookAndFeel.installColorsAndFont(popupMenu, "PopupMenu.background",
+                                     "PopupMenu.foreground", "PopupMenu.font");
+    LookAndFeel.installBorder(popupMenu, "PopupMenu.border");
     popupMenu.setOpaque(true);
   }
 
@@ -277,23 +273,26 @@ public class BasicPopupMenuUI extends PopupMenuUI
 
       RootPaneContainer rootContainer = (RootPaneContainer) SwingUtilities
                                         .getRoot(invoker);
-      ((Container) rootContainer).removeComponentListener(topWindowListener);
-
-      // If this popup menu is the last popup menu visible on the screen, then
-      // stop interrupting mouse events in the glass pane before hiding this 
-      // last popup menu.
-      boolean topLevelMenu = (popupMenu.getInvoker() instanceof JMenu)
-                             && ((JMenu) popupMenu.getInvoker())
-                                .isTopLevelMenu();
-
-      if (topLevelMenu || ! (popupMenu.getInvoker() instanceof MenuElement))
+      if (rootContainer != null)
         {
-          // set glass pane not to interrupt mouse events and remove
-	  // mouseInputListener
-	  Container glassPane = (Container) rootContainer.getGlassPane();
-	  glassPane.setVisible(false);
-	  glassPane.removeMouseListener(mouseInputListener);
-	  mouseInputListener = null;
+          ((Container) rootContainer).removeComponentListener(topWindowListener);
+
+          // If this popup menu is the last popup menu visible on the screen,
+          // then
+          // stop interrupting mouse events in the glass pane before hiding this
+          // last popup menu.
+          boolean topLevelMenu = (popupMenu.getInvoker() instanceof JMenu)
+                                 && ((JMenu) popupMenu.getInvoker()).isTopLevelMenu();
+
+          if (topLevelMenu || !(popupMenu.getInvoker() instanceof MenuElement))
+            {
+              // set glass pane not to interrupt mouse events and remove
+              // mouseInputListener
+              Container glassPane = (Container) rootContainer.getGlassPane();
+              glassPane.setVisible(false);
+              glassPane.removeMouseListener(mouseInputListener);
+              mouseInputListener = null;
+            }
         }
     }