Index: /trunk/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java	(revision 19299)
+++ /trunk/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java	(revision 19300)
@@ -111,15 +111,12 @@
          */
         public String getDisplay() {
-            switch (info.getCategory()) {
-                case NamedColorProperty.COLOR_CATEGORY_MAPPAINT:
-                    if (info.getSource() != null)
-                        return tr("Paint style {0}: {1}", tr(I18n.escape(info.getSource())), tr(info.getName()));
-                    // fall through
-                default:
-                    if (info.getSource() != null)
-                        return tr(I18n.escape(info.getSource())) + " - " + tr(I18n.escape(info.getName()));
-                    else
-                        return tr(I18n.escape(info.getName()));
-            }
+            if (info.getSource() != null) {
+                if (info.getCategory() == NamedColorProperty.COLOR_CATEGORY_MAPPAINT)
+                    return tr("Paint style {0}: {1}", tr(I18n.escape(info.getSource())), tr(info.getName()));
+                else
+                    return tr(I18n.escape(info.getSource())) + " - " + tr(I18n.escape(info.getName()));
+            }
+            else
+                return tr(I18n.escape(info.getName()));
         }