Changeset 6584 in josm for trunk/src/org/openstreetmap/josm/data/validation/tests

Timestamp:

2014-01-01T12:06:54+01:00 (10 years ago)

Author:

simon04

Message:

fix #9503 - Different syntax for .cfg and .mapcss validator files paths (implementation uses MirroredInputStream now)

File:

• trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java (modified) (3 diffs)

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

@@ -5 +5 @@
 
 import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
@@ -45 +43 @@
 import org.openstreetmap.josm.gui.mappaint.mapcss.parsergen.ParseException;
 import org.openstreetmap.josm.gui.widgets.EditableList;
+import org.openstreetmap.josm.io.MirroredInputStream;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.GBC;
@@ -395 +394 @@
         addMapCSS("geometry");
         for (final String i : sourcesProperty.get()) {
-            final String file = new File(i).getAbsolutePath();
             try {
-                Main.info(tr("Adding {0} to tag checker", file));
-                addMapCSS(new BufferedReader(new InputStreamReader(new FileInputStream(i), Utils.UTF_8)));
+                Main.info(tr("Adding {0} to tag checker", i));
+                addMapCSS(new BufferedReader(new InputStreamReader(new MirroredInputStream(i), Utils.UTF_8)));
             } catch (Exception ex) {
-                Main.warn(new RuntimeException(tr("Failed to add {0} to tag checker", file), ex));
+                Main.warn(new RuntimeException(tr("Failed to add {0} to tag checker", i), ex));
             }
         }