Changeset 16181 in josm for trunk/src

Timestamp:

2020-03-21T12:00:55+01:00 (5 years ago)

Author:

simon04

Message:

see #18954, see #18864 - Introduce StringParser for parsing various types

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• StringParser.java (added)
• XmlObjectParser.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/tools/XmlObjectParser.java

@@ -17 +17 @@
 import java.util.Locale;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Stack;
 
@@ -68 +69 @@
         private final Stack<Object> current = new Stack<>();
         private StringBuilder characters = new StringBuilder(64);
-
         private Locator locator;
+        private final StringParser primitiveParsers = new StringParser(StringParser.DEFAULT)
+                .registerParser(boolean.class, this::parseBoolean)
+                .registerParser(Boolean.class, this::parseBoolean);
 
         @Override
@@ -123 +126 @@
         }
 
-        private Object getValueForClass(Class<?> klass, String value) {
-            if (boolean.class.equals(klass))
-                return parseBoolean(value);
-            else if (char.class.equals(klass))
-                return value.charAt(0);
-            else if (short.class.equals(klass) || Short.class.equals(klass))
-                return Integer.valueOf(value);
-            else if (Integer.class.equals(klass))
-                return Integer.valueOf(value);
-            else if (Long.class.equals(klass))
-                return Long.valueOf(value);
-            else if (Float.class.equals(klass))
-                return Float.valueOf(value);
-            else if (Double.class.equals(klass))
-                return Double.valueOf(value);
-            return value;
-        }
-
         private void setValue(Entry entry, String fieldName, String value) throws SAXException {
             if (value != null) {
@@ -157 +142 @@
                     f = entry.getField("locale_" + fieldName.substring(lang.length()));
                 }
-                if (f != null && Modifier.isPublic(f.getModifiers()) && (
-                        String.class.equals(f.getType()) || boolean.class.equals(f.getType()) || char.class.equals(f.getType()) ||
-                        Float.class.equals(f.getType()) || Double.class.equals(f.getType()) ||
-                        short.class.equals(f.getType()) || Short.class.equals(f.getType()) ||
-                        Long.class.equals(f.getType()) || Integer.class.equals(f.getType()))) {
-                    f.set(c, getValueForClass(f.getType(), value));
+                Optional<?> parsed;
+                if (f != null && Modifier.isPublic(f.getModifiers()) && (parsed = primitiveParsers.tryParse(f.getType(), value)).isPresent()) {
+                    f.set(c, parsed.get());
                 } else {
                     String setter;
@@ -173 +155 @@
                     Method m = entry.getMethod(setter);
                     if (m != null) {
-                        m.invoke(c, getValueForClass(m.getParameterTypes()[0], value));
+                        parsed = primitiveParsers.tryParse(m.getParameterTypes()[0], value);
+                        m.invoke(c, parsed.isPresent() ? parsed.get() : value);
                     }
                 }