Changeset 3893 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Expression.java

Timestamp:

2011-02-12T20:30:01+01:00 (13 years ago)

Author:

bastiK

Message:

mapcss: some rework of Error Handling, (Multi)Cascade and icon loading

File:

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

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

@@ -122 +122 @@
                 Cascade c;
                 if (layer == null) {
-                    c = env.getCascade();
+                    c = env.mc.getCascade(env.layer);
                 } else {
                     c = env.mc.getCascade(layer);
@@ -136 +136 @@
                 Cascade c;
                 if (layer == null) {
-                    c = env.getCascade();
+                    // env.layer is null if expression is evaluated
+                    // in ExpressionCondition, but MultiCascade.getCascade
+                    // handles this
+                    c = env.mc.getCascade(env.layer);
                 } else {
                     c = env.mc.getCascade(layer);