Index: trunk/src/org/openstreetmap/josm/data/Preferences.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/Preferences.java	(revision 12989)
+++ trunk/src/org/openstreetmap/josm/data/Preferences.java	(revision 12990)
@@ -1006,5 +1006,5 @@
      * @param def default value
      * @return a Color object for the configured colour, or the default value if none configured.
-     * @deprecated Use a {@link ColorProperty} instead.
+     * @deprecated Use a {@link NamedColorProperty} instead.
      */
     @Deprecated
@@ -1045,6 +1045,6 @@
      * @param def default value
      * @return a Color object for the configured colour, or the default value if none configured.
-     * @deprecated Use a {@link ColorProperty} instead.
-     * You can replace this by: <code>new ColorProperty(colName, def).getChildColor(specName)</code>
+     * @deprecated Use a {@link NamedColorProperty} instead.
+     * You can replace this by: <code>new NamedColorProperty(colName, def).getChildColor(specName)</code>
      */
     @Deprecated
@@ -1095,5 +1095,5 @@
      * @param val The color
      * @return true if the setting was modified
-     * @see ColorProperty#put(Color)
+     * @see NamedColorProperty#put(Color)
      * @deprecated (since 12987) no longer supported (see {@link NamedColorProperty})
      */
Index: trunk/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java	(revision 12989)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java	(revision 12990)
@@ -141,5 +141,5 @@
          */
         public boolean isDefault() {
-            return info.getValue() == null || Objects.equals(info.getValue(),  info.getDefaultValue());
+            return info.getValue() == null || Objects.equals(info.getValue(), info.getDefaultValue());
         }
 
Index: trunk/test/unit/org/openstreetmap/josm/gui/layer/LayerTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/layer/LayerTest.java	(revision 12989)
+++ trunk/test/unit/org/openstreetmap/josm/gui/layer/LayerTest.java	(revision 12990)
@@ -59,5 +59,5 @@
         assertEquals(Color.BLACK, color.get());
         assertEquals(Color.BLACK, color.getDefaultValue());
-        assertEquals("color.layer.test.layer", color.getKey());
+        assertEquals("clr.layer.Test Layer.x", color.getKey());
     }
 
Index: trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParserTest.groovy
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParserTest.groovy	(revision 12989)
+++ trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParserTest.groovy	(revision 12990)
@@ -6,5 +6,4 @@
 import org.junit.Test
 import org.openstreetmap.josm.JOSMFixture
-import org.openstreetmap.josm.Main
 import org.openstreetmap.josm.data.coor.LatLon
 import org.openstreetmap.josm.data.osm.DataSet
@@ -308,5 +307,4 @@
         def expected = new Color(0x88DD22)
         assert e.getCascade(Environment.DEFAULT_LAYER).get("color") == expected
-        assert Main.pref.getDefaultColor("mappaint.mapcss.testcolour1") == expected
     }
 
@@ -317,5 +315,4 @@
         def expected = new Color(0x12, 0x34, 0x56, 0x78)
         assert e.getCascade(Environment.DEFAULT_LAYER).get("color") == expected
-        assert Main.pref.getDefaultColor("mappaint.mapcss.testcolour2") == expected
     }