Changeset 5464 in josm for trunk/src/org/openstreetmap/josm/data/preferences/CachedProperty.java

Timestamp:

2012-08-20T23:06:41+02:00 (12 years ago)

Author:

Don-vip

Message:

Rework Properties a bit to simplify management of Color properties

File:

• trunk/src/org/openstreetmap/josm/data/preferences/CachedProperty.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/preferences/CachedProperty.java

@@ -8 +8 @@
 public abstract class CachedProperty<T> extends AbstractProperty<T> implements PreferenceChangedListener {
 
-    protected final String defaultValue;
+    private final String defaultValueAsString;
     private T value;
     private int updateCount;
 
-    protected CachedProperty(String key, String defaultValue) {
-        super(key);
+    protected CachedProperty(String key, T defaultValue, String defaultValueAsString) {
+        super(key, defaultValue);
         Main.pref.addPreferenceChangeListener(this);
-        this.defaultValue = defaultValue;
+        this.defaultValueAsString = defaultValueAsString;
         updateValue();
     }
@@ -30 +30 @@
     protected abstract T fromString(String s);
 
+    @Override
     public T get() {
         return value;
@@ -40 +41 @@
     }
 
+    @Override
+    public final boolean put(T value) {
+        // Not used
+        throw new IllegalAccessError("You cannot use put(T). Use put(String) instead.");
+    }
+
     public int getUpdateCount() {
         return updateCount;
     }
 
-    @Override
-    public T getDefaultValue() {
-        return fromString(getDefaultValueAsString());
-    }
-
     public String getDefaultValueAsString() {
-        return defaultValue;
+        return defaultValueAsString;
     }