Changeset 3444 in josm for trunk/src/org/openstreetmap/josm/actions

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/actions

Files:

• JosmAction.java (modified) (1 diff)
• mapmode/SelectAction.java (modified) (3 diffs)

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);
+                            }
                         }
                     }