Changeset 5964 in josm for trunk/src

Timestamp:

2013-05-17T01:58:59+02:00 (11 years ago)

Author:

Don-vip

Message:

fix #5618 - Use full list of ISO 3166 country codes from JDK for addr:country in presets with new preset attribute values_from

File:

• trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java

@@ -20 +20 @@
 import java.io.Reader;
 import java.io.UnsupportedEncodingException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
 import java.text.NumberFormat;
 import java.text.ParseException;
@@ -666 +668 @@
         public String locale_text;
         public String values;
+        public String values_from;
         public String values_context;
         public String display_values;
@@ -760 +763 @@
             char delChar = getDelChar();
 
-            String[] value_array = splitEscaped(delChar, values);
+            String[] value_array = null;
+            
+            if (values_from != null) {
+                String[] class_method = values_from.split("#");
+                if (class_method != null && class_method.length == 2) {
+                    try {
+                        Method method = Class.forName(class_method[0]).getMethod(class_method[1]);
+                        // Check method is public static String[] methodName();
+                        int mod = method.getModifiers();
+                        if (Modifier.isPublic(mod) && Modifier.isStatic(mod) 
+                                && method.getReturnType().equals(String[].class) && method.getParameterTypes().length == 0) {
+                            value_array = (String[]) method.invoke(null);
+                        } else {
+                            System.err.println(tr("Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is not \"{2}\"", key, text,
+                                    "public static String[] methodName()"));
+                        }
+                    } catch (Exception e) {
+                        System.err.println(tr("Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' threw {2} ({3})", key, text,
+                                e.getClass().getName(), e.getMessage()));
+                    }
+                }
+            }
+            
+            if (value_array == null) {
+                value_array = splitEscaped(delChar, values);
+            }
 
             final String displ = Utils.firstNonNull(locale_display_values, display_values);