Changeset 13250 in josm for trunk/src/org

Timestamp:

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

Author:

Don-vip

Message:

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

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/AddImageryLayerAction.java (modified) (1 diff)
• gui/mappaint/styleelement/MapImage.java (modified) (1 diff)
• gui/tagging/presets/TaggingPreset.java (modified) (1 diff)
• tools/ImageProvider.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java

@@ -76 +76 @@
         String icon = info.getIcon();
         if (icon != null) {
-            new ImageProvider(icon).setOptional(true).getResourceAsync().thenAccept(result -> {
+            new ImageProvider(icon).setOptional(true).getResourceAsync().thenAcceptAsync(result -> {
                 if (result != null) {
                     GuiHelper.runInEDT(() -> result.attachImageIcon(this));

trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/MapImage.java

@@ -139 +139 @@
                 .setHeight(height)
                 .setOptional(true)
-                .getAsync().thenAccept(result -> {
+                .getAsync().thenAcceptAsync(result -> {
                     synchronized (this) {
                         if (result == null) {

trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java

@@ -217 +217 @@
         imgProv.setArchive(arch);
         imgProv.setOptional(true);
-        imgProv.getResourceAsync().thenAccept(result -> {
+        imgProv.getResourceAsync().thenAcceptAsync(result -> {
             if (result != null) {
                 GuiHelper.runInEDT(() -> result.attachImageIcon(this));

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());