Changeset 14548 in josm for trunk

Timestamp:

2018-12-10T17:04:09+01:00 (6 years ago)

Author:

GerdP

Message:

see #17040 - destroy AddImageryLayerAction

Up to now they were never destroyed, and one is created for each available entry in ImageryMenu whenever you open the menu.

File:

• trunk/src/org/openstreetmap/josm/gui/ImageryMenu.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/ImageryMenu.java

@@ -154 +154 @@
         savedLayers.sort(alphabeticImageryComparator);
         for (final ImageryInfo u : savedLayers) {
-            addDynamic(new AddImageryLayerAction(u));
+            addDynamic(trackJosmAction(new AddImageryLayerAction(u)));
         }
 
@@ -189 +189 @@
                 addDynamicSeparator();
                 for (ImageryInfo i : inViewLayers) {
-                    addDynamic(new AddImageryLayerAction(i));
+                    addDynamic(trackJosmAction(new AddImageryLayerAction(i)));
                 }
             }
@@ -262 +262 @@
      */
     private final List<Object> dynamicItems = new ArrayList<>(20);
+    private final List<JosmAction> dynJosmActions = new ArrayList<>(20);
 
     /**
@@ -268 +269 @@
      */
     private void removeDynamicItems() {
+        dynJosmActions.forEach(JosmAction::destroy);
+        dynJosmActions.clear();
         for (Object item : dynamicItems) {
             if (item instanceof JMenuItem) {
@@ -294 +297 @@
         dynamicItems.add(this.add(it));
     }
+
+    private Action trackJosmAction(Action action) {
+        if (action instanceof JosmAction) {
+            dynJosmActions.add((JosmAction) action);
+        }
+        return action;
+    }
+
 }