Index: trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesCellRenderer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesCellRenderer.java (revision 16290) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesCellRenderer.java (revision 16292) @@ -120,5 +120,5 @@ str = "" + str + " <" + label.a + ">"; } - } else if (column == 1 && str != null && String.valueOf(table.getModel().getValueAt(row, 0)).contains("colour")) { + } else if (column == 1 && str != null && String.valueOf(getKeyInRow(table, row)).contains("colour")) { enableHTML = true; // U+25A0 BLACK SQUARE @@ -133,5 +133,5 @@ key = str; } else if (column == 1) { - Object value0 = table.getModel().getValueAt(row, 0); + Object value0 = getKeyInRow(table, row); if (value0 instanceof String) { key = (String) value0; @@ -142,4 +142,8 @@ } return c; + } + + private Object getKeyInRow(JTable table, int row) { + return table.getModel().getValueAt(table.convertRowIndexToModel(row), 0); }