Changeset 13633 in josm for trunk/src/org/openstreetmap/josm/data/validation/tests

Timestamp:

2018-04-15T16:21:00+02:00 (6 years ago)

Author:

Don-vip

Message:

fix #16183 - automatically remove "areaStyle" pseudo-classes from map paint styles. This class only works for validator rules.

File:

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

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

@@ -16 +16 @@
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
@@ -376 +375 @@
             parser.sheet(source);
             // Ignore "meta" rule(s) from external rules of JOSM wiki
-            removeMetaRules(source);
+            source.removeMetaRules();
             // group rules with common declaration block
             Map<Declaration, List<Selector>> g = new LinkedHashMap<>();
@@ -399 +398 @@
             }
             return new ParseResult(parseChecks, source.getErrors());
-        }
-
-        private static void removeMetaRules(MapCSSStyleSource source) {
-            for (Iterator<MapCSSRule> it = source.rules.iterator(); it.hasNext();) {
-                MapCSSRule x = it.next();
-                if (x.selector instanceof GeneralSelector) {
-                    GeneralSelector gs = (GeneralSelector) x.selector;
-                    if ("meta".equals(gs.base)) {
-                        it.remove();
-                    }
-                }
-            }
         }