Changeset 15655 in josm for trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java

Timestamp:

2020-01-07T20:03:45+01:00 (6 years ago)

Author:

Don-vip

Message:

see #18514 - cleanup menu groups handling

File:

• trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java

@@ -27 +27 @@
 
 import javax.swing.JCheckBoxMenuItem;
-import javax.swing.JMenuItem;
 
 import org.openstreetmap.josm.actions.JosmAction;
@@ -51 +50 @@
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.MapView;
-import org.openstreetmap.josm.gui.WindowMenu;
 import org.openstreetmap.josm.gui.draw.MapViewPath;
 import org.openstreetmap.josm.gui.draw.SymbolShape;
@@ -241 +239 @@
     public void destroy() {
         super.destroy();
+        MainApplication.getMenu().editMenu.remove(dualAlignCheckboxMenuItem);
         dualAlignChangeAction.destroy();
     }
@@ -246 +245 @@
     private JCheckBoxMenuItem addDualAlignMenuItem() {
         int n = MainApplication.getMenu().editMenu.getItemCount();
-        for (int i = n-1; i > 0; i--) {
-            JMenuItem item = MainApplication.getMenu().editMenu.getItem(i);
-            if (item != null && item.getAction() != null && item.getAction() instanceof DualAlignChangeAction) {
-                MainApplication.getMenu().editMenu.remove(i);
-            }
-        }
-        return MainMenu.addWithCheckbox(MainApplication.getMenu().editMenu, dualAlignChangeAction, WindowMenu.WINDOW_MENU_GROUP.VOLATILE);
+        return MainMenu.addWithCheckbox(MainApplication.getMenu().editMenu, dualAlignChangeAction, n-5, false);
     }