Index: trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesCellRenderer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesCellRenderer.java (revision 16292)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesCellRenderer.java (revision 16293)
@@ -25,7 +25,7 @@
import org.openstreetmap.josm.data.preferences.CachingProperty;
import org.openstreetmap.josm.data.preferences.NamedColorProperty;
+import org.openstreetmap.josm.tools.ColorHelper;
import org.openstreetmap.josm.tools.I18n;
import org.openstreetmap.josm.tools.Pair;
-import org.openstreetmap.josm.tools.Utils;
/**
@@ -123,6 +123,8 @@
enableHTML = true;
// U+25A0 BLACK SQUARE
- String escaped = Utils.escapeReservedCharactersHTML(str);
- str = "\u25A0 " + escaped + "";
+ final String color = str.matches("#[0-9A-Fa-f]{3,8}")
+ ? str
+ : ColorHelper.color2html(ColorHelper.html2color(str));
+ str = "\u25A0 " + color + "";
}
((JLabel) c).putClientProperty("html.disable", enableHTML ? null : Boolean.TRUE); // Fix #8730
Index: trunk/src/org/openstreetmap/josm/tools/ColorHelper.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/ColorHelper.java (revision 16292)
+++ trunk/src/org/openstreetmap/josm/tools/ColorHelper.java (revision 16293)
@@ -3,4 +3,6 @@
import java.awt.Color;
+
+import org.openstreetmap.josm.gui.mappaint.mapcss.CSSColors;
/**
@@ -14,5 +16,5 @@
/**
- * Returns the {@code Color} for the given HTML code.
+ * Returns the {@code Color} for the given HTML code, also evaluates CSS color names using {@link CSSColors}.
* @param html the color code
* @return the color
@@ -22,9 +24,11 @@
html = html.substring(1);
if (html.length() == 3) {
- return html2color(new String(
- new char[]{html.charAt(0), html.charAt(0), html.charAt(1), html.charAt(1), html.charAt(2), html.charAt(2)}));
+ html = new String(new char[]{
+ html.charAt(0), html.charAt(0),
+ html.charAt(1), html.charAt(1),
+ html.charAt(2), html.charAt(2)});
}
if (html.length() != 6 && html.length() != 8)
- return null;
+ return CSSColors.get(html);
try {
return new Color(
@@ -34,5 +38,5 @@
html.length() == 8 ? Integer.parseInt(html.substring(6, 8), 16) : 255);
} catch (NumberFormatException e) {
- return null;
+ return CSSColors.get(html);
}
}