Changeset 9216 in josm for trunk

Timestamp:

2015-12-29T21:29:58+01:00 (9 years ago)

Author:

stoecker

Message:

fix #12189 - properly handle the file version

File:

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

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

@@ -112 +112 @@
 
     /**
+     * Version of the loaded data file, required for updates
+     */
+    private int loadedVersion = 0;
+
+    /**
      * Internal storage for the cache directory.
      */
@@ -1639 +1644 @@
         while (true) {
             if (event == XMLStreamConstants.START_ELEMENT) {
+                try
+                {
+                  loadedVersion = Integer.parseInt(parser.getAttributeValue(null, "version"));
+                } catch (Exception e) {
+                }
                 parseRoot();
             } else if (event == XMLStreamConstants.END_ELEMENT) {
@@ -1878 +1888 @@
         // update old style JOSM server links to use zip now, see #10581, #12189
         // actually also cache and mirror entries should be cleared
-        if (getInteger("josm.version", 0 /* current version avoids this value being written in #save() */) < 9206) {
+        if (loadedVersion < 9216) {
             for (String key: new String[]{"mappaint.style.entries", "taggingpreset.entries"}) {
                 Collection<Map<String, String>> data = getListOfStructs(key, (Collection<Map<String, String>>) null);