Changeset 7248 in josm for trunk/src/org/openstreetmap/josm/data/imagery

Timestamp:

2014-06-14T12:40:50+02:00 (10 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/data/imagery/ImageryLayerInfo.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java

@@ -16 +16 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryPreferenceEntry;
-import org.openstreetmap.josm.io.MirroredInputStream;
+import org.openstreetmap.josm.io.CachedFile;
 import org.openstreetmap.josm.io.imagery.ImageryReader;
 import org.xml.sax.SAXException;
@@ -78 +78 @@
         for (String source : Main.pref.getCollection("imagery.layers.sites", Arrays.asList(DEFAULT_LAYER_SITES))) {
             if (clearCache) {
-                MirroredInputStream.cleanup(source);
+                CachedFile.cleanup(source);
             }
             try {