Changeset 7246 in josm for trunk/src/org

Timestamp:

2014-06-13T07:35:31+02:00 (10 years ago)

Author:

bastiK

Message:

fixed #10142 - Regression: MapCSS changes did break lane attribute style

Location:

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

Files:

• Cascade.java (modified) (1 diff)
• mapcss/ExpressionFactory.java (modified) (1 diff)

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

@@ -146 +146 @@
             return !(s.isEmpty() || "false".equals(s) || "no".equals(s) || "0".equals(s) || "0.0".equals(s));
         if (o instanceof Number)
-            return ((Number) o).floatValue() == 0.0f;
+            return ((Number) o).floatValue() != 0.0f;
         if (o instanceof List)
             return !((List) o).isEmpty();

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

@@ -431 +431 @@
          */
         public static boolean equal(Object a, Object b) {
-            // make sure the casts are done in a meaningful way, so
-            // the 2 objects really can be considered equal
-            for (Class<?> klass : new Class<?>[]{Float.class, Boolean.class, Color.class, float[].class, String.class}) {
-                Object a2 = Cascade.convertTo(a, klass);
-                Object b2 = Cascade.convertTo(b, klass);
-                if (a2 != null && b2 != null && a2.equals(b2)) {
-                    return true;
-                }
-            }
-            return false;
+            if (a.getClass() == b.getClass()) return a.equals(b);
+            if (a.equals(Cascade.convertTo(b, a.getClass()))) return true;
+            return b.equals(Cascade.convertTo(a, b.getClass()));
         }