Index: javax/swing/JPopupMenu.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JPopupMenu.java,v
retrieving revision 1.20
diff -u -r1.20 JPopupMenu.java
--- javax/swing/JPopupMenu.java	8 Sep 2005 17:04:55 -0000	1.20
+++ javax/swing/JPopupMenu.java	9 Sep 2005 14:35:12 -0000
@@ -1016,7 +1016,7 @@
    * HeavyWeightPopup is JWindow that is used to display JPopupMenu menu item's
    * on the screen
    */
-  private class HeavyWeightPopup extends JWindow implements Popup
+  private class HeavyWeightPopup extends JDialog implements Popup
   {
     /**
      * Creates a new HeavyWeightPopup object.
@@ -1026,6 +1026,8 @@
     public HeavyWeightPopup(Container c)
     {
       this.setContentPane(c);
+      this.setUndecorated(true);
+      this.getRootPane().setWindowDecorationStyle(JRootPane.PLAIN_DIALOG);
     }
 
     /**
Index: javax/swing/JRootPane.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JRootPane.java,v
retrieving revision 1.24
diff -u -r1.24 JRootPane.java
--- javax/swing/JRootPane.java	6 Sep 2005 20:38:54 -0000	1.24
+++ javax/swing/JRootPane.java	9 Sep 2005 14:35:12 -0000
@@ -616,7 +616,8 @@
         && style != COLOR_CHOOSER_DIALOG
         && style != FILE_CHOOSER_DIALOG
         && style != QUESTION_DIALOG
-        && style != WARNING_DIALOG)
+        && style != WARNING_DIALOG
+        && style != PLAIN_DIALOG)
       throw new IllegalArgumentException("invalid style");
     
     int oldStyle = windowDecorationStyle;
Index: javax/swing/plaf/basic/BasicTreeUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicTreeUI.java,v
retrieving revision 1.74
diff -u -r1.74 BasicTreeUI.java
--- javax/swing/plaf/basic/BasicTreeUI.java	2 Sep 2005 18:45:36 -0000	1.74
+++ javax/swing/plaf/basic/BasicTreeUI.java	9 Sep 2005 14:35:13 -0000
@@ -1206,7 +1206,7 @@
    * @param tree
    *          is the JTree to install defaults for
    */
-  protected void installDefaults(JTree tree)
+  protected void installDefaults()
   {
     UIDefaults defaults = UIManager.getLookAndFeelDefaults();
 
@@ -1326,7 +1326,7 @@
   public void installUI(JComponent c)
   {
     super.installUI(c);
-    installDefaults((JTree) c);
+    installDefaults();
     tree = (JTree) c;
 
     currentCellRenderer = createDefaultCellRenderer();
@@ -1355,7 +1355,7 @@
    * @param tree
    *          to uninstall defaults for
    */
-  protected void uninstallDefaults(JTree tree)
+  protected void uninstallDefaults()
   {
     tree.setFont(null);
     tree.setForeground(null);
@@ -1370,7 +1370,7 @@
    */
   public void uninstallUI(JComponent c)
   {
-    uninstallDefaults((JTree) c);
+    uninstallDefaults();
     uninstallKeyboardActions();
     uninstallListeners();
     tree = null;