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

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/plugins/ReadRemotePluginInformationTask.java (modified) (9 diffs)

trunk/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java

@@ -6 +6 @@
 import java.awt.Dimension;
 import java.awt.GridBagLayout;
-import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
 import java.io.File;
@@ -13 +12 @@
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
-import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -42 +39 @@
 import org.openstreetmap.josm.io.OsmTransferException;
 import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.HttpClient;
 import org.openstreetmap.josm.tools.Utils;
 import org.xml.sax.SAXException;
@@ -53 +51 @@
     private Collection<String> sites;
     private boolean canceled;
-    private HttpURLConnection connection;
+    private HttpClient.Response connection;
     private List<PluginInformation> availablePlugins;
     private boolean displayErrMsg;
@@ -153 +151 @@
         }
 
+        String content = null;
         try {
             monitor.beginTask("");
@@ -158 +157 @@
 
             URL url = new URL(site);
-            synchronized (this) {
-                connection = Utils.openHttpConnection(url);
-                connection.setRequestProperty("Cache-Control", "no-cache");
-                connection.setRequestProperty("Accept-Charset", "utf-8");
-            }
-            try (BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream(), StandardCharsets.UTF_8))) {
-                StringBuilder sb = new StringBuilder();
-                String line;
-                while ((line = in.readLine()) != null) {
-                    sb.append(line).append('\n');
-                }
-                return sb.toString();
-            }
+            connection = HttpClient.create(url).useCache(false).connect();
+            content = connection.fetchContent();
+            if (connection.getResponseCode() != 200) {
+                throw new IOException(tr("Unsuccessful HTTP request"));
+            }
+            return content;
         } catch (MalformedURLException e) {
             if (canceled) return null;
@@ -177 +169 @@
         } catch (IOException e) {
             if (canceled) return null;
-            Main.addNetworkError(site, e);
-            handleIOException(monitor, e, tr("Plugin list download error"), tr("JOSM failed to download plugin list:"), displayErrMsg);
+            handleIOException(monitor, e, content);
             return null;
         } finally {
@@ -191 +182 @@
     }
 
-    private void handleIOException(final ProgressMonitor monitor, IOException e, final String title, final String firstMessage,
-            boolean displayMsg) {
-        StringBuilder sb = new StringBuilder();
-        try (InputStream errStream = connection.getErrorStream()) {
-            if (errStream != null) {
-                try (BufferedReader err = new BufferedReader(new InputStreamReader(errStream, StandardCharsets.UTF_8))) {
-                    String line;
-                    while ((line = err.readLine()) != null) {
-                        sb.append(line).append('\n');
-                    }
-                } catch (Exception ex) {
-                    Main.error(e);
-                    Main.error(ex);
-                }
-            }
-        } catch (IOException ex) {
-            Main.warn(ex);
-        }
+    private void handleIOException(final ProgressMonitor monitor, IOException e, String details) {
         final String msg = e.getMessage();
-        final String details = sb.toString();
         if (details.isEmpty()) {
             Main.error(e.getClass().getSimpleName()+": " + msg);
@@ -217 +190 @@
         }
 
-        if (displayMsg) {
-            displayErrorMessage(monitor, msg, details, title, firstMessage);
+        if (displayErrMsg) {
+            displayErrorMessage(monitor, msg, details, tr("Plugin list download error"), tr("JOSM failed to download plugin list:"));
         }
     }