Changeset 2208 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2009-09-28T12:50:05+02:00 (15 years ago)

Author:

jttt

Message:

Fix #3589 - Preset on toolbar gives error when nothing selected.

File:

• trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java

@@ -29 +29 @@
         super.setIcon(iconName);
     }
+
+    private Component copyMenuComponent(Component menuComponent) {
+        if (menuComponent instanceof JMenu) {
+            JMenu menu = (JMenu)menuComponent;
+            JMenu result = new JMenu(menu.getAction());
+            for (Component item:menu.getMenuComponents()) {
+                result.add(copyMenuComponent(item));
+            }
+            result.setText(menu.getText());
+            return result;
+        } else if (menuComponent instanceof JMenuItem) {
+            JMenuItem menuItem = (JMenuItem)menuComponent;
+            JMenuItem result = new JMenuItem(menuItem.getAction());
+            result.setText(menuItem.getText());
+            return result;
+        } else if(menuComponent instanceof JSeparator) {
+            return new JSeparator();
+        } else {
+            return menuComponent;
+        }
+    }
+
     public void actionPerformed(ActionEvent e) {
         Object s = e.getSource();
@@ -36 +58 @@
             JPopupMenu pm = new JPopupMenu(getName());
             for(Component c : menu.getMenuComponents())
+                pm.add(copyMenuComponent(c));
             {
-                if(c instanceof JMenuItem)
-                {
-                    JMenuItem j = new JMenuItem(((JMenuItem)c).getAction());
-                    j.setText(((JMenuItem)c).getText());
-                    pm.add(j);
-                }
-                else if(c instanceof JSeparator)
-                    pm.addSeparator();
             }
             pm.show(co, co.getWidth()/2, co.getHeight()/2);