Changeset 17894 in josm for trunk/src/org

Timestamp:

2021-05-15T21:12:23+02:00 (4 years ago)

Author:

simon04

Message:

see #20690 - Upload dialog: add DocumentListener for changeset comments as an attempt to fix comments off-by-one error

File:

• trunk/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java (modified) (5 diffs)

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

@@ -28 +28 @@
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
 import javax.swing.event.HyperlinkEvent;
 
@@ -96 +98 @@
         hcbUploadComment.getEditor().addActionListener(commentModelListener);
         hcbUploadComment.getEditorComponent().addFocusListener(commentModelListener);
+        hcbUploadComment.getEditorComponent().getDocument().addDocumentListener(commentModelListener);
         pnl.add(hcbUploadComment, GBC.eol().fill(GBC.HORIZONTAL));
         pnl.add(uploadCommentFeedback, GBC.eol().insets(0, 3, 0, 0).fill(GBC.HORIZONTAL));
@@ -133 +136 @@
         hcbUploadSource.getEditor().addActionListener(sourceModelListener);
         hcbUploadSource.getEditorComponent().addFocusListener(sourceModelListener);
+        hcbUploadSource.getEditorComponent().getDocument().addDocumentListener(sourceModelListener);
         pnl.add(hcbUploadSource, GBC.eol().fill(GBC.HORIZONTAL));
         pnl.add(hcbUploadSourceFeedback, GBC.eol().insets(0, 3, 0, 0).fill(GBC.HORIZONTAL));
@@ -350 +354 @@
      * Updates the changeset comment model upon changes in the input field.
      */
-    static class CommentModelListener extends FocusAdapter implements ActionListener {
+    static class CommentModelListener extends FocusAdapter implements ActionListener, DocumentListener {
 
         private final HistoryComboBox source;
@@ -360 +364 @@
         }
 
+        private void setComment() {
+            destination.setComment(source.getText());
+        }
+
         @Override
         public void actionPerformed(ActionEvent e) {
-            destination.setComment(source.getText());
+            setComment();
         }
 
         @Override
         public void focusLost(FocusEvent e) {
-            destination.setComment(source.getText());
+            setComment();
+        }
+
+        @Override
+        public void insertUpdate(DocumentEvent e) {
+            setComment();
+        }
+
+        @Override
+        public void removeUpdate(DocumentEvent e) {
+            setComment();
+        }
+
+        @Override
+        public void changedUpdate(DocumentEvent e) {
+            setComment();
         }
     }