Changeset 10160 in josm for trunk/src/org/openstreetmap

Timestamp:

2016-04-27T12:47:30+02:00 (9 years ago)

Author:

bastiK

Message:

partial revert of [9529] (fixes #12583)

possibly breaking tests

Location:

trunk/src/org/openstreetmap/josm

Files:

• io/StreamProgressUpdater.java (modified) (1 diff)
• tools/HttpClient.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/io/StreamProgressUpdater.java

@@ -27 +27 @@
 
     private void initProgressMonitor() {
-        progressMonitor.beginTask(taskTitle);
         if (size > 0) {
+            progressMonitor.beginTask(taskTitle);
             progressMonitor.setTicksCount((int) size);
         } else {

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

@@ -110 +110 @@
             connection.setFixedLengthStreamingMode(requestBody.length);
             connection.setDoOutput(true);
-            final ProgressMonitor subTaskMonitor = progressMonitor.createSubTaskMonitor(1, false);
             try (OutputStream out = new BufferedOutputStream(
-                    new ProgressOutputStream(connection.getOutputStream(), requestBody.length, subTaskMonitor))) {
+                    new ProgressOutputStream(connection.getOutputStream(), requestBody.length, progressMonitor))) {
                 out.write(requestBody);
             }
@@ -264 +263 @@
                 in = connection.getErrorStream();
             }
-            monitor.subTask(tr("Fetching content..."));
             if (in != null) {
-                in = new ProgressInputStream(in, getContentLength(), monitor.createSubTaskMonitor(1, false));
+                in = new ProgressInputStream(in, getContentLength(), monitor);
                 in = "gzip".equalsIgnoreCase(getContentEncoding()) ? new GZIPInputStream(in) : in;
                 Compression compression = Compression.NONE;