Changeset 3444 in josm for trunk

Timestamp:

2010-08-17T08:08:58+02:00 (14 years ago)

Author:

jttt

Message:

Fix #5331 Memory leak when removing data layers

Location:

trunk/src/org/openstreetmap/josm

Files:

• Main.java (modified) (2 diffs)
• actions/JosmAction.java (modified) (1 diff)
• actions/mapmode/SelectAction.java (modified) (3 diffs)
• gui/dialogs/HistoryDialog.java (modified) (4 diffs)
• gui/dialogs/properties/PropertiesDialog.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/Main.java

@@ -36 +36 @@
 import javax.swing.UIManager;
 
+import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.actions.OpenFileAction;
 import org.openstreetmap.josm.actions.downloadtasks.DownloadGpsTask;
@@ -313 +314 @@
     }
 
+    public static void unregisterActionShortcut(JosmAction action) {
+        unregisterActionShortcut(action, action.getShortcut());
+    }
+
+    public static void unregisterActionShortcut(Action action, Shortcut shortcut) {
+        contentPanePrivate.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).remove(shortcut.getKeyStroke());
+        contentPanePrivate.getActionMap().remove(action);
+    }
+
+
     ///////////////////////////////////////////////////////////////////////////
     //  Implementation part

trunk/src/org/openstreetmap/josm/actions/JosmAction.java

@@ -108 +108 @@
     public void destroy() {
         if (sc != null) {
-            Main.unregisterActionShortcut(sc);
+            Main.unregisterActionShortcut(this);
         }
         MapView.removeLayerChangeListener(layerChangeAdapter);

trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java

@@ -63 +63 @@
     //static private final Logger logger = Logger.getLogger(SelectAction.class.getName());
 
-    /**
-     * Replies true if we are currently running on OSX
-     *
-     * @return true if we are currently running on OSX
-     */
-    public static boolean isPlatformOsx() {
-        return Main.platform != null
-        && Main.platform instanceof PlatformHookOsx;
-    }
-
     enum Mode { move, rotate, select }
     private Mode mode = null;
@@ -274 +264 @@
         // Mac OSX simulates with  ctrl + mouse 1  the second mouse button hence no dragging events get fired.
         //
-        if (isPlatformOsx() && mode == Mode.rotate) {
+        if ((Main.platform instanceof PlatformHookOsx) && mode == Mode.rotate) {
             mouseDragged(e);
         }
@@ -490 +480 @@
                         if (!nodesToMerge.isEmpty()) {
                             Command cmd = MergeNodesAction.mergeNodes(Main.main.getEditLayer(),nodesToMerge, targetNode);
-                            if(cmd != null)
+                            if(cmd != null) {
                                 Main.main.undoRedo.add(cmd);
+                            }
                         }
                     }

trunk/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java

@@ -71 +71 @@
                         Shortcut.GROUP_LAYER, Shortcut.SHIFT_DEFAULT), 150);
         build();
-        DataSet.addSelectionListener(model);
-
         HelpUtil.setHelpContext(this, HelpUtil.ht("/Dialog/HistoryDialog"));
     }
@@ -142 +140 @@
     public void showNotify() {
         HistoryDataSet.getInstance().addHistoryDataSetListener(this);
+        DataSet.addSelectionListener(model);
     }
 
@@ -147 +146 @@
     public void hideNotify() {
         HistoryDataSet.getInstance().removeHistoryDataSetListener(this);
+        DataSet.removeSelectionListener(model);
     }
 
@@ -278 +278 @@
      */
     class ReloadAction extends AbstractAction implements ListSelectionListener {
+
         public ReloadAction() {
             putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));

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

@@ -151 +151 @@
     // button in the upper right corner of this dialog
     public static JPanel pluginHook = new JPanel();
-    
+
     private final Map<String, Map<String, Integer>> valueCount = new TreeMap<String, Map<String, Integer>>();
 
@@ -179 +179 @@
         SelectionEventManager.getInstance().removeSelectionListener(this);
         MapView.removeEditLayerChangeListener(this);
-        Main.unregisterActionShortcut(addActionShortcut);
+        Main.unregisterActionShortcut(addAction, addActionShortcut);
     }