Changeset 18801 in josm for trunk/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java

Timestamp:

2023-08-09T15:30:01+02:00 (3 years ago)

Author:

taylor.smock

Message:

Fix #22832: Code cleanup and some simplification, documentation fixes (patch by gaben)

There should not be any functional changes in this patch; it is intended to do
the following:

• Simplify and cleanup code (example: Arrays.asList(item) -> Collections.singletonList(item))
• Fix typos in documentation (which also corrects the documentation to match what actually happens, in some cases)

File:

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

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

@@ -10 +10 @@
 import java.util.EnumSet;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
@@ -16 +17 @@
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -430 +432 @@
 
     private void checkLoop(Relation parent, List<Relation> path) {
-        if (path.contains(parent)) {
+        Set<Relation> pathSet = new HashSet<>(path);
+        if (pathSet.contains(parent)) {
             Iterator<List<Relation>> iter = loops.iterator();
+            Set<Relation> loop = new HashSet<>();
             while (iter.hasNext()) {
-                List<Relation> loop = iter.next();
+                loop.addAll(iter.next());
                 if (loop.size() > path.size() && loop.containsAll(path)) {
                     // remove same loop with irrelevant parent
                     iter.remove();
-                } else if (path.size() >= loop.size() && path.containsAll(loop)) {
+                } else if (path.size() >= loop.size() && pathSet.containsAll(loop)) {
                     // same or smaller loop is already known
                     return;
                 }
+                loop.clear();
             }
             if (path.get(0).equals(parent)) {