Changeset 9171 in josm for trunk/src/org/openstreetmap/josm/data/imagery

Timestamp:

2015-12-26T23:42:00+01:00 (8 years ago)

Author:

simon04

Message:

see #12231 - Use HttpClient instead of some Utils.openHttpConnection usages

File:

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

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

@@ -6 +6 @@
 import java.net.URL;
 import java.util.List;
-import java.util.Scanner;
 import java.util.concurrent.Callable;
 
@@ -14 +13 @@
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.io.CacheCustomContent;
-import org.openstreetmap.josm.io.UTFInputStreamReader;
-import org.openstreetmap.josm.tools.Utils;
+import org.openstreetmap.josm.tools.HttpClient;
 import org.xml.sax.InputSource;
 
@@ -55 +53 @@
         protected byte[] updateData() throws IOException {
             URL u = getAttributionUrl();
-            try (Scanner scanner = new Scanner(UTFInputStreamReader.create(Utils.openURL(u)))) {
-                String r = scanner.useDelimiter("\\A").next();
-                Main.info("Successfully loaded Bing attribution data.");
-                return r.getBytes("UTF-8");
-            }
+            final String r = HttpClient.create(u).connect().fetchContent();
+            Main.info("Successfully loaded Bing attribution data.");
+            return r.getBytes("UTF-8");
         }
     }