Changeset 16843 in josm for trunk

Timestamp:

2020-08-03T22:32:16+02:00 (4 years ago)

Author:

simon04

Message:

fix #19574 - Add a color setting for MapCSS (patch by taylor.smock)

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/preferences/NamedColorProperty.java (modified) (3 diffs)
• gui/mappaint/ColorStyleSettingGui.java (added)
• gui/mappaint/StyleSetting.java (modified) (2 diffs)
• gui/mappaint/StyleSettingFactory.java (modified) (2 diffs)

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

@@ -17 +17 @@
  * @since 12987
  */
-public class NamedColorProperty extends AbstractProperty<Color> {
+public class NamedColorProperty extends AbstractToStringProperty<Color> {
 
     public static final String NAMED_COLOR_PREFIX = "clr.";
@@ -62 +62 @@
     private List<String> getDefaultValuePref() {
         return defaultValue == null ? null : getValuePref(defaultValue, category, source, name);
+    }
+
+    @Override
+    protected void storeDefaultValue() {
+        // This is required due to the super() initializer calling this method.
+        if (category != null) {
+            super.storeDefaultValue();
+        }
     }
 
@@ -137 +145 @@
         return getChildColor(category, source, name);
     }
+
+    @Override
+    protected Color fromString(String string) {
+        return ColorHelper.html2color(string);
+    }
+
+    @Override
+    protected String toString(Color color) {
+        return ColorHelper.color2html(color);
+    }
 }

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

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.mappaint;
 
+import java.awt.Color;
 import java.util.Objects;
 import java.util.Optional;
@@ -176 +177 @@
         }
     }
+
+    /**
+     * A style setting for color values.
+     * @since 16842
+     */
+    class ColorStyleSetting extends PropertyStyleSetting<Color> {
+        ColorStyleSetting(StyleSource parentStyle, String label, AbstractToStringProperty<Color> property) {
+            super(parentStyle, label, Color.class, property);
+        }
+
+        @Override
+        public StyleSettingGui getStyleSettingGui() {
+            return new ColorStyleSettingGui(this);
+        }
+    }
 }

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

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.mappaint;
 
+import java.awt.Color;
 import java.util.function.BiFunction;
 
 import org.openstreetmap.josm.data.preferences.BooleanProperty;
 import org.openstreetmap.josm.data.preferences.DoubleProperty;
+import org.openstreetmap.josm.data.preferences.NamedColorProperty;
 import org.openstreetmap.josm.data.preferences.StringProperty;
 import org.openstreetmap.josm.tools.Logging;
@@ -46 +48 @@
                     return new StyleSetting.PropertyStyleSetting<>(parentStyle, label, String.class, property);
                 });
+            case "color":
+                return forLabelAndDefault(c, Color.class, (label, defaultValue) -> {
+                    final NamedColorProperty property = new NamedColorProperty(NamedColorProperty.COLOR_CATEGORY_MAPPAINT,
+                            parentStyle.getFileNamePart(), label, defaultValue);
+                    return new StyleSetting.ColorStyleSetting(parentStyle, label, property);
+                });
             default:
                 Logging.warn("Unknown setting type {0} for style {1}", type, parentStyle.url);