Changeset 28553 in osm for applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java

Timestamp:

2012-08-15T22:52:04+02:00 (12 years ago)

Author:

jttt

Message:

better message when bing attribution is not loaded yet

File:

• applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java (modified) (4 diffs)

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java

@@ -2 +2 @@
 
 //License: GPL.
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.Image;
@@ -36 +38 @@
 
 public class BingAerialTileSource extends AbstractTMSTileSource {
+
     private static String API_KEY = "Arzdiw4nlOJzRwOz__qailc8NiR31Tt51dN2D7cm57NrnceZnCpgOkmJhNpGoppU";
     private static volatile Future<List<Attribution>> attributions; // volatile is required for getAttribution(), see below.
@@ -61 +64 @@
     public String getTileUrl(int zoom, int tilex, int tiley) throws IOException {
         // make sure that attribution is loaded. otherwise subdomains is null.
-        getAttribution();
+        if (getAttribution() == null)
+            throw new IOException(tr("Attribution is not loaded yet"));
 
         int t = (zoom + tilex + tiley) % subdomains.length;
@@ -240 +244 @@
         try {
             final List<Attribution> data = getAttribution();
-            if (data == null) {
+            if (data == null)
                 return "Error loading Bing attribution data";
-            }
             StringBuilder a = new StringBuilder();
             for (Attribution attr : data) {