Changeset 4162 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java

Timestamp:

2011-06-24T23:13:02+02:00 (13 years ago)

Author:

stoecker

Message:

fix #4140 - make colors in conflict dialog configurable

File:

• trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.awt.Color;
-
+import org.openstreetmap.josm.gui.conflict.ConflictColors;
 import org.openstreetmap.josm.gui.conflict.pair.MergeDecisionType;
 
 public class TheirTableCellRenderer extends TagMergeTableCellRenderer {
 
-    public final static Color BGCOLOR_UNDECIDED = new Color(255,197,197);
-    public final static Color BGCOLOR_MINE = Color.white;
-    public final static Color BGCOLOR_THEIR = new Color(217,255,217);
-    public final static Color BGCOLOR_SELECTED = new Color(143,170,255);
-
     protected void setBackgroundColor(TagMergeItem item, boolean isSelected) {
         if (isSelected) {
-            setBackground(BGCOLOR_SELECTED);
+            setBackground(ConflictColors.BGCOLOR_SELECTED.get());
             return;
         }
         if (MergeDecisionType.KEEP_MINE.equals(item.getMergeDecision())) {
-            setBackground(BGCOLOR_MINE);
+            setBackground(ConflictColors.BGCOLOR_MINE.get());
         } else if (MergeDecisionType.KEEP_THEIR.equals(item.getMergeDecision())) {
-            setBackground(BGCOLOR_THEIR);
+            setBackground(ConflictColors.BGCOLOR_THEIR.get());
         } else if (MergeDecisionType.UNDECIDED.equals(item.getMergeDecision())) {
-            setBackground(BGCOLOR_UNDECIDED);
+            setBackground(ConflictColors.BGCOLOR_UNDECIDED.get());
         }
     }
@@ -31 +25 @@
     protected void setTextColor(TagMergeItem item) {
         if (MergeDecisionType.KEEP_THEIR.equals(item.getMergeDecision())) {
-            setForeground(Color.black);
+            setForeground(ConflictColors.FGCOLOR_THEIR.get());
         } else if (MergeDecisionType.KEEP_MINE.equals(item.getMergeDecision())) {
-            setForeground(Color.LIGHT_GRAY);
+            setForeground(ConflictColors.FGCOLOR_MINE.get());
         } else if (MergeDecisionType.UNDECIDED.equals(item.getMergeDecision())) {
-            setForeground(Color.black);
+            setForeground(ConflictColors.FGCOLOR_UNDECIDED.get());
         }
     }