Changeset 2322 in josm for trunk/src/org/openstreetmap/josm/Main.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/Main.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/Main.java

@@ -20 +20 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -32 +33 @@
 import org.openstreetmap.josm.actions.downloadtasks.DownloadGpsTask;
 import org.openstreetmap.josm.actions.downloadtasks.DownloadOsmTask;
+import org.openstreetmap.josm.actions.downloadtasks.DownloadTask;
+import org.openstreetmap.josm.actions.downloadtasks.PostDownloadHandler;
 import org.openstreetmap.josm.actions.mapmode.MapMode;
 import org.openstreetmap.josm.actions.search.SearchAction;
@@ -46 +49 @@
 import org.openstreetmap.josm.gui.SplashScreen;
 import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
-import org.openstreetmap.josm.gui.download.DownloadDialog.DownloadTask;
 import org.openstreetmap.josm.gui.help.HelpBrowserProxy;
 import org.openstreetmap.josm.gui.io.SaveLayersDialog;
@@ -421 +423 @@
                 //DownloadTask osmTask = main.menu.download.downloadTasks.get(0);
                 DownloadTask osmTask = new DownloadOsmTask();
-                osmTask.download(main.menu.download, b.min.lat(), b.min.lon(), b.max.lat(), b.max.lon(), null);
+                Future<?> future = osmTask.download(main.menu.download, b.min.lat(), b.min.lon(), b.max.lat(), b.max.lon(), null);
+                Main.worker.submit(new PostDownloadHandler(osmTask, future));
             }
             return;
@@ -466 +469 @@
             try {
                 DownloadTask task = rawGps ? new DownloadGpsTask() : new DownloadOsmTask();
-                task.download(main.menu.download, Double.parseDouble(st.nextToken()), Double.parseDouble(st.nextToken()), Double.parseDouble(st.nextToken()), Double.parseDouble(st.nextToken()), null);
+                // asynchronously launch the download task ...
+                Future<?> future = task.download(main.menu.download, Double.parseDouble(st.nextToken()), Double.parseDouble(st.nextToken()), Double.parseDouble(st.nextToken()), Double.parseDouble(st.nextToken()), null);
+                // ... and the continuation when the download is finished (this will wait for the download to finish)
+                Main.worker.execute(new PostDownloadHandler(task, future));
                 return;
             } catch (final NumberFormatException e) {