Changeset 9171 in josm for trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java

Timestamp:

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

Author:

simon04

Message:

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

File:

• trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java

@@ -13 +13 @@
 import java.awt.event.MouseEvent;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.io.Reader;
-import java.net.HttpURLConnection;
 import java.net.URL;
-import java.nio.charset.StandardCharsets;
 import java.text.DecimalFormat;
 import java.util.ArrayList;
@@ -57 +53 @@
 import org.openstreetmap.josm.io.OsmTransferException;
 import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.HttpClient;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.OsmUrlToBounds;
@@ -328 +325 @@
 
         private final String searchExpression;
-        private HttpURLConnection connection;
+        private HttpClient.Response connection;
         private List<SearchResult> data;
         private boolean canceled;
@@ -371 +368 @@
                 URL url = new URL(urlString);
                 synchronized (this) {
-                    connection = Utils.openHttpConnection(url);
-                }
-                connection.setConnectTimeout(Main.pref.getInteger("socket.timeout.connect", 15)*1000);
-                try (
-                    InputStream inputStream = connection.getInputStream();
-                    Reader reader = new InputStreamReader(inputStream, StandardCharsets.UTF_8);
-                ) {
+                    connection = HttpClient.create(url).connect();
+                }
+                try (Reader reader = connection.getContentReader()) {
                     InputSource inputSource = new InputSource(reader);
                     NameFinderResultParser parser = new NameFinderResultParser();