Changeset 801 in josm

Timestamp:

Aug 17, 2008 12:26:23 AM (5 years ago)

Author:

stoecker

Message:

allow configurable mappaint colors

File:

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

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

@@ -9 +9 @@
 
 import org.openstreetmap.josm.tools.ColorHelper;
+import org.openstreetmap.josm.Main;
 import org.xml.sax.Attributes;
 import org.xml.sax.helpers.DefaultHandler;
@@ -32 +33 @@
         }
 
-        /*
-    ElemStyles getElemStyles()
-    {
-        return styles;
-    }
-        */
+        Color convertColor(String colString)
+        {
+                int i = colString.indexOf("#");
+                String colorString;
+                if(i < 0) // name only
+                        colorString = Main.pref.get("color.mappaint."+colString);
+                else if(i == 0) // value only
+                        colorString = colString;
+                else // value and name
+                        colorString = Main.pref.get("color.mappaint."+colString.substring(0,i), colString.substring(i));
+                return ColorHelper.html2color(colorString);
+        }
 
         @Override public void startDocument() {
@@ -73 +80 @@
                                                 curLineWidth = Integer.parseInt(atts.getValue(count));
                                         else if (atts.getQName(count).equals("colour"))
-                                                curLineColour=ColorHelper.html2color(atts.getValue(count));
+                                                curLineColour=convertColor(atts.getValue(count));
                                         else if (atts.getQName(count).equals("realwidth"))
                                                 curLineRealWidth=Integer.parseInt(atts.getValue(count));
@@ -123 +130 @@
                                 {
                                         if (atts.getQName(count).equals("colour"))
-                                                curAreaColour=ColorHelper.html2color(atts.getValue(count));
+                                                curAreaColour=convertColor(atts.getValue(count));
                                 }
                         }