Changeset 12954 in josm for trunk

Timestamp:

2017-10-08T19:03:07+02:00 (7 years ago)

Author:

bastiK

Message:

see #15410 - better sorting

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java

@@ -76 +76 @@
     private JButton remove;
 
-    private static class ColorEntry implements Comparable<ColorEntry> {
+    private static class ColorEntry {
         String key;
         Color color;
@@ -91 +91 @@
         public String getDisplay() {
             return Main.pref.getColorName(key);
-        }
-
-        @Override
-        public int compareTo(ColorEntry o) {
-            if (o == null) return -1;
-            return Collator.getInstance().compare(getDisplay(), o.getDisplay());
         }
     }
@@ -208 +202 @@
 
     private void addColorRows(List<ColorEntry> entries) {
-        Collections.sort(entries);
+        Collections.sort(entries, (e1, e2) -> Collator.getInstance().compare(e1.getDisplay(), e2.getDisplay()));
         entries.forEach(tableModel::addEntry);
     }