Changeset 6611 in josm for trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java

Timestamp:

2014-01-03T17:14:36+01:00 (10 years ago)

Author:

simon04

Message:

see #9516 - Replace BuildingInBuilding by a corresponding MapCSS test

File:

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

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

@@ -116 +116 @@
                 if (i instanceof Instruction.AssignmentInstruction) {
                     final Instruction.AssignmentInstruction ai = (Instruction.AssignmentInstruction) i;
+                    if (ai.isSetInstruction) {
+                        containsSetClassExpression = true;
+                        continue;
+                    }
                     final String val = ai.val instanceof Expression
                             ? (String) ((Expression) ai.val).evaluate(new Environment())
@@ -141 +145 @@
                     } else if ("assertNoMatch".equals(ai.key) && val != null) {
                         check.assertions.put(val, false);
-                    } else if (ai.val instanceof Boolean && ((Boolean) ai.val)) {
-                        containsSetClassExpression = true;
                     } else {
                         throw new RuntimeException("Cannot add instruction " + ai.key + ": " + ai.val + "!");