Changeset 8787 in josm


Ignore:
Timestamp:
2015-09-22T22:18:04+02:00 (9 years ago)
Author:
simon04
Message:

see #11428 - Change Overpass task name in progress monitor to "Contacting Server..."

Location:
trunk/src/org/openstreetmap/josm/io
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java

    r8540 r8787  
    8080        progressMonitor.beginTask("", 1);
    8181        try {
    82             progressMonitor.indeterminateSubTask(tr("Contacting OSM Server..."));
     82            progressMonitor.indeterminateSubTask(getTaskName());
    8383            if (crosses180th) {
    8484                // API 0.6 does not support requests crossing the 180th meridian, so make two requests
     
    112112    }
    113113
     114    /**
     115     * Returns the name of the download task to be displayed in the {@link ProgressMonitor}.
     116     */
     117    protected String getTaskName() {
     118        return tr("Contacting OSM Server...");
     119    }
     120
     121    /**
     122     * Builds the request part for the bounding box.
     123     */
    114124    protected String getRequestForBbox(double lon1, double lat1, double lon2, double lat2) {
    115125        return "map?bbox=" + lon1 + "," + lat1 + "," + lon2 + "," + lat2;
     
    118128    @Override
    119129    public DataSet parseOsm(ProgressMonitor progressMonitor) throws OsmTransferException {
    120         progressMonitor.beginTask(tr("Contacting OSM Server..."), 10);
     130        progressMonitor.beginTask(getTaskName(), 10);
    121131        try {
    122132            DataSet ds = null;
  • trunk/src/org/openstreetmap/josm/io/OverpassDownloadReader.java

    r8782 r8787  
    11// License: GPL. For details, see LICENSE file.
    22package org.openstreetmap.josm.io;
     3
     4import static org.openstreetmap.josm.tools.I18n.tr;
    35
    46import java.io.InputStream;
     
    100102
    101103    @Override
     104    protected String getTaskName() {
     105        return tr("Contacting Server...");
     106    }
     107
     108    @Override
    102109    public DataSet parseOsm(ProgressMonitor progressMonitor) throws OsmTransferException {
    103110
Note: See TracChangeset for help on using the changeset viewer.