Changeset 5472 in josm for trunk

Timestamp:

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

Author:

Don-vip

Message:

see #7980 - fix another two memory leaks

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• MapMover.java (modified) (5 diffs)
• MapView.java (modified) (3 diffs)
• dialogs/properties/PropertiesDialog.java (modified) (2 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);
+                    }
+                }
+            }
+        }
+    }
 }

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

@@ -215 +215 @@
     private boolean paintPreferencesChanged = true;
     private Rectangle lastClipBounds = new Rectangle();
+    private MapMover mapMover;
 
     /**
@@ -235 +236 @@
                 scaler.setLocation(10,30);
 
-                new MapMover(MapView.this, contentPane);
+                mapMover = new MapMover(MapView.this, contentPane);
                 OsmDataLayer layer = getEditLayer();
                 if (layer != null) {
@@ -887 +888 @@
         DataSet.removeSelectionListener(repaintSelectionChangedListener);
         MultipolygonCache.getInstance().clear(this);
+        if (mapMover != null) {
+            mapMover.destroy();
+        }
     }
 

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

@@ -7 +7 @@
 import java.awt.BorderLayout;
 import java.awt.Component;
+import java.awt.Container;
 import java.awt.Cursor;
 import java.awt.Dialog.ModalityType;
@@ -1678 +1679 @@
             action.destroy();
         }
+        Container parent = pluginHook.getParent();
+        if (parent != null) {
+            parent.remove(pluginHook);
+        }
     }
 }