Changeset 8877 in josm for trunk

Timestamp:

2015-10-14T23:48:08+02:00 (9 years ago)

Author:

simon04

Message:

fix #11926 - Presets: option to disable alphabetic sorting for a single key

Specify the values_sort="false" attribute for the <combo> of
<multiselect>.

Location:

trunk

Files:

• data/defaultpresets.xml (modified) (1 diff)
• data/tagging-preset.xsd (modified) (1 diff)
• src/org/openstreetmap/josm/gui/tagging/presets/items/ComboMultiSelect.java (modified) (2 diffs)

trunk/data/defaultpresets.xml

@@ -18 +18 @@
     <chunk id="surface_smoothness">
         <reference ref="surface" />
-        <combo key="smoothness" text="Smoothness" values_searchable="true">
+        <combo key="smoothness" text="Smoothness" values_searchable="true" values_sort="false">
             <list_entry value="excellent" short_description="Thin Rollers: rollerblade, skateboard" />
             <list_entry value="good" short_description="Thin Wheels: racing bike" />

trunk/data/tagging-preset.xsd

@@ -205 +205 @@
                 <attribute name="values_context" type="string" />
                 <attribute name="values_no_i18n" type="boolean" />
+                <attribute name="values_sort" type="boolean" />
                 <attribute name="display_values" type="string" />
                 <attribute name="values_searchable" type="boolean" />

trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/ComboMultiSelect.java

@@ -99 +99 @@
     /** Disabled internationalisation for value to avoid mistakes, see #11696 */
     public boolean values_no_i18n;
+    /** Whether to sort the values, defaults to true. */
+    public boolean values_sort = true;
     public String display_values;
     /** The localized version of {@link #display_values}. */
@@ -425 +427 @@
         }
 
-        if (Main.pref.getBoolean("taggingpreset.sortvalues", true)) {
+        if (Main.pref.getBoolean("taggingpreset.sortvalues", true) && values_sort) {
             Collections.sort(entries);
         }