Changeset 12059 in josm for trunk/src/org

Timestamp:

2017-05-04T10:22:09+02:00 (7 years ago)

Author:

stoecker

Message:

fix silent import error for NMEA data

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• FileImporter.java (modified) (2 diffs)
• NmeaReader.java (modified) (1 diff)

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

@@ -16 +16 @@
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.tools.bugreport.BugReportExceptionHandler;
 import org.openstreetmap.josm.tools.Utils;
 
@@ -102 +103 @@
             displayError(f, e);
             return false;
+        } catch (Exception e) {
+            BugReportExceptionHandler.handleException(e);
+            return false;
         }
     }

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

@@ -340 +340 @@
                 // vdop
                 accu = e[GPGSA.VDOP.position];
-                if (!accu.isEmpty()) {
+                if (!accu.isEmpty() && currentwp != null) {
                     currentwp.put(GpxConstants.PT_VDOP, Float.valueOf(accu));
                 }
                 // hdop
                 accu = e[GPGSA.HDOP.position];
-                if (!accu.isEmpty()) {
+                if (!accu.isEmpty() && currentwp != null) {
                     currentwp.put(GpxConstants.PT_HDOP, Float.valueOf(accu));
                 }
                 // pdop
                 accu = e[GPGSA.PDOP.position];
-                if (!accu.isEmpty()) {
+                if (!accu.isEmpty() && currentwp != null) {
                     currentwp.put(GpxConstants.PT_PDOP, Float.valueOf(accu));
                 }