Changeset 14478 in josm for trunk

Timestamp:

2018-12-01T16:56:42+01:00 (6 years ago)

Author:

GerdP

Message:

see #17040 make MapSlider Destroyable

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• MapSlider.java (modified) (2 diffs)
• MapView.java (modified) (2 diffs)

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

@@ -11 +11 @@
 import javax.swing.event.ChangeListener;
 
+import org.openstreetmap.josm.gui.NavigatableComponent.ZoomChangeListener;
 import org.openstreetmap.josm.gui.help.Helpful;
-import org.openstreetmap.josm.gui.NavigatableComponent.ZoomChangeListener;
+import org.openstreetmap.josm.tools.Destroyable;
 
 /**
  * This is the slider used in the top left corner of the map view. It allows the user to select the scale
  */
-class MapSlider extends JSlider implements ZoomChangeListener, ChangeListener, Helpful {
+class MapSlider extends JSlider implements ZoomChangeListener, ChangeListener, Helpful, Destroyable {
 
     private static final double ZOOM_STEP = 1.1;
@@ -69 +70 @@
         return ht("/MapView/Slider");
     }
+
+    /**
+     * Free resources
+     */
+    public void destroy() {
+        NavigatableComponent.removeZoomChangeListener(this);
+    }
 }

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

@@ -71 +71 @@
 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles.MapPaintSylesUpdateListener;
+import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.io.audio.AudioPlayer;
 import org.openstreetmap.josm.spi.preferences.Config;
@@ -808 +809 @@
         nonChangedLayersBuffer = null;
         offscreenBuffer = null;
+        GuiHelper.destroyComponents(this, false);
     }