Changeset 17238 in josm for trunk/src/org/openstreetmap/josm/gui/io/UploadTextComponentValidator.java

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)

File:

• trunk/src/org/openstreetmap/josm/gui/io/UploadTextComponentValidator.java (modified) (4 diffs)

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 {