Index: trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesCellRenderer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesCellRenderer.java (revision 16318)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesCellRenderer.java (revision 16319)
@@ -25,4 +25,5 @@
import org.openstreetmap.josm.data.preferences.CachingProperty;
import org.openstreetmap.josm.data.preferences.NamedColorProperty;
+import org.openstreetmap.josm.gui.mappaint.mapcss.CSSColors;
import org.openstreetmap.josm.tools.ColorHelper;
import org.openstreetmap.josm.tools.I18n;
@@ -125,6 +126,8 @@
final String color = str.matches("#[0-9A-Fa-f]{3,8}")
? str
- : ColorHelper.color2html(ColorHelper.html2color(str));
- str = "\u25A0 " + str + "";
+ : ColorHelper.color2html(CSSColors.get(str));
+ if (color != null) {
+ str = "\u25A0 " + str + "";
+ }
}
((JLabel) c).putClientProperty("html.disable", enableHTML ? null : Boolean.TRUE); // Fix #8730
Index: trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/Combo.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/Combo.java (revision 16318)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/Combo.java (revision 16319)
@@ -15,4 +15,5 @@
import org.openstreetmap.josm.data.tagging.ac.AutoCompletionPriority;
import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.gui.mappaint.mapcss.CSSColors;
import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField;
import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList;
@@ -135,5 +136,8 @@
protected Color getColor() {
- return ColorHelper.html2color(String.valueOf(getSelectedItem()));
+ String colorString = String.valueOf(getSelectedItem());
+ return colorString.startsWith("#")
+ ? ColorHelper.html2color(colorString)
+ : CSSColors.get(colorString);
}
Index: trunk/src/org/openstreetmap/josm/tools/ColorHelper.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/ColorHelper.java (revision 16318)
+++ trunk/src/org/openstreetmap/josm/tools/ColorHelper.java (revision 16319)
@@ -3,6 +3,4 @@
import java.awt.Color;
-
-import org.openstreetmap.josm.gui.mappaint.mapcss.CSSColors;
/**
@@ -16,5 +14,5 @@
/**
- * Returns the {@code Color} for the given HTML code, also evaluates CSS color names using {@link CSSColors}.
+ * Returns the {@code Color} for the given HTML code.
* @param html the color code
* @return the color
@@ -30,5 +28,5 @@
}
if (html.length() != 6 && html.length() != 8)
- return CSSColors.get(html);
+ return null;
try {
return new Color(
@@ -38,5 +36,5 @@
html.length() == 8 ? Integer.parseInt(html.substring(6, 8), 16) : 255);
} catch (NumberFormatException e) {
- return CSSColors.get(html);
+ return null;
}
}