Changeset 17118 in josm for trunk

Timestamp:

2020-10-08T20:26:02+02:00 (4 years ago)

Author:

simon04

Message:

see #19819 - NamedColorProperty: obtain fallback color using UIManager (patch by DevCharly)

File:

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

trunk/src/org/openstreetmap/josm/data/preferences/NamedColorProperty.java

@@ -37 +37 @@
      */
     public NamedColorProperty(String category, String source, String name, Color defaultValue) {
-        super(getKey(category, source, name), defaultValue);
+        super(getKey(category, source, name), getUIColor("JOSM." + getKey(category, source, name), defaultValue));
         CheckParameterUtil.ensureParameterNotNull(category, "category");
         CheckParameterUtil.ensureParameterNotNull(name, "name");
@@ -58 +58 @@
         CheckParameterUtil.ensureParameterNotNull(name, "name");
         return NAMED_COLOR_PREFIX + category + "." + (source == null ? "" : source + ".") + name;
+    }
+
+    private static Color getUIColor(String uiKey, Color defaultValue) {
+        Color color = UIManager.getColor(uiKey);
+        return color != null ? color : defaultValue;
     }