Changeset 9715 in josm

Timestamp:

2016-02-02T22:30:27+01:00 (8 years ago)

Author:

stoecker

Message:

fix #12474 - exception due to preferences update

File:

• trunk/src/org/openstreetmap/josm/data/Preferences.java (modified) (1 diff)

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

@@ -1962 +1962 @@
             }
         }
+        /* drop in October 2016 */
+        if (loadedVersion < 9715) {
+            Setting<?> setting = settingsMap.get("imagery.entries");
+            if (setting != null && setting instanceof MapListSetting) {
+                List<Map<String, String>> l = new LinkedList<>();
+                boolean modified = false;
+                for (Map<String, String> map: ((MapListSetting)setting).getValue()) {
+                    Map<String, String> newMap = new HashMap<>();
+                    for (Entry<String, String> entry: map.entrySet()) {
+                        String value = entry.getValue();
+                        if ("noTileHeaders".equals(entry.getKey())) {
+                            value = value.replaceFirst("\":(\".*\")\\}", "\":[$1]}");
+                            if (!value.equals(entry.getValue())) {
+                                modified = true;
+                            }
+                        }
+                        newMap.put(entry.getKey(), value);
+                    }
+                    l.add(newMap);
+                }
+                if (modified) {
+                    putListOfStructs("imagery.entries", l);
+                }
+            }
+        }
 
         for (String key : OBSOLETE_PREF_KEYS) {