Changeset 3893 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.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/LineElemStyle.java (modified) (2 diffs)

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

@@ -19 +19 @@
 
     public static LineElemStyle createSimpleLineStyle(Color color) {
-        Cascade c = new Cascade(false);
+        MultiCascade mc = new MultiCascade();
+        Cascade c = mc.getOrCreateCascade("default");
         c.put("width", -1f);
         c.put("color", color != null ? color : PaintColors.UNTAGGED.get());
-        MultiCascade mc = new MultiCascade();
-        mc.put("default", c);
         return createLine(new Environment(null, mc, "default", null));
     }
@@ -60 +59 @@
 
     private static LineElemStyle createImpl(Environment env, boolean casing) {
-        Cascade c = env.getCascade();
+        Cascade c = env.mc.getCascade(env.layer);
         Cascade c_def = env.mc.getCascade("default");