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

Timestamp:

2015-12-05T16:09:41+01:00 (8 years ago)

Author:

Don-vip

Message:

sonar - fix some errors, mainly NPEs

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• AlignInLineAction.java (modified) (2 diffs)
• DistributeAction.java (modified) (3 diffs)
• JoinAreasAction.java (modified) (3 diffs)
• UnGlueAction.java (modified) (1 diff)

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

@@ -81 +81 @@
      * @param nodes Nodes to be aligned.
      * @return A array of two nodes.
+     * @throws IllegalArgumentException if nodes is empty
      */
     private static Node[] nodePairFurthestApart(List<Node> nodes) {
@@ -93 +94 @@
             else
                 waysRef.retainAll(ref);
+        }
+
+        if (waysRef == null) {
+            throw new IllegalArgumentException();
         }
 

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

@@ -212 +212 @@
      * @param nodes nodes to distribute
      * @return Commands to execute to perform action
+     * @throws IllegalArgumentException if nodes is empty
      */
     private static Collection<Command> distributeNodes(Collection<Node> nodes) {
@@ -234 +235 @@
         }
 
+        if (nodea == null || nodeb == null) {
+            throw new IllegalArgumentException();
+        }
+
         // Remove the nodes A and B from the list of nodes to move
         nodes.remove(nodea);
@@ -266 +271 @@
             }
 
-            // First move the node to A's position, then move it towards B
-            double dx = ax - s.getEastNorth().east() + (bx-ax)*pos/num;
-            double dy = ay - s.getEastNorth().north() + (by-ay)*pos/num;
-
-            cmds.add(new MoveCommand(s, dx, dy));
-
-            //remove moved node from the list
-            nodes.remove(s);
+            if (s != null) {
+                // First move the node to A's position, then move it towards B
+                double dx = ax - s.getEastNorth().east() + (bx-ax)*pos/num;
+                double dy = ay - s.getEastNorth().north() + (by-ay)*pos/num;
+
+                cmds.add(new MoveCommand(s, dx, dy));
+
+                //remove moved node from the list
+                nodes.remove(s);
+            }
         }
 

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

@@ -765 +765 @@
      * @param isInner - if true, reverts the direction (for multipolygon islands)
      * @return list of parts, marked with the inside orientation.
+     * @throws IllegalArgumentException if parts is empty
      */
     private List<WayInPolygon> markWayInsideSide(List<Way> parts, boolean isInner) {
@@ -796 +797 @@
                 }
             }
+        }
+
+        if (topWay == null || topNode == null) {
+            throw new IllegalArgumentException();
         }
 
@@ -855 +860 @@
 
         //iterate till full circle is reached
-        while (true) {
+        while (curWay != null) {
 
             //add cur way

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

@@ -418 +418 @@
                 way = w;
             }
+        }
+        if (way == null) {
+            return false;
         }
         List<Node> oldNodes = way.getNodes();