Changeset 18827 in osm for applications/editors

Timestamp:

2009-11-27T21:45:13+01:00 (15 years ago)

Author:

stoecker

Message:

fix josm 3681 - double values in prefs not shown

Location:

applications/editors/josm/plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker

Files:

• DoubleConfigurer.java (modified) (2 diffs)
• IntConfigurer.java (modified) (1 diff)
• LakewalkerPreferences.java (modified) (1 diff)

applications/editors/josm/plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/DoubleConfigurer.java

@@ -14 +14 @@
  *
  * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, copies are available 
+ * License along with this library; if not, copies are available
  * at http://www.opensource.org.
  */
@@ -24 +24 @@
 public class DoubleConfigurer extends StringConfigurer {
 
-  public DoubleConfigurer() {
-    super();
-  }
+    public DoubleConfigurer() {
+        super();
+    }
 
-  public DoubleConfigurer(String key, String name) {
-    this(key, name, new Double(0));
-  }
+    public DoubleConfigurer(String key, String name) {
+        this(key, name, new Double(0));
+    }
 
-  public DoubleConfigurer(String key, String name, Double val) {
-    super(key, name, val == null ? null : val.toString());
-  }
+    public DoubleConfigurer(String key, String name, Double val) {
+        super(key, name, val == null ? null : val.toString());
+    }
 
-  public void setValue(String s) {
-    Double d = null;
-    try {
-      d = Double.valueOf(s);
+    public void setValue(String s) {
+        Double d = null;
+        try {
+            d = Double.valueOf(s);
+        }
+        catch (NumberFormatException e) {
+            d = null;
+        }
+        if (d != null)
+            setValue(d);
     }
-    catch (NumberFormatException e) {
-      d = null;
+
+    public void setValue(Object o) {
+        if (!noUpdate && nameField != null && o != null) {
+            nameField.setText(o.toString());
+        }
+        super.setValue(o);
     }
-    if (d != null) {
-      setValue(d);
-      if (!noUpdate && nameField != null) {
-        nameField.setText(d.toString());
-      }
+
+    public String getValueString() {
+        if (value == null || value.equals("")) {
+            return null;
+        }
+        return value.toString();
     }
-  }
-
-  public String getValueString() {
-    if (value == null || value.equals("")) {
-      return null;
-    }
-    return value.toString();
-  }
 }

applications/editors/josm/plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/IntConfigurer.java

@@ -39 +39 @@
   }
 
-  public void setValue(String s) {
-    Integer i = null;
-    try {
-      i = Integer.valueOf(s);
-    }
-    catch (NumberFormatException e) {
-      i = null;
-    }
-    if (i != null) {
-      setValue(i);
-    }
-  }
-  
   public int getIntValue(int defaultValue) {
     if (getValue() instanceof Integer) {

applications/editors/josm/plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java

@@ -92 +92 @@
         landsatResConfig.setValue(Main.pref.getInteger(PREF_LANDSAT_RES, 4000));
         landsatSizeConfig.setValue(Main.pref.getInteger(PREF_LANDSAT_SIZE, 2000));
+System.out.println("set");
         eastOffsetConfig.setValue(Main.pref.getDouble(PREF_EAST_OFFSET, 0.0));
         northOffsetConfig.setValue(Main.pref.getDouble(PREF_NORTH_OFFSET, 0.0));