Index: /trunk/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java	(revision 16695)
+++ /trunk/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java	(revision 16696)
@@ -35,4 +35,6 @@
 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,4 +80,10 @@
     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,7 +98,5 @@
         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,7 +135,5 @@
         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,4 +268,6 @@
         hcbUploadComment.requestFocusInWindow();
         hcbUploadComment.getEditorComponent().requestFocusInWindow();
+        uploadCommentValidator.validate();
+        uploadSourceValidator.validate();
     }