Changeset 2201 in josm for trunk

Timestamp:

2009-09-27T17:28:08+02:00 (15 years ago)

Author:

Gubaer

Message:

fixed #2818: error when retrieving map data

File:

• trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java

@@ -12 +12 @@
 import org.openstreetmap.josm.actions.DownloadAction;
 import org.openstreetmap.josm.data.gpx.GpxData;
+import org.openstreetmap.josm.gui.ExceptionDialogUtil;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
 import org.openstreetmap.josm.gui.download.DownloadDialog.DownloadTask;
@@ -28 +29 @@
         private GpxData rawData;
         private final boolean newLayer;
+        private OsmTransferException lastException;
 
         public Task(boolean newLayer, BoundingBoxDownloader reader, ProgressMonitor progressMonitor) {
@@ -36 +38 @@
 
         @Override public void realRun() throws IOException, SAXException, OsmTransferException {
-            rawData = reader.parseRawGps(progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false));
+            try {
+                rawData = reader.parseRawGps(progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false));
+            } catch(OsmTransferException e) {
+                lastException = e;
+            } catch(Exception e) {
+                lastException = new OsmTransferException(e);
+            }
         }
 
         @Override protected void finish() {
+            if (lastException != null) {
+                ExceptionDialogUtil.explainException(lastException);
+                return;
+            }
             if (rawData == null)
                 return;
@@ -46 +58 @@
             GpxLayer layer = new GpxLayer(rawData, name);
             Layer x = findMergeLayer();
-            if (newLayer || x == null)
+            if (newLayer || x == null) {
                 Main.main.addLayer(layer);
-            else
+            } else {
                 x.mergeFrom(layer);
+            }
         }
 
@@ -66 +79 @@
 
         @Override protected void cancel() {
-            if (reader != null)
+            if (reader != null) {
                 reader.cancel();
+            }
         }
     }
@@ -105 +119 @@
             Task t = task.get();
             return t.getProgressMonitor().getErrorMessage() == null
-                ? ""
-                : t.getProgressMonitor().getErrorMessage();
+            ? ""
+                    : t.getProgressMonitor().getErrorMessage();
         } catch (Exception e) {
             return "";