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

Timestamp:

2009-08-04T08:08:30+02:00 (15 years ago)

Author:

Gubaer

Message:

fixed #3180: Zoom to layer + GPX = NPE

File:

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

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

@@ -73 +73 @@
     }
 
+    protected Layer getActiveLayer() {
+        try {
+            return Main.map.mapView.getActiveLayer();
+        } catch(NullPointerException e) {
+            return null;
+        }
+    }
+
     private BoundingXYVisitor getBoundingBox() {
         BoundingXYVisitor v = new BoundingXYVisitor();
@@ -80 +88 @@
             }
         } else if (mode.equals("layer")) {
-            Main.map.mapView.getActiveLayer().visitBoundingBox(v);
+            if (getActiveLayer() == null)
+                return null;
+            getActiveLayer().visitBoundingBox(v);
         } else if (mode.equals("selection") || mode.equals("conflict")) {
             Collection<OsmPrimitive> sel = new HashSet<OsmPrimitive>();
@@ -131 +141 @@
         if ("selection".equals(mode)) {
             setEnabled(getCurrentDataSet() != null && ! getCurrentDataSet().getSelected().isEmpty());
+        }  else if ("layer".equals(mode)) {
+            setEnabled(getActiveLayer() != null);
         } else {
             setEnabled(