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

Timestamp:

2017-09-01T23:55:45+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15141, see #15167 - use correct message ("Downloading data" instead of "Uploading data") when downloading data from Overpass API / POST

Location:

trunk/src/org/openstreetmap/josm

Files:

• io/OsmServerReader.java (modified) (1 diff)
• io/ProgressOutputStream.java (modified) (1 diff)
• tools/HttpClient.java (modified) (3 diffs)

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

@@ -174 +174 @@
                     .setFinishOnCloseOutput(false)
                     .setReasonForRequest(reason)
+                    .setOutputMessage(tr("Downloading data..."))
                     .setRequestBody(requestBody);
             activeConnection = client;

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

@@ -31 +31 @@
      */
     public ProgressOutputStream(OutputStream out, long size, ProgressMonitor progressMonitor, boolean finishOnClose) {
+        this(out, size, progressMonitor, tr("Uploading data ..."), finishOnClose);
+    }
+
+    /**
+     * Constructs a new {@code ProgressOutputStream}.
+     *
+     * @param out the stream to monitor
+     * @param size the total size which will be sent
+     * @param progressMonitor the monitor to report to
+     * @param message the message that will be displayed by the inner {@link StreamProgressUpdater}
+     * @param finishOnClose whether to call {@link ProgressMonitor#finishTask} when this stream is closed
+     * @since 12711
+     */
+    public ProgressOutputStream(OutputStream out, long size, ProgressMonitor progressMonitor, String message, boolean finishOnClose) {
         this.updater = new StreamProgressUpdater(size,
-                progressMonitor != null ? progressMonitor : NullProgressMonitor.INSTANCE, tr("Uploading data ..."));
+                progressMonitor != null ? progressMonitor : NullProgressMonitor.INSTANCE, message);
         this.out = out;
         this.finishOnClose = finishOnClose;

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

@@ -53 +53 @@
     private boolean useCache;
     private String reasonForRequest;
+    private String outputMessage = tr("Uploading data ...");
     private HttpURLConnection connection; // to allow disconnecting before `response` is set
     private Response response;
@@ -115 +116 @@
             connection.setDoOutput(true);
             try (OutputStream out = new BufferedOutputStream(
-                    new ProgressOutputStream(connection.getOutputStream(), requestBody.length, progressMonitor, finishOnCloseOutput))) {
+                    new ProgressOutputStream(connection.getOutputStream(), requestBody.length,
+                            progressMonitor, outputMessage, finishOnCloseOutput))) {
                 out.write(requestBody);
             }
@@ -622 +624 @@
 
     /**
+     * Sets the output message to be displayed in progress monitor for {@code PUT}, {@code POST} and {@code DELETE} methods.
+     * Defaults to "Uploading data ..." (translated). Has no effect for {@code GET} or any other method.
+     * @param outputMessage message to be displayed in progress monitor
+     * @return {@code this}
+     * @since 12711
+     */
+    public HttpClient setOutputMessage(String outputMessage) {
+        this.outputMessage = outputMessage;
+        return this;
+    }
+
+    /**
      * Sets whether the progress monitor task will be finished when the output stream is closed. This is {@code true} by default.
      * @param finishOnCloseOutput whether the progress monitor task will be finished when the output stream is closed