Changeset 3372 in josm for trunk/src/org/openstreetmap

Timestamp:

2010-07-09T13:38:41+02:00 (14 years ago)

Author:

bastiK

Message:

fixed #5226 - XML encodings and byte-order marker (BOM) support

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• GpxImporter.java (modified) (1 diff)
• GpxReader.java (modified) (1 diff)
• OsmReader.java (modified) (3 diffs)
• UTFInputStreamReader.java (added)

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

@@ -37 +37 @@
                 is = new FileInputStream(file);
             }
-            // Workaround for SAX BOM bug
-            // http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6206835
-            if (!((is.read() == 0xef) && (is.read() == 0xbb) && (is.read() == 0xbf))) {
-                is.close();
-                if (file.getName().endsWith(".gpx.gz")) {
-                    is = new GZIPInputStream(new FileInputStream(file));
-                } else {
-                    is = new FileInputStream(file);
-                }
-            }
             final GpxReader r = new GpxReader(is);
             final boolean parsedProperly = r.parse(true);

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

@@ -355 +355 @@
      */
     public GpxReader(InputStream source) throws IOException {
-        this.inputSource = new InputSource(new InputStreamReader(source, "UTF-8"));
+        this.inputSource = new InputSource(UTFInputStreamReader.create(source, "UTF-8"));
     }
 

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

@@ +1 @@
+// License: GPL. See LICENSE file for details.
 package org.openstreetmap.josm.io;
 
@@ -4 +5 @@
 
 import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.text.MessageFormat;
 import java.util.ArrayList;
@@ -570 +570 @@
             progressMonitor.beginTask(tr("Prepare OSM data...", 2));
             progressMonitor.indeterminateSubTask(tr("Parsing OSM data..."));
-            InputSource inputSource = new InputSource(new InputStreamReader(source, "UTF-8"));
+
+            InputSource inputSource = new InputSource(UTFInputStreamReader.create(source, "UTF-8"));
             SAXParserFactory.newInstance().newSAXParser().parse(inputSource, reader.new Parser());
             progressMonitor.worked(1);