Changeset 7248 in josm for trunk/src/org/openstreetmap/josm/tools/XmlObjectParser.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/tools/XmlObjectParser.java (modified) (2 diffs)

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();