Changeset 5854 in josm for trunk


Ignore:
Timestamp:
2013-04-14T12:50:53+02:00 (7 years ago)
Author:
bastiK
Message:

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

Location:
trunk/src/org/openstreetmap/josm
Files:
1 added
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/Main.java

    r5831 r5854  
    200200        if (log_level < 1)
    201201            return;
    202         System.out.println(msg);
     202        System.err.println(tr("WARNING: {0}", msg));
    203203    }
    204204    /**
     
    209209        if (log_level < 2)
    210210            return;
    211         System.out.println(msg);
     211        System.err.println(tr("INFO: {0}", msg));
    212212    }
    213213    /**
     
    218218        if (log_level < 3)
    219219            return;
    220         System.out.println(msg);
     220        System.err.println(tr("DEBUG: {0}", msg));
    221221    }
    222222    /**
  • trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

    r5843 r5854  
    10671067
    10681068                                if (conn.getResponseCode() != 200) {
    1069                                     Main.info("INFO: {0} does not exist", u);
     1069                                    Main.info("{0} does not exist", u);
    10701070                                    conn.disconnect();
    10711071                                } else {
     
    10841084                                     */
    10851085                                    if (Math.abs(conn.getContentLength() - osize) > 200) {
    1086                                         Main.info("INFO: {0} is a mediawiki redirect", u);
     1086                                        Main.info("{0} is a mediawiki redirect", u);
    10871087                                        conn.disconnect();
    10881088                                    } else {
    1089                                         Main.info("INFO: browsing to {0}", u);
     1089                                        Main.info("browsing to {0}", u);
    10901090                                        conn.disconnect();
    10911091
  • trunk/src/org/openstreetmap/josm/io/GpxReader.java

    r5684 r5854  
    423423     * Parse the input stream and store the result in trackData and markerData
    424424     *
     425     * @param source the source input stream
     426     * @throws IOException if an IO error occurs, e.g. the input stream is closed.
    425427     */
    426428    public GpxReader(InputStream source) throws IOException {
    427         this.inputSource = new InputSource(UTFInputStreamReader.create(source, "UTF-8"));
     429        InputStream filtered = new InvalidXmlCharacterFilter(source);
     430        this.inputSource = new InputSource(UTFInputStreamReader.create(filtered, "UTF-8"));
    428431    }
    429432
    430433    /**
     434     * Parse the GPX data.
    431435     *
    432      * @return True if file was properly parsed, false if there was error during parsing but some data were parsed anyway
     436     * @param tryToFinish true, if the reader should return at least part of the GPX
     437     * data in case of an error.
     438     * @return true if file was properly parsed, false if there was error during
     439     * parsing but some data were parsed anyway
    433440     * @throws SAXException
    434441     * @throws IOException
  • trunk/src/org/openstreetmap/josm/io/UTFInputStreamReader.java

    r3372 r5854  
    22package org.openstreetmap.josm.io;
    33
     4import java.io.IOException;
    45import java.io.InputStream;
    56import java.io.InputStreamReader;
    6 import java.io.IOException;
    77import java.io.PushbackInputStream;
    88import java.io.UnsupportedEncodingException;
Note: See TracChangeset for help on using the changeset viewer.