Changeset 35324 in osm for applications/editors/josm/plugins

Timestamp:

2020-02-15T18:05:24+01:00 (5 years ago)

Author:

donvip

Message:

fix #18713 - make terracer plugin restartless (patch by taylor.smock)

Location:

applications/editors/josm/plugins/terracer

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/terracer/TerracerPlugin.java (modified) (2 diffs)

applications/editors/josm/plugins/terracer/build.xml

@@ -8 +8 @@
     <property name="plugin.icon" value="images/terrace.png"/>
     <property name="plugin.link" value="https://wiki.openstreetmap.org/wiki/JOSM/Plugins/Terracer"/>
+        <property name="plugin.canloadatruntime" value="true"/>
 
     <!-- ** include targets that all plugins have in common ** -->

applications/editors/josm/plugins/terracer/src/org/openstreetmap/josm/plugins/terracer/TerracerPlugin.java

@@ -2 +2 @@
 package org.openstreetmap.josm.plugins.terracer;
 
+import java.awt.Component;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.stream.Collectors;
+
+import javax.swing.Action;
+import javax.swing.JMenu;
+import javax.swing.JMenuItem;
+
+import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MainMenu;
 import org.openstreetmap.josm.plugins.Plugin;
 import org.openstreetmap.josm.plugins.PluginInformation;
+import org.openstreetmap.josm.tools.Destroyable;
 
 /**
@@ -12 +25 @@
  * @author zere - Copyright 2009 CloudMade Ltd
  */
-public class TerracerPlugin extends Plugin {
+public class TerracerPlugin extends Plugin implements Destroyable {
+        private List<JosmAction> actions = Arrays.asList(new TerracerAction(), new ReverseTerraceAction());
+
     public TerracerPlugin(PluginInformation info) {
         super(info);
+        for (JosmAction action : actions) {
+                MainMenu.add(MainApplication.getMenu().moreToolsMenu, action);
+        }
+    }
 
-        MainMenu.add(MainApplication.getMenu().moreToolsMenu, new TerracerAction());
-        MainMenu.add(MainApplication.getMenu().moreToolsMenu, new ReverseTerraceAction());
-    }
+        @Override
+        public void destroy() {
+        final JMenu moreToolsMenu = MainApplication.getMenu().moreToolsMenu;
+        final Map<Action, Component> actionsMap = Arrays.asList(moreToolsMenu.getMenuComponents()).stream()
+                .filter(JMenuItem.class::isInstance).map(JMenuItem.class::cast)
+                .collect(Collectors.toMap(JMenuItem::getAction, component -> component));
+
+        for (final Entry<Action, Component> action : actionsMap.entrySet()) {
+            if (actionsMap.containsKey(action.getKey())) {
+                moreToolsMenu.remove(action.getValue());
+            }
+        }
+                actions.forEach(JosmAction::destroy);
+        }
 }