Changeset 17621 in josm for trunk

Timestamp:

2021-03-21T15:45:26+01:00 (4 years ago)

Author:

simon04

Message:

see #19180 - Fix code duplication

Location:

trunk/src/org/openstreetmap/josm/data/validation/tests

Files:

• MapCSSTagChecker.java (modified) (4 diffs)
• TagChecker.java (modified) (1 diff)

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

@@ -21 +21 @@
 import java.util.Set;
 import java.util.function.Consumer;
+import java.util.function.Predicate;
 import java.util.stream.Stream;
 
@@ -386 +387 @@
     @Override
     public void visit(Collection<OsmPrimitive> selection) {
-        if (progressMonitor != null) {
+        visit(selection, null);
+    }
+
+    /**
+     * Execute the rules from the URLs matching the given predicate.
+     * @param selection collection of primitives
+     * @param urlPredicate a predicate deciding whether the rules from the given URL shall be executed
+     */
+    void visit(Collection<OsmPrimitive> selection, Predicate<String> urlPredicate) {
+        if (urlPredicate == null && progressMonitor != null) {
             progressMonitor.setTicksCount(selection.size() * checks.size());
         }
@@ -396 +406 @@
             if (isCanceled()) {
                 break;
+            }
+            if (urlPredicate != null && !urlPredicate.test(entry.getKey())) {
+                continue;
             }
             visit(entry.getKey(), entry.getValue(), selection, surrounding);
@@ -480 +493 @@
     }
 
-    /**
-     * Execute only the rules for the rules matching the given file name. See #19180
-     * @param ruleFile the name of the mapcss file, e.g. deprecated.mapcss
-     * @param selection collection of primitives
-     * @since 16784
-     */
-    public void runOnly(String ruleFile, Collection<OsmPrimitive> selection) {
-        mpAreaCache.clear();
-
-        Set<OsmPrimitive> surrounding = new HashSet<>();
-        for (Entry<String, Set<MapCSSTagCheckerRule>> entry : checks.entrySet()) {
-            if (isCanceled()) {
-                break;
-            }
-            if (entry.getKey().endsWith(ruleFile)) {
-                visit(entry.getKey(), entry.getValue(), selection, surrounding);
-            }
-        }
-
-    }
 }

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

@@ -1043 +1043 @@
             return 0;
         deprecatedChecker.getErrors().clear();
-        deprecatedChecker.runOnly("deprecated.mapcss", Collections.singleton(p));
+        deprecatedChecker.visit(Collections.singleton(p), url -> url.endsWith("deprecated.mapcss"));
         return deprecatedChecker.getErrors().size();
     }