Changeset 10131 in josm for trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java

Timestamp:

2016-04-10T03:35:29+02:00 (8 years ago)

Author:

Don-vip

Message:

fix coverity 1354553, 1347477, 1347476, 1347474, 1347472, 1347471 - NPE

File:

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

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

@@ -8 +8 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
+import java.awt.geom.Area;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -302 +303 @@
                     } else {
                         lastZoomArea = -1;
-                        v.visit(new Bounds(Main.main.getCurrentDataSet().getDataSourceArea().getBounds2D()));
+                        Area sourceArea = Main.main.getCurrentDataSet().getDataSourceArea();
+                        if (sourceArea != null) {
+                            v.visit(new Bounds(sourceArea.getBounds2D()));
+                        }
                     }
                     lastZoomTime = System.currentTimeMillis();