Changeset 25217 in osm for applications/viewer/jmapviewer/src/org/openstreetmap

Timestamp:

2011-02-02T19:28:17+01:00 (14 years ago)

Author:

stotz

Message:

timeout removed because of JOSM dependency

File:

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

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

@@ -14 +14 @@
 import javax.imageio.ImageIO;
 
-import org.openstreetmap.josm.Main;
 import org.xml.sax.Attributes;
 import org.xml.sax.InputSource;
@@ -31 +30 @@
         if (attributions == null) {
             attributions = Executors.newSingleThreadExecutor().submit(new Callable<List<Attribution>>() {
-                @Override
                 public List<Attribution> call() throws Exception {
                     return loadAttributionText();
@@ -107 +105 @@
             URL u = new URL("http://dev.virtualearth.net/REST/v1/Imagery/Metadata/Aerial/0,0?zl=1&mapVersion=v1&key="+API_KEY+"&include=ImageryProviders&output=xml");
             URLConnection conn = u.openConnection();
-            conn.setConnectTimeout(Main.pref.getInteger("imagery.bing.load-attribution-text.timeout", 4000));
+            
+            // This is not JOSM! Do not use anything other than standard JRE classes within this package!
+            // See package.html for details
+            //conn.setConnectTimeout(Main.pref.getInteger("imagery.bing.load-attribution-text.timeout", 4000));
+            
             InputStream stream = conn.getInputStream();
             
@@ -147 +149 @@
     }
 
-    @Override
     public TileUpdate getTileUpdate() {
         return TileUpdate.IfNoneMatch;