Changeset 8493 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2015-06-19T17:26:18+02:00 (9 years ago)

Author:

simon04

Message:

fix #5509 - Presets: sort property lists by display name

Sorting is on by default and can be controlled with preference key
taggingpreset.sortvalues.

File:

• trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java (modified) (5 diffs)

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

@@ -65 +65 @@
 import org.openstreetmap.josm.gui.widgets.QuadStateCheckBox;
 import org.openstreetmap.josm.gui.widgets.UrlLabel;
+import org.openstreetmap.josm.tools.AlphanumComparator;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -93 +94 @@
     private static final Map<String,String> LAST_VALUES = new HashMap<>();
 
-    public static class PresetListEntry {
+    public static class PresetListEntry implements Comparable<PresetListEntry> {
         public String value;
         /** The context used for translating {@link #value} */
@@ -168 +169 @@
                 return DIFFERENT;
             return getDisplayValue(true).replaceAll("<.*>", ""); // remove additional markup, e.g. <br>
+        }
+
+        @Override
+        public int compareTo(PresetListEntry o) {
+            return AlphanumComparator.getInstance().compare(this.getDisplayValue(true), o.getDisplayValue(true));
         }
     }
@@ -1064 +1070 @@
         }
 
-        private String[] initListEntriesFromAttributes() {
+        private void initListEntriesFromAttributes() {
             char delChar = getDelChar();
 
@@ -1110 +1116 @@
             }
 
+            final List<PresetListEntry> entries = new ArrayList<>(value_array.length);
             for (int i = 0; i < value_array.length; i++) {
                 final PresetListEntry e = new PresetListEntry(value_array[i]);
                 e.locale_display_value = locale_display_values != null
                         ? display_array[i]
-                                : trc(values_context, fixPresetString(display_array[i]));
-                        if (short_descriptions_array != null) {
-                            e.locale_short_description = locale_short_descriptions != null
-                                    ? short_descriptions_array[i]
-                                            : tr(fixPresetString(short_descriptions_array[i]));
-                        }
-                        lhm.put(value_array[i], e);
-                        display_array[i] = e.getDisplayValue(true);
-            }
-
-            return display_array;
+                        : trc(values_context, fixPresetString(display_array[i]));
+                if (short_descriptions_array != null) {
+                    e.locale_short_description = locale_short_descriptions != null
+                            ? short_descriptions_array[i]
+                            : tr(fixPresetString(short_descriptions_array[i]));
+                }
+
+                entries.add(e);
+            }
+
+            if (Main.pref.getBoolean("taggingpreset.sortvalues", true)) {
+                Collections.sort(entries);
+            }
+
+            for (PresetListEntry i : entries) {
+                lhm.put(i.value, i);
+            }
+
         }