Changeset 11400 in josm

Timestamp:

2016-12-15T00:55:15+01:00 (7 years ago)

Author:

Don-vip

Message:

drop old stuff

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/Preferences.java (modified) (1 diff)
• data/cache/JCSCacheManager.java (modified) (1 diff)
• gui/mappaint/MapPaintStyles.java (modified) (7 diffs)

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

@@ -1513 +1513 @@
      */
     private void removeObsolete(int loadedVersion) {
-        /* drop in October 2016 */
-        if (loadedVersion < 9715) {
-            Setting<?> setting = settingsMap.get("imagery.entries");
-            if (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);
-                }
-            }
-        }
-        // drop in November 2016
-        removeUrlFromEntries(loadedVersion, 9965,
-                "mappaint.style.entries",
-                "josm.openstreetmap.de/josmfile?page=Styles/LegacyStandard");
-        // drop in December 2016
+        // drop in March 2017
         removeUrlFromEntries(loadedVersion, 10063,
                 "validator.org.openstreetmap.josm.data.validation.tests.MapCSSTagChecker.entries",

trunk/src/org/openstreetmap/josm/data/cache/JCSCacheManager.java

@@ -239 +239 @@
 
     private static void removeStaleFiles(String basePathPart, String suffix) {
-        deleteCacheFiles(basePathPart); // TODO: this can be removed around 2016.09
-        deleteCacheFiles(basePathPart + "_BLOCK"); // TODO: this can be removed around 2016.09
-        deleteCacheFiles(basePathPart + "_INDEX"); // TODO: this can be removed around 2016.09
         deleteCacheFiles(basePathPart + suffix);
     }

trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java

@@ -6 +6 @@
 import java.io.File;
 import java.io.IOException;
-import java.io.Reader;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -17 +16 @@
 
 import javax.swing.ImageIcon;
-import javax.swing.JOptionPane;
 import javax.swing.SwingUtilities;
 
@@ -25 +23 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.Tag;
-import org.openstreetmap.josm.gui.HelpAwareOptionPane;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
-import org.openstreetmap.josm.gui.help.HelpUtil;
 import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSStyleSource;
 import org.openstreetmap.josm.gui.mappaint.styleelement.MapImage;
@@ -36 +32 @@
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.io.CachedFile;
-import org.openstreetmap.josm.io.IllegalDataException;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Utils;
@@ -48 +43 @@
  */
 public final class MapPaintStyles {
-
-    /** To remove in November 2016 */
-    private static final String XML_STYLE_MIME_TYPES =
-             "application/xml, text/xml, text/plain; q=0.8, application/zip, application/octet-stream; q=0.5";
 
     private static final Collection<String> DEPRECATED_IMAGE_NAMES = Arrays.asList(
@@ -302 +293 @@
 
     private static StyleSource fromSourceEntry(SourceEntry entry) {
-        // TODO: Method to clean up in November 2016: remove XML detection completely
         Set<String> mimes = new HashSet<>(Arrays.asList(MapCSSStyleSource.MAPCSS_STYLE_MIME_TYPES.split(", ")));
-        mimes.addAll(Arrays.asList(XML_STYLE_MIME_TYPES.split(", ")));
         try (CachedFile cf = new CachedFile(entry.url).setHttpAccept(Utils.join(", ", mimes))) {
             String zipEntryPath = cf.findZipEntryPath("mapcss", "style");
@@ -310 +299 @@
                 entry.isZip = true;
                 entry.zipEntryPath = zipEntryPath;
-                return new MapCSSStyleSource(entry);
-            }
-            zipEntryPath = cf.findZipEntryPath("xml", "style");
-            if (zipEntryPath != null || Utils.hasExtension(entry.url, "xml"))
-                throw new IllegalDataException("XML style");
-            if (Utils.hasExtension(entry.url, "mapcss"))
-                return new MapCSSStyleSource(entry);
-            try (Reader reader = cf.getContentReader()) {
-                WHILE: while (true) {
-                    int c = reader.read();
-                    switch (c) {
-                        case -1:
-                            break WHILE;
-                        case ' ':
-                        case '\t':
-                        case '\n':
-                        case '\r':
-                            continue;
-                        case '<':
-                            throw new IllegalDataException("XML style");
-                        default:
-                            return new MapCSSStyleSource(entry);
-                    }
-                }
-            }
-            Main.warn("Could not detect style type. Using default (mapcss).");
+            }
             return new MapCSSStyleSource(entry);
-        } catch (IOException e) {
-            Main.warn(tr("Failed to load Mappaint styles from ''{0}''. Exception was: {1}", entry.url, e.toString()));
-            Main.error(e);
-        } catch (IllegalDataException e) {
-            String msg = tr("JOSM does no longer support mappaint styles written in the old XML format.\nPlease update ''{0}'' to MapCSS",
-                    entry.url);
-            Main.error(msg);
-            Main.debug(e);
-            HelpAwareOptionPane.showOptionDialog(Main.parent, msg, tr("Warning"), JOptionPane.WARNING_MESSAGE,
-                    HelpUtil.ht("/Styles/MapCSSImplementation"));
-        }
-        return null;
+        }
     }