Changeset 9171 in josm for trunk/src/org/openstreetmap/josm/io

Timestamp:

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

Author:

simon04

Message:

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

File:

• trunk/src/org/openstreetmap/josm/io/imagery/WMSImagery.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/io/imagery/WMSImagery.java

@@ -3 +3 @@
 
 import java.awt.HeadlessException;
-import java.io.BufferedReader;
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.StringReader;
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.net.URLConnection;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -27 +24 @@
 import org.openstreetmap.josm.data.imagery.ImageryInfo;
 import org.openstreetmap.josm.data.projection.Projections;
-import org.openstreetmap.josm.io.UTFInputStreamReader;
+import org.openstreetmap.josm.tools.HttpClient;
 import org.openstreetmap.josm.tools.Predicate;
 import org.openstreetmap.josm.tools.Utils;
@@ -137 +134 @@
 
         Main.info("GET " + getCapabilitiesUrl);
-        URLConnection openConnection = Utils.openHttpConnection(getCapabilitiesUrl, false, true);
-        StringBuilder ba = new StringBuilder();
-
-        try (
-            InputStream inputStream = openConnection.getInputStream();
-            BufferedReader br = new BufferedReader(UTFInputStreamReader.create(inputStream))
-        ) {
-            String line;
-            while ((line = br.readLine()) != null) {
-                ba.append(line);
-                ba.append('\n');
-            }
-        }
-        String incomingData = ba.toString();
+        final String incomingData = HttpClient.create(getCapabilitiesUrl).connect().fetchContent();
         Main.debug("Server response to Capabilities request:");
         Main.debug(incomingData);