Changeset 11108 in josm for trunk

Timestamp:

2016-10-09T03:29:20+02:00 (8 years ago)

Author:

Don-vip

Message:

sonar - squid:S3518 - Zero should not be a possible denominator

Location:

trunk

Files:

• src/org/openstreetmap/josm/actions/MergeNodesAction.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/actions/MergeNodesActionTest.java (added)

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

@@ -104 +104 @@
         if (size == 0)
             throw new IllegalArgumentException("empty list");
+        if (size == 1) // to avoid division by 0 in mode 2
+            return candidates.get(0);
 
         switch (Main.pref.getInteger("merge-nodes.mode", 0)) {
         case 0:
-            Node targetNode = candidates.get(size - 1);
-            for (final Node n : candidates) { // pick last one
-                targetNode = n;
-            }
-            return targetNode;
+            return candidates.get(size - 1);
         case 1:
             double east1 = 0, north1 = 0;
             for (final Node n : candidates) {
-                east1 += n.getEastNorth().east();
-                north1 += n.getEastNorth().north();
+                EastNorth en = n.getEastNorth();
+                east1 += en.east();
+                north1 += en.north();
             }