Changeset 15731 in josm for trunk/src/org/openstreetmap

Timestamp:

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

Author:

simon04

Message:

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

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• dialogs/MapPaintDialog.java (modified) (3 diffs)
• mappaint/PropertyStyleSettingGui.java (added)
• mappaint/RenderingHelper.java (modified) (1 diff)
• mappaint/StyleSetting.java (modified) (5 diffs)
• mappaint/StyleSettingFactory.java (added)
• mappaint/StyleSettingGroupGui.java (modified) (1 diff)
• mappaint/StyleSettingGuiFactory.java (deleted)
• mappaint/mapcss/MapCSSStyleSource.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java

@@ -25 +25 @@
 import java.util.Collection;
 import java.util.List;
-import java.util.Map.Entry;
-import java.util.stream.Collectors;
 
 import javax.swing.AbstractAction;
@@ -63 +61 @@
 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles.MapPaintSylesUpdateListener;
-import org.openstreetmap.josm.gui.mappaint.StyleSetting;
-import org.openstreetmap.josm.gui.mappaint.StyleSetting.StyleSettingGroup;
 import org.openstreetmap.josm.gui.mappaint.StyleSettingGroupGui;
-import org.openstreetmap.josm.gui.mappaint.StyleSettingGuiFactory;
 import org.openstreetmap.josm.gui.mappaint.StyleSource;
 import org.openstreetmap.josm.gui.mappaint.loader.MapPaintStyleLoader;
@@ -694 +689 @@
             } else {
                 // Add settings groups
-                for (Entry<StyleSettingGroup, List<StyleSetting>> e : style.settingGroups.entrySet()) {
-                    new StyleSettingGroupGui(e.getKey(), e.getValue()).addMenuEntry(setMenu);
-                }
+                style.settingGroups.forEach((group, settings) -> new StyleSettingGroupGui(group, settings).addMenuEntry(setMenu));
                 // Add settings not in groups
-                final List<StyleSetting> allStylesInGroups = style.settingGroups.values().stream()
-                        .flatMap(List<StyleSetting>::stream).collect(Collectors.toList());
-                for (StyleSetting s : style.settings.stream()
-                        .filter(s -> !allStylesInGroups.contains(s)).collect(Collectors.toList())) {
-                    StyleSettingGuiFactory.getStyleSettingGui(s).addMenuEntry(setMenu);
-                }
+                style.settings.stream()
+                        .filter(s -> style.settingGroups.values().stream().flatMap(List::stream).noneMatch(s::equals))
+                        .forEach(s -> s.getStyleSettingGui().addMenuEntry(setMenu));
             }
 

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

@@ -121 +121 @@
                 }
                 for (String key : sd.settings.keySet()) {
-                    StyleSetting.BooleanStyleSetting match = source.settings.stream()
-                            .filter(s -> s instanceof StyleSetting.BooleanStyleSetting)
-                            .map(s -> (StyleSetting.BooleanStyleSetting) s)
-                            .filter(bs -> bs.prefKey.endsWith(":" + key))
+                    StyleSetting.PropertyStyleSetting<?> match = source.settings.stream()
+                            .filter(s -> s instanceof StyleSetting.PropertyStyleSetting)
+                            .map(s -> (StyleSetting.PropertyStyleSetting<?>) s)
+                            .filter(bs -> bs.getKey().endsWith(":" + key))
                             .findFirst().orElse(null);
                     if (match == null) {
                         Logging.warn(tr("Style setting not found: ''{0}''", key));
                     } else {
-                        boolean value = Boolean.parseBoolean(sd.settings.get(key));
+                        String value = sd.settings.get(key);
                         Logging.trace("setting applied: ''{0}:{1}''", key, value);
-                        match.setValue(value);
+                        match.setStringValue(value);
                     }
                 }

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);
         }
     }

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

@@ -64 +64 @@
         // Add individual settings
         for (StyleSetting s : settings) {
-            StyleSettingGuiFactory.getStyleSettingGui(s).addMenuEntry(submenu);
+            s.getStyleSettingGui().addMenuEntry(submenu);
         }
         menu.add(submenu);

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java

@@ -49 +49 @@
 import org.openstreetmap.josm.gui.mappaint.StyleKeys;
 import org.openstreetmap.josm.gui.mappaint.StyleSetting;
-import org.openstreetmap.josm.gui.mappaint.StyleSetting.BooleanStyleSetting;
 import org.openstreetmap.josm.gui.mappaint.StyleSetting.StyleSettingGroup;
+import org.openstreetmap.josm.gui.mappaint.StyleSettingFactory;
 import org.openstreetmap.josm.gui.mappaint.StyleSource;
 import org.openstreetmap.josm.gui.mappaint.mapcss.ConditionFactory.KeyCondition;
@@ -624 +624 @@
             }
             Cascade c = e.getValue();
-            String type = c.get("type", null, String.class);
-            StyleSetting set = null;
-            if ("boolean".equals(type)) {
-                set = BooleanStyleSetting.create(c, this, e.getKey());
-            } else {
-                Logging.warn("Unknown setting type: {0}", type);
-            }
+            StyleSetting set = StyleSettingFactory.create(c, this, e.getKey());
             if (set != null) {
                 settings.add(set);
@@ -636 +630 @@
                 String groupId = c.get("group", null, String.class);
                 if (groupId != null) {
-                    settingGroups.get(settingGroups.keySet().stream().filter(g -> g.key.equals(groupId)).findAny()
-                            .orElseThrow(() -> new IllegalArgumentException("Unknown settings group: " + groupId))).add(set);
+                    final StyleSettingGroup group = settingGroups.keySet().stream()
+                            .filter(g -> g.key.equals(groupId))
+                            .findAny()
+                            .orElseThrow(() -> new IllegalArgumentException("Unknown settings group: " + groupId));
+                    settingGroups.get(group).add(set);
                 }
             }