Changeset 16696 in josm

Timestamp:

2020-06-21T14:08:23+02:00 (4 years ago)

Author:

simon04

Message:

see #19381 - Upload dialog: (re)validate when showing the dialog

File:

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

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

@@ -35 +35 @@
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.io.UploadTextComponentValidator.UploadAreaValidator;
+import org.openstreetmap.josm.gui.io.UploadTextComponentValidator.UploadCommentValidator;
+import org.openstreetmap.josm.gui.io.UploadTextComponentValidator.UploadSourceValidator;
 import org.openstreetmap.josm.gui.widgets.HistoryComboBox;
 import org.openstreetmap.josm.gui.widgets.JMultilineLabel;
@@ -78 +80 @@
     private final transient ChangesetCommentModel changesetSourceModel;
     private final transient ChangesetReviewModel changesetReviewModel;
+    private final transient JLabel uploadCommentFeedback = new JLabel();
+    private final transient UploadCommentValidator uploadCommentValidator = new UploadCommentValidator(
+            hcbUploadComment.getEditorComponent(), uploadCommentFeedback);
+    private final transient JLabel hcbUploadSourceFeedback = new JLabel();
+    private final transient UploadSourceValidator uploadSourceValidator = new UploadSourceValidator(
+            hcbUploadSource.getEditorComponent(), hcbUploadSourceFeedback);
 
     protected JPanel buildUploadCommentPanel() {
@@ -90 +98 @@
         hcbUploadComment.getEditorComponent().addFocusListener(commentModelListener);
         pnl.add(hcbUploadComment, GBC.eol().fill(GBC.HORIZONTAL));
-        JLabel hcbUploadCommentFeedback = new JLabel();
-        pnl.add(hcbUploadCommentFeedback, GBC.eol().insets(0, 3, 0, 0).fill(GBC.HORIZONTAL));
-        new UploadTextComponentValidator.UploadCommentValidator(hcbUploadComment.getEditorComponent(), hcbUploadCommentFeedback);
+        pnl.add(uploadCommentFeedback, GBC.eol().insets(0, 3, 0, 0).fill(GBC.HORIZONTAL));
         return pnl;
     }
@@ -129 +135 @@
         hcbUploadSource.getEditorComponent().addFocusListener(sourceModelListener);
         pnl.add(hcbUploadSource, GBC.eol().fill(GBC.HORIZONTAL));
-        JLabel hcbUploadSourceFeedback = new JLabel();
         pnl.add(hcbUploadSourceFeedback, GBC.eol().insets(0, 3, 0, 0).fill(GBC.HORIZONTAL));
-        new UploadTextComponentValidator.UploadSourceValidator(hcbUploadSource.getEditorComponent(), hcbUploadSourceFeedback);
         if (obtainSourceAutomatically.isSelected()) {
             automaticallyAddSource();
@@ -264 +268 @@
         hcbUploadComment.requestFocusInWindow();
         hcbUploadComment.getEditorComponent().requestFocusInWindow();
+        uploadCommentValidator.validate();
+        uploadSourceValidator.validate();
     }