Changeset 7167 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Condition.java

Timestamp:

2014-05-22T17:13:04+02:00 (10 years ago)

Author:

simon04

Message:

MapCSS: simplify ~= implementation, add unit tests

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Condition.java (modified) (2 diffs)

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

@@ -3 +3 @@
 
 import java.text.MessageFormat;
+import java.util.Arrays;
 import java.util.EnumSet;
 import java.util.Objects;
@@ -95 +96 @@
                 return REGEX.equals(this) ? contains : !contains;
             case ONE_OF:
-                String[] parts = testString.split(";");
-                for (String part : parts) {
-                    if (Objects.equals(prototypeString, part.trim()))
-                        return true;
-                }
-                return false;
+                return Arrays.asList(testString.split("\\s*;\\s*")).contains(prototypeString);
             case BEGINS_WITH:
                 return testString.startsWith(prototypeString);