Index: trunk/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java	(revision 12953)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java	(revision 12954)
@@ -76,5 +76,5 @@
     private JButton remove;
 
-    private static class ColorEntry implements Comparable<ColorEntry> {
+    private static class ColorEntry {
         String key;
         Color color;
@@ -91,10 +91,4 @@
         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,5 +202,5 @@
 
     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);
     }