1 files changed, 13 insertions, 8 deletions
diff --git a/javax/swing/plaf/basic/BasicMenuBarUI.java b/javax/swing/plaf/basic/BasicMenuBarUI.java
index cff8a011c..f0bd73fa0 100644
--- a/javax/swing/plaf/basic/BasicMenuBarUI.java
+++ b/javax/swing/plaf/basic/BasicMenuBarUI.java
@@ -101,9 +101,9 @@ public class BasicMenuBarUI extends MenuBarUI
   }
 
   /**
-   * DOCUMENT ME!
+   * Creates ChangeListener
    *
-   * @return DOCUMENT ME!
+   * @return The ChangeListener
    */
   protected ChangeListener createChangeListener()
   {
@@ -112,7 +112,7 @@ public class BasicMenuBarUI extends MenuBarUI
 
   /**
    * Creates ContainerListener() to listen for ContainerEvents
-   * fired by JMenuBar
+   * fired by JMenuBar.
    *
    * @return The ContainerListener
    */
@@ -242,7 +242,7 @@ public class BasicMenuBarUI extends MenuBarUI
   }
 
   /**
-   * DOCUMENT ME!
+   * Unregisters all the listeners that this UI delegate was using.
    */
   protected void uninstallListeners()
   {
@@ -273,7 +273,8 @@ public class BasicMenuBarUI extends MenuBarUI
   }
 
   /**
-   * This class handles ContainerEvents fired by JMenuBar
+   * This class handles ContainerEvents fired by JMenuBar. It revalidates
+   * and repaints menu bar whenever menu is added or removed from it.
    */
   protected class ContainerHandler implements ContainerListener
   {
@@ -284,17 +285,19 @@ public class BasicMenuBarUI extends MenuBarUI
      */
     public void componentAdded(ContainerEvent e)
     {
-      System.out.println("BasicMenuBar...componentAdded.. listener");
+      menuBar.revalidate();
+      menuBar.repaint();
     }
 
     /**
-     * This method is called whenever menu is removed from the menu bar
+     * This method is called whenever menu is removed from the menu bar.
      *
      * @param e The ContainerEvent.
      */
     public void componentRemoved(ContainerEvent e)
     {
-      System.out.println("BasicMenuBar...componentRemoved.. listener");
+      menuBar.revalidate();
+      menuBar.repaint();
     }
   }
 
@@ -313,6 +316,8 @@ public class BasicMenuBarUI extends MenuBarUI
     {
       if (e.getPropertyName().equals(JMenuBar.BORDER_PAINTED_CHANGED_PROPERTY))
 	menuBar.repaint();
+      if (e.getPropertyName().equals(JMenuBar.MARGIN_CHANGED_PROPERTY))
+	menuBar.repaint();
     }
   }
 }