Changeset 15784 in josm for trunk/src/org/openstreetmap/josm/actions/downloadtasks/AbstractDownloadTask.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/AbstractDownloadTask.java (modified) (3 diffs)

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

@@ -3 +3 @@
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import org.openstreetmap.josm.data.ProjectionBounds;
+import org.openstreetmap.josm.io.UrlPattern;
 import org.openstreetmap.josm.io.XmlWriter;
 
@@ -57 +59 @@
     public void setFailed(boolean failed) {
         this.failed = failed;
+    }
+
+    protected static <T extends Enum<T> & UrlPattern> String[] patterns(Class<T> urlPatternEnum) {
+        // Do not use a method reference until we switch to Java 11, as we face JDK-8141508 with Java 8
+        return Arrays.stream(urlPatternEnum.getEnumConstants()).map(/* JDK-8141508 */ t -> t.pattern()).toArray(String[]::new);
     }
 
@@ -116 +123 @@
      */
     public boolean acceptsUrl(String url) {
-        if (url == null)
-            return false;
-        for (String p: getPatterns()) {
-            if (url.matches(p)) {
-                return true;
-            }
-        }
-        return false;
+        return url != null && Arrays.stream(getPatterns()).anyMatch(url::matches);
     }