Changeset 34944 in osm for applications

Timestamp:

2019-03-25T09:03:56+01:00 (6 years ago)

Author:

gerdp

Message:

sonarlint: combine this loop.

File:

• applications/editors/josm/plugins/reverter/src/reverter/DataSetCommandMerger.java (modified) (1 diff)

applications/editors/josm/plugins/reverter/src/reverter/DataSetCommandMerger.java

@@ -179 +179 @@
         }
         // first handle those relations which don't refer to other relations
+        List<Relation> withRelationsMembers = new ArrayList<>();
         for (Relation relation: sourceDataSet.getRelations()) {
             if (relation.getMemberPrimitives(Relation.class).isEmpty()) {
                 mergeRelation(relation);
-            }
-        }
-        // now the rest of the relations.
-        for (Relation relation: sourceDataSet.getRelations()) {
-            if (!relation.getMemberPrimitives(Relation.class).isEmpty()) {
-                mergeRelation(relation);
-            }
-        }
+            } else {
+                // postpone
+                withRelationsMembers.add(relation);
+            }
+        }
+        withRelationsMembers.forEach(this::mergeRelation);
     }