diff options
43 files changed, 61 insertions, 59 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; 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 12b84e129d..87234d8317 100644 --- 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 336df617d1..d38bad9b62 100644 --- 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 a4fa3e0ad0..47e8bc5a0e 100644 --- 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 e428155ccd..7996cd4086 100644 --- 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 3f98efb15d..7379be4764 100644 --- 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 859d69d26e..fb18ed0e06 100644 --- 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 70a6a4487c..eb4cbd37a4 100644 --- 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 22e260b442..6ee9bf9bd3 100644 --- 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 bc9f13c454..9d68ad3800 100644 --- 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 c9d5ff425d..ea33219ee3 100644 --- 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 bd47622394..f3a6dcae88 100644 --- 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 799d789a7f..47c55a263b 100644 --- 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 1a34e90446..3403ebeb11 100644 --- 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 7d69de4f15..92a5892c16 100644 --- 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 58f2292f84..a4cddb0c1d 100644 --- 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 a8c21f2aa0..29e69bbcba 100644 --- 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 306469e6f3..fed4f6b151 100644 --- 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 e8f23da3d1..b57d03ed8f 100644 --- 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 2109b1729a..1339b59dae 100644 --- 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 5f6305bcb0..f78f72a60a 100644 --- 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 c5d212ec92..ae5e032a9f 100644 --- 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 06fb162f59..ec584f44d3 100644 --- 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 0900213989..609e32a5f0 100644 --- 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 6acd43c312..ee46bf5bd6 100644 --- 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 5c31a72392..fe4f7e22c7 100644 --- 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 0847a62b52..b20d9efe20 100644 --- 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 746a460da8..6f184bd6ed 100644 --- 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 4fa6eda5c3..3384e40586 100644 --- 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; |