Changeset 6031 in josm for trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java

Timestamp:

2013-06-26T21:04:53+02:00 (11 years ago)

Author:

akks

Message:

see #8809: [patch by brycenesbitt, reworked] detailed documentation for "no suitable download task is available" error (Ctrl-L)

File:

• trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java

@@ -49 +49 @@
     
     protected String newLayerName = null;
+    
+    @Override
+    public String[] getPatterns() {
+        if (this.getClass() == DownloadOsmTask.class) {
+            return new String[]{PATTERN_OSM_API_URL, PATTERN_OVERPASS_API_URL, 
+                PATTERN_OVERPASS_API_XAPI_URL, PATTERN_EXTERNAL_OSM_FILE};
+        } else {
+            return super.getPatterns();
+        }
+    }
+
+    @Override
+    public String getTitle() {
+        if (this.getClass() == DownloadOsmTask.class) {
+            return tr("Download OSM");
+        } else {
+            return super.getTitle();
+        }
+    }
 
     protected void rememberDownloadedData(DataSet ds) {
@@ -136 +155 @@
      * @param url The URL as String
      */
+    @Override
     public Future<?> loadUrl(boolean new_layer, String url, ProgressMonitor progressMonitor) {
         if (url.matches(PATTERN_OVERPASS_API_URL)) {
@@ -156 +176 @@
         newLayerName = matcher.matches() ? matcher.group(1) : null;
     }
-    
-    /* (non-Javadoc)
-     * @see org.openstreetmap.josm.actions.downloadtasks.DownloadTask#acceptsUrl(java.lang.String)
-     */
-    @Override
-    public boolean acceptsUrl(String url) {
-        return url != null && (
-                url.matches(PATTERN_OSM_API_URL)           // OSM API 0.6 and XAPI
-             || url.matches(PATTERN_OVERPASS_API_URL)      // Overpass API
-             || url.matches(PATTERN_OVERPASS_API_XAPI_URL) // Overpass API XAPI compatibility layer
-             || url.matches(PATTERN_EXTERNAL_OSM_FILE)     // Remote .osm files
-                );
-    }
-
+
+    @Override
     public void cancel() {
         if (downloadTask != null) {