Changeset 15731 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/StyleSetting.java

Timestamp:

2020-01-19T17:33:40+01:00 (4 years ago)

Author:

simon04

Message:

see #10435, fix #18095 - MapCSS: add settings of type string/double

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/StyleSetting.java (modified) (5 diffs)

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

@@ -7 +7 @@
 import javax.swing.Icon;
 
-import org.openstreetmap.josm.spi.preferences.Config;
+import org.openstreetmap.josm.data.preferences.AbstractToStringProperty;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.ImageProvider.ImageSizes;
@@ -39 +39 @@
      */
     Object getValue();
+
+    /**
+     * Create a matching {@link StyleSettingGui} instances for a given {@link StyleSetting} object.
+     * @return matching {@code StyleSettingGui}
+     * @throws UnsupportedOperationException when class of {@link StyleSetting} is not supported
+     */
+    default StyleSettingGui getStyleSettingGui() {
+        throw new UnsupportedOperationException(getClass() + " not supported");
+    }
 
     /**
@@ -84 +93 @@
         public final Icon icon;
 
-        public StyleSettingGroup(StyleSource parentStyle, String label, String key, Icon icon) {
+        StyleSettingGroup(StyleSource parentStyle, String label, String key, Icon icon) {
             super(parentStyle, label);
             this.key = Objects.requireNonNull(key);
@@ -100 +109 @@
             String label = c.get("label", null, String.class);
             if (label == null) {
-                Logging.warn("property 'label' required for boolean style setting");
+                Logging.warn("property 'label' required for StyleSettingGroup");
                 return null;
             }
@@ -109 +118 @@
     }
 
+    class PropertyStyleSetting<T> extends LabeledStyleSetting implements StyleSetting {
+        private final Class<T> type;
+        private final AbstractToStringProperty<T> property;
+
+        PropertyStyleSetting(StyleSource parentStyle, String label, Class<T> type, AbstractToStringProperty<T> property) {
+            super(parentStyle, label);
+            this.type = type;
+            this.property = property;
+        }
+
+        /**
+         * Replies the property key.
+         * @return The property key
+         */
+        public String getKey() {
+            return property.getKey();
+        }
+
+        @Override
+        public T getValue() {
+            return property.get();
+        }
+
+        /**
+         * Sets this property to the specified value.
+         * @param value The new value of this property
+         */
+        public void setValue(T value) {
+            property.put(value);
+        }
+
+        /**
+         * Sets this property to the specified string value.
+         * @param value The new string value of this property
+         */
+        public void setStringValue(String value) {
+            setValue(Cascade.convertTo(value, type));
+        }
+
+        @Override
+        public StyleSettingGui getStyleSettingGui() {
+            return new PropertyStyleSettingGui<>(this);
+        }
+    }
+
     /**
      * A style setting for boolean value (yes / no).
      */
-    class BooleanStyleSetting extends LabeledStyleSetting implements StyleSetting {
-        public final String prefKey;
-        public final boolean def;
-
-        public BooleanStyleSetting(StyleSource parentStyle, String prefKey, String label, boolean def) {
-            super(parentStyle, label);
-            this.prefKey = Objects.requireNonNull(prefKey);
-            this.def = def;
-        }
-
-        /**
-         * Creates a new {@code BooleanStyleSetting}.
-         * @param c cascade
-         * @param parentStyle parent style source
-         * @param key setting identifier
-         * @return newly created {@code BooleanStyleSetting}
-         */
-        public static BooleanStyleSetting create(Cascade c, StyleSource parentStyle, String key) {
-            String label = c.get("label", null, String.class);
-            if (label == null) {
-                Logging.warn("property 'label' required for boolean style setting");
-                return null;
-            }
-            Boolean def = c.get("default", null, Boolean.class);
-            if (def == null) {
-                Logging.warn("property 'default' required for boolean style setting");
-                return null;
-            }
-            String prefKey = parentStyle.url + ":boolean:" + key;
-            return new BooleanStyleSetting(parentStyle, prefKey, label, def);
+    class BooleanStyleSetting extends PropertyStyleSetting<Boolean> {
+        BooleanStyleSetting(StyleSource parentStyle, String label, AbstractToStringProperty<Boolean> property) {
+            super(parentStyle, label, Boolean.class, property);
         }
 
         @Override
-        public Object getValue() {
-            String val = Config.getPref().get(prefKey, null);
-            if (val == null) return def;
-            return Boolean.valueOf(val);
-        }
-
-        public void setValue(Object o) {
-            if (!(o instanceof Boolean)) {
-                throw new IllegalArgumentException();
-            }
-            boolean b = (Boolean) o;
-            if (b == def) {
-                Config.getPref().put(prefKey, null);
-            } else {
-                Config.getPref().putBoolean(prefKey, b);
-            }
+        public StyleSettingGui getStyleSettingGui() {
+            return new BooleanStyleSettingGui(this);
         }
     }