Changeset 10824 in josm for trunk/src/org/openstreetmap/josm/gui/conflict

Timestamp:

2016-08-17T09:18:31+02:00 (8 years ago)

Author:

Don-vip

Message:

see #13309 - Caching and notifying preferences (patch by michael2402) - gsoc-core

File:

• trunk/src/org/openstreetmap/josm/gui/conflict/ConflictColors.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/conflict/ConflictColors.java

@@ -6 +6 @@
 import java.awt.Color;
 
-import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.Preferences.ColorKey;
+import org.openstreetmap.josm.data.preferences.ColorProperty;
 
 /**
@@ -13 +12 @@
  * @since 4162
  */
-public enum ConflictColors implements ColorKey {
+public enum ConflictColors {
 
     /** Conflict background: no conflict */
@@ -83 +82 @@
     FGCOLOR_MEMBER_REMOVE(marktr("Conflict foreground: remove member"), Color.black);
 
-    private final String name;
-    private final Color defaultColor;
+    private final ColorProperty property;
 
     ConflictColors(String name, Color defaultColor) {
-        this.name = name;
-        this.defaultColor = defaultColor;
-    }
-
-    @Override
-    public String getColorName() {
-        return name;
-    }
-
-    @Override
-    public Color getDefaultValue() {
-        return defaultColor;
-    }
-
-    @Override
-    public String getSpecialName() {
-        return null;
+        property = new ColorProperty(name, defaultColor);
     }
 
@@ -111 +93 @@
      */
     public Color get() {
-        return Main.pref.getColor(this);
+        return property.get();
     }