Changeset 4282 in josm for trunk/src/org/openstreetmap/josm/data/preferences

Timestamp:

07.08.2011 09:08:29 (10 months ago)

Author:

jttt

Message:

Allow to specify custom pattern for marker text labels

Location:

trunk/src/org/openstreetmap/josm/data/preferences

Files:

• AbstractProperty.java (modified) (2 diffs)
• BooleanProperty.java (modified) (3 diffs)
• CachedProperty.java (added)
• CollectionProperty.java (modified) (2 diffs)
• IntegerProperty.java (modified) (2 diffs)
• StringProperty.java (modified) (2 diffs)

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

@@ -7 +7 @@
  * captures the common functionality of preference properties
  */
-public class AbstractProperty {
+public abstract class AbstractProperty<T> {
     protected final String key;
 
@@ -21 +21 @@
         return Main.pref.hasKey(key);
     }
+
+    public abstract T getDefaultValue();
+
+    public void remove() {
+        Main.pref.put(getKey(), String.valueOf(getDefaultValue()));
+    }
+
 }

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

@@ -4 +4 @@
 import org.openstreetmap.josm.Main;
 
-public class BooleanProperty extends AbstractProperty {
+public class BooleanProperty extends AbstractProperty<Boolean> {
 
     protected final boolean defaultValue;
@@ -14 +14 @@
 
     public boolean get() {
-        return Main.pref.getBoolean(getKey(), isDefaultValue());
+        return Main.pref.getBoolean(getKey(), defaultValue);
     }
 
@@ -21 +21 @@
     }
 
-    public boolean isDefaultValue() {
+    @Override
+    public Boolean getDefaultValue() {
         return defaultValue;
     }

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

@@ -6 +6 @@
 import org.openstreetmap.josm.Main;
 
-public class CollectionProperty extends AbstractProperty {
+public class CollectionProperty extends AbstractProperty<Collection<String>> {
     protected final Collection<String> defaultValue;
 
@@ -22 +22 @@
     }
 
+    @Override
     public Collection<String> getDefaultValue() {
         return defaultValue;

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

@@ -4 +4 @@
 import org.openstreetmap.josm.Main;
 
-public class IntegerProperty extends AbstractProperty {
+public class IntegerProperty extends AbstractProperty<Integer> {
 
     protected final int defaultValue;
@@ -37 +37 @@
     }
 
-    public int getDefaultValue() {
+    @Override
+    public Integer getDefaultValue() {
         return defaultValue;
     }

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

@@ -4 +4 @@
 import org.openstreetmap.josm.Main;
 
-public class StringProperty extends AbstractProperty {
+public class StringProperty extends AbstractProperty<String> {
 
     protected final String defaultValue;
@@ -21 +21 @@
     }
 
+    @Override
     public String getDefaultValue() {
         return defaultValue;