Changeset 10661 in osm for applications/editors/josm/plugins/validator/src/org

Timestamp:

2008-09-13T15:56:55+02:00 (16 years ago)

Author:

stotz

Message:

Zooming to the problem is now triggered by a context menu instead of double click; Zooming style is now equal to original JOSM implementation.
Note: This version requires at least JOSM rev 948

File:

• applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java (modified) (6 diffs)

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java

@@ -16 +16 @@
 import java.util.Set;
 
+import javax.swing.JMenuItem;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
+import javax.swing.JPopupMenu;
 import javax.swing.JScrollPane;
 import javax.swing.event.TreeSelectionEvent;
@@ -47 +49 @@
     private static final long serialVersionUID = 2952292777351992696L;
 
-    private static final double MIN_SCALE_ON_SELECT = 0.00001;
-
     /** The display tree */
     protected ErrorTreePanel tree;
@@ -59 +59 @@
     /** The select button */
 
+    private JPopupMenu popupMenu;
+    private TestError popupMenuError = null;
+
     /** Last selected element */
     private DefaultMutableTreeNode lastSelectedNode = null;
@@ -69 +72 @@
 
         this.plugin = plugin;
+        popupMenu = new JPopupMenu();
+
+        JMenuItem zoomTo = new JMenuItem(tr("Zoom to problem"));
+        zoomTo.addActionListener(new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
+                zoomToProblem();
+            }
+        });
+        popupMenu.add(zoomTo);
 
         tree = new ErrorTreePanel();
@@ -226 +238 @@
     }
 
+    private void showPopupMenu(MouseEvent e) {
+        if (!e.isPopupTrigger())
+            return;
+        popupMenuError = null;
+        TreePath selPath = tree.getPathForLocation(e.getX(), e.getY());
+        if (selPath == null)
+            return;
+        DefaultMutableTreeNode node = (DefaultMutableTreeNode) selPath.getPathComponent(selPath.getPathCount() - 1);
+        if (!(node.getUserObject() instanceof TestError))
+            return;
+        popupMenuError = (TestError) node.getUserObject();
+        popupMenu.show(e.getComponent(), e.getX(), e.getY());
+    }
+
+    private void zoomToProblem() {
+        if (popupMenuError == null)
+            return;
+        ValidatorBoundingXYVisitor bbox = new ValidatorBoundingXYVisitor();
+        popupMenuError.visitHighlighted(bbox);
+        if (bbox.min == null || bbox.max == null)
+            return;
+        bbox.enlargeBoundingBox();
+        Main.map.mapView.recalculateCenterScale(bbox);
+    }
+
     /**
      * Sets the selection of the map to the current selected items.
@@ -341 +378 @@
                 Main.ds.setSelected(sel);
             }
-            TreePath selPath = tree.getPathForLocation(e.getX(), e.getY());
-            if ((selPath != null) && (e.getClickCount() == 2)) {
-                DefaultMutableTreeNode node = (DefaultMutableTreeNode) selPath
-                        .getPathComponent(selPath.getPathCount() - 1);
-                if (node.getUserObject() instanceof TestError) {
-                    TestError testError = (TestError) node.getUserObject();
-                    ValidatorBoundingXYVisitor box = new ValidatorBoundingXYVisitor();
-                    testError.visitHighlighted(box);
-                    if (box.max.equals(box.min))
-                        Main.map.mapView.zoomTo(box.max, MIN_SCALE_ON_SELECT);
-                    else {
-                        Main.map.mapView.recalculateCenterScale(box);
-                        if (Main.map.mapView.getScale() < MIN_SCALE_ON_SELECT)
-                            Main.map.mapView.zoomTo(Main.map.mapView.getCenter(), MIN_SCALE_ON_SELECT);
-                    }
-                }
-            }
-        }
+        }
+
+        @Override
+        public void mousePressed(MouseEvent e) {
+            showPopupMenu(e);
+        }
+
+        @Override
+        public void mouseReleased(MouseEvent e) {
+            showPopupMenu(e);
+        }
+
     }