Changeset 9171 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/properties

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/gui/dialogs/properties/PropertiesDialog.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

@@ -16 +16 @@
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
-import java.net.HttpURLConnection;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -101 +100 @@
 import org.openstreetmap.josm.tools.AlphanumComparator;
 import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.HttpClient;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.InputMapUtils;
@@ -1171 +1171 @@
                         try {
                             // find a page that actually exists in the wiki
-                            HttpURLConnection conn;
+                            HttpClient.Response conn;
                             for (URI u : uris) {
-                                conn = Utils.openHttpConnection(u.toURL());
-                                conn.setConnectTimeout(Main.pref.getInteger("socket.timeout.connect", 15)*1000);
+                                conn = HttpClient.create(u.toURL(), "HEAD").connect();
 
                                 if (conn.getResponseCode() != 200) {
-                                    Main.info("{0} does not exist", u);
                                     conn.disconnect();
                                 } else {
-                                    int osize = conn.getContentLength();
+                                    long osize = conn.getContentLength();
                                     if (osize > -1) {
                                         conn.disconnect();
 
-                                        conn = Utils.openHttpConnection(new URI(u.toString()
+                                        final URI newURI = new URI(u.toString()
                                                 .replace("=", "%3D") /* do not URLencode whole string! */
                                                 .replaceFirst("/wiki/", "/w/index.php?redirect=no&title=")
-                                                ).toURL());
-                                        conn.setConnectTimeout(Main.pref.getInteger("socket.timeout.connect", 15)*1000);
+                                        );
+                                        conn = HttpClient.create(newURI.toURL(), "HEAD").connect();
                                     }
 
@@ -1199 +1197 @@
                                         conn.disconnect();
                                     } else {
-                                        Main.info("browsing to {0}", u);
                                         conn.disconnect();