Move Validator and Validatable into legacy package.

Change-Id: I7f8e9b1f7dff40ca76933cdf1978e3749f390142

diff --git a/server/src/main/java/com/vaadin/data/Buffered.java b/server/src/main/java/com/vaadin/data/Buffered.java
index 469f9987a43f9214f60eb3e5ced5139e822f7357..4f34da5c7c6b1c412b31485ebf4b0ba4fc7a9729 100644 (file)
--- a/server/src/main/java/com/vaadin/data/Buffered.java
+++ b/server/src/main/java/com/vaadin/data/Buffered.java
@@ -18,7 +18,7 @@ package com.vaadin.data;
 
 import java.io.Serializable;
 
-import com.vaadin.data.Validator.InvalidValueException;
+import com.vaadin.legacy.data.Validator.InvalidValueException;
 
 /**
  * <p>

diff --git a/server/src/main/java/com/vaadin/data/BufferedValidatable.java b/server/src/main/java/com/vaadin/data/BufferedValidatable.java
index 6f9d952d2f43bfd4e11b617295ae60fbf20f7534..584f196a0cd5e93cdc94abbd1b1d97fb65183176 100644 (file)
--- a/server/src/main/java/com/vaadin/data/BufferedValidatable.java
+++ b/server/src/main/java/com/vaadin/data/BufferedValidatable.java
@@ -18,6 +18,8 @@ package com.vaadin.data;
 
 import java.io.Serializable;
 
+import com.vaadin.legacy.data.Validatable;
+
 /**
  * <p>
  * This interface defines the combination of <code>Validatable</code> and

diff --git a/server/src/main/java/com/vaadin/data/Validatable.java b/server/src/main/java/com/vaadin/data/Validatable.java
deleted file mode 100644 (file)
index 1ae7cd8..0000000
--- a/server/src/main/java/com/vaadin/data/Validatable.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Copyright 2000-2014 Vaadin Ltd.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.vaadin.data;
-
-import java.io.Serializable;
-import java.util.Collection;
-
-/**
- * <p>
- * Interface for validatable objects. Defines methods to verify if the object's
- * value is valid or not, and to add, remove and list registered validators of
- * the object.
- * </p>
- * 
- * @author Vaadin Ltd.
- * @since 3.0
- * @see com.vaadin.data.Validator
- */
-public interface Validatable extends Serializable {
-
-    /**
-     * <p>
-     * Adds a new validator for this object. The validator's
-     * {@link Validator#validate(Object)} method is activated every time the
-     * object's value needs to be verified, that is, when the {@link #isValid()}
-     * method is called. This usually happens when the object's value changes.
-     * </p>
-     * 
-     * @param validator
-     *            the new validator
-     */
-    void addValidator(Validator validator);
-
-    /**
-     * <p>
-     * Removes a previously registered validator from the object. The specified
-     * validator is removed from the object and its <code>validate</code> method
-     * is no longer called in {@link #isValid()}.
-     * </p>
-     * 
-     * @param validator
-     *            the validator to remove
-     */
-    void removeValidator(Validator validator);
-
-    /**
-     * Removes all validators from this object, as if
-     * {@link #removeValidator(Validator) removeValidator} was called for each
-     * registered validator.
-     */
-    void removeAllValidators();
-
-    /**
-     * <p>
-     * Returns a collection of all validators currently registered for the
-     * object. The collection may be immutable. Calling
-     * <code>removeValidator</code> for this Validatable while iterating over
-     * the collection may be unsafe (e.g. may throw
-     * <code>ConcurrentModificationException</code>.)
-     * </p>
-     * 
-     * @return A collection of validators
-     */
-    public Collection<Validator> getValidators();
-
-    /**
-     * <p>
-     * Tests the current value of the object against all registered validators.
-     * The registered validators are iterated and for each the
-     * {@link Validator#validate(Object)} method is called. If any validator
-     * throws the {@link Validator.InvalidValueException} this method returns
-     * <code>false</code>.
-     * </p>
-     * 
-     * @return <code>true</code> if the registered validators concur that the
-     *         value is valid, <code>false</code> otherwise
-     */
-    public boolean isValid();
-
-    /**
-     * <p>
-     * Checks the validity of the validatable. If the validatable is valid this
-     * method should do nothing, and if it's not valid, it should throw
-     * <code>Validator.InvalidValueException</code>
-     * </p>
-     * 
-     * @throws Validator.InvalidValueException
-     *             if the value is not valid
-     */
-    public void validate() throws Validator.InvalidValueException;
-
-    /**
-     * <p>
-     * Checks the validabtable object accept invalid values.The default value is
-     * <code>true</code>.
-     * </p>
-     * 
-     */
-    public boolean isInvalidAllowed();
-
-    /**
-     * <p>
-     * Should the validabtable object accept invalid values. Supporting this
-     * configuration possibility is optional. By default invalid values are
-     * allowed.
-     * </p>
-     * 
-     * @param invalidValueAllowed
-     * 
-     * @throws UnsupportedOperationException
-     *             if the setInvalidAllowed is not supported.
-     */
-    public void setInvalidAllowed(boolean invalidValueAllowed)
-            throws UnsupportedOperationException;
-
-}

diff --git a/server/src/main/java/com/vaadin/data/Validator.java b/server/src/main/java/com/vaadin/data/Validator.java
deleted file mode 100644 (file)
index d567267..0000000
--- a/server/src/main/java/com/vaadin/data/Validator.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- * Copyright 2000-2014 Vaadin Ltd.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.vaadin.data;
-
-import java.io.Serializable;
-
-import com.vaadin.server.VaadinServlet;
-
-/**
- * Interface that implements a method for validating if an {@link Object} is
- * valid or not.
- * <p>
- * Implementors of this class can be added to any
- * {@link com.vaadin.data.Validatable Validatable} implementor to verify its
- * value.
- * </p>
- * <p>
- * {@link #validate(Object)} can be used to check if a value is valid. An
- * {@link InvalidValueException} with an appropriate validation error message is
- * thrown if the value is not valid.
- * </p>
- * <p>
- * Validators must not have any side effects.
- * </p>
- * <p>
- * Since Vaadin 7, the method isValid(Object) does not exist in the interface -
- * {@link #validate(Object)} should be used instead, and the exception caught
- * where applicable. Concrete classes implementing {@link Validator} can still
- * internally implement and use isValid(Object) for convenience or to ease
- * migration from earlier Vaadin versions.
- * </p>
- * 
- * @author Vaadin Ltd.
- * @since 3.0
- */
-public interface Validator extends Serializable {
-
-    /**
-     * Checks the given value against this validator. If the value is valid the
-     * method does nothing. If the value is invalid, an
-     * {@link InvalidValueException} is thrown.
-     * 
-     * @param value
-     *            the value to check
-     * @throws Validator.InvalidValueException
-     *             if the value is invalid
-     */
-    public void validate(Object value) throws Validator.InvalidValueException;
-
-    /**
-     * Exception that is thrown by a {@link Validator} when a value is invalid.
-     * 
-     * <p>
-     * The default implementation of InvalidValueException does not support HTML
-     * in error messages. To enable HTML support, override
-     * {@link #getHtmlMessage()} and use the subclass in validators.
-     * </p>
-     * 
-     * @author Vaadin Ltd.
-     * @since 3.0
-     */
-    @SuppressWarnings("serial")
-    public class InvalidValueException extends RuntimeException {
-
-        /**
-         * Array of one or more validation errors that are causing this
-         * validation error.
-         */
-        private InvalidValueException[] causes = null;
-
-        /**
-         * Constructs a new {@code InvalidValueException} with the specified
-         * message.
-         * 
-         * @param message
-         *            The detail message of the problem.
-         */
-        public InvalidValueException(String message) {
-            this(message, new InvalidValueException[] {});
-        }
-
-        /**
-         * Constructs a new {@code InvalidValueException} with a set of causing
-         * validation exceptions. The causing validation exceptions are included
-         * when the exception is painted to the client.
-         * 
-         * @param message
-         *            The detail message of the problem.
-         * @param causes
-         *            One or more {@code InvalidValueException}s that caused
-         *            this exception.
-         */
-        public InvalidValueException(String message,
-                InvalidValueException... causes) {
-            super(message);
-            if (causes == null) {
-                throw new NullPointerException(
-                        "Possible causes array must not be null");
-            }
-
-            this.causes = causes;
-        }
-
-        /**
-         * Check if the error message should be hidden.
-         * 
-         * An empty (null or "") message is invisible unless it contains nested
-         * exceptions that are visible.
-         * 
-         * @return true if the error message should be hidden, false otherwise
-         */
-        public boolean isInvisible() {
-            String msg = getMessage();
-            if (msg != null && msg.length() > 0) {
-                return false;
-            }
-            if (causes != null) {
-                for (int i = 0; i < causes.length; i++) {
-                    if (!causes[i].isInvisible()) {
-                        return false;
-                    }
-                }
-            }
-            return true;
-        }
-
-        /**
-         * Returns the message of the error in HTML.
-         * 
-         * Note that this API may change in future versions.
-         */
-        public String getHtmlMessage() {
-            return VaadinServlet.safeEscapeForHtml(getLocalizedMessage());
-        }
-
-        /**
-         * Returns the {@code InvalidValueExceptions} that caused this
-         * exception.
-         * 
-         * @return An array containing the {@code InvalidValueExceptions} that
-         *         caused this exception. Returns an empty array if this
-         *         exception was not caused by other exceptions.
-         */
-        public InvalidValueException[] getCauses() {
-            return causes;
-        }
-
-    }
-
-    /**
-     * A specific type of {@link InvalidValueException} that indicates that
-     * validation failed because the value was empty. What empty means is up to
-     * the thrower.
-     * 
-     * @author Vaadin Ltd.
-     * @since 5.3.0
-     */
-    @SuppressWarnings("serial")
-    public class EmptyValueException extends Validator.InvalidValueException {
-
-        public EmptyValueException(String message) {
-            super(message);
-        }
-
-    }
-}

diff --git a/server/src/main/java/com/vaadin/data/fieldgroup/FieldGroup.java b/server/src/main/java/com/vaadin/data/fieldgroup/FieldGroup.java
index 9c926637ef6170093df177bece9dbb06f99a2f87..acf35f154e1aeb3ff8ed15511191e31f60beab0b 100644 (file)
--- a/server/src/main/java/com/vaadin/data/fieldgroup/FieldGroup.java
+++ b/server/src/main/java/com/vaadin/data/fieldgroup/FieldGroup.java
@@ -27,9 +27,9 @@ import java.util.Map;
 
 import com.vaadin.data.Item;
 import com.vaadin.data.Property;
-import com.vaadin.data.Validator.InvalidValueException;
 import com.vaadin.data.util.TransactionalPropertyWrapper;
 import com.vaadin.legacy.ui.LegacyField;
+import com.vaadin.legacy.data.Validator.InvalidValueException;
 import com.vaadin.legacy.ui.LegacyAbstractField;
 import com.vaadin.ui.DefaultFieldFactory;
 import com.vaadin.ui.Form;

diff --git a/server/src/main/java/com/vaadin/data/validator/AbstractValidator.java b/server/src/main/java/com/vaadin/data/validator/AbstractValidator.java
index b0894bbdbf7a4340ca09298c9a841c08654800ed..8831ac46ce33d241e8686df52c263363fbede1d9 100644 (file)
--- a/server/src/main/java/com/vaadin/data/validator/AbstractValidator.java
+++ b/server/src/main/java/com/vaadin/data/validator/AbstractValidator.java
@@ -15,10 +15,10 @@
  */
 package com.vaadin.data.validator;
 
-import com.vaadin.data.Validator;
+import com.vaadin.legacy.data.Validator;
 
 /**
- * Abstract {@link com.vaadin.data.Validator Validator} implementation that
+ * Abstract {@link com.vaadin.legacy.data.Validator Validator} implementation that
  * provides a basic Validator implementation except the
  * {@link #isValidValue(Object)} method.
  * <p>

diff --git a/server/src/main/java/com/vaadin/data/validator/BeanValidator.java b/server/src/main/java/com/vaadin/data/validator/BeanValidator.java
index b25f7e687c512f96359221d64fc6718c349e52d8..2e9a20bc53cd49e8ef5fa9f8b38a0aa69e3444d5 100644 (file)
--- a/server/src/main/java/com/vaadin/data/validator/BeanValidator.java
+++ b/server/src/main/java/com/vaadin/data/validator/BeanValidator.java
@@ -26,7 +26,7 @@ import javax.validation.Validation;
 import javax.validation.ValidatorFactory;
 import javax.validation.metadata.ConstraintDescriptor;
 
-import com.vaadin.data.Validator;
+import com.vaadin.legacy.data.Validator;
 
 /**
  * Vaadin {@link Validator} using the JSR-303 (javax.validation)

diff --git a/server/src/main/java/com/vaadin/data/validator/CompositeValidator.java b/server/src/main/java/com/vaadin/data/validator/CompositeValidator.java
index f3b7133b9d0a2a6b3cd6c8d1a917b25e4c531fa5..bd2a8b72b1dd0e9b357ba6bc80c6d70863b1e02d 100644 (file)
--- a/server/src/main/java/com/vaadin/data/validator/CompositeValidator.java
+++ b/server/src/main/java/com/vaadin/data/validator/CompositeValidator.java
@@ -21,7 +21,7 @@ import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
 
-import com.vaadin.data.Validator;
+import com.vaadin.legacy.data.Validator;
 
 /**
  * The <code>CompositeValidator</code> allows you to chain (compose) many

diff --git a/server/src/main/java/com/vaadin/data/validator/NullValidator.java b/server/src/main/java/com/vaadin/data/validator/NullValidator.java
index 42cf4199734f27ea0f5b92ffef278d86e75e5c4d..16655ab2bb82cc9013cfdd99bcf27d138ce6e735 100644 (file)
--- a/server/src/main/java/com/vaadin/data/validator/NullValidator.java
+++ b/server/src/main/java/com/vaadin/data/validator/NullValidator.java
@@ -16,7 +16,7 @@
 
 package com.vaadin.data.validator;
 
-import com.vaadin.data.Validator;
+import com.vaadin.legacy.data.Validator;
 
 /**
  * This validator is used for validating properties that do or do not allow null

diff --git a/server/src/main/java/com/vaadin/legacy/data/Validatable.java b/server/src/main/java/com/vaadin/legacy/data/Validatable.java
new file mode 100644 (file)
index 0000000..ede34d9
--- /dev/null
+++ b/server/src/main/java/com/vaadin/legacy/data/Validatable.java
@@ -0,0 +1,130 @@
+/*
+ * Copyright 2000-2014 Vaadin Ltd.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package com.vaadin.legacy.data;
+
+import java.io.Serializable;
+import java.util.Collection;
+
+/**
+ * <p>
+ * Interface for validatable objects. Defines methods to verify if the object's
+ * value is valid or not, and to add, remove and list registered validators of
+ * the object.
+ * </p>
+ * 
+ * @author Vaadin Ltd.
+ * @since 3.0
+ * @see com.vaadin.legacy.data.Validator
+ */
+public interface Validatable extends Serializable {
+
+    /**
+     * <p>
+     * Adds a new validator for this object. The validator's
+     * {@link Validator#validate(Object)} method is activated every time the
+     * object's value needs to be verified, that is, when the {@link #isValid()}
+     * method is called. This usually happens when the object's value changes.
+     * </p>
+     * 
+     * @param validator
+     *            the new validator
+     */
+    void addValidator(Validator validator);
+
+    /**
+     * <p>
+     * Removes a previously registered validator from the object. The specified
+     * validator is removed from the object and its <code>validate</code> method
+     * is no longer called in {@link #isValid()}.
+     * </p>
+     * 
+     * @param validator
+     *            the validator to remove
+     */
+    void removeValidator(Validator validator);
+
+    /**
+     * Removes all validators from this object, as if
+     * {@link #removeValidator(Validator) removeValidator} was called for each
+     * registered validator.
+     */
+    void removeAllValidators();
+
+    /**
+     * <p>
+     * Returns a collection of all validators currently registered for the
+     * object. The collection may be immutable. Calling
+     * <code>removeValidator</code> for this Validatable while iterating over
+     * the collection may be unsafe (e.g. may throw
+     * <code>ConcurrentModificationException</code>.)
+     * </p>
+     * 
+     * @return A collection of validators
+     */
+    public Collection<Validator> getValidators();
+
+    /**
+     * <p>
+     * Tests the current value of the object against all registered validators.
+     * The registered validators are iterated and for each the
+     * {@link Validator#validate(Object)} method is called. If any validator
+     * throws the {@link Validator.InvalidValueException} this method returns
+     * <code>false</code>.
+     * </p>
+     * 
+     * @return <code>true</code> if the registered validators concur that the
+     *         value is valid, <code>false</code> otherwise
+     */
+    public boolean isValid();
+
+    /**
+     * <p>
+     * Checks the validity of the validatable. If the validatable is valid this
+     * method should do nothing, and if it's not valid, it should throw
+     * <code>Validator.InvalidValueException</code>
+     * </p>
+     * 
+     * @throws Validator.InvalidValueException
+     *             if the value is not valid
+     */
+    public void validate() throws Validator.InvalidValueException;
+
+    /**
+     * <p>
+     * Checks the validabtable object accept invalid values.The default value is
+     * <code>true</code>.
+     * </p>
+     * 
+     */
+    public boolean isInvalidAllowed();
+
+    /**
+     * <p>
+     * Should the validabtable object accept invalid values. Supporting this
+     * configuration possibility is optional. By default invalid values are
+     * allowed.
+     * </p>
+     * 
+     * @param invalidValueAllowed
+     * 
+     * @throws UnsupportedOperationException
+     *             if the setInvalidAllowed is not supported.
+     */
+    public void setInvalidAllowed(boolean invalidValueAllowed)
+            throws UnsupportedOperationException;
+
+}

diff --git a/server/src/main/java/com/vaadin/legacy/data/Validator.java b/server/src/main/java/com/vaadin/legacy/data/Validator.java
new file mode 100644 (file)
index 0000000..319f4ae
--- /dev/null
+++ b/server/src/main/java/com/vaadin/legacy/data/Validator.java
@@ -0,0 +1,180 @@
+/*
+ * Copyright 2000-2014 Vaadin Ltd.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package com.vaadin.legacy.data;
+
+import java.io.Serializable;
+
+import com.vaadin.server.VaadinServlet;
+
+/**
+ * Interface that implements a method for validating if an {@link Object} is
+ * valid or not.
+ * <p>
+ * Implementors of this class can be added to any
+ * {@link com.vaadin.legacy.data.Validatable Validatable} implementor to verify its
+ * value.
+ * </p>
+ * <p>
+ * {@link #validate(Object)} can be used to check if a value is valid. An
+ * {@link InvalidValueException} with an appropriate validation error message is
+ * thrown if the value is not valid.
+ * </p>
+ * <p>
+ * Validators must not have any side effects.
+ * </p>
+ * <p>
+ * Since Vaadin 7, the method isValid(Object) does not exist in the interface -
+ * {@link #validate(Object)} should be used instead, and the exception caught
+ * where applicable. Concrete classes implementing {@link Validator} can still
+ * internally implement and use isValid(Object) for convenience or to ease
+ * migration from earlier Vaadin versions.
+ * </p>
+ * 
+ * @author Vaadin Ltd.
+ * @since 3.0
+ */
+public interface Validator extends Serializable {
+
+    /**
+     * Checks the given value against this validator. If the value is valid the
+     * method does nothing. If the value is invalid, an
+     * {@link InvalidValueException} is thrown.
+     * 
+     * @param value
+     *            the value to check
+     * @throws Validator.InvalidValueException
+     *             if the value is invalid
+     */
+    public void validate(Object value) throws Validator.InvalidValueException;
+
+    /**
+     * Exception that is thrown by a {@link Validator} when a value is invalid.
+     * 
+     * <p>
+     * The default implementation of InvalidValueException does not support HTML
+     * in error messages. To enable HTML support, override
+     * {@link #getHtmlMessage()} and use the subclass in validators.
+     * </p>
+     * 
+     * @author Vaadin Ltd.
+     * @since 3.0
+     */
+    @SuppressWarnings("serial")
+    public class InvalidValueException extends RuntimeException {
+
+        /**
+         * Array of one or more validation errors that are causing this
+         * validation error.
+         */
+        private InvalidValueException[] causes = null;
+
+        /**
+         * Constructs a new {@code InvalidValueException} with the specified
+         * message.
+         * 
+         * @param message
+         *            The detail message of the problem.
+         */
+        public InvalidValueException(String message) {
+            this(message, new InvalidValueException[] {});
+        }
+
+        /**
+         * Constructs a new {@code InvalidValueException} with a set of causing
+         * validation exceptions. The causing validation exceptions are included
+         * when the exception is painted to the client.
+         * 
+         * @param message
+         *            The detail message of the problem.
+         * @param causes
+         *            One or more {@code InvalidValueException}s that caused
+         *            this exception.
+         */
+        public InvalidValueException(String message,
+                InvalidValueException... causes) {
+            super(message);
+            if (causes == null) {
+                throw new NullPointerException(
+                        "Possible causes array must not be null");
+            }
+
+            this.causes = causes;
+        }
+
+        /**
+         * Check if the error message should be hidden.
+         * 
+         * An empty (null or "") message is invisible unless it contains nested
+         * exceptions that are visible.
+         * 
+         * @return true if the error message should be hidden, false otherwise
+         */
+        public boolean isInvisible() {
+            String msg = getMessage();
+            if (msg != null && msg.length() > 0) {
+                return false;
+            }
+            if (causes != null) {
+                for (int i = 0; i < causes.length; i++) {
+                    if (!causes[i].isInvisible()) {
+                        return false;
+                    }
+                }
+            }
+            return true;
+        }
+
+        /**
+         * Returns the message of the error in HTML.
+         * 
+         * Note that this API may change in future versions.
+         */
+        public String getHtmlMessage() {
+            return VaadinServlet.safeEscapeForHtml(getLocalizedMessage());
+        }
+
+        /**
+         * Returns the {@code InvalidValueExceptions} that caused this
+         * exception.
+         * 
+         * @return An array containing the {@code InvalidValueExceptions} that
+         *         caused this exception. Returns an empty array if this
+         *         exception was not caused by other exceptions.
+         */
+        public InvalidValueException[] getCauses() {
+            return causes;
+        }
+
+    }
+
+    /**
+     * A specific type of {@link InvalidValueException} that indicates that
+     * validation failed because the value was empty. What empty means is up to
+     * the thrower.
+     * 
+     * @author Vaadin Ltd.
+     * @since 5.3.0
+     */
+    @SuppressWarnings("serial")
+    public class EmptyValueException extends Validator.InvalidValueException {
+
+        public EmptyValueException(String message) {
+            super(message);
+        }
+
+    }
+}

diff --git a/server/src/main/java/com/vaadin/legacy/ui/LegacyAbstractField.java b/server/src/main/java/com/vaadin/legacy/ui/LegacyAbstractField.java
index 8cce999371e971254900995f7aff4048d15d4be8..5beada527f17e0b02e1a05a4931e2081fd6574aa 100644 (file)
--- a/server/src/main/java/com/vaadin/legacy/ui/LegacyAbstractField.java
+++ b/server/src/main/java/com/vaadin/legacy/ui/LegacyAbstractField.java
@@ -32,9 +32,6 @@ import org.jsoup.nodes.Element;
 
 import com.vaadin.data.Buffered;
 import com.vaadin.data.Property;
-import com.vaadin.data.Validatable;
-import com.vaadin.data.Validator;
-import com.vaadin.data.Validator.InvalidValueException;
 import com.vaadin.data.util.LegacyPropertyHelper;
 import com.vaadin.data.util.converter.Converter;
 import com.vaadin.data.util.converter.Converter.ConversionException;
@@ -42,6 +39,9 @@ import com.vaadin.data.util.converter.ConverterUtil;
 import com.vaadin.event.Action;
 import com.vaadin.event.ShortcutAction;
 import com.vaadin.event.ShortcutListener;
+import com.vaadin.legacy.data.Validatable;
+import com.vaadin.legacy.data.Validator;
+import com.vaadin.legacy.data.Validator.InvalidValueException;
 import com.vaadin.server.AbstractErrorMessage;
 import com.vaadin.server.CompositeErrorMessage;
 import com.vaadin.server.ErrorMessage;
@@ -69,7 +69,7 @@ import com.vaadin.ui.declarative.DesignContext;
  * </p>
  * 
  * <p>
- * The class also supports {@link com.vaadin.data.Validator validators} to make
+ * The class also supports {@link com.vaadin.legacy.data.Validator validators} to make
  * sure the value contained in the field is valid.
  * </p>
  * 
@@ -962,7 +962,7 @@ public abstract class LegacyAbstractField<T> extends AbstractComponent
      * is required and empty this method throws an EmptyValueException with the
      * error message set using {@link #setRequiredError(String)}.
      * 
-     * @see com.vaadin.data.Validatable#validate()
+     * @see com.vaadin.legacy.data.Validatable#validate()
      */
     @Override
     public void validate() throws Validator.InvalidValueException {
@@ -1035,7 +1035,7 @@ public abstract class LegacyAbstractField<T> extends AbstractComponent
      * because the field otherwise visually forget the user input immediately.
      * 
      * @return true iff the invalid values are allowed.
-     * @see com.vaadin.data.Validatable#isInvalidAllowed()
+     * @see com.vaadin.legacy.data.Validatable#isInvalidAllowed()
      */
     @Override
     public boolean isInvalidAllowed() {
@@ -1053,7 +1053,7 @@ public abstract class LegacyAbstractField<T> extends AbstractComponent
      * datasource is set.
      * </p>
      * 
-     * @see com.vaadin.data.Validatable#setInvalidAllowed(boolean)
+     * @see com.vaadin.legacy.data.Validatable#setInvalidAllowed(boolean)
      */
     @Override
     public void setInvalidAllowed(boolean invalidAllowed)

diff --git a/server/src/main/java/com/vaadin/server/AbstractErrorMessage.java b/server/src/main/java/com/vaadin/server/AbstractErrorMessage.java
index b56521993ab528ea4990d42f059a6b156e51eaa9..29eddfdf53d7a28fa71e1489c3dee6f4048ddbd8 100644 (file)
--- a/server/src/main/java/com/vaadin/server/AbstractErrorMessage.java
+++ b/server/src/main/java/com/vaadin/server/AbstractErrorMessage.java
@@ -22,7 +22,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import com.vaadin.data.Buffered;
-import com.vaadin.data.Validator;
+import com.vaadin.legacy.data.Validator;
 
 /**
  * Base class for component error messages.

diff --git a/server/src/main/java/com/vaadin/ui/AbstractSelect.java b/server/src/main/java/com/vaadin/ui/AbstractSelect.java
index bf0e7274f480c903df4d1f9f3e99752663db95ae..1867e2edfd42f348f16f4c2a9b73c3f757a423bb 100644 (file)
--- a/server/src/main/java/com/vaadin/ui/AbstractSelect.java
+++ b/server/src/main/java/com/vaadin/ui/AbstractSelect.java
@@ -34,7 +34,6 @@ import org.jsoup.nodes.Element;
 import com.vaadin.data.Container;
 import com.vaadin.data.Item;
 import com.vaadin.data.Property;
-import com.vaadin.data.Validator.InvalidValueException;
 import com.vaadin.data.util.IndexedContainer;
 import com.vaadin.data.util.converter.Converter;
 import com.vaadin.data.util.converter.Converter.ConversionException;
@@ -47,6 +46,7 @@ import com.vaadin.event.dd.TargetDetailsImpl;
 import com.vaadin.event.dd.acceptcriteria.ClientSideCriterion;
 import com.vaadin.event.dd.acceptcriteria.ContainsDataFlavor;
 import com.vaadin.event.dd.acceptcriteria.TargetDetailIs;
+import com.vaadin.legacy.data.Validator.InvalidValueException;
 import com.vaadin.legacy.ui.LegacyAbstractField;
 import com.vaadin.server.KeyMapper;
 import com.vaadin.server.PaintException;

diff --git a/server/src/main/java/com/vaadin/ui/DateField.java b/server/src/main/java/com/vaadin/ui/DateField.java
index 6ceae9962c1fde4db00d76002186931e3af5dc37..23533be3f46580bccbe6c557b67a54194ec05b3c 100644 (file)
--- a/server/src/main/java/com/vaadin/ui/DateField.java
+++ b/server/src/main/java/com/vaadin/ui/DateField.java
@@ -29,8 +29,6 @@ import java.util.logging.Logger;
 import org.jsoup.nodes.Element;
 
 import com.vaadin.data.Property;
-import com.vaadin.data.Validator;
-import com.vaadin.data.Validator.InvalidValueException;
 import com.vaadin.data.util.converter.Converter;
 import com.vaadin.data.validator.DateRangeValidator;
 import com.vaadin.event.FieldEvents;
@@ -38,6 +36,8 @@ import com.vaadin.event.FieldEvents.BlurEvent;
 import com.vaadin.event.FieldEvents.BlurListener;
 import com.vaadin.event.FieldEvents.FocusEvent;
 import com.vaadin.event.FieldEvents.FocusListener;
+import com.vaadin.legacy.data.Validator;
+import com.vaadin.legacy.data.Validator.InvalidValueException;
 import com.vaadin.legacy.ui.LegacyAbstractField;
 import com.vaadin.legacy.ui.LegacyField;
 import com.vaadin.server.PaintException;

diff --git a/server/src/main/java/com/vaadin/ui/Form.java b/server/src/main/java/com/vaadin/ui/Form.java
index 606f6ee5f9c77558bf9bb71c3ea80c3133238e78..ff747f429f19fe9fda13242028e21c0c5148a4ab 100644 (file)
--- a/server/src/main/java/com/vaadin/ui/Form.java
+++ b/server/src/main/java/com/vaadin/ui/Form.java
@@ -27,15 +27,15 @@ import java.util.Map;
 import com.vaadin.data.Buffered;
 import com.vaadin.data.Item;
 import com.vaadin.data.Property;
-import com.vaadin.data.Validatable;
-import com.vaadin.data.Validator;
-import com.vaadin.data.Validator.InvalidValueException;
 import com.vaadin.data.fieldgroup.FieldGroup;
 import com.vaadin.data.util.BeanItem;
 import com.vaadin.event.Action;
 import com.vaadin.event.Action.Handler;
 import com.vaadin.event.Action.ShortcutNotifier;
 import com.vaadin.event.ActionManager;
+import com.vaadin.legacy.data.Validatable;
+import com.vaadin.legacy.data.Validator;
+import com.vaadin.legacy.data.Validator.InvalidValueException;
 import com.vaadin.legacy.ui.LegacyAbstractField;
 import com.vaadin.legacy.ui.LegacyField;
 import com.vaadin.server.AbstractErrorMessage;
@@ -959,7 +959,7 @@ public class Form extends LegacyAbstractField<Object> implements Item.Editor,
     /**
      * Checks the validity of the Form and all of its fields.
      * 
-     * @see com.vaadin.data.Validatable#validate()
+     * @see com.vaadin.legacy.data.Validatable#validate()
      */
     @Override
     public void validate() throws InvalidValueException {
@@ -972,7 +972,7 @@ public class Form extends LegacyAbstractField<Object> implements Item.Editor,
     /**
      * Checks the validabtable object accept invalid values.
      * 
-     * @see com.vaadin.data.Validatable#isInvalidAllowed()
+     * @see com.vaadin.legacy.data.Validatable#isInvalidAllowed()
      */
     @Override
     public boolean isInvalidAllowed() {
@@ -982,7 +982,7 @@ public class Form extends LegacyAbstractField<Object> implements Item.Editor,
     /**
      * Should the validabtable object accept invalid values.
      * 
-     * @see com.vaadin.data.Validatable#setInvalidAllowed(boolean)
+     * @see com.vaadin.legacy.data.Validatable#setInvalidAllowed(boolean)
      */
     @Override
     public void setInvalidAllowed(boolean invalidValueAllowed)

diff --git a/server/src/main/java/com/vaadin/ui/Grid.java b/server/src/main/java/com/vaadin/ui/Grid.java
index 09a3eecb739e4c64cedf65ffa62ce9639fa097c5..592175eeff049b60c6d612be7a1c2f7f4ee928a7 100644 (file)
--- a/server/src/main/java/com/vaadin/ui/Grid.java
+++ b/server/src/main/java/com/vaadin/ui/Grid.java
@@ -53,7 +53,6 @@ import com.vaadin.data.Container.PropertySetChangeNotifier;
 import com.vaadin.data.Container.Sortable;
 import com.vaadin.data.Item;
 import com.vaadin.data.Property;
-import com.vaadin.data.Validator.InvalidValueException;
 import com.vaadin.data.fieldgroup.DefaultFieldGroupFieldFactory;
 import com.vaadin.data.fieldgroup.FieldGroup;
 import com.vaadin.data.fieldgroup.FieldGroup.CommitException;
@@ -73,6 +72,7 @@ import com.vaadin.event.SelectionEvent.SelectionNotifier;
 import com.vaadin.event.SortEvent;
 import com.vaadin.event.SortEvent.SortListener;
 import com.vaadin.event.SortEvent.SortNotifier;
+import com.vaadin.legacy.data.Validator.InvalidValueException;
 import com.vaadin.legacy.ui.LegacyField;
 import com.vaadin.server.AbstractClientConnector;
 import com.vaadin.server.AbstractExtension;

diff --git a/server/src/test/java/com/vaadin/tests/data/validator/CompositeValidatorTest.java b/server/src/test/java/com/vaadin/tests/data/validator/CompositeValidatorTest.java
index 12b84e129da2408d5e0981a6ea31e0e8c44672e0..87234d8317b91d93bae956844719b983d2c785ef 100644 (file)
--- a/server/src/test/java/com/vaadin/tests/data/validator/CompositeValidatorTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/validator/CompositeValidatorTest.java
@@ -8,9 +8,9 @@ import static org.junit.Assert.fail;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.vaadin.data.Validator;
 import com.vaadin.data.validator.CompositeValidator;
 import com.vaadin.data.validator.CompositeValidator.CombinationMode;
+import com.vaadin.legacy.data.Validator;
 import com.vaadin.data.validator.EmailValidator;
 import com.vaadin.data.validator.RegexpValidator;
 

diff --git a/server/src/test/java/com/vaadin/tests/data/validator/NullValidatorTest.java b/server/src/test/java/com/vaadin/tests/data/validator/NullValidatorTest.java
index 336df617d14d50bf9e03b57fc55c73e58faa83d7..d38bad9b62cfcfff2aa8f3098a0aa235b8ecf09e 100644 (file)
--- a/server/src/test/java/com/vaadin/tests/data/validator/NullValidatorTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/validator/NullValidatorTest.java
@@ -5,8 +5,8 @@ import static org.junit.Assert.fail;
 
 import org.junit.Test;
 
-import com.vaadin.data.Validator;
 import com.vaadin.data.validator.NullValidator;
+import com.vaadin.legacy.data.Validator;
 
 public class NullValidatorTest {
 

diff --git a/server/src/test/java/com/vaadin/tests/server/component/abstractfield/AbsFieldValidatorsTest.java b/server/src/test/java/com/vaadin/tests/server/component/abstractfield/AbsFieldValidatorsTest.java
index a4fa3e0ad00f52de32ccb6194828f3575b0d86f4..47e8bc5a0ef79964e79d47f55724d0af66a66b35 100644 (file)
--- a/server/src/test/java/com/vaadin/tests/server/component/abstractfield/AbsFieldValidatorsTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/abstractfield/AbsFieldValidatorsTest.java
@@ -8,7 +8,7 @@ import static org.junit.Assert.assertTrue;
 import org.easymock.EasyMock;
 import org.junit.Test;
 
-import com.vaadin.data.Validator;
+import com.vaadin.legacy.data.Validator;
 import com.vaadin.legacy.ui.LegacyAbstractField;
 
 public class AbsFieldValidatorsTest {

diff --git a/server/src/test/java/com/vaadin/tests/server/component/abstractfield/AbsFieldValueConversionErrorTest.java b/server/src/test/java/com/vaadin/tests/server/component/abstractfield/AbsFieldValueConversionErrorTest.java
index e428155ccd57aa5d0eb26a2bd9dda1865eaf4145..7996cd40866fa3f93a024ffd89b645af280d8deb 100644 (file)
--- a/server/src/test/java/com/vaadin/tests/server/component/abstractfield/AbsFieldValueConversionErrorTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/abstractfield/AbsFieldValueConversionErrorTest.java
@@ -5,9 +5,9 @@ import static org.junit.Assert.fail;
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.vaadin.data.Validator.InvalidValueException;
 import com.vaadin.data.util.MethodProperty;
 import com.vaadin.data.util.converter.Converter.ConversionException;
+import com.vaadin.legacy.data.Validator.InvalidValueException;
 import com.vaadin.data.util.converter.StringToIntegerConverter;
 import com.vaadin.tests.data.bean.Address;
 import com.vaadin.tests.data.bean.Country;

diff --git a/server/src/test/java/com/vaadin/tests/server/component/fieldgroup/FieldGroupTest.java b/server/src/test/java/com/vaadin/tests/server/component/fieldgroup/FieldGroupTest.java
index 3f98efb15d0bfc6b23a30dc8b69acbc557308a81..7379be47641ba61d1be027e45a12389fe0242fa7 100644 (file)
--- a/server/src/test/java/com/vaadin/tests/server/component/fieldgroup/FieldGroupTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/fieldgroup/FieldGroupTest.java
@@ -27,10 +27,10 @@ import org.junit.Test;
 
 import com.vaadin.data.Item;
 import com.vaadin.data.Property;
-import com.vaadin.data.Validator.InvalidValueException;
 import com.vaadin.data.fieldgroup.FieldGroup;
 import com.vaadin.data.fieldgroup.FieldGroup.CommitException;
 import com.vaadin.data.util.AbstractProperty;
+import com.vaadin.legacy.data.Validator.InvalidValueException;
 import com.vaadin.legacy.ui.LegacyField;
 import com.vaadin.ui.TextField;
 

diff --git a/server/src/test/java/com/vaadin/tests/server/component/textfield/TextFieldWithValidatorTest.java b/server/src/test/java/com/vaadin/tests/server/component/textfield/TextFieldWithValidatorTest.java
index 859d69d26e559906c63b22e2d4216c380bffd798..fb18ed0e064a74e499532b97ef7a2974734c5542 100644 (file)
--- a/server/src/test/java/com/vaadin/tests/server/component/textfield/TextFieldWithValidatorTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/textfield/TextFieldWithValidatorTest.java
@@ -5,12 +5,12 @@ import static org.junit.Assert.fail;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.vaadin.data.Validator;
-import com.vaadin.data.Validator.InvalidValueException;
 import com.vaadin.data.util.ObjectProperty;
 import com.vaadin.data.validator.EmailValidator;
 import com.vaadin.data.validator.RegexpValidator;
 import com.vaadin.data.validator.StringLengthValidator;
+import com.vaadin.legacy.data.Validator;
+import com.vaadin.legacy.data.Validator.InvalidValueException;
 import com.vaadin.ui.TextField;
 
 public class TextFieldWithValidatorTest {

diff --git a/server/src/test/java/com/vaadin/tests/server/validation/BeanValidationTest.java b/server/src/test/java/com/vaadin/tests/server/validation/BeanValidationTest.java
index 70a6a4487c1cf7651434b5b296530f1cd87ce8d6..eb4cbd37a497470f5e407e9e0579504899e350d6 100644 (file)
--- a/server/src/test/java/com/vaadin/tests/server/validation/BeanValidationTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/validation/BeanValidationTest.java
@@ -3,9 +3,9 @@ package com.vaadin.tests.server.validation;
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.vaadin.data.Validator.InvalidValueException;
 import com.vaadin.data.fieldgroup.BeanFieldGroup;
 import com.vaadin.data.validator.BeanValidator;
+import com.vaadin.legacy.data.Validator.InvalidValueException;
 import com.vaadin.legacy.ui.LegacyField;
 import com.vaadin.tests.data.bean.BeanToValidate;
 

diff --git a/uitest/src/main/java/com/vaadin/tests/components/checkbox/CheckBoxNullValue.java b/uitest/src/main/java/com/vaadin/tests/components/checkbox/CheckBoxNullValue.java
index 22e260b442c57d9b868bca36ba245f5563eba041..6ee9bf9bd3e488013ab57845e6022cea2dbb84bf 100644 (file)
--- a/uitest/src/main/java/com/vaadin/tests/components/checkbox/CheckBoxNullValue.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/checkbox/CheckBoxNullValue.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.components.checkbox;
 
-import com.vaadin.data.Validator.InvalidValueException;
+import com.vaadin.legacy.data.Validator.InvalidValueException;
 import com.vaadin.server.AbstractErrorMessage;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;

diff --git a/uitest/src/main/java/com/vaadin/tests/components/customfield/AddressField.java b/uitest/src/main/java/com/vaadin/tests/components/customfield/AddressField.java
index bc9f13c4544fec240b8a200482a5a73bf1f26eb7..9d68ad3800c10e5f1cebaaddf9e1c7ff6b3f273f 100644 (file)
--- a/uitest/src/main/java/com/vaadin/tests/components/customfield/AddressField.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/customfield/AddressField.java
@@ -4,8 +4,8 @@ import java.util.Arrays;
 import java.util.List;
 
 import com.vaadin.data.Buffered;
-import com.vaadin.data.Validator.InvalidValueException;
 import com.vaadin.data.util.BeanItem;
+import com.vaadin.legacy.data.Validator.InvalidValueException;
 import com.vaadin.tests.util.Address;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.CustomField;

diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/CommitInvalid.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/CommitInvalid.java
index c9d5ff425ddd2d36f70518da1e8921a9f3e0433f..ea33219ee3d38d85fba607980054567757fed55d 100644 (file)
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/CommitInvalid.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/CommitInvalid.java
@@ -4,8 +4,8 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Locale;
 
-import com.vaadin.data.Validator.InvalidValueException;
 import com.vaadin.data.util.ObjectProperty;
+import com.vaadin.legacy.data.Validator.InvalidValueException;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.tests.util.Log;
 import com.vaadin.ui.Button;

diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/RequiredInvalidDateField.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/RequiredInvalidDateField.java
index bd476223945ca0c772ec0b341db7764ab0e3aca3..f3a6dcae88c7cbbac60c97ca5439cdc9ea019e80 100644 (file)
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/RequiredInvalidDateField.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/RequiredInvalidDateField.java
@@ -4,9 +4,9 @@ import java.util.Date;
 import java.util.Locale;
 
 import com.vaadin.data.Property;
-import com.vaadin.data.Validator;
 import com.vaadin.data.util.ObjectProperty;
 import com.vaadin.data.validator.AbstractValidator;
+import com.vaadin.legacy.data.Validator;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.DateField;
 

diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridWithLabelEditor.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridWithLabelEditor.java
index 799d789a7fcf427efdd51b0ce9f72e46b52a7eda..47c55a263b7c9727c44f8334cd18b573ba4a7289 100644 (file)
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridWithLabelEditor.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridWithLabelEditor.java
@@ -17,8 +17,8 @@ package com.vaadin.tests.components.grid;
 
 import java.util.Collection;
 
-import com.vaadin.data.Validator;
-import com.vaadin.data.Validator.InvalidValueException;
+import com.vaadin.legacy.data.Validator;
+import com.vaadin.legacy.data.Validator.InvalidValueException;
 import com.vaadin.legacy.ui.LegacyField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;

diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/UndefinedHeightSubWindowAndContent.java b/uitest/src/main/java/com/vaadin/tests/components/window/UndefinedHeightSubWindowAndContent.java
index 1a34e90446470aeab1cf4a31298e2a3ad3ca4aab..3403ebeb11f594da30452cd1477bc05fe36a9b8b 100644 (file)
--- a/uitest/src/main/java/com/vaadin/tests/components/window/UndefinedHeightSubWindowAndContent.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/UndefinedHeightSubWindowAndContent.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.components.window;
 
-import com.vaadin.data.Validator;
+import com.vaadin.legacy.data.Validator;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Form;
 import com.vaadin.ui.TextField;

diff --git a/uitest/src/main/java/com/vaadin/tests/fieldgroup/AbstractBasicCrud.java b/uitest/src/main/java/com/vaadin/tests/fieldgroup/AbstractBasicCrud.java
index 7d69de4f15e1db8a223d3b997b135d842d606f09..92a5892c162f7d1e573c76c9d9b6f32ae5e53a59 100644 (file)
--- a/uitest/src/main/java/com/vaadin/tests/fieldgroup/AbstractBasicCrud.java
+++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/AbstractBasicCrud.java
@@ -21,13 +21,13 @@ import java.util.Map;
 import com.vaadin.annotations.Theme;
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.Property.ValueChangeListener;
-import com.vaadin.data.Validator.InvalidValueException;
 import com.vaadin.data.fieldgroup.BeanFieldGroup;
 import com.vaadin.data.fieldgroup.FieldGroup.CommitException;
 import com.vaadin.data.fieldgroup.PropertyId;
 import com.vaadin.data.util.BeanItem;
 import com.vaadin.data.util.BeanItemContainer;
 import com.vaadin.data.validator.IntegerRangeValidator;
+import com.vaadin.legacy.data.Validator.InvalidValueException;
 import com.vaadin.legacy.ui.LegacyField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.shared.ui.label.ContentMode;

diff --git a/uitest/src/main/java/com/vaadin/tests/fieldgroup/MultipleValidationErrors.java b/uitest/src/main/java/com/vaadin/tests/fieldgroup/MultipleValidationErrors.java
index 58f2292f8498c54091291a03607733da38301e03..a4cddb0c1d928496810a751454561e52a65120f0 100644 (file)
--- a/uitest/src/main/java/com/vaadin/tests/fieldgroup/MultipleValidationErrors.java
+++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/MultipleValidationErrors.java
@@ -1,9 +1,9 @@
 package com.vaadin.tests.fieldgroup;
 
-import com.vaadin.data.Validator;
 import com.vaadin.data.fieldgroup.FieldGroup;
 import com.vaadin.data.util.BeanItem;
 import com.vaadin.data.validator.BeanValidator;
+import com.vaadin.legacy.data.Validator;
 import com.vaadin.server.AbstractErrorMessage;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;

diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/GridLayoutCaptions.java b/uitest/src/main/java/com/vaadin/tests/layouts/GridLayoutCaptions.java
index a8c21f2aa0c09b297172ed655e2f6cf7c32cf269..29e69bbcba7ccb3e29b78ab6ef8a387f1b7fd5ec 100644 (file)
--- a/uitest/src/main/java/com/vaadin/tests/layouts/GridLayoutCaptions.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/GridLayoutCaptions.java
@@ -1,8 +1,8 @@
 package com.vaadin.tests.layouts;
 
 import com.vaadin.data.Item;
-import com.vaadin.data.Validator;
 import com.vaadin.data.util.BeanItem;
+import com.vaadin.legacy.data.Validator;
 import com.vaadin.legacy.ui.LegacyField;
 import com.vaadin.server.AbstractErrorMessage;
 import com.vaadin.tests.components.TestBase;

diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1804.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1804.java
index 306469e6f34583ef143abb686605da128fc733ff..fed4f6b151df87db283f0848c8e95ae11db0ceba 100644 (file)
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1804.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1804.java
@@ -3,8 +3,8 @@ package com.vaadin.tests.tickets;
 import java.util.Iterator;
 import java.util.LinkedList;
 
-import com.vaadin.data.Validator;
 import com.vaadin.data.util.MethodProperty;
+import com.vaadin.legacy.data.Validator;
 import com.vaadin.legacy.ui.LegacyAbstractField;
 import com.vaadin.server.SystemError;
 import com.vaadin.shared.ui.label.ContentMode;

diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1811.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1811.java
index e8f23da3d1febdca82d6fc013986f5c7b760b7f5..b57d03ed8ff62eef58eab49504b71145abf98625 100644 (file)
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1811.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1811.java
@@ -3,8 +3,8 @@ package com.vaadin.tests.tickets;
 import java.util.Iterator;
 import java.util.LinkedList;
 
-import com.vaadin.data.Validator;
 import com.vaadin.data.validator.StringLengthValidator;
+import com.vaadin.legacy.data.Validator;
 import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;

diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1900.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1900.java
index 2109b1729aad249686f8fb33446738cbd2a0f8ac..1339b59dae01d1660999927867d403a368d5b937 100644 (file)
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1900.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1900.java
@@ -2,7 +2,7 @@ package com.vaadin.tests.tickets;
 
 import com.vaadin.data.Property;
 import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Validator;
+import com.vaadin.legacy.data.Validator;
 import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.TextField;

diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket20.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket20.java
index 5f6305bcb0a56bc4c6e1cdd9618ac7a030719c10..f78f72a60a1b142dc66423ab7f665b2d1d9c278e 100644 (file)
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket20.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket20.java
@@ -1,9 +1,9 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.data.Validator;
 import com.vaadin.data.util.MethodProperty;
 import com.vaadin.data.validator.CompositeValidator;
 import com.vaadin.data.validator.CompositeValidator.CombinationMode;
+import com.vaadin.legacy.data.Validator;
 import com.vaadin.data.validator.IntegerValidator;
 import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Button;

diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2107.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2107.java
index c5d212ec927372aa4e04e18b1cf497b1b182118f..ae5e032a9f51e41f2eb62d6aaa287627c9287caf 100644 (file)
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2107.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2107.java
@@ -2,7 +2,7 @@ package com.vaadin.tests.tickets;
 
 import com.vaadin.data.Property;
 import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Validator;
+import com.vaadin.legacy.data.Validator;
 import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.LegacyWindow;

diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2179.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2179.java
index 06fb162f59a067879ee0fa139c49c8256c917d36..ec584f44d34fbac9bab13a5808340dce7b50f061 100644 (file)
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2179.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2179.java
@@ -2,7 +2,7 @@ package com.vaadin.tests.tickets;
 
 import com.vaadin.data.Property;
 import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Validator;
+import com.vaadin.legacy.data.Validator;
 import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.TextField;

diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2998.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2998.java
index 0900213989e695e346b1c07c7442e9099cb86972..609e32a5f03b02ecc1abcc761855bb20d1783ec5 100644 (file)
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2998.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2998.java
@@ -9,8 +9,8 @@ import java.util.Random;
 import java.util.Set;
 
 import com.vaadin.data.Container;
-import com.vaadin.data.Validator;
 import com.vaadin.data.util.BeanItemContainer;
+import com.vaadin.legacy.data.Validator;
 import com.vaadin.legacy.ui.LegacyField;
 import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.ComboBox;

diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket736.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket736.java
index 6acd43c312e6272a22cbff2b605d058e189a45a1..ee46bf5bd6eb80787185a6d7f3087dc85c40d434 100644 (file)
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket736.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket736.java
@@ -1,9 +1,9 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.data.Validator;
 import com.vaadin.data.util.BeanItem;
 import com.vaadin.data.util.MethodProperty;
 import com.vaadin.data.validator.IntegerValidator;
+import com.vaadin.legacy.data.Validator;
 import com.vaadin.server.LegacyApplication;
 import com.vaadin.server.ThemeResource;
 import com.vaadin.ui.AbstractComponent;

diff --git a/uitest/src/main/java/com/vaadin/tests/validation/EmptyFieldErrorIndicators.java b/uitest/src/main/java/com/vaadin/tests/validation/EmptyFieldErrorIndicators.java
index 5c31a723923fbfa339ccf743d905965745118e29..fe4f7e22c770bb235727b5acaf9dc635ba91aa59 100644 (file)
--- a/uitest/src/main/java/com/vaadin/tests/validation/EmptyFieldErrorIndicators.java
+++ b/uitest/src/main/java/com/vaadin/tests/validation/EmptyFieldErrorIndicators.java
@@ -2,7 +2,7 @@ package com.vaadin.tests.validation;
 
 import java.util.Date;
 
-import com.vaadin.data.Validator.InvalidValueException;
+import com.vaadin.legacy.data.Validator.InvalidValueException;
 import com.vaadin.legacy.ui.LegacyField;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.tests.util.AlwaysFailValidator;

diff --git a/uitest/src/main/java/com/vaadin/tests/validation/FieldErrorIndication.java b/uitest/src/main/java/com/vaadin/tests/validation/FieldErrorIndication.java
index 0847a62b523570fbcd905f79840f33c3d962cdc4..b20d9efe206427f583da9b586a498535d34983e5 100644 (file)
--- a/uitest/src/main/java/com/vaadin/tests/validation/FieldErrorIndication.java
+++ b/uitest/src/main/java/com/vaadin/tests/validation/FieldErrorIndication.java
@@ -17,9 +17,9 @@ package com.vaadin.tests.validation;
 
 import java.util.Set;
 
-import com.vaadin.data.Validator;
 import com.vaadin.data.validator.StringLengthValidator;
 import com.vaadin.legacy.ui.LegacyField;
+import com.vaadin.legacy.data.Validator;
 import com.vaadin.legacy.ui.LegacyAbstractField;
 import com.vaadin.server.UserError;
 import com.vaadin.server.VaadinRequest;

diff --git a/uitest/src/main/java/com/vaadin/tests/validation/TestValidators.java b/uitest/src/main/java/com/vaadin/tests/validation/TestValidators.java
index 746a460da836f32bdfd582324f6081eb97905868..6f184bd6ed8d2dd8c4a0c7a398b48d66e795f80b 100644 (file)
--- a/uitest/src/main/java/com/vaadin/tests/validation/TestValidators.java
+++ b/uitest/src/main/java/com/vaadin/tests/validation/TestValidators.java
@@ -1,9 +1,9 @@
 package com.vaadin.tests.validation;
 
-import com.vaadin.data.Validator;
 import com.vaadin.data.validator.AbstractStringValidator;
 import com.vaadin.data.validator.CompositeValidator;
 import com.vaadin.data.validator.CompositeValidator.CombinationMode;
+import com.vaadin.legacy.data.Validator;
 import com.vaadin.data.validator.DoubleValidator;
 import com.vaadin.data.validator.EmailValidator;
 import com.vaadin.data.validator.IntegerValidator;

diff --git a/uitest/src/main/java/com/vaadin/tests/validation/ValidationOfRequiredEmptyFields.java b/uitest/src/main/java/com/vaadin/tests/validation/ValidationOfRequiredEmptyFields.java
index 4fa6eda5c3c82ec18afa98508e4023301d0d927a..3384e40586afb7b2606d5e15361e760d08dbd5a0 100644 (file)
--- a/uitest/src/main/java/com/vaadin/tests/validation/ValidationOfRequiredEmptyFields.java
+++ b/uitest/src/main/java/com/vaadin/tests/validation/ValidationOfRequiredEmptyFields.java
@@ -2,9 +2,9 @@ package com.vaadin.tests.validation;
 
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.Property.ValueChangeListener;
-import com.vaadin.data.Validator;
 import com.vaadin.data.validator.IntegerValidator;
 import com.vaadin.data.validator.StringLengthValidator;
+import com.vaadin.legacy.data.Validator;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.CheckBox;