Index: trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/ComboTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/ComboTest.java	(revision 16532)
+++ trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/ComboTest.java	(revision 16533)
@@ -5,4 +5,5 @@
 import static org.junit.Assert.assertTrue;
 
+import java.awt.Color;
 import java.util.Collections;
 
@@ -26,5 +27,5 @@
     @Rule
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules().main();
+    public JOSMTestRules test = new JOSMTestRules().main().i18n("de");
 
     /**
@@ -38,3 +39,30 @@
         assertTrue(p.getComponentCount() > 0);
     }
+
+    @Test
+    public void testColor() {
+        Combo combo = new Combo();
+        combo.key = "colour";
+        combo.values = "red;green;blue;black";
+        combo.values_context = "color";
+        combo.delimiter = ';';
+        combo.addToPanel(new JPanel(), Collections.<OsmPrimitive>emptyList(), false);
+        assertEquals(5, combo.combobox.getItemCount());
+        combo.presetListEntries.stream().filter(e -> "red".equals(e.value)).findFirst().ifPresent(combo.combobox::setSelectedItem);
+        assertEquals("red", combo.getSelectedValue());
+        assertEquals("Rot", combo.getSelectedItem().toString());
+        assertEquals(new Color(0xFF0000), combo.getColor());
+        combo.presetListEntries.stream().filter(e -> "green".equals(e.value)).findFirst().ifPresent(combo.combobox::setSelectedItem);
+        assertEquals("green", combo.getSelectedValue());
+        assertEquals("Grün", combo.getSelectedItem().toString());
+        assertEquals(new Color(0x008000), combo.getColor());
+        combo.combobox.setSelectedItem("#135");
+        assertEquals("#135", combo.getSelectedValue());
+        assertEquals(new Color(0x113355), combo.getColor());
+        combo.combobox.setSelectedItem("#123456");
+        assertEquals("#123456", combo.getSelectedValue());
+        assertEquals(new Color(0x123456), combo.getColor());
+        combo.setColor(new Color(0x448822));
+        assertEquals("#448822", combo.getSelectedValue());
+    }
 }