Changeset 16458 in josm for trunk/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java

Timestamp:

2020-05-17T23:02:27+02:00 (4 years ago)

Author:

simon04

Message:

fix #19253 - History browser: highlight selected relation member row

File:

• trunk/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java

@@ -7 +7 @@
 import javax.swing.JLabel;
 import javax.swing.JTable;
-import javax.swing.UIManager;
 import javax.swing.table.TableCellRenderer;
 
@@ -34 +33 @@
 
     protected void setBackgroundReadable(String key, TagTableModel model, boolean isSelected, boolean hasFocus, boolean isValue) {
-        Color bgColor = UIManager.getColor("Table.background");
+        final TwoColumnDiff.Item.DiffItemType diffItemType;
         if ((!model.hasTag(key) && model.isCurrentPointInTime())
                 || (!model.oppositeHasTag(key) && model.isReferencePointInTime())) {
-            bgColor = TwoColumnDiff.Item.DiffItemType.DELETED.getColor();
+            diffItemType = TwoColumnDiff.Item.DiffItemType.DELETED;
         } else if ((!model.oppositeHasTag(key) && model.isCurrentPointInTime())
                 || (!model.hasTag(key) && model.isReferencePointInTime())) {
-            bgColor = TwoColumnDiff.Item.DiffItemType.INSERTED.getColor();
+            diffItemType = TwoColumnDiff.Item.DiffItemType.INSERTED;
         } else if (isValue && model.hasTag(key) && model.oppositeHasTag(key) && !model.hasSameValueAsOpposite(key)) {
-            bgColor = TwoColumnDiff.Item.DiffItemType.CHANGED.getColor();
+            diffItemType = TwoColumnDiff.Item.DiffItemType.CHANGED;
+        } else {
+            diffItemType = TwoColumnDiff.Item.DiffItemType.EMPTY;
         }
-        if (isSelected) {
-            if (hasFocus) {
-                bgColor = BGCOLOR_SELECTED_FOCUS;
-            } else {
-                bgColor = BGCOLOR_SELECTED;
-            }
-        }
-
-        GuiHelper.setBackgroundReadable(this, bgColor);
+        GuiHelper.setBackgroundReadable(this, diffItemType.getColor(isSelected, hasFocus));
     }