Ticket #1839: preset-menu-sorting.patch

src/org/openstreetmap/josm/tools/PresetTextComparator.java

@@ +1 @@
+package org.openstreetmap.josm.tools;
+
+import java.util.Comparator;
+
+import javax.swing.JMenuItem;
+
+public class PresetTextComparator implements Comparator {
+        //TODO add error checking and stuff
+        public int compare(Object arg0, Object arg1) {
+                return ((JMenuItem)arg0).getText().compareTo(((JMenuItem)arg1).getText());
+        }
+
+
+}

src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java

@@ -5 +5 @@
 
 import java.awt.event.ActionEvent;
 import java.awt.Component;
+import java.util.ArrayList;
+import java.util.Collections;
 
 import javax.swing.Action;
 import javax.swing.JMenu;
@@ -13 +15 @@
 import javax.swing.JSeparator;
 
 import org.openstreetmap.josm.gui.tagging.TaggingPreset;
+import org.openstreetmap.josm.tools.PresetTextComparator;
 
 public class TaggingPresetMenu extends TaggingPreset {
     public JMenu menu = null; // set by TaggingPresetPreferences
@@ -45 +48 @@
             pm.show(co, co.getWidth()/2, co.getHeight()/2);
         }
     }
+        /**
+         * Sorts the menu items using the translated item text
+         */
+        public void sortMenu(){
+                TaggingPresetMenu.sortMenu(this.menu);
+        }
+
+        /**
+         * Sorts the menu items using the translated item text
+         */
+        public static void sortMenu(JMenu menu){
+                Component[] items = menu.getMenuComponents();
+                PresetTextComparator comp = new PresetTextComparator();
+                ArrayList<JMenuItem> sortarray = new ArrayList<JMenuItem>();
+                int lastSeperator = 0;
+                for (int i = 0; i < items.length; i++) {
+                        Object item = items[i];
+                        if (item instanceof JMenu){
+                                sortMenu((JMenu)item);
+                        }                       
+                        if (item instanceof JMenuItem){
+                                sortarray.add((JMenuItem)item);
+                                if (i == items.length-1){
+                                        Collections.sort(sortarray, comp);
+                                        int pos = 0;
+                                        for (JMenuItem menuItem : sortarray) {
+                                                int oldPos;
+                                                if(lastSeperator == 0){
+                                                        oldPos=pos;
+                                                }else {
+                                                        oldPos = pos+lastSeperator+1;
+                                                }
+                                                menu.add(menuItem, oldPos);
+                                                pos++;
+                                        }
+                                        sortarray = new ArrayList<JMenuItem>();
+                                        lastSeperator = 0;
+                                }
+                        }else if (item instanceof JSeparator){
+                                Collections.sort(sortarray, comp);
+                                int pos = 0;
+                                for (JMenuItem menuItem : sortarray) {
+                                        int oldPos;
+                                        if(lastSeperator == 0){
+                                                oldPos=pos;
+                                        }else {
+                                                oldPos = pos+lastSeperator+1;
+                                        }
+                                        menu.add(menuItem, oldPos);
+                                        pos++;
+                                }
+                                sortarray = new ArrayList<JMenuItem>();
+                                lastSeperator = i;
+                        }
+                }
+        }
 }

src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java

@@ -149 +149 @@
                 }
             }
         }
+        TaggingPresetMenu.sortMenu(Main.main.menu.presetsMenu);
     }
 }