Changeset 16443 in josm for trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java

Timestamp:

2020-05-17T15:57:57+02:00 (4 years ago)

Author:

simon04

Message:

see #19053 - fix cleanup3000, add non-regression test

File:

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

trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java

@@ -19 +19 @@
 import java.util.Enumeration;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.Set;
 import java.util.SortedMap;
 import java.util.TreeMap;
@@ -322 +320 @@
     private static void cleanup3000() {
         // see #19053
-        Set<String> toRemove = new HashSet<>();
-        for (Entry<String, String> entry : ignoredErrors.entrySet()) {
-            if (entry.getKey().equals("3000_" + entry.getValue()))
-                toRemove.add(entry.getValue());
-        }
         ignoredErrors.entrySet()
-                .removeIf(e -> toRemove.contains(e.getValue()) && !e.getKey().equals("3000_" + e.getValue()));
-
+                .removeIf(e -> e.getKey().equals("3000_" + e.getValue()));
     }