Ticket #18941: 18941.patch

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

@@ -9 +9 @@
 import java.awt.Rectangle;
 import java.awt.image.BufferedImage;
 import java.util.Objects;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
 
 import javax.swing.ImageIcon;
 
@@ -21 +23 @@
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.ImageResource;
+import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -114 +117 @@
 
     /**
      * Get the image resource associated with this MapImage object.
+     * This method blocks until the image has been loaded.
      * @return the image resource
      */
     public ImageResource getImageResource() {
+        if (imageResource == null) {
+            try {
+                // load and wait for the image
+                loadImage().get();
+            } catch (ExecutionException | InterruptedException e) {
+                Logging.warn(e);
+                Thread.currentThread().interrupt();
+            }
+        }
         return imageResource;
     }
 
@@ -141 +154 @@
         if (img != null)
             return img;
         temporary = false;
-        new ImageProvider(name)
+        loadImage();
+        synchronized (this) {
+            if (img == null) {
+                img = ImageProvider.get("clock").getImage();
+                temporary = true;
+            }
+        }
+        return img;
+    }
+
+    private CompletableFuture<Void> loadImage() {
+        return new ImageProvider(name)
                 .setDirs(MapPaintStyles.getIconSourceDirs(source))
                 .setId("mappaint."+source.getPrefName())
                 .setArchive(source.zipIcons)
@@ -167 +191 @@
                     }
                 }
         );
-        synchronized (this) {
-            if (img == null) {
-                img = ImageProvider.get("clock").getImage();
-                temporary = true;
-            }
-        }
-        return img;
     }
 
     /**