Changeset 8541 in josm for trunk/src

Timestamp:

2015-06-28T14:38:26+02:00 (9 years ago)

Author:

wiktorn

Message:

Cast JsonValue to JsonString and use getString instead of toString on preferences deserialization. Prevents from adding additional quotation marks in values. Closes: #11611

File:

• trunk/src/org/openstreetmap/josm/data/Preferences.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/Preferences.java

@@ -45 +45 @@
 import javax.json.JsonObjectBuilder;
 import javax.json.JsonReader;
+import javax.json.JsonString;
 import javax.json.JsonValue;
 import javax.json.JsonWriter;
@@ -1361 +1362 @@
             ret = new HashMap(object.size());
             for (Entry<String, JsonValue> e: object.entrySet()) {
-                ret.put(e.getKey(), e.getValue().toString());
+                JsonValue value = e.getValue();
+                if (value instanceof JsonString) {
+                    // in some cases, when JsonValue.toString() is called, then additional quotation marks are left in value
+                    ret.put(e.getKey(), ((JsonString)value).getString());
+                } else {
+                    ret.put(e.getKey(), e.getValue().toString());
+                }
             }
         }