Changeset 8787 in josm for trunk/src/org/openstreetmap/josm/io

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:

• BoundingBoxDownloader.java (modified) (3 diffs)
• OverpassDownloadReader.java (modified) (2 diffs)

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

@@ -80 +80 @@
         progressMonitor.beginTask("", 1);
         try {
-            progressMonitor.indeterminateSubTask(tr("Contacting OSM Server..."));
+            progressMonitor.indeterminateSubTask(getTaskName());
             if (crosses180th) {
                 // API 0.6 does not support requests crossing the 180th meridian, so make two requests
@@ -112 +112 @@
     }
 
+    /**
+     * Returns the name of the download task to be displayed in the {@link ProgressMonitor}.
+     */
+    protected String getTaskName() {
+        return tr("Contacting OSM Server...");
+    }
+
+    /**
+     * Builds the request part for the bounding box.
+     */
     protected String getRequestForBbox(double lon1, double lat1, double lon2, double lat2) {
         return "map?bbox=" + lon1 + "," + lat1 + "," + lon2 + "," + lat2;
@@ -118 +128 @@
     @Override
     public DataSet parseOsm(ProgressMonitor progressMonitor) throws OsmTransferException {
-        progressMonitor.beginTask(tr("Contacting OSM Server..."), 10);
+        progressMonitor.beginTask(getTaskName(), 10);
         try {
             DataSet ds = null;

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.io;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.io.InputStream;
@@ -100 +102 @@
 
     @Override
+    protected String getTaskName() {
+        return tr("Contacting Server...");
+    }
+
+    @Override
     public DataSet parseOsm(ProgressMonitor progressMonitor) throws OsmTransferException {