Changeset 14686 in josm for trunk/src/org

Timestamp:

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

Author:

GerdP

Message:

 

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/search/SearchAction.java (modified) (1 diff)
• io/AbstractReader.java (modified) (3 diffs)
• io/OsmServerLocationReader.java (modified) (1 diff)

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

@@ -807 +807 @@
                 }
                 final ProgressMonitor subMonitor = getProgressMonitor().createSubTaskMonitor(all.size(), false);
-                subMonitor.beginTask(trn("Searching in {0} object", "Searching in {0} objects", all.size(), all.size()));
+                subMonitor.beginTask(trn("Searching in {0} object", "Searching in {0} objects", all.size(), all.size()),all.size());
 
                 for (IPrimitive osm : all) {

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("Postprocessing 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);
         }

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

@@ -132 +132 @@
 
     protected final <T> T doParse(Parser<T> parser, final ProgressMonitor progressMonitor) throws OsmTransferException {
-        progressMonitor.beginTask(tr("Contacting Server...", 10));
+        progressMonitor.beginTask(tr("Contacting Server..."), 10);
         try {
             return parser.parse();