Changeset 15984 in josm for trunk/src/org

Timestamp:

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

Author:

simon04

Message:

see #18802 - Add MapCSSRule.matches

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/validation/tests/MapCSSTagChecker.java (modified) (1 diff)
• gui/mappaint/mapcss/MapCSSRule.java (modified) (1 diff)

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) {