Changeset 14687 in josm for trunk/src


Ignore:
Timestamp:
2019-01-13T10:54:13+01:00 (6 years ago)
Author:
GerdP
Message:

revert accidential commit

Location:
trunk/src/org/openstreetmap/josm
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java

    r14686 r14687  
    807807                }
    808808                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()));
    810810
    811811                for (IPrimitive osm : all) {
  • trunk/src/org/openstreetmap/josm/io/AbstractReader.java

    r14686 r14687  
    291291        CheckParameterUtil.ensureParameterNotNull(source, "source");
    292292        try {
    293             progressMonitor.beginTask(tr("Prepare OSM data..."), 4); // read, prepare, post-process, render
     293            progressMonitor.beginTask(tr("Prepare OSM data...", 2));
    294294            progressMonitor.indeterminateSubTask(tr("Parsing OSM data..."));
    295295
     
    310310            }
    311311            progressMonitor.worked(1);
    312             progressMonitor.indeterminateSubTask(tr("Postprocessing data set..."));
     312
    313313            // iterate over registered postprocessors and give them each a chance
    314314            // to modify the dataset we have just loaded.
    315315            callPostProcessors(progressMonitor);
    316             progressMonitor.worked(1);
    317             progressMonitor.indeterminateSubTask(tr("Rendering data set..."));
    318316            // Make sure postprocessors did not change the read-only state
    319317            if (readOnly && !getDataSet().isLocked()) {
     
    330328                AbstractPrimitive.advanceUniqueId(minId.getAsLong());
    331329            }
    332             // don't call progressMonitor.finishTask() here, let caller do it
     330            progressMonitor.finishTask();
    333331            progressMonitor.removeCancelListener(cancelListener);
    334332        }
  • trunk/src/org/openstreetmap/josm/io/OsmServerLocationReader.java

    r14686 r14687  
    132132
    133133    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));
    135135        try {
    136136            return parser.parse();
Note: See TracChangeset for help on using the changeset viewer.