Changeset 15593 in josm for trunk

Timestamp:

2019-12-15T10:57:07+01:00 (4 years ago)

Author:

GerdP

Message:

fix #18397: Provide more helpful error message when loading an invalid gpx file
patch by Bjoeni

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/io/importexport/GpxImporter.java (modified) (1 diff)
• io/GpxReader.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/io/importexport/GpxImporter.java

@@ -113 +113 @@
         } catch (SAXException e) {
             Logging.error(e);
-            throw new IOException(tr("Parsing data for layer ''{0}'' failed", fileName), e);
+            throw new IOException(e.getLocalizedMessage(), e);
         }
     }

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

@@ -645 +645 @@
             if (tryToFinish) {
                 parser.tryToFinish();
-                if (parser.data.isEmpty())
-                    throw e;
-                String message = e.getMessage();
+                String message = e.getLocalizedMessage();
                 if (e instanceof SAXParseException) {
+                    boolean dot = message.lastIndexOf('.') == message.length() - 1;
+                    if (dot)
+                        message = message.substring(0, message.length() - 1);
                     SAXParseException spe = (SAXParseException) e;
                     message += ' ' + tr("(at line {0}, column {1})", spe.getLineNumber(), spe.getColumnNumber());
-                }
-                Logging.warn(message);
+                    if (dot)
+                        message += '.';
+                }
+                if (parser.data.creator != null && !parser.data.creator.trim().isEmpty()) {
+                    message += "\n" + tr("The file was created by \"{0}\".", parser.data.creator);
+                }
+                SAXException ex = new SAXException(message, e);
+                if (parser.data.isEmpty())
+                    throw ex;
+                Logging.warn(ex);
                 return false;
             } else