Changeset 7248 in josm for trunk/src/org/openstreetmap/josm/plugins

Timestamp:

2014-06-14T12:40:50+02:00 (11 years ago)

Author:

bastiK

Message:

reworked MirroredInputStream (renamed to CachedFile):

• no more awkwardly open and close InputStream if you just want the underlying file (e.g. to get file inside zip file)
• make it easier to add configuration parameters, without having endless list of parameters for the constructor (Factory style, similar to ImageProvider)

breaks plugins; see #10139

File:

• trunk/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java

@@ -22 +22 @@
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
-import org.openstreetmap.josm.io.MirroredInputStream;
+import org.openstreetmap.josm.io.CachedFile;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.xml.sax.SAXException;
@@ -125 +125 @@
             URL url = new URL(pi.downloadlink);
             synchronized(this) {
-                downloadConnection = MirroredInputStream.connectFollowingRedirect(url, PLUGIN_MIME_TYPES, null);
+                downloadConnection = CachedFile.connectFollowingRedirect(url, PLUGIN_MIME_TYPES, null);
             }
             try (