Index: trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesCellRenderer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesCellRenderer.java (revision 16282) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesCellRenderer.java (revision 16283) @@ -27,4 +27,5 @@ import org.openstreetmap.josm.tools.I18n; import org.openstreetmap.josm.tools.Pair; +import org.openstreetmap.josm.tools.Utils; /** @@ -112,16 +113,18 @@ } } - boolean knownNameKey = false; + boolean enableHTML = false; if (column == 0 && str != null) { Pair label = I18n.getLocalizedLanguageName(str); - if (label != null) { - knownNameKey = label.b; - if (knownNameKey) { - str = new StringBuilder("").append(str) - .append(" <").append(label.a).append(">").toString(); - } + if (label != null && label.b) { + enableHTML = true; + str = "" + str + " <" + label.a + ">"; } + } else if (column == 1 && str != null && String.valueOf(table.getModel().getValueAt(row, 0)).contains("colour")) { + enableHTML = true; + // U+25A0 BLACK SQUARE + String escaped = Utils.escapeReservedCharactersHTML(str); + str = "\u25A0 " + escaped + ""; } - ((JLabel) c).putClientProperty("html.disable", knownNameKey ? null : Boolean.TRUE); // Fix #8730 + ((JLabel) c).putClientProperty("html.disable", enableHTML ? null : Boolean.TRUE); // Fix #8730 ((JLabel) c).setText(str); if (DISCARDABLE.get()) {