Changeset 10172 in josm for trunk/src/org/openstreetmap/josm/gui/util

Timestamp:

2016-05-10T14:18:05+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #12828 - exception from popup menu (regression from r9916)

File:

• trunk/src/org/openstreetmap/josm/gui/util/GuiHelper.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/util/GuiHelper.java

@@ -43 +43 @@
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
+import javax.swing.JPopupMenu;
 import javax.swing.JScrollPane;
 import javax.swing.Scrollable;
@@ -478 +479 @@
      */
     public static Window getWindowAncestorFor(EventObject e) {
-        return e != null && e.getSource() instanceof Component ? SwingUtilities.getWindowAncestor((Component) e.getSource()) : null;
+        if (e != null) {
+            Object source = e.getSource();
+            if (source instanceof Component) {
+                Window ancestor = SwingUtilities.getWindowAncestor((Component) source);
+                if (ancestor != null) {
+                    return ancestor;
+                } else {
+                    Container parent = ((Component) source).getParent();
+                    if (parent instanceof JPopupMenu) {
+                        Component invoker = ((JPopupMenu) parent).getInvoker();
+                        return SwingUtilities.getWindowAncestor(invoker);
+                    }
+                }
+            }
+        }
+        return null;
     }