Changeset 1221 in josm for trunk/src/org/openstreetmap/josm/data/Preferences.java

Timestamp:

2009-01-09T09:42:46+01:00 (15 years ago)

Author:

stoecker

Message:

cleanup color handling

File:

• trunk/src/org/openstreetmap/josm/data/Preferences.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/Preferences.java

@@ -183 +183 @@
     }
 
+    synchronized public TreeMap<String, String> getAllColors() {
+        final TreeMap<String,String> all = new TreeMap<String,String>();
+        for (final Entry<String,String> e : defaults.entrySet())
+            if (e.getKey().startsWith("color."))
+                all.put(e.getKey().substring(6), e.getValue());
+        for (final Entry<String,String> e : properties.entrySet())
+            if (e.getKey().startsWith("color."))
+                all.put(e.getKey().substring(6), e.getValue());
+        for (final Entry<String,String> e : override.entrySet())
+            if (e.getKey().startsWith("color."))
+                if (e.getValue() == null)
+                    all.remove(e.getKey().substring(6));
+                else
+                    all.put(e.getKey().substring(6), e.getValue());
+        return all;
+    }
+
     synchronized public Map<String, String> getDefaults() {
         return defaults;
@@ -345 +362 @@
      */
     synchronized public Color getColor(String colName, Color def) {
-        String colStr = get("color."+colName);
-        if (colStr.equals("")) {
-            put("color."+colName, ColorHelper.color2html(def));
-            return def;
-        }
-        return ColorHelper.html2color(colStr);
+        return getColor(colName, null, def);
     }
 
@@ -362 +374 @@
      */
     synchronized public Color getColor(String colName, String specName, Color def) {
-        String colStr = get("color."+specName);
+        putDefault("color."+colName, ColorHelper.color2html(def));
+        String colStr = specName != null ? get("color."+specName) : "";
         if(colStr.equals(""))
-        {
             colStr = get("color."+colName);
-            if (colStr.equals("")) {
-                put("color."+colName, ColorHelper.color2html(def));
-                return def;
-            }
-        }
-        putDefault("color."+colName, ColorHelper.color2html(def));
-        return ColorHelper.html2color(colStr);
+        return colStr.equals("") ? def : ColorHelper.html2color(colStr);
     }