Ticket #17040: 17040-work2.patch

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

@@ -793 +793 @@
      * Destroy this map view panel. Should be called once when it is not needed any more.
      */
     public void destroy() {
+                
         layerManager.removeAndFireLayerChangeListener(this);
         layerManager.removeActiveLayerChangeListener(this);
         Config.getPref().removePreferenceChangeListener(this);
@@ -807 +808 @@
         }
         nonChangedLayersBuffer = null;
         offscreenBuffer = null;
+        removeAllZoomChangeListeners();
     }
 
     /**

src/org/openstreetmap/josm/gui/NavigatableComponent.java

@@ -128 +128 @@
     }
 
     /**
+     * Removes a zoom change listener
+     *
+     * @param listener the listener. Ignored if null or already absent
+     */
+    protected static void removeAllZoomChangeListeners() {
+        zoomChangeListeners.clear();
+    }
+
+
+    /**
      * Adds a zoom change listener
      *
      * @param listener the listener. Ignored if null or already registered.

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

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

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

@@ -551 +551 @@
 
     @Override
     public void destroy() {
+        taginfoAction.destroy();
         super.destroy();
         Config.getPref().removeKeyPreferenceChangeListener("display.discardable-keys", preferenceListener);
         Container parent = pluginHook.getParent();