Ticket #19819: JOSM-NamedColor-from-Laf.diff

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

@@ -5 +5 @@
 import java.util.Arrays;
 import java.util.List;
 
+import javax.swing.UIManager;
+
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.ColorHelper;
 
@@ -36 +38 @@
      * @param defaultValue the default value, can be null
      */
     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");
         this.category = category;
@@ -59 +61 @@
         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;
+    }
+
     private List<String> getDefaultValuePref() {
         return defaultValue == null ? null : getValuePref(defaultValue, category, source, name);
     }