Changeset 5854 in josm for trunk/src/org
- Timestamp:
- 2013-04-14T12:50:53+02:00 (12 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 1 added
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/Main.java
r5831 r5854 200 200 if (log_level < 1) 201 201 return; 202 System. out.println(msg);202 System.err.println(tr("WARNING: {0}", msg)); 203 203 } 204 204 /** … … 209 209 if (log_level < 2) 210 210 return; 211 System. out.println(msg);211 System.err.println(tr("INFO: {0}", msg)); 212 212 } 213 213 /** … … 218 218 if (log_level < 3) 219 219 return; 220 System. out.println(msg);220 System.err.println(tr("DEBUG: {0}", msg)); 221 221 } 222 222 /** -
trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java
r5843 r5854 1067 1067 1068 1068 if (conn.getResponseCode() != 200) { 1069 Main.info(" INFO:{0} does not exist", u);1069 Main.info("{0} does not exist", u); 1070 1070 conn.disconnect(); 1071 1071 } else { … … 1084 1084 */ 1085 1085 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); 1087 1087 conn.disconnect(); 1088 1088 } else { 1089 Main.info(" INFO:browsing to {0}", u);1089 Main.info("browsing to {0}", u); 1090 1090 conn.disconnect(); 1091 1091 -
trunk/src/org/openstreetmap/josm/io/GpxReader.java
r5684 r5854 423 423 * Parse the input stream and store the result in trackData and markerData 424 424 * 425 * @param source the source input stream 426 * @throws IOException if an IO error occurs, e.g. the input stream is closed. 425 427 */ 426 428 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")); 428 431 } 429 432 430 433 /** 434 * Parse the GPX data. 431 435 * 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 433 440 * @throws SAXException 434 441 * @throws IOException -
trunk/src/org/openstreetmap/josm/io/UTFInputStreamReader.java
r3372 r5854 2 2 package org.openstreetmap.josm.io; 3 3 4 import java.io.IOException; 4 5 import java.io.InputStream; 5 6 import java.io.InputStreamReader; 6 import java.io.IOException;7 7 import java.io.PushbackInputStream; 8 8 import java.io.UnsupportedEncodingException;
Note:
See TracChangeset
for help on using the changeset viewer.