Changeset 15789 in josm for trunk/src/org

Timestamp:

2020-01-27T22:40:13+01:00 (5 years ago)

Author:

Don-vip

Message:

see #18613 - fix regressions

Location:

trunk/src/org/openstreetmap/josm/actions/downloadtasks

Files:

• DownloadOsmChangeTask.java (modified) (3 diffs)
• DownloadOsmTask.java (modified) (2 diffs)

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

@@ -10 +10 @@
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Optional;
 import java.util.concurrent.Future;
 import java.util.concurrent.RejectedExecutionException;
@@ -65 +66 @@
     @Override
     public Future<?> loadUrl(DownloadParams settings, final String url, ProgressMonitor progressMonitor) {
-        OsmChangeUrlPattern urlPattern = Arrays.stream(OsmChangeUrlPattern.values()).filter(p -> p.matches(url)).findFirst()
-                .orElseThrow(() -> new IllegalArgumentException("URL does not match any OSM URL pattern: " + url));
+        Optional<OsmChangeUrlPattern> urlPattern = Arrays.stream(OsmChangeUrlPattern.values()).filter(p -> p.matches(url)).findFirst();
         String newUrl = url;
         final Matcher matcher = OsmChangeUrlPattern.OSM_WEBSITE.matcher(url);
@@ -75 +75 @@
                 Compression.byExtension(newUrl));
         // Extract .osc filename from URL to set the new layer name
-        extractOsmFilename(settings, urlPattern.pattern(), newUrl);
+        extractOsmFilename(settings, urlPattern.orElse(OsmChangeUrlPattern.EXTERNAL_OSC_FILE).pattern(), newUrl);
         return MainApplication.worker.submit(downloadTask);
     }

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

@@ -159 +159 @@
     public Future<?> loadUrl(DownloadParams settings, String url, ProgressMonitor progressMonitor) {
         String newUrl = modifyUrlBeforeLoad(url);
-        OsmUrlPattern urlPattern = Arrays.stream(OsmUrlPattern.values()).filter(p -> p.matches(newUrl)).findFirst()
-                .orElseThrow(() -> new IllegalArgumentException("URL does not match any OSM URL pattern: " + newUrl));
+        Optional<OsmUrlPattern> urlPattern = Arrays.stream(OsmUrlPattern.values()).filter(p -> p.matches(newUrl)).findFirst();
         downloadTask = new DownloadTask(settings, getOsmServerReader(newUrl), progressMonitor, true, Compression.byExtension(newUrl));
         currentBounds = null;
         // Extract .osm filename from URL to set the new layer name
-        extractOsmFilename(settings, urlPattern.pattern(), newUrl);
+        extractOsmFilename(settings, urlPattern.orElse(OsmUrlPattern.EXTERNAL_OSM_FILE).pattern(), newUrl);
         return MainApplication.worker.submit(downloadTask);
     }
@@ -190 +189 @@
         if (newLayerName == null || newLayerName.isEmpty()) {
             Matcher matcher = Pattern.compile(pattern).matcher(url);
-            newLayerName = matcher.matches() ? matcher.group(1) : null;
+            newLayerName = matcher.matches() && matcher.groupCount() > 0 ? matcher.group(1) : null;
         }
     }