Changeset 8850 in josm for trunk/src/org

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

Files:

• actions/OrthogonalizeAction.java (modified) (2 diffs)
• actions/mapmode/DrawAction.java (modified) (1 diff)
• data/validation/tests/DuplicateRelation.java (modified) (2 diffs)
• data/validation/tests/DuplicateWay.java (modified) (2 diffs)
• gui/preferences/map/MapPaintPreference.java (modified) (1 diff)
• io/session/SessionReader.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);
             }

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

@@ -243 +243 @@
         long idToKeep = 0;
         Relation relationToKeep = relFix.iterator().next();
-        // Only one relation will be kept - the one with lowest positive ID, if such exist
-        // or one "at random" if no such exists. Rest of the relations will be deleted
-        for (Relation w: relFix) {
-            if (!w.isNew() && (idToKeep == 0 || w.getId() < idToKeep)) {
-                idToKeep = w.getId();
-                relationToKeep = w;
-            }
-        }
-
         // Find the relation that is member of one or more relations. (If any)
         Relation relationWithRelations = null;
@@ -262 +253 @@
                 relationWithRelations = w;
                 relRef = rel;
+            }
+            // Only one relation will be kept - the one with lowest positive ID, if such exist
+            // or one "at random" if no such exists. Rest of the relations will be deleted
+            if (!w.isNew() && (idToKeep == 0 || w.getId() < idToKeep)) {
+                idToKeep = w.getId();
+                relationToKeep = w;
             }
         }

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

@@ -253 +253 @@
         long idToKeep = 0;
         Way wayToKeep = ways.iterator().next();
-        // Only one way will be kept - the one with lowest positive ID, if such exist
-        // or one "at random" if no such exists. Rest of the ways will be deleted
-        for (Way w: ways) {
-            if (!w.isNew() && (idToKeep == 0 || w.getId() < idToKeep)) {
-                idToKeep = w.getId();
-                wayToKeep = w;
-            }
-        }
-
         // Find the way that is member of one or more relations. (If any)
         Way wayWithRelations = null;
@@ -273 +264 @@
                 relations = rel;
             }
+            // Only one way will be kept - the one with lowest positive ID, if such exist
+            // or one "at random" if no such exists. Rest of the ways will be deleted
+            if (!w.isNew() && (idToKeep == 0 || w.getId() < idToKeep)) {
+                idToKeep = w.getId();
+                wayToKeep = w;
+            }
         }
 

trunk/src/org/openstreetmap/josm/gui/preferences/map/MapPaintPreference.java

@@ -259 +259 @@
                     }
                 }
-            }
-
-            for (SourceEntry def : defaults) {
                 knownDefaults.add(def.url);
             }

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

@@ -503 +503 @@
                 }
             }
-        }
-        for (Entry<Integer, Layer> e : layersMap.entrySet()) {
-            Layer l = e.getValue();
-            if (l == null) {
-                continue;
-            }
-
-            l.setName(names.get(e.getKey()));
-            layers.add(l);
+            layer.setName(names.get(entry.getKey()));
+            layers.add(layer);
         }
     }