Changeset 5854 in josm for trunk

Timestamp:

2013-04-14T12:50:53+02:00 (11 years ago)

Author:

bastiK

Message:

fixed #7648 - GPS-Download in JOSM in specific area not possible

Location:

trunk/src/org/openstreetmap/josm

Files:

• Main.java (modified) (3 diffs)
• gui/dialogs/properties/PropertiesDialog.java (modified) (2 diffs)
• io/GpxReader.java (modified) (1 diff)
• io/InvalidXmlCharacterFilter.java (added)
• io/UTFInputStreamReader.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/Main.java

@@ -200 +200 @@
         if (log_level < 1)
             return;
-        System.out.println(msg);
+        System.err.println(tr("WARNING: {0}", msg));
     }
     /**
@@ -209 +209 @@
         if (log_level < 2)
             return;
-        System.out.println(msg);
+        System.err.println(tr("INFO: {0}", msg));
     }
     /**
@@ -218 +218 @@
         if (log_level < 3)
             return;
-        System.out.println(msg);
+        System.err.println(tr("DEBUG: {0}", msg));
     }
     /**

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

@@ -1067 +1067 @@
 
                                 if (conn.getResponseCode() != 200) {
-                                    Main.info("INFO: {0} does not exist", u);
+                                    Main.info("{0} does not exist", u);
                                     conn.disconnect();
                                 } else {
@@ -1084 +1084 @@
                                      */
                                     if (Math.abs(conn.getContentLength() - osize) > 200) {
-                                        Main.info("INFO: {0} is a mediawiki redirect", u);
+                                        Main.info("{0} is a mediawiki redirect", u);
                                         conn.disconnect();
                                     } else {
-                                        Main.info("INFO: browsing to {0}", u);
+                                        Main.info("browsing to {0}", u);
                                         conn.disconnect();
 

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

@@ -423 +423 @@
      * Parse the input stream and store the result in trackData and markerData
      *
+     * @param source the source input stream
+     * @throws IOException if an IO error occurs, e.g. the input stream is closed.
      */
     public GpxReader(InputStream source) throws IOException {
-        this.inputSource = new InputSource(UTFInputStreamReader.create(source, "UTF-8"));
+        InputStream filtered = new InvalidXmlCharacterFilter(source);
+        this.inputSource = new InputSource(UTFInputStreamReader.create(filtered, "UTF-8"));
     }
 
     /**
+     * Parse the GPX data.
      *
-     * @return True if file was properly parsed, false if there was error during parsing but some data were parsed anyway
+     * @param tryToFinish true, if the reader should return at least part of the GPX
+     * data in case of an error.
+     * @return true if file was properly parsed, false if there was error during
+     * parsing but some data were parsed anyway
      * @throws SAXException
      * @throws IOException

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

@@ -2 +2 @@
 package org.openstreetmap.josm.io;
 
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.io.IOException;
 import java.io.PushbackInputStream;
 import java.io.UnsupportedEncodingException;