Changeset 9087 in josm

Timestamp:

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

Author:

Don-vip

Message:

sonar - fix some errors, mainly NPEs

Location:

trunk/src/org/openstreetmap/josm

Files:

• Main.java (modified) (1 diff)
• actions/AlignInLineAction.java (modified) (2 diffs)
• actions/DistributeAction.java (modified) (3 diffs)
• actions/JoinAreasAction.java (modified) (3 diffs)
• actions/UnGlueAction.java (modified) (1 diff)
• data/osm/MultipolygonBuilder.java (modified) (1 diff)
• data/validation/tests/MultipolygonTest.java (modified) (1 diff)
• gui/dialogs/relation/sort/WayConnectionTypeCalculator.java (modified) (1 diff)
• gui/mappaint/mapcss/Condition.java (modified) (1 diff)
• io/OsmReader.java (modified) (1 diff)
• io/session/SessionReader.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/Main.java

@@ -700 +700 @@
     }
 
-    private abstract class InitializationTask implements Callable<Void> {
+    private abstract static class InitializationTask implements Callable<Void> {
 
         private final String name;

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

trunk/src/org/openstreetmap/josm/data/osm/MultipolygonBuilder.java

@@ -203 +203 @@
             while (true) {
                 boolean curWayReverse = prevNode == curWay.lastNode();
-                Node nextNode = (curWayReverse) ? curWay.firstNode() : curWay.lastNode();
+                Node nextNode = curWayReverse ? curWay.firstNode() : curWay.lastNode();
 
                 //add cur way to the list

trunk/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java

@@ -267 +267 @@
                         addError(r, new TestError(this, Severity.WARNING, tr("Multipolygon inner way is outside"),
                                 INNER_WAY_OUTSIDE, Collections.singletonList(r), highlights));
-                    } else {
+                    } else if (outerWay != null) {
                         highlights.add(outerWay.getNodes());
                         addError(r, new TestError(this, Severity.WARNING, tr("Intersection between multipolygon ways"),

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculator.java

@@ -73 +73 @@
                 }
 
-                if (!RelationSortUtils.isOneway(m)) {
+                if (!RelationSortUtils.isOneway(m) && lastWct != null) {
                     wct.direction = determineDirection(i-1, lastWct.direction, i);
                     wct.linkPrev = (wct.direction != NONE);

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Condition.java

@@ -140 +140 @@
                 return REGEX.equals(this) ? contains : !contains;
             case ONE_OF:
-                return Arrays.asList(testString.split("\\s*;\\s*")).contains(prototypeString);
+                return testString != null && Arrays.asList(testString.split("\\s*;\\s*")).contains(prototypeString);
             case BEGINS_WITH:
-                return testString.startsWith(prototypeString);
+                return testString != null && testString.startsWith(prototypeString);
             case ENDS_WITH:
-                return testString.endsWith(prototypeString);
+                return testString != null && testString.endsWith(prototypeString);
             case CONTAINS:
-                return testString.contains(prototypeString);
+                return testString != null && testString.contains(prototypeString);
             }
 

trunk/src/org/openstreetmap/josm/io/OsmReader.java

@@ -370 +370 @@
         if (key == null || value == null) {
             throwException(tr("Missing key or value attribute in tag."));
-        }
-        t.put(key.intern(), value.intern());
+        } else {
+            t.put(key.intern(), value.intern());
+        }
         jumpToEnd();
     }

trunk/src/org/openstreetmap/josm/io/session/SessionReader.java

@@ -413 +413 @@
             if (e == null) {
                 error(tr("missing layer with index {0}", idx));
-            }
-            if (!e.hasAttribute("name")) {
+                return;
+            } else if (!e.hasAttribute("name")) {
                 error(tr("missing mandatory attribute ''name'' for element ''layer''"));
+                return;
             }
             String name = e.getAttribute("name");
@@ -421 +422 @@
             if (!e.hasAttribute("type")) {
                 error(tr("missing mandatory attribute ''type'' for element ''layer''"));
+                return;
             }
             String type = e.getAttribute("type");