Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 5950)
+++ trunk/data/defaultpresets.xml	(revision 5964)
@@ -48,4 +48,7 @@
   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,4 +70,7 @@
              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,5 +6058,5 @@
                 <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>
