Index: /trunk/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java	(revision 12946)
+++ /trunk/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java	(revision 12947)
@@ -5,4 +5,5 @@
 
 import java.awt.Color;
+import java.awt.Component;
 import java.awt.Dimension;
 import java.awt.GridBagLayout;
@@ -27,6 +28,6 @@
 import javax.swing.ListSelectionModel;
 import javax.swing.event.ListSelectionEvent;
+import javax.swing.table.DefaultTableCellRenderer;
 import javax.swing.table.DefaultTableModel;
-import javax.swing.table.TableCellRenderer;
 
 import org.openstreetmap.josm.Main;
@@ -46,5 +47,4 @@
 import org.openstreetmap.josm.gui.preferences.TabPreferenceSetting;
 import org.openstreetmap.josm.gui.util.GuiHelper;
-import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.ColorHelper;
 import org.openstreetmap.josm.tools.GBC;
@@ -218,16 +218,19 @@
         });
         colors.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-        final TableCellRenderer oldColorsRenderer = colors.getDefaultRenderer(Object.class);
-        colors.setDefaultRenderer(Object.class, (t, o, selected, focus, row, column) -> {
-            if (o == null)
-                return new JLabel();
-            if (column == 1) {
-                Color c = (Color) o;
-                JLabel l = new JLabel(ColorHelper.color2html(c));
-                GuiHelper.setBackgroundReadable(l, c);
-                l.setOpaque(true);
-                return l;
-            }
-            return oldColorsRenderer.getTableCellRendererComponent(t, getName(o.toString()), selected, focus, row, column);
+        colors.getColumnModel().getColumn(1).setCellRenderer(new DefaultTableCellRenderer() {
+            @Override
+            public Component getTableCellRendererComponent(
+                    JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
+                Component comp = super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
+                if (value != null && comp instanceof JLabel) {
+                    JLabel label = (JLabel) comp;
+                    Color c = (Color) value;
+                    label.setText(ColorHelper.color2html(c));
+                    GuiHelper.setBackgroundReadable(label, c);
+                    label.setOpaque(true);
+                    return label;
+                }
+                return comp;
+            }
         });
         colors.getColumnModel().getColumn(1).setWidth(100);