Changeset 8850 in josm for trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateRelation.java

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

File:

• trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateRelation.java (modified) (2 diffs)

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;
             }
         }