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

Timestamp:

2021-07-11T04:02:42+02:00 (3 years ago)

Author:

Don-vip

Message:

fix #20969 - fix trimming/synchronization issue in changeset upload comment input field (patch by Bjoeni)

Location:

trunk/src/org/openstreetmap/josm/gui/io

Files:

• BasicUploadSettingsPanel.java (modified) (1 diff)
• ChangesetCommentModel.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java

@@ -411 +411 @@
             if (!(e.getSource() instanceof ChangesetCommentModel)) return;
             String newComment = ((ChangesetCommentModel) e.getSource()).getComment();
-            if (!destination.getText().equals(newComment)) {
+            if (!destination.getText().trim().equals(newComment)) {
                 destination.setText(newComment);
             }

trunk/src/org/openstreetmap/josm/gui/io/ChangesetCommentModel.java

@@ -25 +25 @@
     public void setComment(String comment) {
         String oldValue = this.comment;
-        this.comment = comment == null ? "" : comment;
+        this.comment = comment == null ? "" : comment.trim();
         if (!Objects.equals(oldValue, this.comment)) {
             fireStateChanged();