Changeset 14688 in josm for trunk/src/org

Timestamp:

2019-01-13T10:59:30+01:00 (6 years ago)

Author:

GerdP

Message:

see #17201 improve progressMonitor for internal osm (xml) importer

File:

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

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

@@ -291 +291 @@
         CheckParameterUtil.ensureParameterNotNull(source, "source");
         try {
-            progressMonitor.beginTask(tr("Prepare OSM data...", 2));
+            progressMonitor.beginTask(tr("Prepare OSM data..."), 4); // read, prepare, post-process, render
             progressMonitor.indeterminateSubTask(tr("Parsing OSM data..."));
 
@@ -310 +310 @@
             }
             progressMonitor.worked(1);
-
+            progressMonitor.indeterminateSubTask(tr("Post-processing data set..."));
             // iterate over registered postprocessors and give them each a chance
             // to modify the dataset we have just loaded.
             callPostProcessors(progressMonitor);
+            progressMonitor.worked(1);
+            progressMonitor.indeterminateSubTask(tr("Rendering data set..."));
             // Make sure postprocessors did not change the read-only state
             if (readOnly && !getDataSet().isLocked()) {
@@ -328 +330 @@
                 AbstractPrimitive.advanceUniqueId(minId.getAsLong());
             }
-            progressMonitor.finishTask();
+            // don't call progressMonitor.finishTask() here, let caller do it
             progressMonitor.removeCancelListener(cancelListener);
         }