- Timestamp:
- 2019-01-13T10:54:13+01:00 (6 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java
r14686 r14687 807 807 } 808 808 final ProgressMonitor subMonitor = getProgressMonitor().createSubTaskMonitor(all.size(), false); 809 subMonitor.beginTask(trn("Searching in {0} object", "Searching in {0} objects", all.size(), all.size()) ,all.size());809 subMonitor.beginTask(trn("Searching in {0} object", "Searching in {0} objects", all.size(), all.size())); 810 810 811 811 for (IPrimitive osm : all) { -
trunk/src/org/openstreetmap/josm/io/AbstractReader.java
r14686 r14687 291 291 CheckParameterUtil.ensureParameterNotNull(source, "source"); 292 292 try { 293 progressMonitor.beginTask(tr("Prepare OSM data..." ), 4); // read, prepare, post-process, render293 progressMonitor.beginTask(tr("Prepare OSM data...", 2)); 294 294 progressMonitor.indeterminateSubTask(tr("Parsing OSM data...")); 295 295 … … 310 310 } 311 311 progressMonitor.worked(1); 312 progressMonitor.indeterminateSubTask(tr("Postprocessing data set...")); 312 313 313 // iterate over registered postprocessors and give them each a chance 314 314 // to modify the dataset we have just loaded. 315 315 callPostProcessors(progressMonitor); 316 progressMonitor.worked(1);317 progressMonitor.indeterminateSubTask(tr("Rendering data set..."));318 316 // Make sure postprocessors did not change the read-only state 319 317 if (readOnly && !getDataSet().isLocked()) { … … 330 328 AbstractPrimitive.advanceUniqueId(minId.getAsLong()); 331 329 } 332 // don't call progressMonitor.finishTask() here, let caller do it330 progressMonitor.finishTask(); 333 331 progressMonitor.removeCancelListener(cancelListener); 334 332 } -
trunk/src/org/openstreetmap/josm/io/OsmServerLocationReader.java
r14686 r14687 132 132 133 133 protected final <T> T doParse(Parser<T> parser, final ProgressMonitor progressMonitor) throws OsmTransferException { 134 progressMonitor.beginTask(tr("Contacting Server..." ), 10);134 progressMonitor.beginTask(tr("Contacting Server...", 10)); 135 135 try { 136 136 return parser.parse();
Note:
See TracChangeset
for help on using the changeset viewer.