Changeset 15784 in josm for trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java

Timestamp:

2020-01-27T02:35:43+01:00 (4 years ago)

Author:

Don-vip

Message:

see #18613 - rework download tasks / URL patterns

File:

• trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java (modified) (7 diffs)

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

@@ -6 +6 @@
 import java.io.IOException;
 import java.net.URL;
-import java.util.Arrays;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.concurrent.Future;
 import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 import java.util.stream.Stream;
 
@@ -30 +29 @@
 import org.openstreetmap.josm.io.BoundingBoxDownloader;
 import org.openstreetmap.josm.io.OsmServerLocationReader;
-import org.openstreetmap.josm.io.OsmServerLocationReader.GpxUrlPattern;
 import org.openstreetmap.josm.io.OsmServerReader;
 import org.openstreetmap.josm.io.OsmTransferException;
+import org.openstreetmap.josm.io.UrlPatterns.GpxUrlPattern;
 import org.openstreetmap.josm.spi.preferences.Config;
-import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.Utils;
 import org.xml.sax.SAXException;
@@ -50 +48 @@
     @Override
     public String[] getPatterns() {
-        return Arrays.stream(GpxUrlPattern.values()).map(GpxUrlPattern::pattern).toArray(String[]::new);
+        return patterns(GpxUrlPattern.class);
     }
 
@@ -69 +67 @@
     @Override
     public Future<?> loadUrl(DownloadParams settings, String url, ProgressMonitor progressMonitor) {
-        CheckParameterUtil.ensureParameterNotNull(url, "url");
-        this.url = url;
+        this.url = Objects.requireNonNull(url);
         final Optional<String> mappedUrl = Stream.of(GpxUrlPattern.USER_TRACE_ID, GpxUrlPattern.EDIT_TRACE_ID)
-                .map(p -> Pattern.compile(p.pattern()).matcher(url))
+                .map(p -> p.matcher(url))
                 .filter(Matcher::matches)
                 .map(m -> "https://www.openstreetmap.org/trace/" + m.group(2) + "/data")
@@ -81 +78 @@
         if (Stream.of(GpxUrlPattern.TRACE_ID, GpxUrlPattern.EXTERNAL_GPX_SCRIPT,
                       GpxUrlPattern.EXTERNAL_GPX_FILE, GpxUrlPattern.TASKING_MANAGER)
-                .anyMatch(p -> url.matches(p.pattern()))) {
+                .anyMatch(p -> p.matches(url))) {
             downloadTask = new DownloadTask(settings,
                     new OsmServerLocationReader(url), progressMonitor);
@@ -88 +85 @@
             return MainApplication.worker.submit(downloadTask);
 
-        } else if (url.matches(GpxUrlPattern.TRACKPOINTS_BBOX.pattern())) {
+        } else if (GpxUrlPattern.TRACKPOINTS_BBOX.matches(url)) {
             String[] table = url.split("\\?|=|&");
             for (int i = 0; i < table.length; i++) {
@@ -153 +150 @@
         private String getLayerName() {
             // Extract .gpx filename from URL to set the new layer name
-            final Matcher matcher = url != null ? Pattern.compile(GpxUrlPattern.EXTERNAL_GPX_FILE.pattern()).matcher(url) : null;
+            final Matcher matcher = url != null ? GpxUrlPattern.EXTERNAL_GPX_FILE.matcher(url) : null;
             final String newLayerName = matcher != null && matcher.matches() ? matcher.group(1) : null;
             final String metadataName = rawData != null ? rawData.getString(GpxConstants.META_NAME) : null;