Changeset 1811 in josm for trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java

Timestamp:

2009-07-19T17:38:55+02:00 (16 years ago)

Author:

jttt

Message:

PleaseWait refactoring. Progress is now reported using ProgressMonitor interface, that is available through PleaseWaitRunnable.

File:

• trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java (modified) (11 diffs)

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

@@ -23 +23 @@
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
+import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 
 /**
@@ -33 +35 @@
 public class DownloadOsmTaskList implements Runnable {
     private List<DownloadTask> osmTasks = new LinkedList<DownloadTask>();
+    private ProgressMonitor progressMonitor;
 
     /**
@@ -39 +42 @@
      * @param The List of Rectangle2D to download
      */
-    public void download(boolean newLayer, List<Rectangle2D> rects) {
+    public void download(boolean newLayer, List<Rectangle2D> rects, ProgressMonitor progressMonitor) {
+        this.progressMonitor = progressMonitor;
         if(newLayer) {
             Layer l = new OsmDataLayer(new DataSet(), OsmDataLayer.createNewName(), null);
@@ -46 +50 @@
         }
 
-        int i = 0;
-        for(Rectangle2D td : rects) {
-            i++;
-            DownloadTask dt = new DownloadOsmTask();
-            dt.download(null, td.getMinY(), td.getMinX(), td.getMaxY(), td.getMaxX(), true,
-                    tr("Download {0} of {1} ({2} left)", i, rects.size(), rects.size()-i));
-            osmTasks.add(dt);
-        }
-
-        // 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);
+        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);
+        }
     }
 
@@ -72 +81 @@
         }
 
-        download(newLayer, rects);
+        download(newLayer, rects, NullProgressMonitor.INSTANCE);
     }
 
@@ -79 +88 @@
      */
     public void run() {
+        progressMonitor.finishTask();
         String errors = "";
 
@@ -109 +119 @@
      * Updates the local state of a set of primitives (given by a set of primitive
      * ids) with the state currently held on the server.
-     * 
+     *
      * @param potentiallyDeleted a set of ids to check update from the server
      */
@@ -135 +145 @@
      * the current state on the server. If yes, retrieves the current state on the server
      * and checks whether the primitives are indeed deleted on the server.
-     * 
+     *
      * @param potentiallyDeleted a set of primitives (given by their ids)
      */
@@ -177 +187 @@
      * replies true, if the primitive with id <code>id</code> was downloaded into the
      * dataset <code>ds</code>
-     * 
+     *
      * @param id the id
      * @param ds the dataset
@@ -191 +201 @@
      * replies true, if the primitive with id <code>id</code> was downloaded into the
      * dataset of one of the download tasks
-     * 
+     *
      * @param id the id
      * @return true, if the primitive with id <code>id</code> was downloaded into the
      * dataset of one of the download tasks
-     * 
+     *
      */
     public boolean wasDownloaded(long id) {
@@ -209 +219 @@
     /**
      * Replies the set of primitive ids which have been downloaded by this task list
-     * 
+     *
      * @return the set of primitive ids which have been downloaded by this task list
      */