Changeset 5958 in josm for trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java

Timestamp:

2013-05-13T03:10:05+02:00 (11 years ago)

Author:

Don-vip

Message:

• Improve PopupMenuLauncher to automatically select JTable/JList/JTree line under cursor
• Simplify all popup menus with this new feature
• Remove custom popup menus in BoundingBoxSelection and BoundingBoxSelection to use default text field popup menus recently introduced
• Fix EDT violations in changeset window
• Make Autoscale actions publicly available in MainMenu
• Add a new "Zoom to problem" mode in AutoScaleAction
• Make "Zoom to problem" menu item in validator dialog use this new feature
• Update enabled state of "Zoom to Conflict" and "Zoom to problem" against selection of conflict/validator dialog

File:

• trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java (modified) (13 diffs)

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

@@ -13 +13 @@
 
 import javax.swing.JOptionPane;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import javax.swing.event.TreeSelectionEvent;
+import javax.swing.event.TreeSelectionListener;
 
 import org.openstreetmap.josm.Main;
@@ -19 +23 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
+import org.openstreetmap.josm.data.validation.TestError;
+import org.openstreetmap.josm.gui.MapFrame;
+import org.openstreetmap.josm.gui.MapFrameListener;
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
+import org.openstreetmap.josm.gui.dialogs.ValidatorDialog.ValidatorBoundingXYVisitor;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -36 +44 @@
         marktr("conflict"),
         marktr("download"),
+        marktr("problem"),
         marktr("previous"),
         marktr("next")};
+    
+    private final String mode;
+
+    protected ZoomChangeAdapter zoomChangeAdapter;
+    protected MapFrameAdapter mapFrameAdapter;
 
     /**
@@ -77 +91 @@
     }
 
-    private final String mode;
-
     private static int getModeShortcut(String mode) {
         int shortcut = -1;
@@ -88 +100 @@
         else if (mode.equals("conflict")) { shortcut = KeyEvent.VK_4; }
         else if (mode.equals("download")) { shortcut = KeyEvent.VK_5; }
+        else if (mode.equals("problem")) { shortcut = KeyEvent.VK_6; }
         else if (mode.equals("previous")) { shortcut = KeyEvent.VK_8; }
         else if (mode.equals("next")) { shortcut = KeyEvent.VK_9; }
@@ -95 +108 @@
 
     /**
-     *
-     * @param mode
+     * Constructs a new {@code AutoScaleAction}.
+     * @param mode The autoscale mode (one of {@link AutoScaleAction#MODES})
      * @param marker Used only to differentiate from default constructor
      */
@@ -104 +117 @@
     }
 
-
-    public AutoScaleAction(String mode) {
+    /**
+     * Constructs a new {@code AutoScaleAction}.
+     * @param mode The autoscale mode (one of {@link AutoScaleAction#MODES})
+     */
+    public AutoScaleAction(final String mode) {
         super(tr("Zoom to {0}", tr(mode)), "dialogs/autoscale/" + mode, tr("Zoom the view to {0}.", tr(mode)),
-                Shortcut.registerShortcut("view:zoom"+mode, tr("View: {0}", tr("Zoom to {0}", tr(mode))), getModeShortcut(mode), Shortcut.DIRECT), true);
+                Shortcut.registerShortcut("view:zoom"+mode, tr("View: {0}", tr("Zoom to {0}", tr(mode))), getModeShortcut(mode), Shortcut.DIRECT), 
+                true, null, false);
         String modeHelp = Character.toUpperCase(mode.charAt(0)) + mode.substring(1);
         putValue("help", "Action/AutoScale/" + modeHelp);
@@ -119 +136 @@
         } else if (mode.equals("conflict")) {
             putValue("help", ht("/Action/ZoomToConflict"));
+        } else if (mode.equals("problem")) {
+            putValue("help", ht("/Action/ZoomToProblem"));
         } else if (mode.equals("download")) {
             putValue("help", ht("/Action/ZoomToDownload"));
@@ -125 +144 @@
         } else if (mode.equals("next")) {
             putValue("help", ht("/Action/ZoomToNext"));
-        }
+        } else {
+            throw new IllegalArgumentException("Unknown mode: "+mode);
+        }
+        installAdapters();
     }
 
@@ -171 +193 @@
 
     private BoundingXYVisitor getBoundingBox() {
-        BoundingXYVisitor v = new BoundingXYVisitor();
-        if (mode.equals("data")) {
+        BoundingXYVisitor v = mode.equals("problem") ? new ValidatorBoundingXYVisitor() : new BoundingXYVisitor();
+
+        if (mode.equals("problem")) {
+            TestError error = Main.map.validatorDialog.getSelectedError();
+            if (error == null) return null;
+            ((ValidatorBoundingXYVisitor) v).visit(error);
+            if (v.getBounds() == null) return null;
+            v.enlargeBoundingBox(Main.pref.getDouble("validator.zoom-enlarge-bbox", 0.0002));
+        } else if (mode.equals("data")) {
             for (Layer l : Main.map.mapView.getAllLayers()) {
                 l.visitBoundingBox(v);
@@ -236 +265 @@
                 setEnabled(true);
             }
+        } else if ("conflict".equals(mode)) {
+            setEnabled(Main.map != null && Main.map.conflictDialog.getSelectedConflict() != null);
+        } else if ("problem".equals(mode)) {
+            setEnabled(Main.map != null && Main.map.validatorDialog.getSelectedError() != null);
         } else if ("previous".equals(mode)) {
             setEnabled(Main.isDisplayingMapView() && Main.map.mapView.hasZoomUndoEntries());
@@ -258 +291 @@
     protected void installAdapters() {
         super.installAdapters();
-        // make this action listen to zoom change events
+        // make this action listen to zoom and mapframe change events
         //
-        zoomChangeAdapter = new ZoomChangeAdapter();
-        MapView.addZoomChangeListener(zoomChangeAdapter);
+        MapView.addZoomChangeListener(zoomChangeAdapter = new ZoomChangeAdapter());
+        Main.addMapFrameListener(mapFrameAdapter = new MapFrameAdapter());
         initEnabledState();
     }
 
     /**
-     * Adapter for selection change events
-     *
+     * Adapter for zoom change events
      */
     private class ZoomChangeAdapter implements MapView.ZoomChangeListener {
@@ -275 +307 @@
     }
 
-    private ZoomChangeAdapter zoomChangeAdapter;
+    /**
+     * Adapter for MapFrame change events
+     */
+    private class MapFrameAdapter implements MapFrameListener {
+        private ListSelectionListener conflictSelectionListener;
+        private TreeSelectionListener validatorSelectionListener;
+
+        public MapFrameAdapter() {
+            if (mode.equals("conflict")) {
+                conflictSelectionListener = new ListSelectionListener() {
+                    @Override public void valueChanged(ListSelectionEvent e) {
+                        updateEnabledState();
+                    }
+                };
+            } else if (mode.equals("problem")) {
+                validatorSelectionListener = new TreeSelectionListener() {
+                    @Override public void valueChanged(TreeSelectionEvent e) {
+                        updateEnabledState();
+                    }
+                };
+            }
+        }
+
+        @Override public void mapFrameInitialized(MapFrame oldFrame, MapFrame newFrame) {
+            if (conflictSelectionListener != null) {
+                if (newFrame != null) {
+                    newFrame.conflictDialog.addListSelectionListener(conflictSelectionListener);
+                } else if (oldFrame != null) {
+                    oldFrame.conflictDialog.removeListSelectionListener(conflictSelectionListener);
+                }
+            } else if (validatorSelectionListener != null) {
+                if (newFrame != null) {
+                    newFrame.validatorDialog.addTreeSelectionListener(validatorSelectionListener);
+                } else if (oldFrame != null) {
+                    oldFrame.validatorDialog.removeTreeSelectionListener(validatorSelectionListener);
+                }
+            }
+        }
+    }
 }