Ignore:
Timestamp:
2014-10-04T17:54:40+02:00 (6 years ago)
Author:
Don-vip
Message:

fix #10588 - DownloadGpsTask ignores the ProgressMonitor argument given in its constructor

Location:
trunk/src/org/openstreetmap/josm/actions/downloadtasks
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java

    r7575 r7597  
    6868    public Future<?> loadUrl(boolean newLayer, String url, ProgressMonitor progressMonitor) {
    6969        CheckParameterUtil.ensureParameterNotNull(url, "url");
    70         if (url.matches(PATTERN_TRACE_ID) || url.matches(PATTERN_EXTERNAL_GPX_SCRIPT) || url.matches(PATTERN_EXTERNAL_GPX_FILE)) {
     70        if (url.matches(PATTERN_TRACE_ID)
     71         || url.matches(PATTERN_EXTERNAL_GPX_SCRIPT)
     72         || url.matches(PATTERN_EXTERNAL_GPX_FILE)) {
    7173            downloadTask = new DownloadTask(newLayer,
    7274                    new OsmServerLocationReader(url), progressMonitor);
     
    101103
    102104        public DownloadTask(boolean newLayer, OsmServerReader reader, ProgressMonitor progressMonitor) {
    103             super(tr("Downloading GPS data"));
     105            super(tr("Downloading GPS data"), progressMonitor, false);
    104106            this.reader = reader;
    105107            this.newLayer = newLayer;
     
    132134            String name = newLayerName != null ? newLayerName : tr("Downloaded GPX Data");
    133135
    134             GpxImporterData layers = GpxImporter.loadLayers(rawData, reader.isGpxParsedProperly(), name, tr("Markers from {0}", name));
     136            GpxImporterData layers = GpxImporter.loadLayers(rawData, reader.isGpxParsedProperly(), name,
     137                    tr("Markers from {0}", name));
    135138
    136139            GpxLayer gpxLayer = addOrMergeLayer(layers.getGpxLayer(), findGpxMergeLayer());
  • trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadNotesTask.java

    r7531 r7597  
    7272
    7373        public DownloadTask(OsmServerReader reader, ProgressMonitor progressMonitor) {
    74             super(tr("Downloading Notes"));
     74            super(tr("Downloading Notes"), progressMonitor, false);
    7575            this.reader = reader;
    7676        }
    77 
    7877
    7978        @Override
Note: See TracChangeset for help on using the changeset viewer.