Changeset 17238 in josm for trunk/src/org/openstreetmap/josm/gui/widgets/AbstractTextComponentValidator.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/widgets/AbstractTextComponentValidator.java (modified) (9 diffs)

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();
     }