Changeset 5472 in josm for trunk/src/org/openstreetmap/josm/gui/MapMover.java

Timestamp:

2012-08-23T02:25:01+02:00 (12 years ago)

Author:

Don-vip

Message:

see #7980 - fix another two memory leaks

File:

• trunk/src/org/openstreetmap/josm/gui/MapMover.java (modified) (5 diffs)

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

@@ -15 +15 @@
 
 import javax.swing.AbstractAction;
+import javax.swing.ActionMap;
+import javax.swing.InputMap;
 import javax.swing.JComponent;
 import javax.swing.JPanel;
+import javax.swing.KeyStroke;
 
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.EastNorth;
+import org.openstreetmap.josm.tools.Destroyable;
 import org.openstreetmap.josm.tools.PlatformHookOsx;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -29 +33 @@
  * @author imi
  */
-public class MapMover extends MouseAdapter implements MouseMotionListener, MouseWheelListener {
+public class MapMover extends MouseAdapter implements MouseMotionListener, MouseWheelListener, Destroyable {
 
     private final class ZoomerAction extends AbstractAction {
@@ -67 +71 @@
      */
     private final NavigatableComponent nc;
+    private final JPanel contentPane;
 
     private boolean movementInPlace = false;
@@ -75 +80 @@
     public MapMover(NavigatableComponent navComp, JPanel contentPane) {
         this.nc = navComp;
+        this.contentPane = contentPane;
         nc.addMouseListener(this);
         nc.addMouseMotionListener(this);
@@ -217 +223 @@
     }
 
+    @Override
+    public void destroy() {
+        if (this.contentPane != null) {
+            InputMap inputMap = contentPane.getInputMap();
+            KeyStroke[] inputKeys = inputMap.keys();
+            if (inputKeys != null) {
+                for (KeyStroke key : inputKeys) {
+                    Object binding = inputMap.get(key);
+                    if (binding instanceof String && ((String)binding).startsWith("MapMover.")) {
+                        inputMap.remove(key);
+                    }
+                }
+            }
+            ActionMap actionMap = contentPane.getActionMap();
+            Object[] actionsKeys = actionMap.keys();
+            if (actionsKeys != null) {
+                for (Object key : actionsKeys) {
+                    if (key instanceof String && ((String)key).startsWith("MapMover.")) {
+                        actionMap.remove(key);
+                    }
+                }
+            }
+        }
+    }
 }