Changeset 7248 in josm for trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.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/data/validation/tests/MapCSSTagChecker.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java

@@ -6 +6 @@
 import java.io.BufferedReader;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.Reader;
 import java.util.ArrayList;
@@ -45 +46 @@
 import org.openstreetmap.josm.gui.preferences.validator.ValidatorPreference;
 import org.openstreetmap.josm.gui.preferences.validator.ValidatorTagCheckerRulesPreference;
-import org.openstreetmap.josm.io.MirroredInputStream;
+import org.openstreetmap.josm.io.CachedFile;
 import org.openstreetmap.josm.io.UTFInputStreamReader;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
@@ -533 +534 @@
                     Main.info(tr("Adding {0} to tag checker", i));
                 }
-                try (MirroredInputStream s = new MirroredInputStream(i)) {
+                try (InputStream s = new CachedFile(i).getInputStream()) {
                     addMapCSS(new BufferedReader(UTFInputStreamReader.create(s)));
                 }