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

Timestamp:

2020-10-19T00:54:46+02:00 (4 years ago)

Author:

Don-vip

Message:

see #17634 - enforce upload policy again (broken after #19381 changes)

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• io/BasicUploadSettingsPanel.java (modified) (3 diffs)
• io/UploadDialog.java (modified) (1 diff)
• io/UploadTextComponentValidator.java (modified) (4 diffs)
• widgets/AbstractTextComponentValidator.java (modified) (9 diffs)

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

@@ -93 +93 @@
         hcbUploadComment.setToolTipText(tr("Enter an upload comment"));
         hcbUploadComment.setMaxTextLength(Changeset.MAX_CHANGESET_TAG_LENGTH);
-        populateHistoryComboBox(hcbUploadComment, HISTORY_KEY, new LinkedList<String>());
+        populateHistoryComboBox(hcbUploadComment, HISTORY_KEY, new LinkedList<>());
         CommentModelListener commentModelListener = new CommentModelListener(hcbUploadComment, changesetCommentModel);
         hcbUploadComment.getEditor().addActionListener(commentModelListener);
@@ -172 +172 @@
      */
     protected void refreshHistoryComboBoxes() {
-        populateHistoryComboBox(hcbUploadComment, HISTORY_KEY, new LinkedList<String>());
+        populateHistoryComboBox(hcbUploadComment, HISTORY_KEY, new LinkedList<>());
         populateHistoryComboBox(hcbUploadSource, SOURCE_HISTORY_KEY, getDefaultSources());
     }
@@ -195 +195 @@
     public static List<String> getDefaultSources() {
         return Arrays.asList("knowledge", "survey", "Bing");
+    }
+
+    /**
+     * Returns the list of {@link UploadTextComponentValidator} defined by this panel.
+     * @return the list of {@code UploadTextComponentValidator} defined by this panel.
+     * @since 17238
+     */
+    protected List<UploadTextComponentValidator> getUploadTextValidators() {
+        return Arrays.asList(areaValidator, uploadCommentValidator, uploadSourceValidator);
     }
 

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

@@ -233 +233 @@
         pnlBasicUploadSettings.setUploadTagDownFocusTraversalHandlers(e -> btnUpload.requestFocusInWindow());
 
+        // Enable/disable the upload button if at least an upload validator rejects upload
+        pnlBasicUploadSettings.getUploadTextValidators().forEach(v -> v.addChangeListener(e -> btnUpload.setEnabled(
+                pnlBasicUploadSettings.getUploadTextValidators().stream().noneMatch(UploadTextComponentValidator::isUploadRejected))));
+
         setMinimumSize(new Dimension(600, 350));
 

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

@@ -22 +22 @@
 abstract class UploadTextComponentValidator extends AbstractTextComponentValidator {
     private final JLabel feedback;
+    protected boolean uploadRejected;
 
     UploadTextComponentValidator(JTextComponent tc, JLabel feedback) {
@@ -60 +61 @@
 
     /**
+     * Determines if the input validator considers the violation bad enough to reject upload.
+     * @return {@code true} if the input validator considers the violation bad enough to reject upload
+     * @since 17238
+     */
+    public final boolean isUploadRejected() {
+        return uploadRejected;
+    }
+
+    /**
      * Validator for the changeset {@code comment} tag
      */
@@ -85 +95 @@
                 String rejection = UploadDialog.UploadAction.validateUploadTag(uploadComment, "upload.comment",
                         Collections.emptyList(), Collections.emptyList(), Collections.emptyList());
-                if (rejection != null) {
+                uploadRejected = rejection != null;
+                if (uploadRejected) {
                     feedbackWarning(tr("Your upload comment is <i>rejected</i>.") + "<br />" + rejection);
                 } else {
@@ -120 +131 @@
                 final String rejection = UploadDialog.UploadAction.validateUploadTag(
                         uploadSource, "upload.source", Collections.emptyList(), Collections.emptyList(), Collections.emptyList());
-                if (rejection != null) {
+                uploadRejected = rejection != null;
+                if (uploadRejected) {
                     feedbackWarning(tr("Your changeset source is <i>rejected</i>.") + "<br />" + rejection);
                 } else {

trunk/src/org/openstreetmap/josm/gui/widgets/AbstractTextComponentValidator.java

@@ -21 +21 @@
 
 import org.openstreetmap.josm.data.preferences.NamedColorProperty;
+import org.openstreetmap.josm.gui.util.ChangeNotifier;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 
@@ -35 +36 @@
  * @since 2688
  */
-public abstract class AbstractTextComponentValidator implements ActionListener, FocusListener, DocumentListener, PropertyChangeListener {
+public abstract class AbstractTextComponentValidator extends ChangeNotifier
+    implements ActionListener, FocusListener, DocumentListener, PropertyChangeListener {
 
     protected static final Color ERROR_COLOR = new NamedColorProperty(marktr("Input validation: error"), Color.RED).get();
@@ -63 +65 @@
         if (hasChanged(msg, Status.INVALID)) {
             // only provide feedback if the validity has changed. This avoids unnecessary UI updates.
-            tc.setBorder(ERROR_BORDER);
-            tc.setBackground(ERROR_BACKGROUND);
-            tc.setToolTipText(msg);
-            this.status = Status.INVALID;
-            this.msg = msg;
+            feedback(ERROR_BORDER, ERROR_BACKGROUND, msg, Status.INVALID, msg);
         }
     }
@@ -74 +72 @@
         if (hasChanged(msg, Status.WARNING)) {
             // only provide feedback if the validity has changed. This avoids unnecessary UI updates.
-            tc.setBorder(WARNING_BORDER);
-            tc.setBackground(WARNING_BACKGROUND);
-            tc.setToolTipText(msg);
-            this.status = Status.WARNING;
-            this.msg = msg;
+            feedback(WARNING_BORDER, WARNING_BACKGROUND, msg, Status.WARNING, msg);
         }
     }
@@ -89 +83 @@
         if (hasChanged(msg, Status.VALID)) {
             // only provide feedback if the validity has changed. This avoids unnecessary UI updates.
-            tc.setBorder(msg == null ? UIManager.getBorder("TextField.border") : VALID_BORDER);
-            tc.setBackground(UIManager.getColor("TextField.background"));
-            tc.setToolTipText(msg == null ? "" : msg);
-            this.status = Status.VALID;
-            this.msg = msg;
+            feedback(msg == null ? UIManager.getBorder("TextField.border") : VALID_BORDER,
+                UIManager.getColor("TextField.background"),
+                msg == null ? "" : msg,
+                Status.VALID,
+                msg);
         }
     }
@@ -99 +93 @@
     private boolean hasChanged(String msg, Status status) {
         return !(Objects.equals(status, this.status) && Objects.equals(msg, this.msg));
+    }
+
+    private void feedback(Border border, Color background, String tooltip, Status status, String msg) {
+        tc.setBorder(border);
+        tc.setBackground(background);
+        tc.setToolTipText(tooltip);
+        this.status = status;
+        this.msg = msg;
+        fireStateChanged();
     }
 
@@ -171 +174 @@
     /* -------------------------------------------------------------------------------- */
     @Override
-    public void focusGained(FocusEvent arg0) {}
-
-    @Override
-    public void focusLost(FocusEvent arg0) {
+    public void focusGained(FocusEvent e) {}
+
+    @Override
+    public void focusLost(FocusEvent e) {
         validate();
     }
@@ -182 +185 @@
     /* -------------------------------------------------------------------------------- */
     @Override
-    public void actionPerformed(ActionEvent arg0) {
+    public void actionPerformed(ActionEvent e) {
         validate();
     }
@@ -190 +193 @@
     /* -------------------------------------------------------------------------------- */
     @Override
-    public void changedUpdate(DocumentEvent arg0) {
-        validate();
-    }
-
-    @Override
-    public void insertUpdate(DocumentEvent arg0) {
-        validate();
-    }
-
-    @Override
-    public void removeUpdate(DocumentEvent arg0) {
+    public void changedUpdate(DocumentEvent e) {
+        validate();
+    }
+
+    @Override
+    public void insertUpdate(DocumentEvent e) {
+        validate();
+    }
+
+    @Override
+    public void removeUpdate(DocumentEvent e) {
         validate();
     }