Imported GNU Classpath 0.90

       * scripts/makemake.tcl: LocaleData.java moved to gnu/java/locale.

       * sources.am: Regenerated.
       * gcj/javaprims.h: Regenerated.
       * Makefile.in: Regenerated.
       * gcj/Makefile.in: Regenerated.
       * include/Makefile.in: Regenerated.
       * testsuite/Makefile.in: Regenerated.

       * gnu/java/lang/VMInstrumentationImpl.java: New override.
       * gnu/java/net/local/LocalSocketImpl.java: Likewise.
       * gnu/classpath/jdwp/VMMethod.java: Likewise.
       * gnu/classpath/jdwp/VMVirtualMachine.java: Update to latest
       interface.
       * java/lang/Thread.java: Add UncaughtExceptionHandler.
       * java/lang/reflect/Method.java: Implements GenericDeclaration and
       isSynthetic(),
       * java/lang/reflect/Field.java: Likewise.
       * java/lang/reflect/Constructor.java
       * java/lang/Class.java: Implements Type, GenericDeclaration,
       getSimpleName() and getEnclosing*() methods.
       * java/lang/Class.h: Add new public methods.
       * java/lang/Math.java: Add signum(), ulp() and log10().
       * java/lang/natMath.cc (log10): New function.
       * java/security/VMSecureRandom.java: New override.
       * java/util/logging/Logger.java: Updated to latest classpath
       version.
       * java/util/logging/LogManager.java: New override.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@113887 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 18 insertions, 3 deletions

diff --git a/libjava/classpath/javax/swing/JPopupMenu.java b/libjava/classpath/javax/swing/JPopupMenu.java
index 74f733e921e..a54bd777fd4 100644
--- a/libjava/classpath/javax/swing/JPopupMenu.java
+++ b/libjava/classpath/javax/swing/JPopupMenu.java
@@ -292,7 +292,6 @@ public class JPopupMenu extends JComponent implements Accessible, MenuElement
   public void updateUI()
   {
     setUI((PopupMenuUI) UIManager.getUI(this));
-    invalidate();
   }
 
   /**
@@ -542,11 +541,25 @@ public class JPopupMenu extends JComponent implements Accessible, MenuElement
     this.visible = visible;
     if (old != isVisible())
       {
-        firePropertyChange("visible", old, isVisible());
         if (visible)
           {
+            if (invoker != null && !(invoker instanceof JMenu))
+              {
+                MenuElement[] menuEls;
+                if (getSubElements().length > 0)
+                  {
+                    menuEls = new MenuElement[2];
+                    menuEls[0] = this;
+                    menuEls[1] = getSubElements()[0];
+                }
+                else
+                  {
+                    menuEls = new MenuElement[1];
+                    menuEls[0] = this;
+                  }
+                MenuSelectionManager.defaultManager().setSelectedPath(menuEls);
+              }
             firePopupMenuWillBecomeVisible();
-
             PopupFactory pf = PopupFactory.getSharedInstance();
             pack();
             popup = pf.getPopup(invoker, this, popupLocationX, popupLocationY);
@@ -554,9 +567,11 @@ public class JPopupMenu extends JComponent implements Accessible, MenuElement
           }
         else
           {
+            getSelectionModel().clearSelection();
             firePopupMenuWillBecomeInvisible();
             popup.hide();
           }
+        firePropertyChange("visible", old, isVisible());
       }
   }