Changeset 10131 in josm

Timestamp:

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

Author:

Don-vip

Message:

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

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/AutoScaleAction.java (modified) (2 diffs)
• actions/OverpassDownloadAction.java (modified) (1 diff)
• actions/SplitWayAction.java (modified) (2 diffs)
• gui/tagging/presets/TaggingPresetMenu.java (modified) (2 diffs)
• io/remotecontrol/handler/LoadAndZoomHandler.java (modified) (1 diff)

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();

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

@@ -106 +106 @@
 
         private void enableActions(boolean enabled) {
-            for (Object key : actionMap.allKeys()) {
-                Action action = actionMap.get(key);
-                if (action != null) {
-                    action.setEnabled(enabled);
+            Object[] allKeys = actionMap.allKeys();
+            if (allKeys != null) {
+                for (Object key : allKeys) {
+                    Action action = actionMap.get(key);
+                    if (action != null) {
+                        action.setEnabled(enabled);
+                    }
                 }
             }

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

@@ -213 +213 @@
                 }
             }
-            final SplitWayResult result = doSplitWay(getEditLayer(), selectedWay, wayToKeep, newWays, sel);
-            Main.main.undoRedo.add(result.getCommand());
-            getCurrentDataSet().setSelected(result.getNewSelection());
+            if (wayToKeep != null) {
+                final SplitWayResult result = doSplitWay(getEditLayer(), selectedWay, wayToKeep, newWays, sel);
+                Main.main.undoRedo.add(result.getCommand());
+                getCurrentDataSet().setSelected(result.getNewSelection());
+            }
         }
     }
@@ -536 +538 @@
         final Way wayToKeep = splitStrategy.determineWayToKeep(newWays);
 
-        return doSplitWay(layer, way, wayToKeep, newWays, newSelection);
+        return wayToKeep != null ? doSplitWay(layer, way, wayToKeep, newWays, newSelection) : null;
     }
 

trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetMenu.java

@@ -7 +7 @@
 import java.awt.MouseInfo;
 import java.awt.Point;
+import java.awt.PointerInfo;
 import java.awt.event.ActionEvent;
 import java.io.Serializable;
@@ -94 +95 @@
                 pm.add(copyMenuComponent(c));
             }
-            Point p = MouseInfo.getPointerInfo().getLocation();
-            pm.show(Main.parent, p.x-Main.parent.getX(), p.y-Main.parent.getY());
+            PointerInfo pointerInfo = MouseInfo.getPointerInfo();
+            if (pointerInfo != null) {
+                Point p = pointerInfo.getLocation();
+                pm.show(Main.parent, p.x-Main.parent.getX(), p.y-Main.parent.getY());
+            }
         }
     }

trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandler.java

@@ -291 +291 @@
 
         // Process optional argument 'select'
-        if (args.containsKey("select")) {
+        if (args != null && args.containsKey("select")) {
             toSelect.clear();
             for (String item : args.get("select").split(",")) {