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

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

@@ -58 +58 @@
             System.err.println(tr("Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}", url, e.getMessage()));
             e.printStackTrace();
-            logError(e);
+            logError(new ParseException(e.getMessage())); // allow e to be garbage collected, it links to the entire token stream
         }
     }
@@ -124 +124 @@
                     }
 
-                    Cascade c = mc.get(sub);
-                    if (c == null) {
-                        if (mc.containsKey("*")) {
-                            c = mc.get("*").clone();
-                        } else {
-                            c = new Cascade(!sub.equals("default"));
-                        }
-                        mc.put(sub, c);
-                    }
-
                     if (sub.equals("*")) {
-                        for (Entry<String, Cascade> entry : mc.entrySet()) {
+                        for (Entry<String, Cascade> entry : mc.getLayers()) {
                             env.layer = entry.getKey();
+                            if (Utils.equal(env.layer, "*")) {
+                                continue;
+                            }
                             for (Instruction i : r.declaration) {
                                 i.execute(env);