Changeset 10714 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2016-08-03T14:37:38+02:00 (8 years ago)

Author:

simon04

Message:

see #11390 - Use CompletableFuture for async image loading

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• mappaint/styleelement/MapImage.java (modified) (2 diffs)
• tagging/presets/TaggingPreset.java (modified) (2 diffs)

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

@@ -19 +19 @@
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.tools.ImageProvider;
-import org.openstreetmap.josm.tools.ImageProvider.ImageCallback;
 import org.openstreetmap.josm.tools.Utils;
 
@@ -99 +98 @@
                 .setHeight(height)
                 .setOptional(true)
-                .getInBackground((ImageCallback) result -> {
+                .getAsync().thenAccept(result -> {
                     synchronized (this) {
                         if (result == null) {

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

@@ -60 +60 @@
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
-import org.openstreetmap.josm.tools.ImageProvider.ImageResourceCallback;
 import org.openstreetmap.josm.tools.Utils;
 import org.openstreetmap.josm.tools.template_engine.ParseError;
@@ -204 +203 @@
         imgProv.setArchive(arch);
         imgProv.setOptional(true);
-        imgProv.getInBackground((ImageResourceCallback) result -> {
+        imgProv.getResourceAsync().thenAccept(result -> {
             if (result != null) {
                 GuiHelper.runInEDT(() -> result.attachImageIcon(this));