Changeset 15731 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss

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/mapcss/MapCSSStyleSource.java (modified) (3 diffs)

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