Changeset 1811 in josm for trunk/src/org/openstreetmap/josm/actions/search

Timestamp:

2009-07-19T17:38:55+02:00 (15 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/search/SelectionWebsiteLoader.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java

@@ -39 +39 @@
     }
     @Override protected void realRun() {
-        Main.pleaseWaitDlg.currentAction.setText(tr("Contact {0}...", url.getHost()));
+        progressMonitor.setTicksCount(2);
         sel = mode != SearchAction.SearchMode.remove ? new LinkedList<OsmPrimitive>() : Main.ds.allNonDeletedPrimitives();
         try {
             URLConnection con = url.openConnection();
-            InputStream in = new ProgressInputStream(con, Main.pleaseWaitDlg);
-            Main.pleaseWaitDlg.currentAction.setText(tr("Downloading..."));
+            progressMonitor.subTask(tr("Contact {0}...", url.getHost()));
+            InputStream in = new ProgressInputStream(con, progressMonitor.createSubTaskMonitor(1, true));
+            progressMonitor.subTask(tr("Downloading..."));
             Map<Long, String> ids = idReader.parseIds(in);
             for (OsmPrimitive osm : Main.ds.allNonDeletedPrimitives()) {
@@ -55 +56 @@
                 }
             }
+            progressMonitor.worked(1);
         } catch (IOException e) {
             e.printStackTrace();