Changeset 5964 in josm

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

Location:

trunk

Files:

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

trunk/data/defaultpresets.xml

@@ -48 +48 @@
   text: fixed label to display
   values: comma separated list of values
+  values_from: to use instead of "values" if the list of values has to be obtained with a Java method 
+               of this form: public static String[] getValues();
+               The value must be: "full.package.name.ClassName#methodName"
   display_values: comma separated list of values to be displayed instead of the
                   database values, order and number must be equal to values
@@ -67 +70 @@
              will also be used to separate selected values in the tag.
   values: delimiter-separated list of values (delimiter can be escaped with backslash)
+  values_from: to use instead of "values" if the list of values has to be obtained with a Java method 
+               of this form: public static String[] getValues();
+               The value must be: "full.package.name.ClassName#methodName"
   rows: specify the number of rows to display (default -1)
   display_values: delimiter-separated list of values to be displayed instead of the
@@ -6052 +6058 @@
                 <text key="addr:city" text="City name" use_last_as_default="force" match="key" />
                 <text key="addr:postcode" text="Post code" use_last_as_default="force" match="key" />
-                <combo key="addr:country" text="Country code" values="AT,CH,DE,FR,GB,IT,RS,US" use_last_as_default="force" match="key" />
+                <combo key="addr:country" text="Country code" values_from="java.util.Locale#getISOCountries" use_last_as_default="force" match="key" />
             </optional>
         </item>

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);