Reverted #5785 in 6.4, applying to 6.5 instead

svn changeset:15593/svn branch:6.4

diff --git a/WebContent/release-notes.html b/WebContent/release-notes.html
index 4616ace9ec7e3ee2dbe196ce245dc6df3267f6ea..37abcdddb6a4d0e4b247ae5dba116a6ca94d5ffe 100644 (file)
--- a/WebContent/release-notes.html
+++ b/WebContent/release-notes.html
@@ -37,8 +37,6 @@
 
 <p>Vaadin @version@ is a maintenance release for Vaadin 6.4. It contains several important fixes.</p>
 
-<p>A minor change in behavior is introduced by the fix for #5785: AbstractStringValidator and its subclasses now convert non-String values to Strings using toString() instead of failing immediately.</p>
-
 <p>Please see the <a href="http://dev.vaadin.com/query?status=closed&resolution=fixed&order=id&milestone=Vaadin+@version@&type=!task">list of fixed issues in Vaadin @version@</a>
 for more details. Problem fixes and enhancements planned for upcoming
 releases can be found from the <a

diff --git a/src/com/vaadin/data/validator/AbstractStringValidator.java b/src/com/vaadin/data/validator/AbstractStringValidator.java
index 90778e16b1811ee48313aa7ac844a16e78298942..359d83ef1091683e8228c1d5dc6620ef4b2d50a3 100644 (file)
--- a/src/com/vaadin/data/validator/AbstractStringValidator.java
+++ b/src/com/vaadin/data/validator/AbstractStringValidator.java
@@ -42,21 +42,20 @@ public abstract class AbstractStringValidator extends AbstractValidator {
      * Tests if the given value is a valid string.
      * <p>
      * Null values are always accepted. Values that are not {@link String}s are
-     * converted using {@link #toString()}. Then {@link #isValidString(String)}
-     * is used to validate the value.
+     * always rejected. Uses {@link #isValidString(String)} to validate the
+     * value.
      * </p>
      * 
      * @param value
      *            the value to check
-     * @return true if the value (or its toString()) is a valid string, false
-     *         otherwise
+     * @return true if the value is a valid string, false otherwise
      */
     public boolean isValid(Object value) {
         if (value == null) {
             return true;
         }
         if (!(value instanceof String)) {
-            value = String.valueOf(value);
+            return false;
         }
         return isValidString((String) value);
     }

diff --git a/tests/src/com/vaadin/tests/validation/TestReadOnlyValidation.java b/tests/src/com/vaadin/tests/validation/TestReadOnlyValidation.java
deleted file mode 100644 (file)
index 2765bf6..0000000
--- a/tests/src/com/vaadin/tests/validation/TestReadOnlyValidation.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.vaadin.tests.validation;\r
-\r
-import org.junit.Test;\r
-\r
-import com.vaadin.data.validator.IntegerValidator;\r
-import com.vaadin.ui.TextField;\r
-\r
-public class TestReadOnlyValidation {\r
-\r
-    @Test\r
-    public void testIntegerValidation() {\r
-        TextField field = new TextField();\r
-        field.addValidator(new IntegerValidator("Enter a Valid Number"));\r
-        field.setValue(Integer.valueOf(10));\r
-        field.validate();\r
-    }\r
-}\r