diff --git a/server/src/main/java/com/vaadin/data/BufferedValidatable.java b/server/src/main/java/com/vaadin/data/BufferedValidatable.java
index 6f9d952d2f..584f196a0c 100644
--- 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;
+
/**
*
- * 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.
- *
- *
- * @author Vaadin Ltd.
- * @since 3.0
- * @see com.vaadin.data.Validator
- */
-public interface Validatable extends Serializable {
-
- /**
- *
- * 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.
- *
- *
- * @param validator
- * the new validator
- */
- void addValidator(Validator validator);
-
- /**
- *
- * Removes a previously registered validator from the object. The specified
- * validator is removed from the object and its validate
method
- * is no longer called in {@link #isValid()}.
- *
- *
- * @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();
-
- /**
- *
- * Returns a collection of all validators currently registered for the
- * object. The collection may be immutable. Calling
- * removeValidator
for this Validatable while iterating over
- * the collection may be unsafe (e.g. may throw
- * ConcurrentModificationException
.)
- *
- *
- * @return A collection of validators
- */
- public Collection getValidators();
-
- /**
- *
- * 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
- * false
.
- *
- *
- * @return true
if the registered validators concur that the
- * value is valid, false
otherwise
- */
- public boolean isValid();
-
- /**
- *
- * 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
- * Validator.InvalidValueException
- *
- *
- * @throws Validator.InvalidValueException
- * if the value is not valid
- */
- public void validate() throws Validator.InvalidValueException;
-
- /**
- *
- * Checks the validabtable object accept invalid values.The default value is
- * true
.
- *
- *
- */
- public boolean isInvalidAllowed();
-
- /**
- *
- * Should the validabtable object accept invalid values. Supporting this
- * configuration possibility is optional. By default invalid values are
- * allowed.
- *
- *
- * @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
index d567267338..0000000000
--- 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.
- *
- * Implementors of this class can be added to any
- * {@link com.vaadin.data.Validatable Validatable} implementor to verify its
- * value.
- *
- *
- * {@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.
- *
- *
- * Validators must not have any side effects.
- *
- *
- * 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.
- *
- *
- * @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.
- *
- *
- * 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.
- *
- *
- * @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 9c926637ef..acf35f154e 100644
--- 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 b0894bbdbf..8831ac46ce 100644
--- 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.
*
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 b25f7e687c..2e9a20bc53 100644
--- 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 f3b7133b9d..bd2a8b72b1 100644
--- 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 CompositeValidator
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 42cf419973..16655ab2bb 100644
--- 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
index 0000000000..ede34d9190
--- /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;
+
+/**
+ *
+ * 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.
+ *
+ *
+ * @author Vaadin Ltd.
+ * @since 3.0
+ * @see com.vaadin.legacy.data.Validator
+ */
+public interface Validatable extends Serializable {
+
+ /**
+ *
+ * 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.
+ *
+ *
+ * @param validator
+ * the new validator
+ */
+ void addValidator(Validator validator);
+
+ /**
+ *
+ * Removes a previously registered validator from the object. The specified
+ * validator is removed from the object and its validate
method
+ * is no longer called in {@link #isValid()}.
+ *
+ *
+ * @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();
+
+ /**
+ *
+ * Returns a collection of all validators currently registered for the
+ * object. The collection may be immutable. Calling
+ * removeValidator
for this Validatable while iterating over
+ * the collection may be unsafe (e.g. may throw
+ * ConcurrentModificationException
.)
+ *
+ *
+ * @return A collection of validators
+ */
+ public Collection getValidators();
+
+ /**
+ *
+ * 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
+ * false
.
+ *
+ *
+ * @return true
if the registered validators concur that the
+ * value is valid, false
otherwise
+ */
+ public boolean isValid();
+
+ /**
+ *
+ * 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
+ * Validator.InvalidValueException
+ *
+ *
+ * @throws Validator.InvalidValueException
+ * if the value is not valid
+ */
+ public void validate() throws Validator.InvalidValueException;
+
+ /**
+ *
+ * Checks the validabtable object accept invalid values.The default value is
+ * true
.
+ *
+ *
+ */
+ public boolean isInvalidAllowed();
+
+ /**
+ *
+ * Should the validabtable object accept invalid values. Supporting this
+ * configuration possibility is optional. By default invalid values are
+ * allowed.
+ *
+ *
+ * @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
index 0000000000..319f4ae138
--- /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.
+ *
+ * Implementors of this class can be added to any
+ * {@link com.vaadin.legacy.data.Validatable Validatable} implementor to verify its
+ * value.
+ *
+ *
+ * {@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.
+ *
+ *
+ * Validators must not have any side effects.
+ *
+ *
+ * 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.
+ *
+ *
+ * @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.
+ *
+ *
+ * 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.
+ *
+ *
+ * @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 8cce999371..5beada527f 100644
--- 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;
*