Changeset 7119 in josm for trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java

Timestamp:

2014-05-14T00:51:20+02:00 (10 years ago)

Author:

Don-vip

Message:

code refactoring/cleanup/javadoc + fix bug in preset text comparator in menu

File:

• trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java (modified) (3 diffs)

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

@@ -8 +8 @@
 import java.awt.Point;
 import java.awt.event.ActionEvent;
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 
@@ -19 +21 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.tools.PresetTextComparator;
+import org.openstreetmap.josm.tools.AlphanumComparator;
 
 public class TaggingPresetMenu extends TaggingPreset {
-    public JMenu menu = null; // set by TaggingPresetPreferences
-    
+    public JMenu menu = null; // set by TaggingPresets
+
+    private static class PresetTextComparator implements Comparator<JMenuItem>, Serializable {
+        @Override
+        public int compare(JMenuItem o1, JMenuItem o2) {
+            if (Main.main.menu.presetSearchAction.equals(o1.getAction()))
+                return -1;
+            else if (Main.main.menu.presetSearchAction.equals(o2.getAction()))
+                return 1;
+            else
+                return AlphanumComparator.getInstance().compare(o1.getText(), o2.getText());
+        }
+    }
+
     @Override
     public void setDisplayName() {
@@ -67 +81 @@
         }
     }
-    
+
     /**
      * Sorts the menu items using the translated item text