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

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/io/imagery/ImageryReader.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/io/imagery/ImageryReader.java

@@ -18 +18 @@
 import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryType;
 import org.openstreetmap.josm.data.imagery.Shape;
-import org.openstreetmap.josm.io.MirroredInputStream;
+import org.openstreetmap.josm.io.CachedFile;
 import org.openstreetmap.josm.io.UTFInputStreamReader;
 import org.xml.sax.Attributes;
@@ -50 +50 @@
             SAXParserFactory factory = SAXParserFactory.newInstance();
             factory.setNamespaceAware(true);
-            try (InputStream in = new MirroredInputStream(source, null, 1*MirroredInputStream.DAYS, null, 
-                    MirroredInputStream.CachingStrategy.IfModifiedSince)) {
+            try (InputStream in = new CachedFile(source)
+                    .setMaxAge(1*CachedFile.DAYS)
+                    .setCachingStrategy(CachedFile.CachingStrategy.IfModifiedSince)
+                    .getInputStream()) {
                 InputSource is = new InputSource(UTFInputStreamReader.create(in));
                 factory.newSAXParser().parse(is, parser);