Changeset 6624 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2014-01-04T14:56:55+01:00 (10 years ago)

Author:

Don-vip

Message:

fix #9521 - Colors no more displayed in preferences dialog since [6578]+[6580]

File:

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

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

@@ -852 +852 @@
     }
 
+    /**
+     * Returns the color for the given key.
+     * @param key The color key
+     * @return the color
+     */
     public Color getColor(ColorKey key) {
         return getColor(key.getColorName(), key.getSpecialName(), key.getDefaultValue());
@@ -870 +875 @@
         }
         String colStr = specName != null ? get("color."+specName) : "";
-        if(colStr.isEmpty()) {
-            colStr = get("color." + colKey, "");
+        if (colStr.isEmpty()) {
+            colStr = get("color." + colKey, ColorHelper.color2html(def));
         }
         return colStr.isEmpty() ? def : ColorHelper.html2color(colStr);