Changeset 3443 in josm for trunk

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

Files:

• actions/AbstractInfoAction.java (modified) (1 diff)
• actions/JosmAction.java (modified) (2 diffs)
• actions/mapmode/ZoomAction.java (modified) (5 diffs)
• gui/MapFrame.java (modified) (1 diff)
• gui/MapView.java (modified) (2 diffs)
• gui/dialogs/CommandStackDialog.java (modified) (7 diffs)
• gui/dialogs/UserListDialog.java (modified) (1 diff)
• gui/history/VersionTable.java (modified) (1 diff)

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

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

@@ -214 +214 @@
             }
         }
+        mapView.destroy();
     }
 

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

@@ -222 +222 @@
 
         // listend to selection changes to redraw the map
-        DataSet.addSelectionListener(new SelectionChangedListener(){
-            public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
-                repaint();
-            }
-        });
+        DataSet.addSelectionListener(repaintSelectionChangedListener);
 
         //store the last mouse action
@@ -805 +801 @@
     }
 
+    private SelectionChangedListener repaintSelectionChangedListener = new SelectionChangedListener(){
+        public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
+            repaint();
+        }
+    };
+
+    public void destroy() {
+        Main.pref.removePreferenceChangeListener(this);
+        DataSet.removeSelectionListener(repaintSelectionChangedListener);
+    }
+
 }

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

@@ -12 +12 @@
 import java.awt.event.KeyEvent;
 import java.awt.event.MouseEvent;
-
 import java.util.ArrayList;
 import java.util.LinkedHashSet;
@@ -74 +73 @@
         super(tr("Command Stack"), "commandstack", tr("Open a list of all commands (undo buffer)."),
                 Shortcut.registerShortcut("subwindow:commandstack", tr("Toggle: {0}", tr("Command Stack")), KeyEvent.VK_O, Shortcut.GROUP_LAYER, Shortcut.SHIFT_DEFAULT), 100, true);
-        Main.main.undoRedo.listenerCommands.add(this);
-
         undoTree.addMouseListener(new PopupMenuHandler());
         undoTree.setRootVisible(false);
@@ -212 +209 @@
             listener.updateEnabledState();
         }
+        Main.main.undoRedo.listenerCommands.add(this);
     }
 
@@ -227 +225 @@
         undoTreeModel.setRoot(new DefaultMutableTreeNode());
         redoTreeModel.setRoot(new DefaultMutableTreeNode());
+        Main.main.undoRedo.listenerCommands.remove(this);
     }
 
@@ -263 +262 @@
         // if one tree is empty, move selection to the other
         switch (lastOperation) {
-            case UNDO:
-                if (undoCommands.isEmpty()) {
-                    lastOperation = UndoRedoType.REDO;
-                }
-                break;
-            case REDO:
-                if (redoCommands.isEmpty()) {
-                    lastOperation = UndoRedoType.UNDO;
-                }
-                break;
+        case UNDO:
+            if (undoCommands.isEmpty()) {
+                lastOperation = UndoRedoType.REDO;
+            }
+            break;
+        case REDO:
+            if (redoCommands.isEmpty()) {
+                lastOperation = UndoRedoType.UNDO;
+            }
+            break;
         }
 
         // select the next command to undo/redo
         switch (lastOperation) {
-            case UNDO:
-                undoTree.setSelectionRow(undoTree.getRowCount()-1);
-                break;
-            case REDO:
-                redoTree.setSelectionRow(0);
-                break;
+        case UNDO:
+            undoTree.setSelectionRow(undoTree.getRowCount()-1);
+            break;
+        case REDO:
+            redoTree.setSelectionRow(0);
+            break;
         }
     }
@@ -370 +369 @@
             this.type = type;
             switch (type) {
-                case UNDO:
-                    tree = undoTree;
-                    putValue(NAME,tr("Undo"));
-                    putValue(SHORT_DESCRIPTION, tr("Undo the selected and all later commands"));
-                    putValue(SMALL_ICON, ImageProvider.get("undo"));
-                    break;
-                case REDO:
-                    tree = redoTree;
-                    putValue(NAME,tr("Redo"));
-                    putValue(SHORT_DESCRIPTION, tr("Redo the selected and all earlier commands"));
-                    putValue(SMALL_ICON, ImageProvider.get("redo"));
-                    break;
+            case UNDO:
+                tree = undoTree;
+                putValue(NAME,tr("Undo"));
+                putValue(SHORT_DESCRIPTION, tr("Undo the selected and all later commands"));
+                putValue(SMALL_ICON, ImageProvider.get("undo"));
+                break;
+            case REDO:
+                tree = redoTree;
+                putValue(NAME,tr("Redo"));
+                putValue(SHORT_DESCRIPTION, tr("Redo the selected and all earlier commands"));
+                putValue(SMALL_ICON, ImageProvider.get("redo"));
+                break;
             }
         }
@@ -397 +396 @@
             // calculate the number of commands to undo/redo; then do it
             switch (type) {
-                case UNDO:
-                    int numUndo = ((DefaultMutableTreeNode) undoTreeModel.getRoot()).getChildCount() - idx;
-                    Main.main.undoRedo.undo(numUndo);
-                    break;
-                case REDO:
-                    int numRedo = idx+1;
-                    Main.main.undoRedo.redo(numRedo);
-                    break;
+            case UNDO:
+                int numUndo = ((DefaultMutableTreeNode) undoTreeModel.getRoot()).getChildCount() - idx;
+                Main.main.undoRedo.undo(numUndo);
+                break;
+            case REDO:
+                int numRedo = idx+1;
+                Main.main.undoRedo.redo(numRedo);
+                break;
             }
             Main.map.repaint();

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

@@ -188 +188 @@
 
         public ShowUserInfoAction() {
+            super(false);
             putValue(NAME, tr("Show info"));
             putValue(SHORT_DESCRIPTION, tr("Launches a browser with information about the user"));

trunk/src/org/openstreetmap/josm/gui/history/VersionTable.java

@@ -117 +117 @@
 
         public ChangesetInfoAction() {
+            super(true);
             putValue(NAME, tr("Changeset info"));
             putValue(SHORT_DESCRIPTION, tr("Launch browser with information about the changeset"));