Changeset 3803 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyleHandler.java

Timestamp:

2011-01-22T19:27:33+01:00 (13 years ago)

Author:

bastiK

Message:

Don't merge all mappaitn style rules into one StyleSet, but keep them as separate StyleSources. This allows switching styles on and off at runtime.

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyleHandler.java (modified) (7 diffs)

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

@@ -15 +15 @@
 public class ElemStyleHandler extends DefaultHandler
 {
-    boolean inDoc, inRule, inCondition, inLine, inLineMod, inIcon, inArea, inScaleMax, inScaleMin;
-    boolean hadLine, hadLineMod, hadIcon, hadArea;
-    ElemStyles styles;
-    String styleName;
-    RuleElem rule = new RuleElem();
+    private boolean inDoc, inRule, inCondition, inLine, inLineMod, inIcon, inArea, inScaleMax, inScaleMin;
+    private boolean hadLine, hadLineMod, hadIcon, hadArea;
+    private RuleElem rule = new RuleElem();
+
+    StyleSource style;
 
     static class RuleElem {
@@ -43 +43 @@
     }
 
-    public ElemStyleHandler(String name) {
-        styleName = name;
+    public ElemStyleHandler(StyleSource style) {
+        this.style = style;
         inDoc=inRule=inCondition=inLine=inIcon=inArea=false;
         rule.init();
-        styles = MapPaintStyles.getStyles();
     }
 
@@ -54 +53 @@
         int i = colString.indexOf("#");
         Color ret;
-        if(i < 0) {
-            ret = Main.pref.getColor("mappaint."+styleName+"."+colString, Color.red);
+        if (i < 0) {
+            ret = Main.pref.getColor("mappaint."+style.getPrefName()+"."+colString, Color.red);
         } else if(i == 0) {
             ret = ColorHelper.html2color(colString);
         } else {
-            ret = Main.pref.getColor("mappaint."+styleName+"."+colString.substring(0,i),
+            ret = Main.pref.getColor("mappaint."+style.getPrefName()+"."+colString.substring(0,i),
                     ColorHelper.html2color(colString.substring(i)));
         }
@@ -74 +73 @@
 
     private void error(String message) {
-        System.out.println(styleName + " (" + rule.rule.key + "=" + rule.rule.value + "): " + message);
+        System.out.println(style.getDisplayString() + " (" + rule.rule.key + "=" + rule.rule.value + "): " + message);
     }
 
@@ -141 +140 @@
             } else if (qName.equals("rules"))
             {
-                if(styleName == null)
-                {
-                    String n = atts.getValue("name");
-                    if(n == null) {
-                        n = "standard";
-                    }
-                    styleName = n;
+                if (style.name == null) {
+                    style.name = atts.getValue("name");
+                }
+                if (style.shortdescription == null) {
+                    style.shortdescription = atts.getValue("shortdescription");
                 }
             }
@@ -203 +200 @@
                 {
                     if (atts.getQName(count).equals("src")) {
-                        ImageIcon icon = MapPaintStyles.getIcon(atts.getValue(count), styleName);
+                        ImageIcon icon = MapPaintStyles.getIcon(atts.getValue(count), style.getPrefName());
                         hadIcon = (icon != null);
                         rule.icon.icon = icon;
@@ -242 +239 @@
             if(hadLine)
             {
-                styles.add(styleName, rule.rule, rule.rules,
+                style.add(rule.rule, rule.rules,
                         new LineElemStyle(rule.line, rule.scaleMax, rule.scaleMin));
             }
             if(hadLineMod)
             {
-                styles.addModifier(styleName, rule.rule, rule.rules,
+                style.addModifier(rule.rule, rule.rules,
                         new LineElemStyle(rule.linemod, rule.scaleMax, rule.scaleMin));
             }
             if(hadIcon)
             {
-                styles.add(styleName, rule.rule, rule.rules,
+                style.add(rule.rule, rule.rules,
                         new IconElemStyle(rule.icon, rule.scaleMax, rule.scaleMin));
             }
             if(hadArea)
             {
-                styles.add(styleName, rule.rule, rule.rules,
+                style.add(rule.rule, rule.rules,
                         new AreaElemStyle(rule.area, rule.scaleMax, rule.scaleMin));
             }