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

Timestamp:

2020-06-10T08:04:42+02:00 (4 years ago)

Author:

simon04

Message:

fix #19197 - MapCSS JOSM_pref: check if a pref could be converted to a color instead of a string (patch by taylor.smock, modified)

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Functions.java (modified) (3 diffs)

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

@@ -28 +28 @@
 import org.openstreetmap.josm.data.osm.search.SearchCompiler.Match;
 import org.openstreetmap.josm.data.osm.search.SearchParseError;
+import org.openstreetmap.josm.data.preferences.NamedColorProperty;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.mappaint.Cascade;
@@ -768 +769 @@
      * Obtains the JOSM'key {@link org.openstreetmap.josm.data.Preferences} string for key {@code key},
      * and defaults to {@code def} if that is null.
+     *
+     * If the default value can be {@linkplain Cascade#convertTo converted} to a {@link Color},
+     * the {@link NamedColorProperty} is retrieved as string.
+     *
      * @param env the environment
      * @param key Key in JOSM preference
@@ -774 +779 @@
      */
     public static String JOSM_pref(Environment env, String key, String def) { // NO_UCD (unused code)
-        return MapPaintStyles.getStyles().getPreferenceCached(key, def);
+        return MapPaintStyles.getStyles().getPreferenceCached(env != null ? env.source : null, key, def);
     }