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

Timestamp:

2012-07-15T16:34:27+02:00 (12 years ago)

Author:

Don-vip

Message:

fix #7857 - Mark osmChange primitives inside <modify> block as modified + allow to load remote .osc files

File:

• trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java (modified) (1 diff)

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

@@ -76 +76 @@
         currentBounds = null;
         // Extract .osm filename from URL to set the new layer name
-        Matcher matcher = Pattern.compile("http://.*/(.*\\.osm)").matcher(url);
+        extractOsmFilename("http://.*/(.*\\.osm)", url);
+        return Main.worker.submit(downloadTask);
+    }
+    
+    protected final void extractOsmFilename(String pattern, String url) {
+        Matcher matcher = Pattern.compile(pattern).matcher(url);
         newLayerName = matcher.matches() ? matcher.group(1) : null;
-        return Main.worker.submit(downloadTask);
     }