Changeset 16645 in josm for trunk/src

Timestamp:

2020-06-14T22:59:08+02:00 (5 years ago)

Author:

simon04

Message:

StructUtils: use StringParser

File:

• trunk/src/org/openstreetmap/josm/data/StructUtils.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/data/StructUtils.java

@@ -35 +35 @@
 import org.openstreetmap.josm.tools.MultiMap;
 import org.openstreetmap.josm.tools.ReflectionUtils;
+import org.openstreetmap.josm.tools.StringParser;
 import org.openstreetmap.josm.tools.Utils;
 
@@ -45 +46 @@
  */
 public final class StructUtils {
+
+    private static final StringParser STRING_PARSER = new StringParser(StringParser.DEFAULT)
+            .registerParser(Map.class, StructUtils::mapFromJson)
+            .registerParser(MultiMap.class, StructUtils::multiMapFromJson);
 
     private StructUtils() {
@@ -221 +226 @@
         }
         for (Map.Entry<String, String> keyValue : hash.entrySet()) {
-            Object value;
             Field f = getDeclaredFieldInClassOrSuperTypes(klass, keyValue.getKey().replace('-', '_'));
 
@@ -228 +232 @@
             }
             ReflectionUtils.setObjectsAccessible(f);
-            if (f.getType() == Boolean.class || f.getType() == boolean.class) {
-                value = Boolean.valueOf(keyValue.getValue());
-            } else if (f.getType() == Integer.class || f.getType() == int.class) {
-                try {
-                    value = Integer.valueOf(keyValue.getValue());
-                } catch (NumberFormatException nfe) {
-                    continue;
-                }
-            } else if (f.getType() == Double.class || f.getType() == double.class) {
-                try {
-                    value = Double.valueOf(keyValue.getValue());
-                } catch (NumberFormatException nfe) {
-                    continue;
-                }
-            } else if (f.getType() == String.class) {
-                value = keyValue.getValue();
-            } else if (f.getType().isAssignableFrom(Map.class)) {
-                value = mapFromJson(keyValue.getValue());
-            } else if (f.getType().isAssignableFrom(MultiMap.class)) {
-                value = multiMapFromJson(keyValue.getValue());
-            } else
-                throw new JosmRuntimeException("unsupported preference primitive type");
-
+            Object value = STRING_PARSER.parse(f.getType(), keyValue.getValue());
             try {
                 f.set(struct, value);