Changeset 14801 in josm for trunk

Timestamp:

2019-02-23T16:52:43+01:00 (6 years ago)

Author:

Don-vip

Message:

fix #17358 - mapcss regular expression matches for key (patch by michael2402, regression from #17021)

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/mappaint/mapcss/ConditionFactory.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerTest.java (modified) (1 diff)

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

@@ -316 +316 @@
         }
 
+        /**
+         * Determines if this condition requires an exact key match.
+         * @return {@code true} if this condition requires an exact key match.
+         * @since 14801
+         */
+        public boolean requiresExactKeyMatch() {
+            return !Op.NEGATED_OPS.contains(op);
+        }
+
         @Override
         public boolean applies(Environment env) {
@@ -388 +397 @@
             super(k, v, op, false);
             this.keyPattern = Pattern.compile(k);
+        }
+
+        @Override
+        public boolean requiresExactKeyMatch() {
+            return false;
         }
 

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

@@ -53 +53 @@
 import org.openstreetmap.josm.gui.mappaint.mapcss.ConditionFactory.KeyMatchType;
 import org.openstreetmap.josm.gui.mappaint.mapcss.ConditionFactory.KeyValueCondition;
-import org.openstreetmap.josm.gui.mappaint.mapcss.ConditionFactory.Op;
 import org.openstreetmap.josm.gui.mappaint.mapcss.ConditionFactory.PseudoClassCondition;
 import org.openstreetmap.josm.gui.mappaint.mapcss.ConditionFactory.SimpleKeyValueCondition;
@@ -333 +332 @@
                 } else if (c instanceof KeyValueCondition) {
                     KeyValueCondition keyValueCondition = (KeyValueCondition) c;
-                    if (!Op.NEGATED_OPS.contains(keyValueCondition.op)) {
+                    if (keyValueCondition.requiresExactKeyMatch()) {
                         key = keyValueCondition.k;
                     }

trunk/test/unit/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerTest.java

@@ -332 +332 @@
      */
     @Test
-    @Ignore("not fixed yet")
     public void testTicket17358() throws ParseException {
         final Collection<TestError> errors = buildTagChecker(