Changeset 6650 in josm for trunk

Timestamp:

2014-01-06T19:21:52+01:00 (11 years ago)

Author:

simon04

Message:

see #9414 see #9542 - MapCSS validator: handle BOM in config files

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/validation/tests/MapCSSTagChecker.java (modified) (2 diffs)
• data/validation/tests/TagChecker.java (modified) (1 diff)
• gui/layer/TMSLayer.java (modified) (1 diff)
• io/GpxReader.java (modified) (1 diff)
• io/OsmReader.java (modified) (1 diff)
• io/UTFInputStreamReader.java (modified) (1 diff)
• io/imagery/ImageryReader.java (modified) (1 diff)
• io/imagery/WMSImagery.java (modified) (1 diff)

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

@@ -43 +43 @@
 import org.openstreetmap.josm.gui.widgets.EditableList;
 import org.openstreetmap.josm.io.MirroredInputStream;
+import org.openstreetmap.josm.io.UTFInputStreamReader;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.GBC;
@@ -429 +430 @@
             try {
                 Main.info(tr("Adding {0} to tag checker", i));
-                addMapCSS(new BufferedReader(new InputStreamReader(new MirroredInputStream(i), Utils.UTF_8)));
+                addMapCSS(new BufferedReader(UTFInputStreamReader.create(new MirroredInputStream(i))));
             } catch (Exception ex) {
                 Main.warn(new RuntimeException(tr("Failed to add {0} to tag checker", i), ex));

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

@@ -167 +167 @@
             try {
                 MirroredInputStream s = new MirroredInputStream(source);
-                reader = new BufferedReader(UTFInputStreamReader.create(s, "UTF-8"));
+                reader = new BufferedReader(UTFInputStreamReader.create(s));
 
                 String okValue = null;

trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java

@@ -330 +330 @@
             protected byte[] updateData() throws IOException {
                 URL u = getAttributionUrl();
-                UTFInputStreamReader in = UTFInputStreamReader.create(Utils.openURL(u), "utf-8");
+                UTFInputStreamReader in = UTFInputStreamReader.create(Utils.openURL(u));
                 String r = new Scanner(in).useDelimiter("\\A").next();
                 Utils.close(in);

trunk/src/org/openstreetmap/josm/io/GpxReader.java

@@ -430 +430 @@
      */
     public GpxReader(InputStream source) throws IOException {
-        Reader utf8stream = UTFInputStreamReader.create(source, "UTF-8");
+        Reader utf8stream = UTFInputStreamReader.create(source);
         Reader filtered = new InvalidXmlCharacterFilter(utf8stream);
         this.inputSource = new InputSource(filtered);

trunk/src/org/openstreetmap/josm/io/OsmReader.java

@@ -589 +589 @@
             progressMonitor.indeterminateSubTask(tr("Parsing OSM data..."));
 
-            InputStreamReader ir = UTFInputStreamReader.create(source, "UTF-8");
+            InputStreamReader ir = UTFInputStreamReader.create(source);
             XMLStreamReader parser = XMLInputFactory.newInstance().createXMLStreamReader(ir);
             setParser(parser);

trunk/src/org/openstreetmap/josm/io/UTFInputStreamReader.java

@@ -14 +14 @@
     
     /**
-     * converts input stream to reader
+     * Creates a new {@link InputStreamReader} from the {@link InputStream} with UTF-8 as default encoding.
+     * @return A reader with the correct encoding. Starts to read after the BOM.
+     * @see #create(java.io.InputStream, String)
+     */
+    public static UTFInputStreamReader create(InputStream input) throws IOException {
+        return create(input, "UTF-8");
+    }
+
+    /**
+     * Creates a new {@link InputStreamReader} from the {@link InputStream}.
      * @param defaultEncoding Used, when no BOM was recognized. Can be null.
      * @return A reader with the correct encoding. Starts to read after the BOM.

trunk/src/org/openstreetmap/josm/io/imagery/ImageryReader.java

@@ -53 +53 @@
             factory.setNamespaceAware(true);
             InputStream in = new MirroredInputStream(source);
-            InputSource is = new InputSource(UTFInputStreamReader.create(in, "UTF-8"));
+            InputSource is = new InputSource(UTFInputStreamReader.create(in));
             factory.newSAXParser().parse(is, parser);
             return parser.entries;

trunk/src/org/openstreetmap/josm/io/imagery/WMSImagery.java

@@ -131 +131 @@
         URLConnection openConnection = Utils.openHttpConnection(getCapabilitiesUrl);
         InputStream inputStream = openConnection.getInputStream();
-        BufferedReader br = new BufferedReader(UTFInputStreamReader.create(inputStream, "UTF-8"));
+        BufferedReader br = new BufferedReader(UTFInputStreamReader.create(inputStream));
         String line;
         StringBuilder ba = new StringBuilder();