Changeset 6080 in josm

Timestamp:

2013-07-22T15:21:30+02:00 (11 years ago)

Author:

bastiK

Message:

fixed #8893 - Cannot load GPX file

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• GpxReader.java (modified) (2 diffs)
• InvalidXmlCharacterFilter.java (modified) (4 diffs)

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

@@ -8 +8 @@
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.Reader;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -427 +428 @@
      */
     public GpxReader(InputStream source) throws IOException {
-        InputStream filtered = new InvalidXmlCharacterFilter(source);
-        this.inputSource = new InputSource(UTFInputStreamReader.create(filtered, "UTF-8"));
+        Reader utf8stream = UTFInputStreamReader.create(source, "UTF-8");
+        Reader filtered = new InvalidXmlCharacterFilter(utf8stream);
+        this.inputSource = new InputSource(filtered);
     }
 

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

@@ -2 +2 @@
 package org.openstreetmap.josm.io;
 
-import java.io.FilterInputStream;
 import java.io.IOException;
-import java.io.InputStream;
+import java.io.Reader;
 
 import org.openstreetmap.josm.Main;
@@ -19 +18 @@
  * by space (0x20).
  */
-public class InvalidXmlCharacterFilter extends FilterInputStream {
+public class InvalidXmlCharacterFilter extends Reader {
+
+    private Reader reader;
 
     public static boolean firstWarning = true;
@@ -35 +36 @@
     }
 
-    public InvalidXmlCharacterFilter(InputStream in) {
-        super(in);
+    public InvalidXmlCharacterFilter(Reader reader) {
+        this.reader = reader;
     }
 
     @Override
-    public int read() throws IOException {
-        return filter((byte)super.read());
-    }
-
-    @Override
-    public int read(byte[] b, int off, int len) throws IOException {
-        int n = super.read(b, off, len);
+    public int read(char[] b, int off, int len) throws IOException {
+        int n = reader.read(b, off, len);
         if (n == -1) {
             return -1;
@@ -56 +52 @@
     }
 
-    private byte filter(byte in) {
+    @Override
+    public void close() throws IOException {
+        reader.close();
+    }
+
+    private char filter(char in) {
         if (in < 0x20 && in >= 0 && INVALID_CHARS[in]) {
             if (firstWarning) {