Ticket #17040: 17040-work4.patch

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

@@ -8 +8 @@
 import javax.swing.JPanel;
 
 import org.openstreetmap.josm.actions.mapmode.MapMode;
+import org.openstreetmap.josm.data.UndoRedoHandler; 
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.MainLayerManager;
 import org.openstreetmap.josm.gui.layer.MainLayerManager.LayerAvailabilityEvent;
@@ -65 +66 @@
             map = null;
             MainApplication.map = map;
             add(getGettingStarted(), BorderLayout.CENTER);
+            UndoRedoHandler.getInstance().clean();
         }
         setVisible(true);
 

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

@@ -807 +807 @@
         }
         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/NotesDialog.java

@@ -222 +222 @@
         return noteData != null ? noteData.getSelectedNote() : null;
     }
 
+    @Override
+    public void destroy() {
+        MainApplication.getLayerManager().removeLayerChangeListener(this);
+        super.destroy();
+    }
+
     private static class NoteRenderer implements ListCellRenderer<Note> {
 
         private final DefaultListCellRenderer defaultListCellRenderer = new DefaultListCellRenderer();
@@ -436 +442 @@
             }
         }
     }
+
 }

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

@@ -45 +45 @@
 import org.openstreetmap.josm.actions.relation.RecentRelationsAction;
 import org.openstreetmap.josm.actions.relation.SelectMembersAction;
 import org.openstreetmap.josm.actions.relation.SelectRelationAction;
+import org.openstreetmap.josm.data.UndoRedoHandler;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.DefaultNameFormatter;
 import org.openstreetmap.josm.data.osm.IPrimitive;
@@ -208 +209 @@
 
     @Override
     public void destroy() {
+        UndoRedoHandler.getInstance().removeCommandQueueListener(recentRelationsAction);
         recentRelationsAction.destroy();
         model.clear();
         super.destroy();

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();

src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java

@@ -134 +134 @@
                     default: return false;
                 }
             }
+            dialog.closeDialog();
         }
 
         return true;
@@ -347 +348 @@
      */
     public void closeDialog() {
         setVisible(false);
+        MainApplication.removeMapFrameListener(saveSessionAction);
+        saveSessionAction.destroy();
         dispose();
     }