Changeset 12617 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2017-08-20T19:39:19+02:00 (7 years ago)

Author:

bastiK

Message:

see #15168 - catch exceptions caused by malformatted data; dump limited number of errors to the command line

File:

• trunk/src/org/openstreetmap/josm/io/nmea/NmeaReader.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/io/nmea/NmeaReader.java

@@ -23 +23 @@
 import org.openstreetmap.josm.data.gpx.WayPoint;
 import org.openstreetmap.josm.io.IllegalDataException;
-import org.openstreetmap.josm.tools.JosmRuntimeException;
 import org.openstreetmap.josm.tools.date.DateUtils;
 
@@ -135 +134 @@
     private final SimpleDateFormat rmcTimeFmtStd = new SimpleDateFormat("ddMMyyHHmmss", Locale.ENGLISH);
 
-    private Date readTime(String p) {
+    private Date readTime(String p) throws IllegalDataException {
         Date d = Optional.ofNullable(rmcTimeFmt.parse(p, new ParsePosition(0)))
                 .orElseGet(() -> rmcTimeFmtStd.parse(p, new ParsePosition(0)));
         if (d == null)
-            throw new JosmRuntimeException("Date is malformed");
+            throw new IllegalDataException("Date is malformed: '" + p + "'");
         return d;
     }
@@ -480 +479 @@
 
         } catch (IllegalArgumentException | IndexOutOfBoundsException | IllegalDataException ex) {
-            // out of bounds and such
-            Main.debug(ex);
+            if (ps.malformed < 5) {
+                Main.warn(ex);
+            } else {
+                Main.debug(ex);
+            }
             ps.malformed++;
             ps.pWp = null;