Changeset 10308 in josm for trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java

Timestamp:

2016-06-01T23:17:40+02:00 (8 years ago)

Author:

Don-vip

Message:

sonar - squid:S1854 - Dead stores should be removed

File:

• trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java (modified) (3 diffs)

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

@@ -775 +775 @@
      * @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
+     * @throws IllegalArgumentException if parts is empty or not circular
      */
     private static List<WayInPolygon> markWayInsideSide(List<Way> parts, boolean isInner) {
@@ -785 +785 @@
 
             if (!parts.get(pos).lastNode().equals(parts.get((pos + 1) % parts.size()).firstNode()))
-                throw new RuntimeException("Way not circular");
+                throw new IllegalArgumentException("Way not circular");
 
             nextWayMap.put(parts.get(pos), parts.get((pos + 1) % parts.size()));
@@ -818 +818 @@
 
         if (topNode.equals(topWay.firstNode()) || topNode.equals(topWay.lastNode())) {
-            Node headNode = null; // the node at junction
-            Node prevNode = null; // last node from previous path
-            wayClockwise = false;
+            Node headNode; // the node at junction
+            Node prevNode; // last node from previous path
 
             //node is in split point - find the outermost way from this point