Changeset 7248 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java

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/gui/mappaint/xml/XmlStyleSource.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java

@@ -29 +29 @@
 import org.openstreetmap.josm.gui.mappaint.StyleSource;
 import org.openstreetmap.josm.gui.preferences.SourceEntry;
-import org.openstreetmap.josm.io.MirroredInputStream;
+import org.openstreetmap.josm.io.CachedFile;
 import org.openstreetmap.josm.tools.Utils;
 import org.openstreetmap.josm.tools.XmlObjectParser;
@@ -104 +104 @@
     @Override
     public InputStream getSourceInputStream() throws IOException {
-        MirroredInputStream in = getMirroredInputStream();
-        InputStream zip = in.findZipEntryInputStream("xml", "style");
+        CachedFile cf = getCachedFile();
+        InputStream zip = cf.findZipEntryInputStream("xml", "style");
         if (zip != null) {
-            zipIcons = in.getFile();
+            zipIcons = cf.getFile();
             return zip;
         } else {
             zipIcons = null;
-            return in;
-        }
-    }
-
-    @Override
-    public MirroredInputStream getMirroredInputStream() throws IOException {
-        return new MirroredInputStream(url, null, XML_STYLE_MIME_TYPES);
+            return cf.getInputStream();
+        }
+    }
+
+    @Override
+    public CachedFile getCachedFile() throws IOException {
+        return new CachedFile(url).setHttpAccept(XML_STYLE_MIME_TYPES);
     }