Changeset 1854 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2009-07-26T12:08:12+02:00 (15 years ago)

Author:

Gubaer

Message:

fixed #3091: zoom to selection on gpx load only

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/AutoScaleAction.java (modified) (1 diff)
• actions/ZoomInAction.java (modified) (3 diffs)
• actions/ZoomOutAction.java (modified) (2 diffs)
• gui/MapView.java (modified) (1 diff)

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

@@ -125 +125 @@
     @Override
     protected void updateEnabledState() {
-        setEnabled(Main.map != null);
+        if ("selection".equals(mode)) {
+            setEnabled(getCurrentDataSet() != null && ! getCurrentDataSet().getSelected().isEmpty());
+        } else {
+            setEnabled(
+                    Main.map != null
+                    && Main.map.mapView != null
+                    && Main.map.mapView.getAllLayers().size() > 0
+            );
+        }
     }
-
 }

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

@@ -8 +8 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -15 +16 @@
         super(tr("Zoom In"), "dialogs/zoomin", tr("Zoom In"),
                 Shortcut.registerShortcut("view:zoomin", tr("View: {0}", tr("Zoom In")), KeyEvent.VK_PLUS, Shortcut.GROUP_DIRECT), true);
-        setEnabled(true);
     }
 
@@ -22 +22 @@
         Main.map.mapView.zoomToFactor(0.9);
     }
+
+    @Override
+    protected void updateEnabledState() {
+        setEnabled(
+                Main.map != null
+                && Main.map.mapView != null
+                && Main.map.mapView.getAllLayers().size() > 0
+        );
+    }
+
 }

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

@@ -14 +14 @@
     public ZoomOutAction() {
         super(tr("Zoom Out"), "dialogs/zoomout", tr("Zoom Out"),
-        Shortcut.registerShortcut("view:zoomout", tr("View: {0}", tr("Zoom Out")), KeyEvent.VK_MINUS, Shortcut.GROUP_DIRECT), true);
-        setEnabled(true);
+                Shortcut.registerShortcut("view:zoomout", tr("View: {0}", tr("Zoom Out")), KeyEvent.VK_MINUS, Shortcut.GROUP_DIRECT), true);
     }
 
@@ -22 +21 @@
         Main.map.mapView.zoomToFactor(1/0.9);
     }
+
+    @Override
+    protected void updateEnabledState() {
+        setEnabled(
+                Main.map != null
+                && Main.map.mapView != null
+                && Main.map.mapView.getAllLayers().size() > 0
+        );
+    }
 }

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

@@ -31 +31 @@
 import org.openstreetmap.josm.actions.mapmode.MapMode;
 import org.openstreetmap.josm.data.Bounds;
-import org.openstreetmap.josm.data.ProjectionBounds;
 import org.openstreetmap.josm.data.SelectionChangedListener;
+import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.DataSource;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
-import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.MapViewPaintable;