Changeset 17506 in josm for trunk/src/org

Timestamp:

2021-02-21T13:42:52+01:00 (3 years ago)

Author:

Don-vip

Message:

fix #20493 - allow to comment changesets directly from JOSM

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/dialogs/changeset/ChangesetDiscussionPanel.java (modified) (1 diff)
• io/OsmApi.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDiscussionPanel.java

@@ -124 +124 @@
             try {
                 OsmApi.getOsmApi().addCommentToChangeset(current, dialog.getInputText(), null);
-            } catch (OsmTransferException e) {
+                actUpdateChangesets.actionPerformed(null);
+            } catch (OsmTransferException | IllegalArgumentException e) {
                 Logging.error(e);
                 JOptionPane.showMessageDialog(
                         MainApplication.getMainFrame(),
-                        ExceptionUtil.explainOsmTransferException(e),
+                        ExceptionUtil.explainException(e),
                         tr("Error"),
                         JOptionPane.ERROR_MESSAGE);

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

@@ -550 +550 @@
         else if (changeset.getId() <= 0)
             throw new IllegalArgumentException(tr("Changeset ID > 0 expected. Got {0}.", changeset.getId()));
-        sendRequest("POST", "changeset/" + changeset.getId() + "/comment",
-                "text=" + Utils.encodeUrl(comment), monitor, "application/x-www-form-urlencoded", true, false);
+        sendRequest("POST", "changeset/" + changeset.getId() + "/comment?text="+ Utils.encodeUrl(comment),
+                null, monitor, "application/x-www-form-urlencoded", true, false);
     }