Move Validator and Validatable into legacy package.

Change-Id: I7f8e9b1f7dff40ca76933cdf1978e3749f390142

15 files changed, 31 insertions, 29 deletions

diff --git a/server/src/main/java/com/vaadin/data/Buffered.java b/server/src/main/java/com/vaadin/data/Buffered.java
index 469f9987a4..4f34da5c7c 100644
--- 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 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;
+
 /**
  * <p>
  * This interface defines the combination of <code>Validatable</code> 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.
  * <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 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 <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 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
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
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.
  * <p>
  * 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.
  * </p>
  * <p>
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;
  * </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 b56521993a..29eddfdf53 100644
--- 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 bf0e7274f4..1867e2edfd 100644
--- 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 6ceae9962c..23533be3f4 100644
--- 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 606f6ee5f9..ff747f429f 100644
--- 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 09a3eecb73..592175eeff 100644
--- 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;