Changeset 18283 in josm for trunk/src/org/openstreetmap/josm/io

Timestamp:

2021-10-17T15:17:42+02:00 (3 years ago)

Author:

Don-vip

Message:

fix #21427 - further simplify UploadDialog (patch by marcello, modified)

• The dialog was simplified by combining the function of two radiobuttons and one combobox into one combobox.
• When an open changeset was selected on tab 2, existing tags on the open changeset could overwrite the data the user entered on tab 1. The user might spot this by looking closely at the tag table on tab 2, but then he may not. This non-obvious behaviour was removed.
• The exception thrown when closing an already closed changeset was fixed.
• More cosmetic changes to the dialog.
• Maybe also a solution to #19319, #21387 (added revalidate()).

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• ChangesetClosedException.java (modified) (3 diffs)
• OsmApi.java (modified) (5 diffs)
• UploadStrategySpecification.java (modified) (1 diff)

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

@@ -31 +31 @@
     public static final String ERROR_HEADER_PATTERN = "The changeset (\\d+) was closed at (.*)";
 
+    /**
+     * Identifies when the changeset exception occurred.
+     */
     public enum Source {
         /**
@@ -43 +46 @@
          */
         UPLOAD_DATA,
+        /**
+         * The exception was thrown when we tried to close a changeset.  Probably the changeset
+         * already timed out on the server.
+         * @since 18283
+         */
+        CLOSE_CHANGESET,
         /**
          * Unspecified source
@@ -163 +172 @@
     }
 
+    /**
+     * Sets the source where the exception was thrown
+     *
+     * @param source the source where the exception was thrown
+     */
     public void setSource(Source source) {
         this.source = source == null ? Source.UNSPECIFIED : source;

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

@@ -388 +388 @@
                 }
             }
+        } catch (ChangesetClosedException e) {
+            e.setSource(ChangesetClosedException.Source.UPDATE_CHANGESET);
+            throw e;
         } catch (NumberFormatException e) {
             throw new OsmTransferException(errHandler.apply(ret), e);
@@ -529 +532 @@
             // send "\r\n" instead of empty string, so we don't send zero payload - workaround bugs in proxy software
             sendPutRequest("changeset/" + changeset.getId() + "/close", "\r\n", monitor);
+        } catch (ChangesetClosedException e) {
+            e.setSource(ChangesetClosedException.Source.CLOSE_CHANGESET);
+            throw e;
+        } finally {
             changeset.setOpen(false);
-        } finally {
             monitor.finishTask();
         }
@@ -565 +571 @@
             throws OsmTransferException {
         try {
+            ensureValidChangeset();
             monitor.beginTask("", list.size() * 2);
-            if (changeset == null)
-                throw new OsmTransferException(tr("No changeset present for diff upload."));
 
             initialize(monitor);
@@ -594 +599 @@
                     monitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false)
             );
-        } catch (OsmTransferException e) {
+        } catch (ChangesetClosedException e) {
+            e.setSource(ChangesetClosedException.Source.UPLOAD_DATA);
             throw e;
         } catch (XmlParsingException e) {
@@ -752 +758 @@
                 case HttpURLConnection.HTTP_CONFLICT:
                     if (ChangesetClosedException.errorHeaderMatchesPattern(errorHeader))
-                        throw new ChangesetClosedException(errorBody, ChangesetClosedException.Source.UPLOAD_DATA);
+                        throw new ChangesetClosedException(errorBody, ChangesetClosedException.Source.UNSPECIFIED);
                     else
                         throw new OsmApiException(retCode, errorHeader, errorBody);

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

@@ -151 +151 @@
 
     @Override
+    public String toString() {
+        return String.format("Strategy: %s, ChunkSize: %d, Policy: %s, Close after: %b",
+            strategy.toString(), chunkSize, policy == null ? "none" : policy.toString(), closeChangesetAfterUpload);
+    }
+
+    @Override
     public int hashCode() {
         return Objects.hash(strategy, chunkSize, policy, closeChangesetAfterUpload);