Changeset 8200 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2015-04-17T07:58:04+02:00 (9 years ago)

Author:

stoecker

Message:

fix #7630 - NPE

File:

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

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

@@ -25 +25 @@
 import org.openstreetmap.josm.data.DataSource;
 import org.openstreetmap.josm.data.conflict.Conflict;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
@@ -268 +269 @@
                 lastZoomTime = -1;
             }
-            ArrayList<DataSource> dataSources = new ArrayList<>(Main.main.getCurrentDataSet().getDataSources());
-            int s = dataSources.size();
-            if(s > 0) {
-                if(lastZoomTime == -1 || lastZoomArea == -1 || lastZoomArea > s) {
-                    lastZoomArea = s-1;
-                    v.visit(dataSources.get(lastZoomArea).bounds);
-                } else if(lastZoomArea > 0) {
-                    lastZoomArea -= 1;
-                    v.visit(dataSources.get(lastZoomArea).bounds);
+            DataSet dataset = Main.main.getCurrentDataSet();
+            if(dataset != null) {
+                ArrayList<DataSource> dataSources = new ArrayList<>(dataset.getDataSources());
+                int s = dataSources.size();
+                if(s > 0) {
+                    if(lastZoomTime == -1 || lastZoomArea == -1 || lastZoomArea > s) {
+                        lastZoomArea = s-1;
+                        v.visit(dataSources.get(lastZoomArea).bounds);
+                    } else if(lastZoomArea > 0) {
+                        lastZoomArea -= 1;
+                        v.visit(dataSources.get(lastZoomArea).bounds);
+                    } else {
+                        lastZoomArea = -1;
+                        v.visit(new Bounds(Main.main.getCurrentDataSet().getDataSourceArea().getBounds2D()));
+                    }
+                    lastZoomTime = System.currentTimeMillis();
                 } else {
+                    lastZoomTime = -1;
                     lastZoomArea = -1;
-                    v.visit(new Bounds(Main.main.getCurrentDataSet().getDataSourceArea().getBounds2D()));
-                }
-                lastZoomTime = System.currentTimeMillis();
-            } else {
-                lastZoomTime = -1;
-                lastZoomArea = -1;
+                }
             }
             break;