Changeset 4217 in josm for trunk/src/org

Timestamp:

2011-07-09T21:00:26+02:00 (13 years ago)

Author:

stoecker

Message:

fix #6565 - patch by Don-vip - Improve progress bar for data update

File:

• trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java

@@ -300 +300 @@
         progressMonitor.subTask(tr("Downloading OSM data..."));
         try {
-            DataSet loaded = OsmReader.parseDataSet(in, progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false));
+            DataSet loaded = OsmReader.parseDataSet(in, progressMonitor.createSubTaskMonitor(pkg.size(), false));
             rememberNodesOfIncompleteWaysToLoad(loaded);
             merge(loaded);
@@ -324 +324 @@
         progressMonitor.subTask(tr("Downloading OSM data..."));
         try {
-            DataSet loaded = OsmReader.parseDataSet(in, progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false));
+            DataSet loaded = OsmReader.parseDataSet(in, progressMonitor.createSubTaskMonitor(1, false));
             rememberNodesOfIncompleteWaysToLoad(loaded);
             merge(loaded);
@@ -404 +404 @@
         case RELATION:  msg = tr("Fetching a package of relations from ''{0}''", OsmApi.getOsmApi().getBaseUrl()); break;
         }
-        progressMonitor.indeterminateSubTask(msg);
+        progressMonitor.setTicksCount(ids.size());
+        progressMonitor.setTicks(0);
         Set<Long> toFetch = new HashSet<Long>(ids);
-        toFetch.addAll(ids);
         while(! toFetch.isEmpty() && !isCanceled()) {
             Set<Long> pkg = extractIdPackage(toFetch);
+            progressMonitor.subTask(msg + "... " + progressMonitor.getTicks() + "/" + progressMonitor.getTicksCount());
             try {
                 multiGetIdPackage(type, pkg, progressMonitor);