Changeset 9171 in josm for trunk/src/org/openstreetmap/josm/gui/io/DownloadFileTask.java

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/gui/io/DownloadFileTask.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/gui/io/DownloadFileTask.java

@@ -11 +11 @@
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -22 +21 @@
 import org.openstreetmap.josm.gui.PleaseWaitDialog;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
-import org.openstreetmap.josm.tools.Utils;
+import org.openstreetmap.josm.tools.HttpClient;
 import org.xml.sax.SAXException;
 
@@ -68 +67 @@
 
     private boolean canceled;
-    private HttpURLConnection downloadConnection;
+    private HttpClient.Response downloadConnection;
 
     private synchronized void closeConnectionIfNeeded() {
@@ -100 +99 @@
 
             URL url = new URL(address);
-            int size;
+            long size;
             synchronized (this) {
-                downloadConnection = Utils.openHttpConnection(url);
-                downloadConnection.setRequestProperty("Cache-Control", "no-cache");
-                downloadConnection.connect();
+                downloadConnection = HttpClient.create(url).useCache(false).connect();
                 size = downloadConnection.getContentLength();
             }
@@ -112 +109 @@
 
             try (
-                InputStream in = downloadConnection.getInputStream();
+                InputStream in = downloadConnection.getContent();
                 OutputStream out = new FileOutputStream(file)
             ) {
                 byte[] buffer = new byte[32768];
                 int count = 0;
-                int p1 = 0, p2 = 0;
+                long p1 = 0, p2 = 0;
                 for (int read = in.read(buffer); read != -1; read = in.read(buffer)) {
                     out.write(buffer, 0, read);
@@ -124 +121 @@
                     p2 = 100 * count / size;
                     if (p2 != p1) {
-                        progressMonitor.setTicks(p2);
+                        progressMonitor.setTicks((int) p2);
                         p1 = p2;
                     }