Changeset 403 in josm for trunk

Timestamp:

2007-10-19T01:10:58+02:00 (17 years ago)

Author:

framm

Message:

• added patch to ignore "view->zoom" command if nothing is there to zoom to; by David Earl

File:

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

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

@@ -7 +7 @@
 import java.awt.event.ActionEvent;
 import java.util.Collection;
+
+import javax.swing.JOptionPane;
 
 import org.openstreetmap.josm.Main;
@@ -37 +39 @@
 
         public void actionPerformed(ActionEvent e) {
-                if (Main.map != null)
-                        Main.map.mapView.recalculateCenterScale(getBoundingBox());
+                if (Main.map != null) {
+                        BoundingXYVisitor bbox = getBoundingBox();
+                        if (bbox != null) {
+                                Main.map.mapView.recalculateCenterScale(bbox);
+                        }
+                }
                 putValue("active", true);
         }
@@ -51 +57 @@
                 else if (mode.equals("selection") || mode.equals("conflict")) {
                         Collection<OsmPrimitive> sel = mode.equals("selection") ? Main.ds.getSelected() : Main.map.conflictDialog.conflicts.keySet();
+                        if (sel.isEmpty()) {
+                        JOptionPane.showMessageDialog(Main.parent,
+                                        mode.equals("selection") ? tr("Nothing selected to zoom to.") : tr("No conflicts to zoom to"));
+                                return null;
+                        }
                         for (OsmPrimitive osm : sel)
                                 osm.visit(v);