Changeset 10731 in josm for trunk/src/org

Timestamp:

2016-08-04T22:38:02+02:00 (8 years ago)

Author:

simon04

Message:

fix #13276 - icon flashes when zooming

Do never load local images asynchronously.

File:

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

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

@@ -635 +635 @@
      */
     public CompletableFuture<ImageIcon> getAsync() {
-        return CompletableFuture.supplyAsync(this::get, IMAGE_FETCHER);
+        return name.startsWith(HTTP_PROTOCOL) || name.startsWith(WIKI_PROTOCOL)
+                ? CompletableFuture.supplyAsync(this::get, IMAGE_FETCHER)
+                : CompletableFuture.completedFuture(get());
     }
 
@@ -676 +678 @@
      * @since 10714
      */
-     public CompletableFuture<ImageResource> getResourceAsync() {
-        return CompletableFuture.supplyAsync(this::getResource, IMAGE_FETCHER);
+    public CompletableFuture<ImageResource> getResourceAsync() {
+        return name.startsWith(HTTP_PROTOCOL) || name.startsWith(WIKI_PROTOCOL)
+                ? CompletableFuture.supplyAsync(this::getResource, IMAGE_FETCHER)
+                : CompletableFuture.completedFuture(getResource());
     }