Changeset 10824 in josm for trunk/src/org/openstreetmap/josm/data/preferences/DoubleProperty.java

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/data/preferences/DoubleProperty.java (modified) (3 diffs)

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.data.preferences;
-
-import org.openstreetmap.josm.Main;
 
 /**
@@ -8 +6 @@
  * @since 3246
  */
-public class DoubleProperty extends AbstractProperty<Double> {
+public class DoubleProperty extends AbstractToStringProperty<Double> {
 
     /**
@@ -21 +19 @@
     @Override
     public Double get() {
-        return Main.pref.getDouble(getKey(), getDefaultValue());
+        // Removing this implementation breaks binary compatibility
+        return super.get();
     }
 
     @Override
     public boolean put(Double value) {
-        return Main.pref.putDouble(getKey(), value);
+        // Removing this implementation breaks binary compatibility
+        return super.put(value);
+    }
+
+    @Override
+    protected Double fromString(String string) {
+        try {
+            return Double.valueOf(string);
+        } catch (NumberFormatException e) {
+            throw new InvalidPreferenceValueException(e);
+        }
+    }
+
+    @Override
+    protected String toString(Double t) {
+        return t.toString();
     }