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

Timestamp:

2015-10-10T15:15:14+02:00 (9 years ago)

Author:

Don-vip

Message:

sonar - squid:S3047 - Multiple loops over the same set should be combined

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• OrthogonalizeAction.java (modified) (2 diffs)
• mapmode/DrawAction.java (modified) (1 diff)

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

@@ -255 +255 @@
                 wayDataList.get(0).calcDirections(Direction.RIGHT);
                 double refHeading = wayDataList.get(0).heading;
+                EastNorth totSum = new EastNorth(0., 0.);
                 for (WayData w : wayDataList) {
                     w.calcDirections(Direction.RIGHT);
                     int directionOffset = angleToDirectionChange(w.heading - refHeading, TOLERANCE2);
                     w.calcDirections(Direction.RIGHT.changeBy(directionOffset));
-                    if (angleToDirectionChange(refHeading - w.heading, TOLERANCE2) != 0) throw new RuntimeException();
-                }
-                EastNorth totSum = new EastNorth(0., 0.);
-                for (WayData w : wayDataList) {
+                    if (angleToDirectionChange(refHeading - w.heading, TOLERANCE2) != 0)
+                        throw new RuntimeException();
                     totSum = EN.sum(totSum, w.segSum);
                 }
@@ -343 +342 @@
                     }
                 }
+
+                final Map<Node, Double> nC = (orientation == HORIZONTAL) ? nY : nX;
+
+                double average = 0;
                 for (Node n : cs) {
                     s.remove(n);
-                }
-
-                final Map<Node, Double> nC = (orientation == HORIZONTAL) ? nY : nX;
-
-                double average = 0;
-                for (Node n : cs) {
                     average += nC.get(n).doubleValue();
                 }

trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java

@@ -652 +652 @@
             for (int i : is) {
                 segSet.add(Pair.sort(new Pair<>(w.getNode(i), w.getNode(i+1))));
-            }
-            for (int i : is) {
                 wnew.addNode(i + 1, n);
             }