Changeset 3904 in josm for trunk

Timestamp:

2011-02-15T18:26:09+01:00 (14 years ago)

Author:

bastiK

Message:

mapcss fix

Location:

trunk/src/org/openstreetmap/josm/gui/mappaint

Files:

• Cascade.java (modified) (1 diff)
• mapcss/Condition.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/Cascade.java

@@ -107 +107 @@
         if (o instanceof Boolean)
             return (Boolean) o;
-        if (o instanceof String)
-            return Boolean.parseBoolean((String) o);
+        if (o instanceof String) {
+            String s = (String) o;
+            if ("true".equals(o) || "yes".equals(o))
+                return true;
+            if ("false".equals(o) || "no".equals(o))
+                return false;
+        }
         return null;
     }

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

@@ -12 +12 @@
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.gui.mappaint.Cascade;
 import org.openstreetmap.josm.gui.mappaint.Environment;
 import org.openstreetmap.josm.gui.mappaint.mapcss.Condition.Op;
@@ -169 +170 @@
         @Override
         public boolean applies(Environment env) {
-            Object o = e.evaluate(env);
-            if (o instanceof Boolean)
-                return (Boolean) o;
-            return false;
+            Boolean b = Cascade.convertTo(e.evaluate(env), Boolean.class);
+            return b != null && b;
         }