Changeset 31912 in osm for applications/editors/josm/plugins/DirectUpload/src

Timestamp:

2016-01-02T20:33:42+01:00 (9 years ago)

Author:

simon04

Message:

JOSM/DirectUpload: fix ProgressMonitor usage - see #josm12273

File:

• applications/editors/josm/plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java (modified) (2 diffs)

applications/editors/josm/plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java

@@ -222 +222 @@
             tags = tags.replaceAll("[&?/\\\\.;]", " ");
 
-            // Set progress dialog to indeterminate while connecting
-            progressMonitor.indeterminateSubTask(tr("Connecting..."));
-
             // Generate data for upload
             ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -235 +232 @@
             HttpClient conn = setupConnection(baos.size());
 
-            progressMonitor.setTicksCount(baos.size());
-            progressMonitor.subTask(null);
-
             // FIXME previous method allowed to see real % progress (each 10 Kb of data)
             //flushToServer(bais, conn.getOutputStream(), progressMonitor);
-            Response response = conn.setRequestBody(baos.toByteArray()).connect(progressMonitor);
+            Response response = conn.setRequestBody(baos.toByteArray()).connect(progressMonitor.createSubTaskMonitor(1, false));
 
             if (canceled) {