Changeset 7248 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.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/mapcss/MapCSSStyleSource.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java

@@ -42 +42 @@
 import org.openstreetmap.josm.gui.mappaint.mapcss.parsergen.TokenMgrError;
 import org.openstreetmap.josm.gui.preferences.SourceEntry;
-import org.openstreetmap.josm.io.MirroredInputStream;
+import org.openstreetmap.josm.io.CachedFile;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.LanguageInfo;
@@ -275 +275 @@
             return new ByteArrayInputStream(css.getBytes(StandardCharsets.UTF_8));
         }
-        MirroredInputStream in = getMirroredInputStream();
+        CachedFile cf = getCachedFile();
         if (isZip) {
-            File file = in.getFile();
-            Utils.close(in);
+            File file = cf.getFile();
             zipFile = new ZipFile(file, StandardCharsets.UTF_8);
             zipIcons = file;
@@ -286 +285 @@
             zipFile = null;
             zipIcons = null;
-            return in;
-        }
-    }
-
-    @Override
-    public MirroredInputStream getMirroredInputStream() throws IOException {
-        return new MirroredInputStream(url, null, MAPCSS_STYLE_MIME_TYPES);
+            return cf.getInputStream();
+        }
+    }
+
+    @Override
+    public CachedFile getCachedFile() throws IOException {
+        return new CachedFile(url).setHttpAccept(MAPCSS_STYLE_MIME_TYPES);
     }