Changeset 17119 in josm for trunk

Timestamp:

2020-10-08T20:26:04+02:00 (4 years ago)

Author:

simon04

Message:

see #19819 - NamedColorProperty: update Javadoc, add unit test

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/preferences/NamedColorProperty.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/data/preferences/NamedColorPropertyTest.java (modified) (2 diffs)

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

@@ -5 +5 @@
 import java.util.Arrays;
 import java.util.List;
+
+import javax.swing.UIManager;
 
 import org.openstreetmap.josm.tools.CheckParameterUtil;
@@ -30 +32 @@
     /**
      * Construct a new {@code NamedColorProperty}.
+     *
+     * The priority for getting the color is: 1. a set property, 2. {@link UIManager#getColor}, 3. the given {@code defaultValue}
      * @param category a category, can be any identifier, but the following values are recognized by
      * the GUI preferences: {@link #COLOR_CATEGORY_GENERAL} and {@link #COLOR_CATEGORY_MAPPAINT}

trunk/test/unit/org/openstreetmap/josm/data/preferences/NamedColorPropertyTest.java

@@ -7 +7 @@
 import java.awt.Color;
 import java.util.Arrays;
+import java.util.Collections;
+
+import javax.swing.UIManager;
 
 import org.junit.Before;
@@ -43 +46 @@
     @Test
     public void testGet() {
+        assertEquals(Color.RED, base.get());
+
+        UIManager.put("JOSM.clr.general.test", Color.GRAY);
+        base = new NamedColorProperty("test", Color.RED);
+        assertEquals(Color.GRAY, base.get());
+
+        Config.getPref().putList("clr.general.test", Collections.singletonList("#123456"));
+        assertEquals(new Color(0x123456), base.get());
+
+        Config.getPref().putList("clr.general.test", null);
+        UIManager.put("JOSM.clr.general.test", null);
+        base = new NamedColorProperty("test", Color.RED);
         assertEquals(Color.RED, base.get());
     }