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

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

@@ -18 +18 @@
 import org.openstreetmap.josm.gui.download.DownloadDialog.DownloadTask;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
+import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.io.BoundingBoxDownloader;
 import org.openstreetmap.josm.io.OsmServerLocationReader;
@@ -38 +40 @@
         private DataSet dataSet;
         private boolean newLayer;
-        private String msg = "";
 
-        public Task(boolean newLayer, OsmServerReader reader, boolean silent, String msg) {
-            super(tr("Downloading data"));
-            this.msg = msg;
+        public Task(boolean newLayer, OsmServerReader reader, ProgressMonitor progressMonitor) {
+            super(tr("Downloading data"), progressMonitor, false);
             this.reader = reader;
             this.newLayer = newLayer;
-            this.silent = silent;
         }
 
         @Override public void realRun() throws IOException, SAXException, OsmTransferException {
-            Main.pleaseWaitDlg.setCustomText(msg);
-            dataSet = reader.parseOsm();
+            dataSet = reader.parseOsm(progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false));
         }
 
@@ -63 +61 @@
                 return; // user canceled download or error occurred
             if (dataSet.allPrimitives().isEmpty()) {
-                // If silent is set to true, we don't want to see information messages
-                if(!silent) {
-                    errorMessage = tr("No data imported.");
-                }
+                progressMonitor.setErrorMessage(tr("No data imported."));
                 // need to synthesize a download bounds lest the visual indication of downloaded
                 // area doesn't work
@@ -78 +73 @@
                 getEditLayer().mergeFrom(dataSet);
             }
-
-            Main.pleaseWaitDlg.setCustomText("");
         }
 
@@ -86 +79 @@
                 reader.cancel();
             }
-            Main.pleaseWaitDlg.cancel.setEnabled(false);
         }
     }
@@ -100 +92 @@
 
     public void download(DownloadAction action, double minlat, double minlon,
-            double maxlat, double maxlon, boolean silent, String message) {
+            double maxlat, double maxlon, ProgressMonitor progressMonitor) {
         // Swap min and max if user has specified them the wrong way round
         // (easy to do if you are crossing 0, for example)
@@ -115 +107 @@
 
         Task t = new Task(newLayer,
-                new BoundingBoxDownloader(minlat, minlon, maxlat, maxlon),
-                silent,
-                message);
+                new BoundingBoxDownloader(minlat, minlon, maxlat, maxlon), progressMonitor);
         currentBounds = new Bounds(new LatLon(minlat, minlon), new LatLon(maxlat, maxlon));
         // We need submit instead of execute so we can wait for it to finish and get the error
         // message if necessary. If no one calls getErrorMessage() it just behaves like execute.
         task = Main.worker.submit(t, t);
-    }
-
-    public void download(DownloadAction action, double minlat, double minlon,
-            double maxlat, double maxlon) {
-        download(action, minlat, minlon, maxlat, maxlon, false, "");
     }
 
@@ -137 +122 @@
         Task t = new Task(new_layer,
                 new OsmServerLocationReader(url),
-                false,
-        "");
+                NullProgressMonitor.INSTANCE);
         task = Main.worker.submit(t, t);
     }
@@ -160 +144 @@
         try {
             Task t = task.get();
-            return t.errorMessage == null
+            return t.getProgressMonitor().getErrorMessage() == null
             ? ""
-                    : t.errorMessage;
+                    : t.getProgressMonitor().getErrorMessage();
         } catch (Exception e) {
             return "";