Changeset 16184 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint

Timestamp:

2020-03-21T15:38:15+01:00 (4 years ago)

Author:

simon04

Message:

see #18954, see #18864 - Introduce GenericParser for Cascade.convertTo

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/Cascade.java (modified) (4 diffs)

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

@@ -13 +13 @@
 import org.openstreetmap.josm.gui.mappaint.mapcss.CSSColors;
 import org.openstreetmap.josm.tools.ColorHelper;
+import org.openstreetmap.josm.tools.GenericParser;
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Utils;
@@ -26 +27 @@
 
     private static final Pattern HEX_COLOR_PATTERN = Pattern.compile("#([0-9a-fA-F]{3}|[0-9a-fA-F]{6}|[0-9a-fA-F]{8})");
+
+    private static final GenericParser<Object> GENERIC_PARSER = new GenericParser<>()
+            .registerParser(float.class, Cascade::toFloat)
+            .registerParser(Float.class, Cascade::toFloat)
+            .registerParser(double.class, Cascade::toDouble)
+            .registerParser(Double.class, Cascade::toDouble)
+            .registerParser(boolean.class, Cascade::toBool)
+            .registerParser(Boolean.class, Cascade::toBool)
+            .registerParser(float[].class, Cascade::toFloatArray)
+            .registerParser(Color.class, Cascade::toColor)
+            .registerParser(String.class, Cascade::toString);
 
     /**
@@ -137 +149 @@
             return (T) o;
 
-        if (klass == float.class || klass == Float.class)
-            return (T) toFloat(o);
-
-        if (klass == double.class || klass == Double.class) {
-            o = toFloat(o);
-            if (o != null) {
-                o = Double.valueOf((Float) o);
-            }
-            return (T) o;
-        }
-
-        if (klass == boolean.class || klass == Boolean.class)
-            return (T) toBool(o);
-
-        if (klass == float[].class)
-            return (T) toFloatArray(o);
-
-        if (klass == Color.class)
-            return (T) toColor(o);
-
-        if (klass == String.class) {
-            if (o instanceof Keyword)
-                return (T) ((Keyword) o).val;
-            if (o instanceof Color) {
-                Color c = (Color) o;
-                int alpha = c.getAlpha();
-                if (alpha != 255)
-                    return (T) String.format("#%06x%02x", ((Color) o).getRGB() & 0x00ffffff, alpha);
-                return (T) String.format("#%06x", ((Color) o).getRGB() & 0x00ffffff);
-            }
-
-            return (T) o.toString();
-        }
-
-        return null;
+        return GENERIC_PARSER.supports(klass)
+                ? GENERIC_PARSER.parse(klass, o)
+                : null;
+    }
+
+    private static String toString(Object o) {
+        if (o instanceof Keyword)
+            return ((Keyword) o).val;
+        if (o instanceof Color) {
+            return ColorHelper.color2html((Color) o);
+        }
+        return o.toString();
     }
 
@@ -185 +174 @@
         }
         return null;
+    }
+
+    private static Double toDouble(Object o) {
+        final Float number = toFloat(o);
+        return number != null ? Double.valueOf(number) : null;
     }