Changeset 17440 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java

Timestamp:

2021-01-04T17:06:18+01:00 (3 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.

File:

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

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;