Changeset 5226 in josm for trunk/src/org/openstreetmap/josm/gui/widgets/AbstractTextComponentValidator.java

Timestamp:

2012-05-09T21:29:17+02:00 (12 years ago)

Author:

bastiK

Message:

improvements for custom projection

File:

• trunk/src/org/openstreetmap/josm/gui/widgets/AbstractTextComponentValidator.java (modified) (6 diffs)

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

@@ -19 +19 @@
 
 import org.openstreetmap.josm.tools.CheckParameterUtil;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -41 +42 @@
      */
     private Boolean valid = null;
+    // remember the message
+    private String msg;
 
     protected void feedbackInvalid(String msg) {
-        if (valid == null || valid) {
+        if (valid == null || valid || !Utils.equal(msg, this.msg)) {
             // only provide feedback if the validity has changed. This avoids
             // unnecessary UI updates.
@@ -50 +53 @@
             tc.setToolTipText(msg);
             valid = false;
+            this.msg = msg;
         }
     }
@@ -58 +62 @@
 
     protected void feedbackValid(String msg) {
-        if (valid == null || !valid) {
+        if (valid == null || !valid || !Utils.equal(msg, this.msg)) {
             // only provide feedback if the validity has changed. This avoids
             // unnecessary UI updates.
@@ -65 +69 @@
             tc.setToolTipText(msg == null ? "" : msg);
             valid = true;
+            this.msg = msg;
         }
     }
@@ -92 +97 @@
      */
     public AbstractTextComponentValidator(JTextComponent tc, boolean addActionListener) throws IllegalArgumentException {
+        this(tc, true, true, addActionListener);
+    }
+
+    public AbstractTextComponentValidator(JTextComponent tc, boolean addFocusListener, boolean addDocumentListener, boolean addActionListener) throws IllegalArgumentException {
         CheckParameterUtil.ensureParameterNotNull(tc, "tc");
         this.tc = tc;
-        tc.addFocusListener(this);
-        tc.getDocument().addDocumentListener(this);
+        if (addFocusListener) {
+            tc.addFocusListener(this);
+        }
+        if (addDocumentListener) {
+            tc.getDocument().addDocumentListener(this);
+        }
         if (addActionListener) {
             if (tc instanceof JTextField) {