Changeset 7238 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java

Timestamp:

2014-06-10T13:02:24+02:00 (10 years ago)

Author:

bastiK

Message:

mapcss: improve implicit type conversion for eval expressions

makes JOSM_pref function usable for types string, bool, float and color

File:

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

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

@@ -467 +467 @@
 
         /**
-         * Obtains the JOSM'key {@link org.openstreetmap.josm.data.Preferences} color for key {@code key},
-         * and defaults to {@code def} if that is null.
-         * @see org.openstreetmap.josm.data.Preferences#getColor(String, java.awt.Color)
-         */
-        public static Color JOSM_pref_color(String key, Color def) {
-            Color res = Main.pref.getColor(key, null);
-            return res != null ? res : def;
-        }
-
-        /**
          * Tests if string {@code target} matches pattern {@code pattern}
          * @see Pattern#matches(String, CharSequence)
@@ -642 +632 @@
          * @return the same object, unchanged
          */
+        @NullableArguments
         public static Object print(Object o) {
             System.out.print(o == null ? "none" : o.toString());
@@ -653 +644 @@
          * @return the same object, unchanged
          */
+        @NullableArguments
         public static Object println(Object o) {
             System.out.println(o == null ? "none" : o.toString());