Changeset 2322 in josm for trunk/src/org/openstreetmap/josm/actions/DownloadAction.java

Timestamp:

2009-10-25T23:09:53+01:00 (15 years ago)

Author:

Gubaer

Message:

Added canceling of DownloadOsmTaskLists
Removed error remembering in the progress dialog

File:

• trunk/src/org/openstreetmap/josm/actions/DownloadAction.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/actions/DownloadAction.java

@@ -8 +8 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
+import java.util.List;
+import java.util.concurrent.Future;
 
 import javax.swing.JOptionPane;
@@ -13 +15 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.downloadtasks.DownloadTask;
+import org.openstreetmap.josm.actions.downloadtasks.PostDownloadHandler;
+import org.openstreetmap.josm.gui.ExceptionDialogUtil;
 import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.download.DownloadDialog;
-import org.openstreetmap.josm.gui.download.DownloadDialog.DownloadTask;
+import org.openstreetmap.josm.tools.ExceptionUtil;
 import org.openstreetmap.josm.tools.Shortcut;
 import org.openstreetmap.josm.tools.WindowGeometry;
@@ -69 +74 @@
                     Main.pref.put("download."+task.getPreferencesSuffix(), task.getCheckBox().isSelected());
                     if (task.getCheckBox().isSelected()) {
-                        task.download(this, dialog.minlat, dialog.minlon, dialog.maxlat, dialog.maxlon, null);
+                        // asynchronously launch the download task ...
+                        Future<?> future = task.download(this, dialog.minlat, dialog.minlon, dialog.maxlat, dialog.maxlon, null);
+                        // ... and the continuation when the download task is finished
+                        Main.worker.submit(new PostDownloadHandler(task, future));
                         finish = true;
                     }