Changeset 8714 in josm for trunk/src/org/openstreetmap/josm/data/imagery/CachedAttributionBingAerialTileSource.java

Timestamp:

2015-09-01T22:57:30+02:00 (9 years ago)

Author:

wiktorn

Message:

Do not block in EDT thread, when waiting for attribution download. Closes: #11821

File:

• trunk/src/org/openstreetmap/josm/data/imagery/CachedAttributionBingAerialTileSource.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/data/imagery/CachedAttributionBingAerialTileSource.java

@@ -10 +10 @@
 
 import org.openstreetmap.gui.jmapviewer.tilesources.BingAerialTileSource;
+import org.openstreetmap.gui.jmapviewer.tilesources.TileSourceInfo;
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.io.CacheCustomContent;
 import org.openstreetmap.josm.io.UTFInputStreamReader;
@@ -23 +25 @@
  */
 public class CachedAttributionBingAerialTileSource extends BingAerialTileSource {
+    private Runnable attributionDownloadedTask;
+
     /**
      * Creates tile source
@@ -30 +34 @@
         super(info);
     }
+
+    /**
+     * Creates tile source
+     * @param info ImageryInfo description of this tile source
+     * @param attributionDownloadedTask runnable to be executed once attribution is loaded
+     */
+
+    public CachedAttributionBingAerialTileSource(TileSourceInfo info, Runnable attributionDownloadedTask) {
+        super(info);
+        this.attributionDownloadedTask = attributionDownloadedTask;
+    }
+
 
     class BingAttributionData extends CacheCustomContent<IOException> {
@@ -59 +75 @@
                     try {
                         String xml = attributionLoader.updateIfRequiredString();
-                        return parseAttributionText(new InputSource(new StringReader((xml))));
+                        List<Attribution> ret = parseAttributionText(new InputSource(new StringReader((xml))));
+                        if (attributionDownloadedTask != null) {
+                            GuiHelper.runInEDT(attributionDownloadedTask);
+                            attributionDownloadedTask = null;
+                        }
+                        return ret;
                     } catch (IOException ex) {
                         Main.warn("Could not connect to Bing API. Will retry in " + waitTimeSec + " seconds.");