Changeset 10922 in josm

Timestamp:

2016-08-31T18:44:44+02:00 (8 years ago)

Author:

michael2402

Message:

See #13309: Make PreferencesTest compile again.

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/preferences/ColorProperty.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/data/PreferencesTest.groovy (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/preferences/ColorProperty.java

@@ -21 +21 @@
      */
     public ColorProperty(String colName, String defaultValue) {
-        this(colName, ColorHelper.html2color(defaultValue));
+        this(colName, defaultValue == null ? null : ColorHelper.html2color(defaultValue));
     }
 

trunk/test/unit/org/openstreetmap/josm/data/PreferencesTest.groovy

@@ -21 +21 @@
         assert new ColorProperty("foo", new Color(0x12345678, true)).get().alpha == 0x12
         assert Main.pref.putColor("bar", new Color(0x12345678, true))
-        assert new ColorProperty("bar", null).get().alpha == 0x12
+        assert new ColorProperty("bar", (String) null).get().alpha == 0x12
     }
 
     void testColorNameAlpha() {
-        assert new ColorProperty("foo", "bar", new Color(0x12345678, true)).get().alpha == 0x12
+        assert new ColorProperty("foo", new Color(0x12345678, true)).get().alpha == 0x12
         assert Main.pref.getDefaultColor("foo") == new Color(0x34, 0x56, 0x78, 0x12)
         assert Main.pref.getDefaultColor("foo").alpha == 0x12