Changeset 3896 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java

Timestamp:

2011-02-13T13:13:04+01:00 (15 years ago)

Author:

bastiK

Message:

allow a stylesource to override the background color. This may not be the ideal solution yet, but has to do for now.

File:

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

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

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.awt.Color;
 import java.io.IOException;
 import java.io.InputStream;
@@ -28 +29 @@
     
     final public List<MapCSSRule> rules;
+    private Color backgroundColorOverride;
 
     public MapCSSStyleSource(String url, String name, String shortdescription) {
@@ -47 +49 @@
             parser.sheet(this);
             loadMeta();
+            loadCanvas();
         } catch(IOException e) {
             System.err.println(tr("Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}", url, e.toString()));
@@ -78 +81 @@
      */
     private void loadMeta() {
+        Cascade c = constructSpecial("meta");
+        String pTitle = c.get("title", null, String.class);
+        if (title == null) {
+            title = pTitle;
+        }
+        String pIcon = c.get("icon", null, String.class);
+        if (icon == null) {
+            icon = pIcon;
+        }
+    }
+
+    private void loadCanvas() {
+        Cascade c = constructSpecial("canvas");
+        backgroundColorOverride = c.get("background-color", null, Color.class);
+    }
+
+    private Cascade constructSpecial(String type) {
+
         MultiCascade mc = new MultiCascade();
         Node n = new Node();
@@ -88 +109 @@
         for (MapCSSRule r : rules) {
             for (Selector s : r.selectors) {
-                if (s.base.equals("meta")) {
+                if (s.base.equals(type)) {
                     for (Condition cnd : s.conds) {
                         if (!cnd.applies(env))
@@ -99 +120 @@
             }
         }
-        Cascade c = mc.getCascade("default");
-        String pTitle = c.get("title", null, String.class);
-        if (title == null) {
-            title = pTitle;
-        }
-        String pIcon = c.get("icon", null, String.class);
-        if (icon == null) {
-            icon = pIcon;
-        }
+        return mc.getCascade("default");
+    }
+
+    public Color getBackgroundColorOverride() {
+        return backgroundColorOverride;
     }