Changeset 5024 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2012-02-26T15:14:34+01:00 (12 years ago)

Author:

Don-vip

Message:

Extract .osm filename from URL to set the new layer name

File:

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

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

@@ -7 +7 @@
 import java.util.Collection;
 import java.util.concurrent.Future;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import org.openstreetmap.josm.Main;
@@ -35 +37 @@
     
     protected OsmDataLayer targetLayer;
+    
+    protected String newLayerName = null;
 
     protected void rememberDownloadedData(DataSet ds) {
@@ -64 +68 @@
                 progressMonitor);
         currentBounds = null;
+        // Extract .osm filename from URL to set the new layer name
+        Matcher matcher = Pattern.compile("http://.*/(.*\\.osm)").matcher(url);
+        newLayerName = matcher.matches() ? matcher.group(1) : null;
         return Main.worker.submit(downloadTask);
     }
@@ -150 +157 @@
         }
         
+        protected OsmDataLayer createNewLayer(String layerName) {
+            if (layerName == null || layerName.isEmpty()) {
+                layerName = OsmDataLayer.createNewName();
+            }
+            return new OsmDataLayer(dataSet, layerName, null);
+        }
+        
         protected OsmDataLayer createNewLayer() {
-            return new OsmDataLayer(dataSet, OsmDataLayer.createNewName(), null);
+            return createNewLayer(null);
         }
 
@@ -172 +186 @@
                 // or it is not clear which layer to merge to
                 //
-                targetLayer = createNewLayer();
+                targetLayer = createNewLayer(newLayerName);
                 final boolean isDisplayingMapView = Main.isDisplayingMapView();