From fd651d7921dcfb5ae7e89dee0d538e1072eeb00d Mon Sep 17 00:00:00 2001
From: Denis Anisimov
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;
+
/**
*
* This interface defines the combination of
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
* Implementors of this class can be added to any
- * {@link com.vaadin.data.Validatable Validatable} implementor to verify its
+ * {@link com.vaadin.legacy.data.Validatable Validatable} implementor to verify its
* value.
*
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;
*
- * 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.
* Validatable
and
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.
* 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/data/Validatable.java b/server/src/main/java/com/vaadin/legacy/data/Validatable.java
similarity index 98%
rename from server/src/main/java/com/vaadin/data/Validatable.java
rename to server/src/main/java/com/vaadin/legacy/data/Validatable.java
index 1ae7cd8cee..ede34d9190 100644
--- a/server/src/main/java/com/vaadin/data/Validatable.java
+++ b/server/src/main/java/com/vaadin/legacy/data/Validatable.java
@@ -14,7 +14,7 @@
* the License.
*/
-package com.vaadin.data;
+package com.vaadin.legacy.data;
import java.io.Serializable;
import java.util.Collection;
@@ -28,7 +28,7 @@ import java.util.Collection;
*
* @author Vaadin Ltd.
* @since 3.0
- * @see com.vaadin.data.Validator
+ * @see com.vaadin.legacy.data.Validator
*/
public interface Validatable extends Serializable {
diff --git a/server/src/main/java/com/vaadin/data/Validator.java b/server/src/main/java/com/vaadin/legacy/data/Validator.java
similarity index 98%
rename from server/src/main/java/com/vaadin/data/Validator.java
rename to server/src/main/java/com/vaadin/legacy/data/Validator.java
index d567267338..319f4ae138 100644
--- a/server/src/main/java/com/vaadin/data/Validator.java
+++ b/server/src/main/java/com/vaadin/legacy/data/Validator.java
@@ -14,7 +14,7 @@
* the License.
*/
-package com.vaadin.data;
+package com.vaadin.legacy.data;
import java.io.Serializable;
@@ -25,7 +25,7 @@ import com.vaadin.server.VaadinServlet;
* valid or not.
*