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

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

@@ -5 +5 @@
 
 import java.awt.EventQueue;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import java.awt.geom.Area;
 import java.awt.geom.Rectangle2D;
@@ -10 +12 @@
 import java.util.Collection;
 import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
+import java.util.concurrent.Future;
 
 import javax.swing.JOptionPane;
@@ -20 +24 @@
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.gui.download.DownloadDialog.DownloadTask;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+import org.openstreetmap.josm.gui.progress.ProgressMonitor.CancelListener;
+import org.openstreetmap.josm.tools.ExceptionUtil;
 
 /**
@@ -34 +39 @@
 public class DownloadOsmTaskList implements Runnable {
     private List<DownloadTask> osmTasks = new LinkedList<DownloadTask>();
+    private List<Future<?>> osmTaskFutures = new LinkedList<Future<?>>();
     private ProgressMonitor progressMonitor;
 
@@ -41 +47 @@
      * @param The List of Rectangle2D to download
      */
-    public void download(boolean newLayer, List<Rectangle2D> rects, ProgressMonitor progressMonitor) {
+    public Future<?> download(boolean newLayer, List<Rectangle2D> rects, ProgressMonitor progressMonitor) {
         this.progressMonitor = progressMonitor;
         if(newLayer) {
@@ -50 +56 @@
 
         progressMonitor.beginTask(null, rects.size());
-        try {
-            int i = 0;
-            for(Rectangle2D td : rects) {
-                i++;
-                DownloadTask dt = new DownloadOsmTask();
-                ProgressMonitor childProgress = progressMonitor.createSubTaskMonitor(1, false);
-                childProgress.setSilent(true);
-                childProgress.setCustomText(tr("Download {0} of {1} ({2} left)", i, rects.size(), rects.size()-i));
-                dt.download(null, td.getMinY(), td.getMinX(), td.getMaxY(), td.getMaxX(), childProgress);
-                osmTasks.add(dt);
-            }
-        } finally {
-            // If we try to get the error message now the download task will never have been started
-            // and we'd be stuck in a classical dead lock. Instead attach this to the worker and once
-            // run() gets called all downloadTasks have finished and we can grab the error messages.
-            Main.worker.execute(this);
-        }
+        int i = 0;
+        for(Rectangle2D td : rects) {
+            i++;
+            DownloadTask dt = new DownloadOsmTask();
+            ProgressMonitor childProgress = progressMonitor.createSubTaskMonitor(1, false);
+            childProgress.setSilent(true);
+            childProgress.setCustomText(tr("Download {0} of {1} ({2} left)", i, rects.size(), rects.size()-i));
+            Future<?> future = dt.download(null, td.getMinY(), td.getMinX(), td.getMaxY(), td.getMaxX(), childProgress);
+            osmTaskFutures.add(future);
+            osmTasks.add(dt);
+        }
+        progressMonitor.addCancelListener(
+                new CancelListener() {
+                    public void operationCanceled() {
+                        for (DownloadTask dt: osmTasks) {
+                            dt.cancel();
+                        }
+                    }
+                }
+        );
+        return Main.worker.submit(this);
     }
 
@@ -93 +103 @@
     public void run() {
         progressMonitor.finishTask();
-        String errors = "";
-
-        LinkedList<Integer> shown = new LinkedList<Integer>();
+
+        // wait for all tasks to finish
+        //
+        for (Future<?> future: osmTaskFutures) {
+            try {
+                future.get();
+            } catch(Exception e) {
+                e.printStackTrace();
+                return;
+            }
+        }
+        LinkedHashSet<Object> errors = new LinkedHashSet<Object>();
         for(DownloadTask dt : osmTasks) {
-            String err = dt.getErrorMessage();
-            // avoid display of identical messages
-            if (err.equals("") || shown.contains(err.hashCode())) {
-                continue;
-            }
-            shown.add(err.hashCode());
-            errors += "<br>* " + err;
-        }
-
-        if(! errors.equals("")) {
+            errors.addAll(dt.getErrorObjects());
+        }
+        if (!errors.isEmpty()) {
+            StringBuffer sb = new StringBuffer();
+            for (Object error:errors) {
+                if (error instanceof String) {
+                    sb.append("<li>").append(error).append("</li>").append("<br>");
+                } else if (error instanceof Exception) {
+                    sb.append("<li>").append(ExceptionUtil.explainException((Exception)error)).append("</li>").append("<br>");
+                }
+            }
+            sb.insert(0, "<ul>");
+            sb.append("</ul>");
+
             JOptionPane.showMessageDialog(
                     Main.parent,
-                    "<html>"+tr("The following errors occurred during mass download:{0}", errors)
+                    "<html>"+tr("The following errors occurred during mass download: {0}", sb.toString())
                     +"</html>",
                     tr("Errors during Download"),