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

Timestamp:

2010-08-15T22:04:43+02:00 (14 years ago)

Author:

jttt

Message:

Fix some of the references/forgotten listeners that keeps MapView alive after all layers are removed (see #5331)

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• AbstractInfoAction.java (modified) (1 diff)
• JosmAction.java (modified) (2 diffs)
• mapmode/ZoomAction.java (modified) (5 diffs)

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

@@ -24 +24 @@
 public abstract class AbstractInfoAction extends JosmAction {
 
-    public AbstractInfoAction() {
-        super();
+    public AbstractInfoAction(boolean installAdapters) {
+        super(installAdapters);
     }
 

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

@@ -66 +66 @@
      */
     public JosmAction(String name, String iconName, String tooltip, Shortcut shortcut, boolean register) {
+        this(name, iconName, tooltip, shortcut, register, true);
+    }
+
+    /**
+     * Even newer super for all actions. Use if you don't want to install layer changed and selection changed adapters
+     * @param name
+     * @param iconName
+     * @param tooltip
+     * @param shortcut
+     * @param register
+     * @param installAdapters
+     */
+    public JosmAction(String name, String iconName, String tooltip, Shortcut shortcut, boolean register, boolean installAdapters) {
         super(name, iconName == null ? null : ImageProvider.get(iconName));
         setHelpId();
@@ -77 +90 @@
             Main.toolbar.register(this);
         }
-        installAdapters();
+        if (installAdapters) {
+            installAdapters();
+        }
     }
 

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

@@ -7 +7 @@
 import java.awt.event.KeyEvent;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.MapView;
@@ -30 +31 @@
 
     /**
-     * Shortcut to the mapview.
-     */
-    private final MapView mv;
-    /**
      * Manager that manages the selection rectangle with the aspect ratio of the
      * MapView.
@@ -47 +44 @@
                 Shortcut.registerShortcut("mapmode:zoom", tr("Mode: {0}", tr("Zoom")), KeyEvent.VK_Z, Shortcut.GROUP_EDIT),
                 mapFrame, ImageProvider.getCursor("normal", "zoom"));
-        mv = mapFrame.mapView;
-        selectionManager = new SelectionManager(this, true, mv);
+        selectionManager = new SelectionManager(this, true, mapFrame.mapView);
     }
 
@@ -55 +51 @@
      */
     public void selectionEnded(Rectangle r, boolean alt, boolean shift, boolean ctrl) {
-        if (r.width >= 3 && r.height >= 3) {
+        if (r.width >= 3 && r.height >= 3 && Main.isDisplayingMapView()) {
+            MapView mv = Main.map.mapView;
             mv.zoomToFactor(mv.getEastNorth(r.x+r.width/2, r.y+r.height/2), r.getWidth()/mv.getWidth());
         }
@@ -62 +59 @@
     @Override public void enterMode() {
         super.enterMode();
-        selectionManager.register(mv);
+        selectionManager.register(Main.map.mapView);
     }
 
     @Override public void exitMode() {
         super.exitMode();
-        selectionManager.unregister(mv);
+        selectionManager.unregister(Main.map.mapView);
     }