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

Timestamp:

2014-06-14T12:40:50+02:00 (9 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

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• ImageProvider.java (modified) (5 diffs)
• RightAndLefthandTraffic.java (modified) (2 diffs)
• XmlObjectParser.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/tools/ImageProvider.java

@@ -59 +59 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
-import org.openstreetmap.josm.io.MirroredInputStream;
 import org.openstreetmap.josm.plugins.PluginHandler;
 import org.w3c.dom.Element;
@@ -75 +74 @@
 import com.kitfox.svg.SVGException;
 import com.kitfox.svg.SVGUniverse;
+import org.openstreetmap.josm.io.CachedFile;
 
 /**
@@ -533 +533 @@
 
     private static ImageResource getIfAvailableHttp(String url, ImageType type) {
-        try (MirroredInputStream is = new MirroredInputStream(url,
-                    new File(Main.pref.getCacheDirectory(), "images").getPath())) {
+        CachedFile cf = new CachedFile(url)
+                .setDestDir(new File(Main.pref.getCacheDirectory(), "images").getPath());
+        try (InputStream is = cf.getInputStream()) {
             switch (type) {
             case SVG:
-                URI uri = getSvgUniverse().loadSVG(is, Utils.fileToURL(is.getFile()).toString());
+                URI uri = getSvgUniverse().loadSVG(is, Utils.fileToURL(cf.getFile()).toString());
                 SVGDiagram svg = getSvgUniverse().getDiagram(uri);
                 return svg == null ? null : new ImageResource(svg);
@@ -543 +544 @@
                 BufferedImage img = null;
                 try {
-                    img = read(Utils.fileToURL(is.getFile()), false, false);
+                    img = read(Utils.fileToURL(cf.getFile()), false, false);
                 } catch (IOException e) {
                     Main.warn("IOException while reading HTTP image: "+e.getMessage());
@@ -800 +801 @@
             });
 
-            try (InputStream is = new MirroredInputStream(
-                    base + fn,
-                    new File(Main.pref.getPreferencesDir(), "images").toString())
-            ) {
+            CachedFile cf = new CachedFile(base + fn).setDestDir(new File(Main.pref.getPreferencesDir(), "images").toString());
+            try (InputStream is = cf.getInputStream()) {
                 parser.parse(new InputSource(is));
             }

trunk/src/org/openstreetmap/josm/tools/RightAndLefthandTraffic.java

@@ -11 +11 @@
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.io.CachedFile;
 import org.openstreetmap.josm.io.IllegalDataException;
-import org.openstreetmap.josm.io.MirroredInputStream;
 import org.openstreetmap.josm.io.OsmReader;
 import org.openstreetmap.josm.tools.GeoPropertyIndex.GeoProperty;
@@ -67 +67 @@
     private static void initialize() {
         leftHandTrafficPolygons = new ArrayList<>();
-        try (InputStream is = new MirroredInputStream("resource://data/left-right-hand-traffic.osm")) {
+        try (InputStream is = new CachedFile("resource://data/left-right-hand-traffic.osm").getInputStream()) {
             DataSet data = OsmReader.parseDataSet(is, null);
             for (Way w : data.getWays()) {

trunk/src/org/openstreetmap/josm/tools/XmlObjectParser.java

@@ -28 +28 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.io.MirroredInputStream;
+import org.openstreetmap.josm.io.CachedFile;
 import org.xml.sax.Attributes;
 import org.xml.sax.ContentHandler;
@@ -281 +281 @@
     public Iterable<Object> startWithValidation(final Reader in, String namespace, String schemaSource) throws SAXException {
         SchemaFactory factory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
-        try (InputStream mis = new MirroredInputStream(schemaSource)) {
+        try (InputStream mis = new CachedFile(schemaSource).getInputStream()) {
             Schema schema = factory.newSchema(new StreamSource(mis));
             ValidatorHandler validator = schema.newValidatorHandler();