Changeset 3839 in josm for trunk/src/org/openstreetmap/josm/tools/PresetTextComparator.java

Timestamp:

2011-02-01T08:28:03+01:00 (13 years ago)

Author:

jttt

Message:

Fix #5893 Null Pointer Exception while loding custom presets at start - JOSM hangs on splash screen

File:

• trunk/src/org/openstreetmap/josm/tools/PresetTextComparator.java (modified) (1 diff)

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

@@ -7 +7 @@
 import javax.swing.JMenuItem;
 
+import org.openstreetmap.josm.Main;
+
 public class PresetTextComparator implements Comparator<JMenuItem>, Serializable {
-    //TODO add error checking and stuff
     public int compare(JMenuItem arg0, JMenuItem arg1) {
-        return arg0.getText().compareTo(arg1.getText());
+        if (Main.main.menu.presetSearchAction.equals(arg0.getAction()))
+            return -1;
+        else if (Main.main.menu.presetSearchAction.equals(arg0.getAction()))
+            return 1;
+        else if (arg0.getText() == arg1.getText())
+            return 0;
+        else if (arg0.getText() == null)
+            return -1;
+        else if (arg1.getText() == null)
+            return 1;
+        else
+            return arg0.getText().compareTo(arg1.getText());
     }