Changeset 4162 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.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/TagMergeTableCellRenderer.java (modified) (3 diffs)

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

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.conflict.pair.tags;
 
-import java.awt.Color;
 import java.awt.Component;
 import java.text.MessageFormat;
@@ -9 +8 @@
 import javax.swing.JTable;
 import javax.swing.table.TableCellRenderer;
+
+import org.openstreetmap.josm.gui.conflict.ConflictColors;
 
 public abstract class TagMergeTableCellRenderer extends JLabel implements TableCellRenderer {
@@ -18 +19 @@
     protected void reset() {
         setOpaque(true);
-        setBackground(Color.white);
-        setForeground(Color.black);
+        setBackground(ConflictColors.BGCOLOR.get());
+        setForeground(ConflictColors.FGCOLOR.get());
     }