Changeset 9185 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2015-12-28T01:42:36+01:00 (9 years ago)

Author:

simon04

Message:

see #12231 - HttpClient now reports status to ProgressMonitor

File:

• trunk/src/org/openstreetmap/josm/tools/HttpClient.java (modified) (8 diffs)

trunk/src/org/openstreetmap/josm/tools/HttpClient.java

@@ -22 +22 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Version;
+import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.io.Compression;
+import org.openstreetmap.josm.io.ProgressInputStream;
+import org.openstreetmap.josm.io.ProgressOutputStream;
 import org.openstreetmap.josm.io.UTFInputStreamReader;
 
@@ -61 +64 @@
     /**
      * Opens the HTTP connection.
-     * @param monitor progress monitor
+     * @param progressMonitor progress monitor
      * @return HTTP response
      * @throws IOException if any I/O error occurs
      * @since 9179
      */
-    public Response connect(ProgressMonitor monitor) throws IOException {
+    public Response connect(ProgressMonitor progressMonitor) throws IOException {
+        if (progressMonitor == null) {
+            progressMonitor = NullProgressMonitor.INSTANCE;
+        }
         final HttpURLConnection connection = (HttpURLConnection) url.openConnection();
         connection.setRequestMethod(requestMethod);
@@ -89 +95 @@
         }
 
-        // FIXME: use ProgressMonitor
+        progressMonitor.beginTask(tr("Contacting Server..."), 1);
+        progressMonitor.indeterminateSubTask(null);
 
         if ("PUT".equals(requestMethod) || "POST".equals(requestMethod) || "DELETE".equals(requestMethod)) {
@@ -95 +102 @@
             headers.put("Content-Length", String.valueOf(requestBody.length));
             connection.setDoOutput(true);
-            try (OutputStream out = new BufferedOutputStream(connection.getOutputStream())) {
+            try (OutputStream out = new BufferedOutputStream(
+                    new ProgressOutputStream(connection.getOutputStream(), requestBody.length, progressMonitor))) {
                 out.write(requestBody);
             }
@@ -137 +145 @@
                 }
             }
-            Response response = new Response(connection);
+            Response response = new Response(connection, progressMonitor);
             successfulConnection = true;
             return response;
@@ -152 +160 @@
     public static final class Response {
         private final HttpURLConnection connection;
+        private final ProgressMonitor monitor;
         private final int responseCode;
         private final String responseMessage;
@@ -157 +166 @@
         private boolean uncompressAccordingToContentDisposition;
 
-        private Response(HttpURLConnection connection) throws IOException {
+        private Response(HttpURLConnection connection, ProgressMonitor monitor) throws IOException {
             CheckParameterUtil.ensureParameterNotNull(connection, "connection");
+            CheckParameterUtil.ensureParameterNotNull(monitor, "monitor");
             this.connection = connection;
+            this.monitor = monitor;
             this.responseCode = connection.getResponseCode();
             this.responseMessage = connection.getResponseMessage();
@@ -227 +238 @@
                 in = connection.getErrorStream();
             }
+            in = new ProgressInputStream(in, getContentLength(), monitor);
             in = "gzip".equalsIgnoreCase(getContentEncoding()) ? new GZIPInputStream(in) : in;
             Compression compression = Compression.NONE;