Changeset 10853 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
- Timestamp:
- 2016-08-19T03:43:18+02:00 (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
r10763 r10853 53 53 import org.openstreetmap.josm.data.osm.visitor.AbstractVisitor; 54 54 import org.openstreetmap.josm.data.osm.visitor.Visitor; 55 import org.openstreetmap.josm.data.preferences.ColorProperty; 55 56 import org.openstreetmap.josm.gui.HelpAwareOptionPane; 56 57 import org.openstreetmap.josm.gui.HelpAwareOptionPane.ButtonSpec; … … 76 77 public final class ConflictDialog extends ToggleDialog implements ActiveLayerChangeListener, IConflictListener, SelectionChangedListener { 77 78 79 private static final ColorProperty CONFLICT_COLOR = new ColorProperty(marktr("conflict"), Color.GRAY); 80 private static final ColorProperty BACKGROUND_COLOR = new ColorProperty(marktr("background"), Color.BLACK); 81 78 82 /** the collection of conflicts displayed by this conflict dialog */ 79 83 private transient ConflictCollection conflicts; … … 110 114 */ 111 115 public static Color getColor() { 112 return Main.pref.getColor(marktr("conflict"), Color.gray);116 return CONFLICT_COLOR.get(); 113 117 } 114 118 … … 259 263 public void paintConflicts(final Graphics g, final NavigatableComponent nc) { 260 264 Color preferencesColor = getColor(); 261 if (preferencesColor.equals( Main.pref.getColor(marktr("background"), Color.black)))265 if (preferencesColor.equals(BACKGROUND_COLOR.get())) 262 266 return; 263 267 g.setColor(preferencesColor);
Note:
See TracChangeset
for help on using the changeset viewer.