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

Timestamp:

2020-12-22T14:09:03+01:00 (4 years ago)

Author:

GerdP

Message:

see #17184: Memory Leaks

• clear references to command instances or OSM objects to ease finding of real memory leaks

Location:

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection

Files:

• AdjacentNodesAction.java (modified) (1 diff)
• SelectBoundaryAction.java (modified) (1 diff)
• SelectModNodesAction.java (modified) (1 diff)
• SelectModWaysAction.java (modified) (1 diff)

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/AdjacentNodesAction.java

@@ -97 +97 @@
     @Override
     protected void updateEnabledState(Collection<? extends OsmPrimitive> selection) {
-        if (selection == null) {
-            setEnabled(false);
-            return;
+        boolean hasSel = selection != null && !selection.isEmpty();
+        if (!hasSel) {
+            activeWays.clear();
         }
-        setEnabled(!selection.isEmpty());
+        setEnabled(hasSel);
     }
 }

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectBoundaryAction.java

@@ -102 +102 @@
     @Override
     protected void updateEnabledState(Collection<? extends OsmPrimitive> selection) {
-        setEnabled(selection != null && !selection.isEmpty());
+        boolean hasSel = selection != null && !selection.isEmpty();
+        if (!hasSel) {
+            lastUsedStartingWay = null;
+        }
+        setEnabled(hasSel);
     }
 }

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectModNodesAction.java

@@ -81 +81 @@
     @Override
     protected void updateEnabledState() {
-        setEnabled(getLayerManager().getEditDataSet() != null);
+        boolean hasEditLayer = getLayerManager().getEditDataSet() != null;
+        if (!hasEditLayer) {
+            lastCmd = null;
+        }
+        setEnabled(hasEditLayer);
     }
 }

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectModWaysAction.java

@@ -81 +81 @@
     @Override
     protected void updateEnabledState() {
-        setEnabled(getLayerManager().getEditDataSet() != null);
+        boolean hasEditLayer = getLayerManager().getEditDataSet() != null;
+        if (!hasEditLayer) {
+            lastCmd = null;
+        }
+        setEnabled(hasEditLayer);
     }
 }