Changeset 8510 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java
- Timestamp:
- 2015-06-20T23:42:21+02:00 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java
r4162 r8510 24 24 @Override 25 25 protected void renderKey(TagMergeItem item, boolean isSelected) { 26 setBackgroundColor(item, isSelected);26 setBackgroundColor(item, isSelected); 27 27 if (MergeDecisionType.KEEP_MINE.equals(item.getMergeDecision()) && item.getMyTagValue() == null) { 28 28 setText(tr("<undefined>")); … … 41 41 @Override 42 42 protected void renderValue(TagMergeItem item, boolean isSelected) { 43 setBackgroundColor(item, isSelected);43 setBackgroundColor(item, isSelected); 44 44 if (MergeDecisionType.KEEP_MINE.equals(item.getMergeDecision()) && item.getMyTagValue() == null) { 45 45 setText(tr("<undefined>"));
Note:
See TracChangeset
for help on using the changeset viewer.