Changeset 1221 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java

Timestamp:

2009-01-09T09:42:46+01:00 (17 years ago)

Author:

stoecker

Message:

cleanup color handling

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java

@@ -137 +137 @@
     }
 
+    static public Color getColor()
+    {
+        return Main.pref.getColor(marktr("conflict"), Color.gray);
+    }
+
     /**
      * Paint all conflicts that can be expressed on the main window.
      */
     public void paintConflicts(final Graphics g, final NavigatableComponent nc) {
-        Color preferencesColor = Main.pref.getColor("conflict", Color.gray);
-        if (preferencesColor.equals(Color.BLACK))
+        Color preferencesColor = getColor();
+        if (preferencesColor.equals(Main.pref.getColor(marktr("background"), Color.black)))
             return;
         g.setColor(preferencesColor);