Changeset 15984 in josm

Timestamp:

2020-03-01T23:35:58+01:00 (4 years ago)

Author:

simon04

Message:

see #18802 - Add MapCSSRule.matches

Location:

trunk

Files:

• scripts/TagInfoExtract.java (modified) (1 diff)
• src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSRule.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParserTest.java (modified) (4 diffs)

trunk/scripts/TagInfoExtract.java

@@ -394 +394 @@
                 for (MapCSSRule r : styleSource.rules) {
                     env.clearSelectorMatchingInformation();
-                    if (r.selector.matches(env)) {
+                    if (r.matches(env)) {
                         // ignore selector range
                         if (env.layer == null) {

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

@@ -702 +702 @@
             MapCSSRule r = candidates.next();
             env.clearSelectorMatchingInformation();
-            if (r.selector.matches(env)) { // as side effect env.parent will be set (if s is a child selector)
+            if (r.matches(env)) { // as side effect env.parent will be set (if s is a child selector)
                 TagCheck check = indexData.getCheck(r);
                 if (check != null) {

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSRule.java

@@ -35 +35 @@
 
     /**
+     * Test whether the selector of this rule applies to the primitive.
+     *
+     * @param env the Environment. env.mc and env.layer are read-only when matching a selector.
+     * env.source is not needed. This method will set the matchingReferrers field of env as
+     * a side effect! Make sure to clear it before invoking this method.
+     * @return true, if the selector applies
+     * @see Selector#matches
+     */
+    public boolean matches(Environment env) {
+        return selector.matches(env);
+    }
+
+    /**
      * <p>Executes the instructions against the environment {@code env}</p>
      *
      * @param env the environment
+     * @see Declaration#execute
      */
     public void execute(Environment env) {

trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParserTest.java

@@ -452 +452 @@
         assertEquals(1, source.rules.size());
         Environment e = new Environment(n, new MultiCascade(), Environment.DEFAULT_LAYER, null);
-        assertTrue(source.rules.get(0).selector.matches(e));
+        assertTrue(source.rules.get(0).matches(e));
         source.rules.get(0).declaration.execute(e);
         assertEquals("x2;x10", e.getCascade(Environment.DEFAULT_LAYER).get("refs", null, String.class));
@@ -467 +467 @@
         assertEquals(1, source.rules.size());
         Environment e = new Environment(way1, new MultiCascade(), Environment.DEFAULT_LAYER, null);
-        assertTrue(source.rules.get(0).selector.matches(e));
+        assertTrue(source.rules.get(0).matches(e));
         source.rules.get(0).declaration.execute(e);
         assertEquals(Functions.join(",", "Alpha", "Beta"), e.getCascade(Environment.DEFAULT_LAYER).get("sorted", null, String.class));
@@ -474 +474 @@
         source.loadStyleSource();
         e = new Environment(way1, new MultiCascade(), Environment.DEFAULT_LAYER, null);
-        assertTrue(source.rules.get(0).selector.matches(e));
+        assertTrue(source.rules.get(0).matches(e));
         source.rules.get(0).declaration.execute(e);
         assertEquals(Functions.join(",", "A8", "A9"), e.getCascade(Environment.DEFAULT_LAYER).get("sorted", null, String.class));
@@ -532 +532 @@
         assertEquals(1, source.rules.size());
         e = new Environment(rel1, new MultiCascade(), Environment.DEFAULT_LAYER, null);
-        assertTrue(source.rules.get(0).selector.matches(e));
+        assertTrue(source.rules.get(0).matches(e));
         source.rules.get(0).declaration.execute(e);
         assertEquals((Integer) 1, e.getCascade(Environment.DEFAULT_LAYER).get("roles", null, Integer.class));