Changeset 9965 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2016-03-12T00:10:24+01:00 (8 years ago)

Author:

Don-vip

Message:

fix #12282 - drop XML mappaint support - keep XML detection in order to warn users and let them upgrade to MapCSS, with link to documentation

File:

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

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

@@ -1434 +1434 @@
      */
     private void removeObsolete(int loadedVersion) {
-        // drop this block march 2016
-        // update old style JOSM server links to use zip now, see #10581, #12189
-        // actually also cache and mirror entries should be cleared
-        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);
-                if (data != null) {
-                    List<Map<String, String>> newlist = new ArrayList<>();
-                    boolean modified = false;
-                    for (Map<String, String> map : data) {
-                         Map<String, String> newmap = new LinkedHashMap<>();
-                         for (Entry<String, String> entry : map.entrySet()) {
-                             String val = entry.getValue();
-                             String mkey = entry.getKey();
-                             if ("url".equals(mkey) && val.contains("josm.openstreetmap.de/josmfile") && !val.contains("zip=1")) {
-                                 val += "&zip=1";
-                                 modified = true;
-                             }
-                             if ("url".equals(mkey) && val.contains("http://josm.openstreetmap.de/josmfile")) {
-                                 val = val.replace("http://", "https://");
-                                 modified = true;
-                             }
-                             newmap.put(mkey, val);
-                         }
-                         newlist.add(newmap);
-                    }
-                    if (modified) {
-                        putListOfStructs(key, newlist);
-                    }
-                }
-            }
-        }
         /* drop in October 2016 */
         if (loadedVersion < 9715) {
@@ -1491 +1459 @@
             }
         }
+        // drop in November 2016
+        if (loadedVersion < 9965) {
+            Setting<?> setting = settingsMap.get("mappaint.style.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()) {
+                    String url = map.get("url");
+                    if (url != null && url.contains("josm.openstreetmap.de/josmfile?page=Styles/LegacyStandard")) {
+                        modified = true;
+                    } else {
+                        l.add(map);
+                    }
+                }
+                if (modified) {
+                    putListOfStructs("mappaint.style.entries", l);
+                }
+            }
+        }
 
         for (String key : OBSOLETE_PREF_KEYS) {