Changeset 2327 in josm for trunk/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java

Timestamp:

27.10.2009 01:21:32 (3 years ago)

Author:

Gubaer

Message:

Cleanup in download logic (less global, more encapsulation)

File:

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

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

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.util.ArrayList;
 import java.util.LinkedHashSet;
+import java.util.List;
 import java.util.concurrent.Future;
 
@@ -16 +18 @@
 public class PostDownloadHandler implements Runnable {
     private DownloadTask task;
-    private Future<?> future;
+    private List<Future<?>> futures;
 
     /**
@@ -25 +27 @@
     public PostDownloadHandler(DownloadTask task, Future<?> future) {
         this.task = task;
-        this.future = future;
+        this.futures = new ArrayList<Future<?>>();
+        if (future != null) {
+            this.futures.add(future);
+        }
     }
 
+    /**
+     * constructor
+     * @param task the asynchronous download task
+     * @param future the future on which the completion of the download task can be synchronized
+     */
+    public PostDownloadHandler(DownloadTask task, Future<?> ... futures) {
+        this.task = task;
+        this.futures = new ArrayList<Future<?>>();
+        if (futures == null) return;
+        for (Future<?> future: futures) {
+            this.futures.add(future);
+        }
+    }
+    
+
+    /**
+     * constructor
+     * @param task the asynchronous download task
+     * @param future the future on which the completion of the download task can be synchronized
+     */
+    public PostDownloadHandler(DownloadTask task, List<Future<?>> futures) {
+        this.task = task;
+        this.futures = new ArrayList<Future<?>>();
+        if (futures == null) return;
+        this.futures.addAll(futures);
+    }
+    
     public void run() {
-        // wait for the download task to complete
+        // wait for all downloads task to finish (by waiting for the futures
+        // to return a value)
         //
-        try {
-            future.get();
-        } catch(Exception e) {
-            e.printStackTrace();
-            return;
+        for (Future<?> future: futures) {
+            try {
+                future.get();
+            } catch(Exception e) {
+                e.printStackTrace();
+                return;
+            }
         }