Changeset 17440 in josm

Timestamp:

2021-01-04T17:06:18+01:00 (4 years ago)

Author:

GerdP

Message:

see #17184: Memory leaks

• remove more listeners in destroy()
• reset fields which might reference OSM objects
• call data.clearSelection when data layer is destroyed so that fewer actions keep references on OSM elements in that layer

My goal here: When a layer is closed JOSM should really allow to GC all OSM data and GPX data that was loaded before.

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/mapmode/ImproveWayAccuracyAction.java (modified) (1 diff)
• gui/dialogs/DeleteFromRelationConfirmationDialog.java (modified) (1 diff)
• gui/dialogs/LayerListDialog.java (modified) (5 diffs)
• gui/dialogs/properties/PropertiesDialog.java (modified) (4 diffs)
• gui/dialogs/relation/actions/SavingAction.java (modified) (1 diff)
• gui/layer/OsmDataLayer.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java

@@ -191 +191 @@
         map.keyDetector.removeModifierExListener(this);
         temporaryLayer.invalidate();
+        targetWay = null;
+        candidateNode = null;
+        candidateSegment = null;
     }
 

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

@@ -169 +169 @@
             ).applySafe(this);
             setCanceled(false);
-        } else if (isShowing()) { // Avoid IllegalComponentStateException like in #8775
-            new WindowGeometry(this).remember(getClass().getName() + ".geometry");
+        } else {
+            if (isShowing()) { // Avoid IllegalComponentStateException like in #8775
+                new WindowGeometry(this).remember(getClass().getName() + ".geometry");
+            }
+            model.data.clear();
         }
         super.setVisible(visible);

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

@@ -175 +175 @@
     private final transient MainLayerManager layerManager;
 
+    private PopupMenuHandler popupHandler;
+
+    private LayerListModelListener modelListener;
+
     /**
      * registers (shortcut to toggle right hand side toggle dialogs)+(number keys) shortcuts
@@ -212 +216 @@
         TableHelper.setFont(layerList, getClass());
         layerList.setSelectionModel(selectionModel);
-        layerList.addMouseListener(new PopupMenuHandler());
+        popupHandler = new PopupMenuHandler();
+        layerList.addMouseListener(popupHandler);
         layerList.setBackground(UIManager.getColor("Button.background"));
         layerList.putClientProperty("terminateEditOnFocusLost", Boolean.TRUE);
@@ -274 +279 @@
         model.populate();
         model.setSelectedLayer(layerManager.getActiveLayer());
-        model.addLayerListModelListener(
-                new LayerListModelListener() {
-                    @Override
-                    public void makeVisible(int row, Layer layer) {
-                        layerList.scrollToVisible(row, 0);
-                        layerList.repaint();
-                    }
-
-                    @Override
-                    public void refresh() {
-                        layerList.repaint();
-                    }
-                }
-                );
+        modelListener = new LayerListModelListener() {
+            @Override
+            public void makeVisible(int row, Layer layer) {
+                layerList.scrollToVisible(row, 0);
+                layerList.repaint();
+            }
+
+            @Override
+            public void refresh() {
+                layerList.repaint();
+            }
+        };
+
+        model.addLayerListModelListener(modelListener);
 
         // -- move up action
@@ -398 +403 @@
         JumpToMarkerActions.unregisterActions();
         layerList.setTransferHandler(null);
+        layerList.removeMouseListener(popupHandler);
         DISPLAY_NUMBERS.removeListener(visibilityWidthListener);
         ExpertToggleAction.removeExpertModeChangeListener(visibilityWidthListener);
@@ -403 +409 @@
         cycleLayerUpAction.destroy();
         cycleLayerDownAction.destroy();
+        model.removeLayerListModelListener(modelListener);
         super.destroy();
         instance = null;

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

@@ -248 +248 @@
     private final transient TaggingPresetHandler presetHandler = new TaggingPresetCommandHandler();
 
+    private PopupMenuLauncher popupMenuLauncher;
+
     private static final BooleanProperty PROP_AUTORESIZE_TAGS_TABLE = new BooleanProperty("propertiesdialog.autoresizeTagsTable", false);
 
@@ -419 +421 @@
         });
 
-        membershipTable.addMouseListener(new PopupMenuLauncher(membershipMenu) {
+        popupMenuLauncher = new PopupMenuLauncher(membershipMenu) {
             @Override
             protected int checkTableSelection(JTable table, Point p) {
@@ -446 +448 @@
                 highlightHelper.clear();
             }
-        });
+        };
+        membershipTable.addMouseListener(popupMenuLauncher);
     }
 
@@ -614 +617 @@
     public void destroy() {
         destroyTaginfoNationalActions();
+        membershipTable.removeMouseListener(popupMenuLauncher);
         super.destroy();
         Config.getPref().removeKeyPreferenceChangeListener("display.discardable-keys", preferenceListener);

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

@@ -186 +186 @@
         if (editorAccess.getEditor() instanceof Component) {
             ((Component) editorAccess.getEditor()).setVisible(false);
+            editorAccess.getEditor().setRelation(null);
         }
+
     }
 

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

@@ -1119 +1119 @@
         data.removeDataSetListener(dataSetListenerAdapter);
         data.removeDataSetListener(MultipolygonCache.getInstance());
+        data.clearSelection();
+        validationErrors.clear();
         removeClipboardDataFor(this);
         recentRelations.clear();