Changeset 9509 in josm for trunk/src/org

Timestamp:

2016-01-17T19:46:20+01:00 (9 years ago)

Author:

simon04

Message:

fix #9925 - Allow to stop downloading GPS data and keep the downloaded part

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/downloadtasks/DownloadGpsTask.java (modified) (1 diff)
• io/BoundingBoxDownloader.java (modified) (4 diffs)

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

@@ -129 +129 @@
         protected void finish() {
             rememberDownloadedData(rawData);
-            if (isCanceled() || isFailed())
-                return;
             if (rawData == null)
                 return;

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

@@ -6 +6 @@
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.SocketException;
 import java.util.List;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.DataSource;
@@ -49 +51 @@
         GpxData result = null;
         String url = "trackpoints?bbox="+b.getMinLon()+','+b.getMinLat()+','+b.getMaxLon()+','+b.getMaxLat()+"&page=";
-        for (int i = 0; !done; ++i) {
+        for (int i = 0; !done && !isCanceled(); ++i) {
             progressMonitor.subTask(tr("Downloading points {0} to {1}...", i * 5000, (i + 1) * 5000));
             try (InputStream in = getInputStream(url+i, progressMonitor.createSubTaskMonitor(1, true))) {
@@ -65 +67 @@
                 } else {
                     done = true;
+                }
+            } catch (OsmTransferException | SocketException ex) {
+                if (isCanceled()) {
+                    final OsmTransferCanceledException canceledException = new OsmTransferCanceledException("Operation canceled");
+                    canceledException.initCause(ex);
+                    Main.warn(canceledException);
                 }
             }
@@ -209 +217 @@
             }
             return notes;
-        } catch (IOException e) {
-            throw new OsmTransferException(e);
-        } catch (SAXException e) {
+        } catch (IOException | SAXException e) {
             throw new OsmTransferException(e);
         } finally {