Changeset 13265 in josm for trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java

Timestamp:

2017-12-31T03:09:43+01:00 (6 years ago)

Author:

Don-vip

Message:

see #15709 - fix a lot of memory leaks. Now gui.layer.geoImage.* classes are correctly garbage collected when the mapframe is destroyed

File:

• trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java

@@ -63 +63 @@
 import org.openstreetmap.josm.gui.layer.JumpToMarkerActions.JumpToPreviousMarker;
 import org.openstreetmap.josm.gui.layer.Layer;
-import org.openstreetmap.josm.gui.layer.LayerManager.LayerAddEvent;
-import org.openstreetmap.josm.gui.layer.LayerManager.LayerChangeListener;
-import org.openstreetmap.josm.gui.layer.LayerManager.LayerOrderChangeEvent;
-import org.openstreetmap.josm.gui.layer.LayerManager.LayerRemoveEvent;
+import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeListener;
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -102 +99 @@
     private MouseMotionAdapter mouseMotionAdapter;
     private MapModeChangeListener mapModeListener;
+    private ActiveLayerChangeListener activeLayerChangeListener;
 
     /** Mouse position where the last image was selected. */
@@ -992 +990 @@
         mapModeListener.mapModeChange(null, MainApplication.getMap().mapMode);
 
-        MainApplication.getLayerManager().addActiveLayerChangeListener(e -> {
+        activeLayerChangeListener = e -> {
             if (MainApplication.getLayerManager().getActiveLayer() == this) {
                 // only in select mode it is possible to click the images
                 MainApplication.getMap().selectSelectTool(false);
             }
-        });
-
-        MainApplication.getLayerManager().addLayerChangeListener(new LayerChangeListener() {
-            @Override
-            public void layerAdded(LayerAddEvent e) {
-                // Do nothing
-            }
-
-            @Override
-            public void layerRemoving(LayerRemoveEvent e) {
-                if (e.getRemovedLayer() == GeoImageLayer.this) {
-                    stopLoadThumbs();
-                    MapView mapView = MainApplication.getMap().mapView;
-                    mapView.removeMouseListener(mouseAdapter);
-                    mapView.removeMouseMotionListener(mouseMotionAdapter);
-                    MapFrame.removeMapModeChangeListener(mapModeListener);
-                    currentPhoto = -1;
-                    if (data != null) {
-                        data.clear();
-                    }
-                    data = null;
-                    // stop listening to layer change events
-                    MainApplication.getLayerManager().removeLayerChangeListener(this);
-                }
-            }
-
-            @Override
-            public void layerOrderChanged(LayerOrderChangeEvent e) {
-                // Do nothing
-            }
-        });
+        };
+        MainApplication.getLayerManager().addActiveLayerChangeListener(activeLayerChangeListener);
 
         MapFrame map = MainApplication.getMap();
@@ -1036 +1005 @@
 
     @Override
+    public synchronized void destroy() {
+        super.destroy();
+        stopLoadThumbs();
+        MapView mapView = MainApplication.getMap().mapView;
+        mapView.removeMouseListener(mouseAdapter);
+        mapView.removeMouseMotionListener(mouseMotionAdapter);
+        MapFrame.removeMapModeChangeListener(mapModeListener);
+        MainApplication.getLayerManager().removeActiveLayerChangeListener(activeLayerChangeListener);
+        currentPhoto = -1;
+        if (data != null) {
+            data.clear();
+        }
+        data = null;
+    }
+
+    @Override
     public LayerPainter attachToMapView(MapViewEvent event) {
         MapView.addZoomChangeListener(this);
-        return super.attachToMapView(event);
+        return new CompatibilityModeLayerPainter() {
+            @Override
+            public void detachFromMapView(MapViewEvent event) {
+                MapView.removeZoomChangeListener(GeoImageLayer.this);
+            }
+        };
     }