Changeset 14470 in josm for trunk/src

Timestamp:

2018-12-01T10:13:12+01:00 (6 years ago)

Author:

GerdP

Message:

see #17040 Fix various memory leaks
Not sure if this will break Unit tests. Many of them don't work on my PC with a clean copy.

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/SessionSaveAsAction.java (modified) (1 diff)
• gui/MainPanel.java (modified) (2 diffs)
• gui/dialogs/NotesDialog.java (modified) (2 diffs)
• gui/dialogs/RelationListDialog.java (modified) (2 diffs)
• gui/dialogs/ToggleDialog.java (modified) (1 diff)
• gui/dialogs/properties/PropertiesDialog.java (modified) (1 diff)
• gui/dialogs/relation/GenericRelationEditor.java (modified) (1 diff)
• gui/dialogs/relation/actions/RefreshAction.java (modified) (1 diff)
• gui/io/SaveLayersDialog.java (modified) (2 diffs)
• gui/layer/AbstractTileSourceLayer.java (modified) (1 diff)

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

@@ -86 +86 @@
     }
 
+    @Override
+    public void destroy() {
+        MainApplication.removeMapFrameListener(this);
+        super.destroy();
+    }
+
     /**
      * Attempts to save the session.

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

@@ -9 +9 @@
 
 import org.openstreetmap.josm.actions.mapmode.MapMode;
+import org.openstreetmap.josm.data.UndoRedoHandler; 
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.MainLayerManager;
@@ -66 +67 @@
             MainApplication.map = map;
             add(getGettingStarted(), BorderLayout.CENTER);
+            UndoRedoHandler.getInstance().clean();
         }
         setVisible(true);

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

@@ -221 +221 @@
     public Note getSelectedNote() {
         return noteData != null ? noteData.getSelectedNote() : null;
+    }
+
+    @Override
+    public void destroy() {
+        MainApplication.getLayerManager().removeLayerChangeListener(this);
+        super.destroy();
     }
 
@@ -437 +443 @@
         }
     }
+
 }

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

@@ -46 +46 @@
 import org.openstreetmap.josm.actions.relation.SelectMembersAction;
 import org.openstreetmap.josm.actions.relation.SelectRelationAction;
+import org.openstreetmap.josm.data.UndoRedoHandler;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.DefaultNameFormatter;
@@ -209 +210 @@
     @Override
     public void destroy() {
+        UndoRedoHandler.getInstance().removeCommandQueueListener(recentRelationsAction);
         recentRelationsAction.destroy();
         model.clear();

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

@@ -456 +456 @@
     @Override
     public void destroy() {
+        dialogsPanel = null;
         rememberHeight();
         closeDetachedDialog();

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

@@ -552 +552 @@
     @Override
     public void destroy() {
+        taginfoAction.destroy();
         super.destroy();
         Config.getPref().removeKeyPreferenceChangeListener("display.discardable-keys", preferenceListener);

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java

@@ -830 +830 @@
     }
 
+    @Override
+    public void dispose() {
+        refreshAction.destroy();
+        super.dispose();
+    }
+
     /**
      * Exception thrown when user aborts add operation.

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/RefreshAction.java

@@ -138 +138 @@
         updateEnabledState();
     }
+
+    /**
+     * Allow GC to do its work
+     */
+    public void destroy() {
+        UndoRedoHandler.getInstance().removeCommandQueueListener(this);
+    }
 }

trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java

@@ -135 +135 @@
                 }
             }
+            dialog.closeDialog();
         }
 
@@ -348 +349 @@
     public void closeDialog() {
         setVisible(false);
+        saveSessionAction.destroy();
         dispose();
     }

trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java

@@ -1903 +1903 @@
     public synchronized void destroy() {
         super.destroy();
+        MapView.removeZoomChangeListener(this);
         adjustAction.destroy();
     }