Changeset 13250 in josm for trunk/src/org/openstreetmap/josm/tools/ImageProvider.java

Timestamp:

2017-12-28T00:53:58+01:00 (6 years ago)

Author:

Don-vip

Message:

fix #15654 - repair asynchronous fetching of icons (regression from r10714) + fetch https icons asynchronously (omission from r10731)

File:

• trunk/src/org/openstreetmap/josm/tools/ImageProvider.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/tools/ImageProvider.java

@@ -631 +631 @@
 
     /**
+     * Determines if this icon is located on a remote location (http, https, wiki).
+     * @return {@code true} if this icon is located on a remote location (http, https, wiki)
+     * @since 13250
+     */
+    public boolean isRemote() {
+        return name.startsWith(HTTP_PROTOCOL) || name.startsWith(HTTPS_PROTOCOL) || name.startsWith(WIKI_PROTOCOL);
+    }
+
+    /**
      * Execute the image request and scale result.
      * @return the requested image or null if the request failed
@@ -655 +664 @@
      */
     public CompletableFuture<ImageIcon> getAsync() {
-        return name.startsWith(HTTP_PROTOCOL) || name.startsWith(WIKI_PROTOCOL)
+        return isRemote()
                 ? CompletableFuture.supplyAsync(this::get, IMAGE_FETCHER)
                 : CompletableFuture.completedFuture(get());
@@ -699 +708 @@
      */
     public CompletableFuture<ImageResource> getResourceAsync() {
-        return name.startsWith(HTTP_PROTOCOL) || name.startsWith(WIKI_PROTOCOL)
+        return isRemote()
                 ? CompletableFuture.supplyAsync(this::getResource, IMAGE_FETCHER)
                 : CompletableFuture.completedFuture(getResource());