Changeset 6117 in josm for trunk/src/org/openstreetmap/josm/io

Timestamp:

2013-08-07T22:11:35+02:00 (11 years ago)

Author:

Don-vip

Message:

see #8941 - display gpx parsing error on stderr

File:

• trunk/src/org/openstreetmap/josm/io/GpxReader.java (modified) (5 diffs)

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

@@ -20 +20 @@
 import javax.xml.parsers.SAXParserFactory;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.gpx.Extensions;
@@ -31 +32 @@
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
 import org.xml.sax.helpers.DefaultHandler;
 
@@ -406 +408 @@
                 GpxLink link = new GpxLink(url);
                 link.text = urlname;
-                @SuppressWarnings("unchecked")
+                @SuppressWarnings({ "unchecked", "rawtypes" })
                 Collection<GpxLink> links = (Collection) attr.get(META_LINKS);
                 links.add(link);
@@ -455 +457 @@
                 if (parser.data.isEmpty())
                     throw e;
+                String message = e.getMessage();
+                if (e instanceof SAXParseException) {
+                    SAXParseException spe = ((SAXParseException)e);
+                    message += " " + tr("(at line {0}, column {1})", spe.getLineNumber(), spe.getColumnNumber());
+                }
+                Main.warn(message);
                 return false;
             } else
@@ -464 +472 @@
     }
 
+    /**
+     * Replies the GPX data.
+     * @return The GPX data
+     */
     public GpxData getGpxData() {
         return gpxData;