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

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

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.mappaint;
 
+import java.util.Collection;
 import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
 
 /**
- * Several cascades, e.g. one for the main Line and one for each overlay.
- * The range is (0,Inf) at first and it shrinks in the process when
+ * Several layers / cascades, e.g. one for the main Line and one for each overlay.
+ * The range is (0,Infinity) at first and it shrinks in the process when
  * StyleSources apply zoom level dependent properties.
  */
-public class MultiCascade extends HashMap<String, Cascade> {
+public class MultiCascade {
+    
+    private Map<String, Cascade> layers;
     public Range range;
 
     public MultiCascade() {
-        super();
+        layers = new HashMap<String, Cascade>();
         range = new Range();
     }
 
     /**
-     * Return the cascade for the given layer key. If it does not exist,
-     * return a new cascade, but do not keep it.
+     * Return the cascade with the given name. If it doesn't exist, create
+     * a new layer with that name and return it. The new layer will be
+     * a clone of the "*" layer, if it exists.
      */
-    public Cascade getCascade(String layer) {
+    public Cascade getOrCreateCascade(String layer) {
         if (layer == null)
             throw new IllegalArgumentException();
-        Cascade c = get(layer);
+        Cascade c = layers.get(layer);
         if (c == null) {
-            c = new Cascade(!layer.equals("default"));
+            if (layers.containsKey("*")) {
+                c = layers.get("*").clone();
+            } else {
+                c = new Cascade();
+                // Everything that is not on the default layer is assumed to
+                // be a modifier. Can be overridden in style definition.
+                if (!layer.equals("default")) {
+                    c.put("modifier", true);
+                }
+            }
+            layers.put(layer, c);
         }
         return c;
     }
 
+    /**
+     * Read-only version of getOrCreateCascade. For convenience, it returns an
+     * empty cascade for non-existing layers. However this empty (read-only) cascade
+     * is not added to this MultiCascade object.
+     */
+    public Cascade getCascade(String layer) {
+        if (layer == null) {
+            layer = "default";
+        }
+        Cascade c = layers.get(layer);
+        if (c == null) {
+            c = new Cascade();
+            if (!layer.equals("default")) {
+                c.put("modifier", true);
+            }
+        }
+        return c;
+    }
+
+    public Collection<Entry<String, Cascade>> getLayers() {
+        return layers.entrySet();
+    }
+
+    public boolean hasLayer(String layer) {
+        return layers.containsKey(layer);
+    }
 }