Changeset 17458 in josm for trunk/src

Timestamp:

2021-01-13T15:26:08+01:00 (4 years ago)

Author:

GerdP

Message:

see #17184: Memory leaks

• clear collection rememberMovements in OrthogonalizeAction when no edit layer exits
• clear refs to layers which may disturb GC, maybe because of the complex cyclic deps

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/OrthogonalizeAction.java (modified) (1 diff)
• actions/relation/AbstractRelationAction.java (modified) (3 diffs)
• gui/dialogs/LayerListDialog.java (modified) (1 diff)
• gui/dialogs/layer/ActivateLayerAction.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java

@@ -680 +680 @@
     @Override
     protected void updateEnabledState() {
+        if (MainApplication.getLayerManager().getEditLayer() == null)
+            rememberMovements.clear();
         updateEnabledStateOnCurrentSelection();
     }

trunk/src/org/openstreetmap/josm/actions/relation/AbstractRelationAction.java

@@ -16 +16 @@
 import org.openstreetmap.josm.io.NetworkManager;
 import org.openstreetmap.josm.io.OnlineResource;
+import org.openstreetmap.josm.tools.Destroyable;
 import org.openstreetmap.josm.tools.SubclassFilteredCollection;
 import org.openstreetmap.josm.tools.Utils;
@@ -25 +26 @@
  * @since 13957 (signature)
  */
-public abstract class AbstractRelationAction extends AbstractAction implements IPrimitiveAction {
+public abstract class AbstractRelationAction extends AbstractAction implements IPrimitiveAction, Destroyable {
     /** relation collection */
     protected transient Collection<IRelation<?>> relations = Collections.<IRelation<?>>emptySet();
@@ -72 +73 @@
         putValue("help", helpId);
     }
+
+    @Override
+    public void destroy() {
+        relations = null;
+    }
 }

trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java

@@ -407 +407 @@
         ExpertToggleAction.removeExpertModeChangeListener(visibilityWidthListener);
         layerManager.removeLayerChangeListener(visibilityWidthListener);
+        activateLayerAction.destroy();
         cycleLayerUpAction.destroy();
         cycleLayerDownAction.destroy();

trunk/src/org/openstreetmap/josm/gui/dialogs/layer/ActivateLayerAction.java

@@ -20 +20 @@
 import org.openstreetmap.josm.gui.util.MultikeyShortcutAction;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
+import org.openstreetmap.josm.tools.Destroyable;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -27 +28 @@
  */
 public final class ActivateLayerAction extends AbstractAction
-implements IEnabledStateUpdating, ActiveLayerChangeListener, MultikeyShortcutAction {
+implements IEnabledStateUpdating, ActiveLayerChangeListener, MultikeyShortcutAction, Destroyable {
     private transient Layer layer;
     private final transient Shortcut multikeyShortcut;
@@ -129 +130 @@
     }
 
+    @Override
+    public void destroy() {
+        layer = null;
+    }
+
 }