Changeset 3893 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/xml

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/xml/XmlStyleSource.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java

@@ -278 +278 @@
     @Override
     public void apply(MultiCascade mc, OsmPrimitive osm, double scale, OsmPrimitive multipolyOuterWay, boolean pretendWayIsClosed) {
-        Cascade def = mc.get("default");
-        if (def == null) {
-            def = new Cascade(false);
-            mc.put("default", def);
-        }
+        Cascade def = mc.getOrCreateCascade("default");
         boolean useMinMaxScale = Main.pref.getBoolean("mappaint.zoomLevelDisplay", false);
 
@@ -319 +315 @@
                 int numOver = 0, numUnder = 0;
 
-                while (mc.containsKey(String.format("over_%d", ++numOver))) {}
-                while (mc.containsKey(String.format("under_%d", ++numUnder))) {}
+                while (mc.hasLayer(String.format("over_%d", ++numOver))) {}
+                while (mc.hasLayer(String.format("under_%d", ++numUnder))) {}
 
                 for (LinemodPrototype mod : p.linemods) {
@@ -326 +322 @@
                     if (mod.over) {
                         String layer = String.format("over_%d", numOver);
-                        c = mc.get(layer);
-                        if (c == null) {
-                            c = new Cascade(true);
-                            mc.put(layer, c);
-                        }
+                        c = mc.getOrCreateCascade(layer);
                         c.put("object-z-index", new Float(numOver));
                         ++numOver;
                     } else {
                         String layer = String.format("under_%d", numUnder);
-                        c = mc.get(layer);
-                        if (c == null) {
-                            c = new Cascade(true);
-                            mc.put(layer, c);
-                        }
+                        c = mc.getOrCreateCascade(layer);
                         c.put("object-z-index", new Float(-numUnder));
                         ++numUnder;