diff options
| author | Artur Signell <artur@vaadin.com> | 2016-08-18 14:57:13 +0300 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2016-08-18 20:05:56 +0300 |
| commit | f3c880194b20b9f9d192e72724865233065ccf04 (patch) | |
| tree | 957213861b4f70568aa33380cca0a2beb4601657 /server | |
| parent | 387649190cdbb93d11dc3714de73f0dcdc4c4059 (diff) | |
| download | vaadin-framework-f3c880194b20b9f9d192e72724865233065ccf04.tar.gz vaadin-framework-f3c880194b20b9f9d192e72724865233065ccf04.zip | |
Rename legacy packages to v7
Change-Id: I53f3bd49c234a8d126887f6effa83a3c5c92b4e0
Diffstat (limited to 'server')
170 files changed, 343 insertions, 335 deletions
diff --git a/server/src/main/java/com/vaadin/data/Buffered.java b/server/src/main/java/com/vaadin/data/Buffered.java index 7bb0143849..bc3c2327fe 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.legacy.data.Validator.InvalidValueException; +import com.vaadin.v7.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 7bd1f30c56..0a7c875a96 100644 --- a/server/src/main/java/com/vaadin/data/BufferedValidatable.java +++ b/server/src/main/java/com/vaadin/data/BufferedValidatable.java @@ -18,7 +18,7 @@ package com.vaadin.data; import java.io.Serializable; -import com.vaadin.legacy.data.Validatable; +import com.vaadin.v7.data.Validatable; /** * <p> diff --git a/server/src/main/java/com/vaadin/data/fieldgroup/BeanFieldGroup.java b/server/src/main/java/com/vaadin/data/fieldgroup/BeanFieldGroup.java index f7337b5dda..96e4621761 100644 --- a/server/src/main/java/com/vaadin/data/fieldgroup/BeanFieldGroup.java +++ b/server/src/main/java/com/vaadin/data/fieldgroup/BeanFieldGroup.java @@ -23,8 +23,8 @@ import java.util.Map; import com.vaadin.data.Item; import com.vaadin.data.util.BeanItem; import com.vaadin.data.util.BeanUtil; -import com.vaadin.legacy.data.validator.LegacyBeanValidator; -import com.vaadin.legacy.ui.LegacyField; +import com.vaadin.v7.data.validator.LegacyBeanValidator; +import com.vaadin.v7.ui.LegacyField; public class BeanFieldGroup<T> extends FieldGroup { diff --git a/server/src/main/java/com/vaadin/data/fieldgroup/DefaultFieldGroupFieldFactory.java b/server/src/main/java/com/vaadin/data/fieldgroup/DefaultFieldGroupFieldFactory.java index 943c29e1ac..24c97eedc5 100644 --- a/server/src/main/java/com/vaadin/data/fieldgroup/DefaultFieldGroupFieldFactory.java +++ b/server/src/main/java/com/vaadin/data/fieldgroup/DefaultFieldGroupFieldFactory.java @@ -20,14 +20,6 @@ import java.util.EnumSet; import com.vaadin.data.Item; import com.vaadin.data.fieldgroup.FieldGroup.BindException; -import com.vaadin.legacy.ui.LegacyAbstractField; -import com.vaadin.legacy.ui.LegacyAbstractTextField; -import com.vaadin.legacy.ui.LegacyCheckBox; -import com.vaadin.legacy.ui.LegacyDateField; -import com.vaadin.legacy.ui.LegacyField; -import com.vaadin.legacy.ui.LegacyInlineDateField; -import com.vaadin.legacy.ui.LegacyPopupDateField; -import com.vaadin.legacy.ui.LegacyTextField; import com.vaadin.ui.AbstractSelect; import com.vaadin.ui.ComboBox; import com.vaadin.ui.ListSelect; @@ -35,6 +27,14 @@ import com.vaadin.ui.NativeSelect; import com.vaadin.ui.OptionGroup; import com.vaadin.ui.RichTextArea; import com.vaadin.ui.Table; +import com.vaadin.v7.ui.LegacyAbstractField; +import com.vaadin.v7.ui.LegacyAbstractTextField; +import com.vaadin.v7.ui.LegacyCheckBox; +import com.vaadin.v7.ui.LegacyDateField; +import com.vaadin.v7.ui.LegacyField; +import com.vaadin.v7.ui.LegacyInlineDateField; +import com.vaadin.v7.ui.LegacyPopupDateField; +import com.vaadin.v7.ui.LegacyTextField; /** * This class contains a basic implementation for {@link FieldGroupFieldFactory} 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 2bf98e466f..1254009cfc 100644 --- a/server/src/main/java/com/vaadin/data/fieldgroup/FieldGroup.java +++ b/server/src/main/java/com/vaadin/data/fieldgroup/FieldGroup.java @@ -28,11 +28,11 @@ import java.util.Map; import com.vaadin.data.Item; import com.vaadin.data.Property; import com.vaadin.data.util.TransactionalPropertyWrapper; -import com.vaadin.legacy.data.Validator.InvalidValueException; -import com.vaadin.legacy.ui.LegacyAbstractField; -import com.vaadin.legacy.ui.LegacyField; import com.vaadin.ui.DefaultFieldFactory; import com.vaadin.util.ReflectTools; +import com.vaadin.v7.data.Validator.InvalidValueException; +import com.vaadin.v7.ui.LegacyAbstractField; +import com.vaadin.v7.ui.LegacyField; /** * FieldGroup provides an easy way of binding fields to data and handling diff --git a/server/src/main/java/com/vaadin/data/fieldgroup/FieldGroupFieldFactory.java b/server/src/main/java/com/vaadin/data/fieldgroup/FieldGroupFieldFactory.java index d12c5e23ab..a80d51c6df 100644 --- a/server/src/main/java/com/vaadin/data/fieldgroup/FieldGroupFieldFactory.java +++ b/server/src/main/java/com/vaadin/data/fieldgroup/FieldGroupFieldFactory.java @@ -17,7 +17,7 @@ package com.vaadin.data.fieldgroup; import java.io.Serializable; -import com.vaadin.legacy.ui.LegacyField; +import com.vaadin.v7.ui.LegacyField; /** * Factory interface for creating new LegacyField-instances based on the data diff --git a/server/src/main/java/com/vaadin/data/util/PropertyFormatter.java b/server/src/main/java/com/vaadin/data/util/PropertyFormatter.java index 1f3ee16a95..908c7fb1e5 100644 --- a/server/src/main/java/com/vaadin/data/util/PropertyFormatter.java +++ b/server/src/main/java/com/vaadin/data/util/PropertyFormatter.java @@ -16,7 +16,7 @@ package com.vaadin.data.util; import com.vaadin.data.Property; -import com.vaadin.legacy.data.util.converter.LegacyConverter; +import com.vaadin.v7.data.util.converter.LegacyConverter; /** * Formatting proxy for a {@link Property}. diff --git a/server/src/main/java/com/vaadin/data/util/converter/AbstractStringToNumberConverter.java b/server/src/main/java/com/vaadin/data/util/converter/AbstractStringToNumberConverter.java index e0b467519b..1dbc2bf46a 100644 --- a/server/src/main/java/com/vaadin/data/util/converter/AbstractStringToNumberConverter.java +++ b/server/src/main/java/com/vaadin/data/util/converter/AbstractStringToNumberConverter.java @@ -20,7 +20,7 @@ import java.text.NumberFormat; import java.text.ParsePosition; import java.util.Locale; -import com.vaadin.legacy.data.util.converter.LegacyConverter.ConversionException; +import com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException; /** * A converter that converts from the number type T to {@link String} and back. diff --git a/server/src/main/java/com/vaadin/data/util/converter/Converter.java b/server/src/main/java/com/vaadin/data/util/converter/Converter.java index 5bf1193134..4ccafc5384 100644 --- a/server/src/main/java/com/vaadin/data/util/converter/Converter.java +++ b/server/src/main/java/com/vaadin/data/util/converter/Converter.java @@ -21,8 +21,8 @@ import java.util.Locale; import java.util.function.Function; import com.vaadin.data.Binder.Binding; +import com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException; import com.vaadin.data.Result; -import com.vaadin.legacy.data.util.converter.LegacyConverter.ConversionException; /** * Interface that implements conversion between a model and a presentation type. diff --git a/server/src/main/java/com/vaadin/data/util/converter/StringToIntegerConverter.java b/server/src/main/java/com/vaadin/data/util/converter/StringToIntegerConverter.java index 5011681656..ba7531a4d6 100644 --- a/server/src/main/java/com/vaadin/data/util/converter/StringToIntegerConverter.java +++ b/server/src/main/java/com/vaadin/data/util/converter/StringToIntegerConverter.java @@ -20,7 +20,7 @@ import java.text.NumberFormat; import java.util.Locale; import com.vaadin.data.Result; -import com.vaadin.legacy.data.util.converter.LegacyConverter.ConversionException; +import com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException; /** * A converter that converts from {@link String} to {@link Integer} and back. diff --git a/server/src/main/java/com/vaadin/data/util/sqlcontainer/ColumnProperty.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/ColumnProperty.java index 013d7618ed..e7d83e118d 100644 --- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/ColumnProperty.java +++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/ColumnProperty.java @@ -21,7 +21,7 @@ import java.sql.Timestamp; import java.util.logging.Logger; import com.vaadin.data.Property; -import com.vaadin.legacy.data.util.converter.LegacyConverter.ConversionException; +import com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException; /** * ColumnProperty represents the value of one column in a RowItem. In addition diff --git a/server/src/main/java/com/vaadin/event/FieldEvents.java b/server/src/main/java/com/vaadin/event/FieldEvents.java index 720b1ff390..fca646813a 100644 --- a/server/src/main/java/com/vaadin/event/FieldEvents.java +++ b/server/src/main/java/com/vaadin/event/FieldEvents.java @@ -19,14 +19,14 @@ package com.vaadin.event; import java.io.Serializable; import java.lang.reflect.Method; -import com.vaadin.legacy.ui.LegacyField; -import com.vaadin.legacy.ui.LegacyTextField; -import com.vaadin.legacy.ui.LegacyField.ValueChangeEvent; import com.vaadin.shared.EventId; import com.vaadin.shared.communication.FieldRpc.FocusAndBlurServerRpc; import com.vaadin.ui.Component; import com.vaadin.ui.Component.Event; import com.vaadin.util.ReflectTools; +import com.vaadin.v7.ui.LegacyField; +import com.vaadin.v7.ui.LegacyTextField; +import com.vaadin.v7.ui.LegacyField.ValueChangeEvent; /** * Interface that serves as a wrapper for {@link LegacyField} related events. diff --git a/server/src/main/java/com/vaadin/server/AbstractErrorMessage.java b/server/src/main/java/com/vaadin/server/AbstractErrorMessage.java index 6715427377..6910201856 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.legacy.data.Validator; +import com.vaadin.v7.data.Validator; /** * Base class for component error messages. diff --git a/server/src/main/java/com/vaadin/server/VaadinSession.java b/server/src/main/java/com/vaadin/server/VaadinSession.java index a0cfb1c196..1b852510e3 100644 --- a/server/src/main/java/com/vaadin/server/VaadinSession.java +++ b/server/src/main/java/com/vaadin/server/VaadinSession.java @@ -48,15 +48,15 @@ import javax.servlet.http.HttpSessionBindingEvent; import javax.servlet.http.HttpSessionBindingListener; import com.vaadin.event.EventRouter; -import com.vaadin.legacy.data.util.converter.LegacyConverter; -import com.vaadin.legacy.data.util.converter.LegacyConverterFactory; -import com.vaadin.legacy.data.util.converter.LegacyDefaultConverterFactory; -import com.vaadin.legacy.ui.LegacyAbstractField; import com.vaadin.shared.communication.PushMode; import com.vaadin.ui.Table; import com.vaadin.ui.UI; import com.vaadin.util.CurrentInstance; import com.vaadin.util.ReflectTools; +import com.vaadin.v7.data.util.converter.LegacyConverter; +import com.vaadin.v7.data.util.converter.LegacyConverterFactory; +import com.vaadin.v7.data.util.converter.LegacyDefaultConverterFactory; +import com.vaadin.v7.ui.LegacyAbstractField; /** * Contains everything that Vaadin needs to store for a specific user. This is diff --git a/server/src/main/java/com/vaadin/ui/AbstractComponent.java b/server/src/main/java/com/vaadin/ui/AbstractComponent.java index 8ed9b178c6..4e7cb19b74 100644 --- a/server/src/main/java/com/vaadin/ui/AbstractComponent.java +++ b/server/src/main/java/com/vaadin/ui/AbstractComponent.java @@ -40,7 +40,6 @@ import com.vaadin.event.ContextClickEvent; import com.vaadin.event.ContextClickEvent.ContextClickListener; import com.vaadin.event.ContextClickEvent.ContextClickNotifier; import com.vaadin.event.ShortcutListener; -import com.vaadin.legacy.ui.LegacyField; import com.vaadin.server.AbstractClientConnector; import com.vaadin.server.AbstractErrorMessage.ContentMode; import com.vaadin.server.ComponentSizeValidator; @@ -63,6 +62,7 @@ import com.vaadin.shared.util.SharedUtil; import com.vaadin.ui.declarative.DesignAttributeHandler; import com.vaadin.ui.declarative.DesignContext; import com.vaadin.util.ReflectTools; +import com.vaadin.v7.ui.LegacyField; /** * An abstract class that defines default implementation for the diff --git a/server/src/main/java/com/vaadin/ui/AbstractField.java b/server/src/main/java/com/vaadin/ui/AbstractField.java index 4f4a0002ba..c1895377c2 100644 --- a/server/src/main/java/com/vaadin/ui/AbstractField.java +++ b/server/src/main/java/com/vaadin/ui/AbstractField.java @@ -39,7 +39,7 @@ import com.vaadin.util.ReflectTools; * <p> * This class replaces the Vaadin 7 {@code com.vaadin.ui.AbstractField} class. * The old {@code AbstractField} is retained, under the new name - * {@link com.vaadin.legacy.ui.LegacyAbstractField}, for compatibility and + * {@link com.vaadin.v7.ui.LegacyAbstractField}, for compatibility and * migration purposes. * * @author Vaadin Ltd. diff --git a/server/src/main/java/com/vaadin/ui/AbstractSelect.java b/server/src/main/java/com/vaadin/ui/AbstractSelect.java index 0ffe206bd4..57c2fc1046 100644 --- a/server/src/main/java/com/vaadin/ui/AbstractSelect.java +++ b/server/src/main/java/com/vaadin/ui/AbstractSelect.java @@ -43,11 +43,6 @@ 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.data.util.converter.LegacyConverter; -import com.vaadin.legacy.data.util.converter.LegacyConverterUtil; -import com.vaadin.legacy.data.util.converter.LegacyConverter.ConversionException; -import com.vaadin.legacy.ui.LegacyAbstractField; import com.vaadin.server.KeyMapper; import com.vaadin.server.PaintException; import com.vaadin.server.PaintTarget; @@ -60,6 +55,11 @@ import com.vaadin.ui.declarative.DesignAttributeHandler; import com.vaadin.ui.declarative.DesignContext; import com.vaadin.ui.declarative.DesignException; import com.vaadin.ui.declarative.DesignFormatter; +import com.vaadin.v7.data.Validator.InvalidValueException; +import com.vaadin.v7.data.util.converter.LegacyConverter; +import com.vaadin.v7.data.util.converter.LegacyConverterUtil; +import com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException; +import com.vaadin.v7.ui.LegacyAbstractField; /** * <p> @@ -643,7 +643,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object> /** * Gets the selected item id or in multiselect mode a set of selected ids. * - * @see com.vaadin.legacy.ui.LegacyAbstractField#getValue() + * @see com.vaadin.v7.ui.LegacyAbstractField#getValue() */ @Override public Object getValue() { @@ -683,7 +683,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object> * * @param newValue * the New selected item or collection of selected items. - * @see com.vaadin.legacy.ui.LegacyAbstractField#setValue(java.lang.Object) + * @see com.vaadin.v7.ui.LegacyAbstractField#setValue(java.lang.Object) */ @Override public void setValue(Object newValue) throws Property.ReadOnlyException { @@ -710,7 +710,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object> * True if caller is sure that repaint is not needed. * @param ignoreReadOnly * True if read-only check should be omitted. - * @see com.vaadin.legacy.ui.LegacyAbstractField#setValue(java.lang.Object, + * @see com.vaadin.v7.ui.LegacyAbstractField#setValue(java.lang.Object, * java.lang.Boolean) */ @Override @@ -1874,7 +1874,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object> /** * Notifies the component that it is connected to an application. * - * @see com.vaadin.legacy.ui.LegacyAbstractField#attach() + * @see com.vaadin.v7.ui.LegacyAbstractField#attach() */ @Override public void attach() { diff --git a/server/src/main/java/com/vaadin/ui/Component.java b/server/src/main/java/com/vaadin/ui/Component.java index 08557b37f6..ac96c9e2d6 100644 --- a/server/src/main/java/com/vaadin/ui/Component.java +++ b/server/src/main/java/com/vaadin/ui/Component.java @@ -24,13 +24,13 @@ import org.jsoup.nodes.Element; import com.vaadin.event.ConnectorEvent; import com.vaadin.event.ConnectorEventListener; import com.vaadin.event.FieldEvents; -import com.vaadin.legacy.ui.LegacyField; import com.vaadin.server.ClientConnector; import com.vaadin.server.ErrorMessage; import com.vaadin.server.Resource; import com.vaadin.server.Sizeable; import com.vaadin.server.VariableOwner; import com.vaadin.ui.declarative.DesignContext; +import com.vaadin.v7.ui.LegacyField; /** * {@code Component} is the top-level interface that is and must be implemented diff --git a/server/src/main/java/com/vaadin/ui/CustomField.java b/server/src/main/java/com/vaadin/ui/CustomField.java index 7eac9304df..4985560b3e 100644 --- a/server/src/main/java/com/vaadin/ui/CustomField.java +++ b/server/src/main/java/com/vaadin/ui/CustomField.java @@ -20,8 +20,8 @@ import java.io.Serializable; import java.util.Iterator; import com.vaadin.data.Property; -import com.vaadin.legacy.ui.LegacyField; -import com.vaadin.legacy.ui.LegacyAbstractField; +import com.vaadin.v7.ui.LegacyAbstractField; +import com.vaadin.v7.ui.LegacyField; /** * A {@link LegacyField} whose UI content can be constructed by the user, diff --git a/server/src/main/java/com/vaadin/ui/DefaultFieldFactory.java b/server/src/main/java/com/vaadin/ui/DefaultFieldFactory.java index 54821ec0e8..2ee5ecf00e 100644 --- a/server/src/main/java/com/vaadin/ui/DefaultFieldFactory.java +++ b/server/src/main/java/com/vaadin/ui/DefaultFieldFactory.java @@ -20,11 +20,11 @@ import java.util.Date; import com.vaadin.data.Container; import com.vaadin.data.Property; -import com.vaadin.legacy.ui.LegacyCheckBox; -import com.vaadin.legacy.ui.LegacyDateField; -import com.vaadin.legacy.ui.LegacyField; -import com.vaadin.legacy.ui.LegacyTextField; import com.vaadin.shared.util.SharedUtil; +import com.vaadin.v7.ui.LegacyCheckBox; +import com.vaadin.v7.ui.LegacyDateField; +import com.vaadin.v7.ui.LegacyField; +import com.vaadin.v7.ui.LegacyTextField; /** * This class contains a basic implementation for {@link TableFieldFactory}. The diff --git a/server/src/main/java/com/vaadin/ui/Label.java b/server/src/main/java/com/vaadin/ui/Label.java index f792e4b799..49bad48786 100644 --- a/server/src/main/java/com/vaadin/ui/Label.java +++ b/server/src/main/java/com/vaadin/ui/Label.java @@ -23,13 +23,13 @@ import java.util.Locale; import org.jsoup.nodes.Element; import com.vaadin.data.Property; -import com.vaadin.legacy.data.util.converter.LegacyConverter; -import com.vaadin.legacy.data.util.converter.LegacyConverterUtil; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.shared.ui.label.LabelState; import com.vaadin.shared.util.SharedUtil; import com.vaadin.ui.declarative.DesignContext; import com.vaadin.ui.declarative.DesignFormatter; +import com.vaadin.v7.data.util.converter.LegacyConverter; +import com.vaadin.v7.data.util.converter.LegacyConverterUtil; /** * Label component for showing non-editable short texts. diff --git a/server/src/main/java/com/vaadin/ui/LegacyGrid.java b/server/src/main/java/com/vaadin/ui/LegacyGrid.java index 2212568587..9a98593b83 100644 --- a/server/src/main/java/com/vaadin/ui/LegacyGrid.java +++ b/server/src/main/java/com/vaadin/ui/LegacyGrid.java @@ -70,11 +70,6 @@ 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.data.util.converter.LegacyConverter; -import com.vaadin.legacy.data.util.converter.LegacyConverterUtil; -import com.vaadin.legacy.ui.LegacyCheckBox; -import com.vaadin.legacy.ui.LegacyField; import com.vaadin.server.AbstractClientConnector; import com.vaadin.server.AbstractExtension; import com.vaadin.server.EncodeResult; @@ -114,6 +109,11 @@ import com.vaadin.ui.renderers.HtmlRenderer; import com.vaadin.ui.renderers.Renderer; import com.vaadin.ui.renderers.TextRenderer; import com.vaadin.util.ReflectTools; +import com.vaadin.v7.data.Validator.InvalidValueException; +import com.vaadin.v7.data.util.converter.LegacyConverter; +import com.vaadin.v7.data.util.converter.LegacyConverterUtil; +import com.vaadin.v7.ui.LegacyCheckBox; +import com.vaadin.v7.ui.LegacyField; import elemental.json.Json; import elemental.json.JsonObject; @@ -134,7 +134,7 @@ import elemental.json.JsonValue; * <p> * Each column has its own {@link Renderer} that displays data into something * that can be displayed in the browser. That data is first converted with a - * {@link com.vaadin.legacy.data.util.converter.LegacyConverter Converter} into + * {@link com.vaadin.v7.data.util.converter.LegacyConverter Converter} into * something that the Renderer can process. This can also be an implicit step - * if a column has a simple data type, like a String, no explicit assignment is * needed. diff --git a/server/src/main/java/com/vaadin/ui/LoginForm.java b/server/src/main/java/com/vaadin/ui/LoginForm.java index d12870adbd..f1270f98e9 100644 --- a/server/src/main/java/com/vaadin/ui/LoginForm.java +++ b/server/src/main/java/com/vaadin/ui/LoginForm.java @@ -24,16 +24,16 @@ import java.lang.reflect.Method; import java.util.HashMap; import java.util.Map; -import com.vaadin.legacy.ui.LegacyTextField; import com.vaadin.server.StreamResource; import com.vaadin.shared.ui.loginform.LoginFormConstants; import com.vaadin.shared.ui.loginform.LoginFormRpc; import com.vaadin.shared.ui.loginform.LoginFormState; +import com.vaadin.v7.ui.LegacyTextField; /** * Login form with auto-completion and auto-fill for all major browsers. You can * derive from this class and implement the - * {@link #createContent(com.vaadin.legacy.ui.LegacyTextField, com.vaadin.ui.PasswordField, com.vaadin.ui.Button)} + * {@link #createContent(com.vaadin.v7.ui.LegacyTextField, com.vaadin.ui.PasswordField, com.vaadin.ui.Button)} * method to build the layout using the text fields and login button that are * passed to that method. The supplied components are specially treated so that * they work with password managers. @@ -41,7 +41,7 @@ import com.vaadin.shared.ui.loginform.LoginFormState; * If you need to change the URL as part of the login procedure, call * {@link #setLoginMode(LoginMode)} with the argument {@link LoginMode#DEFERRED} * in your implementation of - * {@link #createContent(com.vaadin.legacy.ui.LegacyTextField, com.vaadin.ui.PasswordField, com.vaadin.ui.Button) + * {@link #createContent(com.vaadin.v7.ui.LegacyTextField, com.vaadin.ui.PasswordField, com.vaadin.ui.Button) * createContent}. * <p> * To customize the fields or to replace them with your own implementations, you diff --git a/server/src/main/java/com/vaadin/ui/PasswordField.java b/server/src/main/java/com/vaadin/ui/PasswordField.java index c3daaa43a8..de973a3fb4 100644 --- a/server/src/main/java/com/vaadin/ui/PasswordField.java +++ b/server/src/main/java/com/vaadin/ui/PasswordField.java @@ -19,9 +19,9 @@ import org.jsoup.nodes.Attributes; import org.jsoup.nodes.Element; import com.vaadin.data.Property; -import com.vaadin.legacy.ui.LegacyAbstractTextField; import com.vaadin.ui.declarative.DesignAttributeHandler; import com.vaadin.ui.declarative.DesignContext; +import com.vaadin.v7.ui.LegacyAbstractTextField; /** * A field that is used to enter secret text information like passwords. The diff --git a/server/src/main/java/com/vaadin/ui/ProgressBar.java b/server/src/main/java/com/vaadin/ui/ProgressBar.java index f68475e529..b7fde04d5a 100644 --- a/server/src/main/java/com/vaadin/ui/ProgressBar.java +++ b/server/src/main/java/com/vaadin/ui/ProgressBar.java @@ -19,10 +19,10 @@ package com.vaadin.ui; import org.jsoup.nodes.Element; import com.vaadin.data.Property; -import com.vaadin.legacy.ui.LegacyAbstractField; import com.vaadin.shared.ui.progressindicator.ProgressBarState; import com.vaadin.ui.declarative.DesignAttributeHandler; import com.vaadin.ui.declarative.DesignContext; +import com.vaadin.v7.ui.LegacyAbstractField; /** * Shows the current progress of a long running task. diff --git a/server/src/main/java/com/vaadin/ui/RichTextArea.java b/server/src/main/java/com/vaadin/ui/RichTextArea.java index 389ab9aa12..e52db6d043 100644 --- a/server/src/main/java/com/vaadin/ui/RichTextArea.java +++ b/server/src/main/java/com/vaadin/ui/RichTextArea.java @@ -21,12 +21,12 @@ import java.util.Map; import org.jsoup.nodes.Element; import com.vaadin.data.Property; -import com.vaadin.legacy.ui.LegacyAbstractField; -import com.vaadin.legacy.ui.LegacyTextField; import com.vaadin.server.PaintException; import com.vaadin.server.PaintTarget; import com.vaadin.shared.ui.textarea.RichTextAreaState; import com.vaadin.ui.declarative.DesignContext; +import com.vaadin.v7.ui.LegacyAbstractField; +import com.vaadin.v7.ui.LegacyTextField; /** * A simple RichTextArea to edit HTML format text. diff --git a/server/src/main/java/com/vaadin/ui/Table.java b/server/src/main/java/com/vaadin/ui/Table.java index 7341255267..13333146f2 100644 --- a/server/src/main/java/com/vaadin/ui/Table.java +++ b/server/src/main/java/com/vaadin/ui/Table.java @@ -55,9 +55,6 @@ import com.vaadin.event.dd.DragSource; import com.vaadin.event.dd.DropHandler; import com.vaadin.event.dd.DropTarget; import com.vaadin.event.dd.acceptcriteria.ServerSideCriterion; -import com.vaadin.legacy.data.util.converter.LegacyConverter; -import com.vaadin.legacy.data.util.converter.LegacyConverterUtil; -import com.vaadin.legacy.ui.LegacyField; import com.vaadin.server.KeyMapper; import com.vaadin.server.LegacyCommunicationManager; import com.vaadin.server.LegacyPaint; @@ -77,6 +74,9 @@ import com.vaadin.ui.declarative.DesignContext; import com.vaadin.ui.declarative.DesignException; import com.vaadin.ui.declarative.DesignFormatter; import com.vaadin.util.ReflectTools; +import com.vaadin.v7.data.util.converter.LegacyConverter; +import com.vaadin.v7.data.util.converter.LegacyConverterUtil; +import com.vaadin.v7.ui.LegacyField; /** * <p> diff --git a/server/src/main/java/com/vaadin/ui/TableFieldFactory.java b/server/src/main/java/com/vaadin/ui/TableFieldFactory.java index bce042d565..54f8bc5110 100644 --- a/server/src/main/java/com/vaadin/ui/TableFieldFactory.java +++ b/server/src/main/java/com/vaadin/ui/TableFieldFactory.java @@ -18,7 +18,7 @@ package com.vaadin.ui; import java.io.Serializable; import com.vaadin.data.Container; -import com.vaadin.legacy.ui.LegacyField; +import com.vaadin.v7.ui.LegacyField; /** * Factory interface for creating new LegacyField-instances based on Container diff --git a/server/src/main/java/com/vaadin/ui/TextArea.java b/server/src/main/java/com/vaadin/ui/TextArea.java index cf2c9e886e..056667a696 100644 --- a/server/src/main/java/com/vaadin/ui/TextArea.java +++ b/server/src/main/java/com/vaadin/ui/TextArea.java @@ -19,10 +19,10 @@ package com.vaadin.ui; import org.jsoup.nodes.Element; import com.vaadin.data.Property; -import com.vaadin.legacy.ui.LegacyAbstractTextField; import com.vaadin.shared.ui.textarea.TextAreaState; import com.vaadin.ui.declarative.DesignContext; import com.vaadin.ui.declarative.DesignFormatter; +import com.vaadin.v7.ui.LegacyAbstractTextField; /** * A text field that supports multi line editing. diff --git a/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerPreview.java b/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerPreview.java index 86db2a3ea6..dc133ce156 100644 --- a/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerPreview.java +++ b/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerPreview.java @@ -19,10 +19,10 @@ import java.lang.reflect.Method; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.Property.ValueChangeListener; -import com.vaadin.legacy.ui.LegacyTextField; import com.vaadin.shared.ui.colorpicker.Color; import com.vaadin.ui.Component; import com.vaadin.ui.CssLayout; +import com.vaadin.v7.ui.LegacyTextField; /** * A component that represents color selection preview within a color picker. diff --git a/server/src/main/java/com/vaadin/ui/declarative/DesignAttributeHandler.java b/server/src/main/java/com/vaadin/ui/declarative/DesignAttributeHandler.java index 81edd9f37f..c38f2bf040 100644 --- a/server/src/main/java/com/vaadin/ui/declarative/DesignAttributeHandler.java +++ b/server/src/main/java/com/vaadin/ui/declarative/DesignAttributeHandler.java @@ -36,10 +36,10 @@ import org.jsoup.nodes.Attributes; import org.jsoup.nodes.Element; import org.jsoup.nodes.Node; -import com.vaadin.legacy.data.util.converter.LegacyConverter; import com.vaadin.shared.ui.AlignmentInfo; import com.vaadin.shared.util.SharedUtil; import com.vaadin.ui.Alignment; +import com.vaadin.v7.data.util.converter.LegacyConverter; /** * Default attribute handler implementation used when parsing designs to diff --git a/server/src/main/java/com/vaadin/ui/declarative/DesignFormatter.java b/server/src/main/java/com/vaadin/ui/declarative/DesignFormatter.java index cd35a6693e..272a52c276 100644 --- a/server/src/main/java/com/vaadin/ui/declarative/DesignFormatter.java +++ b/server/src/main/java/com/vaadin/ui/declarative/DesignFormatter.java @@ -31,10 +31,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.jsoup.parser.Parser; import com.vaadin.event.ShortcutAction; -import com.vaadin.legacy.data.util.converter.LegacyConverter; -import com.vaadin.legacy.data.util.converter.LegacyStringToBigDecimalConverter; -import com.vaadin.legacy.data.util.converter.LegacyStringToDoubleConverter; -import com.vaadin.legacy.data.util.converter.LegacyStringToFloatConverter; import com.vaadin.server.Resource; import com.vaadin.ui.AbstractSelect; import com.vaadin.ui.declarative.converters.DesignDateConverter; @@ -44,6 +40,10 @@ import com.vaadin.ui.declarative.converters.DesignResourceConverter; import com.vaadin.ui.declarative.converters.DesignShortcutActionConverter; import com.vaadin.ui.declarative.converters.DesignTimeZoneConverter; import com.vaadin.ui.declarative.converters.DesignToStringConverter; +import com.vaadin.v7.data.util.converter.LegacyConverter; +import com.vaadin.v7.data.util.converter.LegacyStringToBigDecimalConverter; +import com.vaadin.v7.data.util.converter.LegacyStringToDoubleConverter; +import com.vaadin.v7.data.util.converter.LegacyStringToFloatConverter; /** * Class focused on flexible and consistent formatting and parsing of different diff --git a/server/src/main/java/com/vaadin/ui/declarative/converters/DesignDateConverter.java b/server/src/main/java/com/vaadin/ui/declarative/converters/DesignDateConverter.java index 7e5c98324a..8d8ec7ab7e 100644 --- a/server/src/main/java/com/vaadin/ui/declarative/converters/DesignDateConverter.java +++ b/server/src/main/java/com/vaadin/ui/declarative/converters/DesignDateConverter.java @@ -20,8 +20,8 @@ import java.text.SimpleDateFormat; import java.util.Date; import java.util.Locale; -import com.vaadin.legacy.data.util.converter.LegacyConverter; import com.vaadin.ui.declarative.DesignAttributeHandler; +import com.vaadin.v7.data.util.converter.LegacyConverter; /** * A date converter to be used by {@link DesignAttributeHandler}. Provides diff --git a/server/src/main/java/com/vaadin/ui/declarative/converters/DesignEnumConverter.java b/server/src/main/java/com/vaadin/ui/declarative/converters/DesignEnumConverter.java index d4eb4357b7..ae142c1bb2 100644 --- a/server/src/main/java/com/vaadin/ui/declarative/converters/DesignEnumConverter.java +++ b/server/src/main/java/com/vaadin/ui/declarative/converters/DesignEnumConverter.java @@ -17,8 +17,8 @@ package com.vaadin.ui.declarative.converters; import java.util.Locale; -import com.vaadin.legacy.data.util.converter.LegacyConverter; import com.vaadin.ui.declarative.DesignAttributeHandler; +import com.vaadin.v7.data.util.converter.LegacyConverter; /** * An converter for Enum to/from String for {@link DesignAttributeHandler} to @@ -32,7 +32,7 @@ public class DesignEnumConverter implements LegacyConverter<String, Enum> { @Override public Enum convertToModel(String value, Class<? extends Enum> targetType, Locale locale) - throws com.vaadin.legacy.data.util.converter.LegacyConverter.ConversionException { + throws com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException { if (value == null || value.trim().equals("")) { return null; } @@ -42,7 +42,7 @@ public class DesignEnumConverter implements LegacyConverter<String, Enum> { @Override public String convertToPresentation(Enum value, Class<? extends String> targetType, Locale locale) - throws com.vaadin.legacy.data.util.converter.LegacyConverter.ConversionException { + throws com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException { if (value == null) { return null; } diff --git a/server/src/main/java/com/vaadin/ui/declarative/converters/DesignObjectConverter.java b/server/src/main/java/com/vaadin/ui/declarative/converters/DesignObjectConverter.java index 9c841bcb71..cc9dce4425 100644 --- a/server/src/main/java/com/vaadin/ui/declarative/converters/DesignObjectConverter.java +++ b/server/src/main/java/com/vaadin/ui/declarative/converters/DesignObjectConverter.java @@ -17,8 +17,8 @@ package com.vaadin.ui.declarative.converters; import java.util.Locale; -import com.vaadin.legacy.data.util.converter.LegacyConverter; import com.vaadin.ui.declarative.DesignAttributeHandler; +import com.vaadin.v7.data.util.converter.LegacyConverter; /** * An converter for Object to/from String for {@link DesignAttributeHandler} to @@ -32,14 +32,14 @@ public class DesignObjectConverter implements LegacyConverter<String, Object> { @Override public Object convertToModel(String value, Class<? extends Object> targetType, Locale locale) - throws com.vaadin.legacy.data.util.converter.LegacyConverter.ConversionException { + throws com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException { return value; } @Override public String convertToPresentation(Object value, Class<? extends String> targetType, Locale locale) - throws com.vaadin.legacy.data.util.converter.LegacyConverter.ConversionException { + throws com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException { if (value == null) { return null; } diff --git a/server/src/main/java/com/vaadin/ui/declarative/converters/DesignResourceConverter.java b/server/src/main/java/com/vaadin/ui/declarative/converters/DesignResourceConverter.java index 264b94fb9f..bf2b5446f7 100644 --- a/server/src/main/java/com/vaadin/ui/declarative/converters/DesignResourceConverter.java +++ b/server/src/main/java/com/vaadin/ui/declarative/converters/DesignResourceConverter.java @@ -21,7 +21,6 @@ import java.util.HashMap; import java.util.Locale; import java.util.Map; -import com.vaadin.legacy.data.util.converter.LegacyConverter; import com.vaadin.server.ExternalResource; import com.vaadin.server.FileResource; import com.vaadin.server.FontAwesome; @@ -31,6 +30,7 @@ import com.vaadin.server.Resource; import com.vaadin.server.ResourceReference; import com.vaadin.server.ThemeResource; import com.vaadin.ui.declarative.DesignAttributeHandler; +import com.vaadin.v7.data.util.converter.LegacyConverter; /** * A converter for {@link Resource} implementations supported by diff --git a/server/src/main/java/com/vaadin/ui/declarative/converters/DesignShortcutActionConverter.java b/server/src/main/java/com/vaadin/ui/declarative/converters/DesignShortcutActionConverter.java index e3fb8e5d33..8ca4cbc905 100644 --- a/server/src/main/java/com/vaadin/ui/declarative/converters/DesignShortcutActionConverter.java +++ b/server/src/main/java/com/vaadin/ui/declarative/converters/DesignShortcutActionConverter.java @@ -24,7 +24,7 @@ import java.util.Map.Entry; import com.vaadin.event.ShortcutAction; import com.vaadin.event.ShortcutAction.KeyCode; import com.vaadin.event.ShortcutAction.ModifierKey; -import com.vaadin.legacy.data.util.converter.LegacyConverter; +import com.vaadin.v7.data.util.converter.LegacyConverter; /** * Converter for {@link ShortcutActions}. diff --git a/server/src/main/java/com/vaadin/ui/declarative/converters/DesignTimeZoneConverter.java b/server/src/main/java/com/vaadin/ui/declarative/converters/DesignTimeZoneConverter.java index d20043b2f7..bb8819034a 100644 --- a/server/src/main/java/com/vaadin/ui/declarative/converters/DesignTimeZoneConverter.java +++ b/server/src/main/java/com/vaadin/ui/declarative/converters/DesignTimeZoneConverter.java @@ -18,8 +18,8 @@ package com.vaadin.ui.declarative.converters; import java.util.Locale; import java.util.TimeZone; -import com.vaadin.legacy.data.util.converter.LegacyConverter; import com.vaadin.ui.declarative.DesignAttributeHandler; +import com.vaadin.v7.data.util.converter.LegacyConverter; /** * Utility class for {@link DesignAttributeHandler} that deals with converting diff --git a/server/src/main/java/com/vaadin/ui/declarative/converters/DesignToStringConverter.java b/server/src/main/java/com/vaadin/ui/declarative/converters/DesignToStringConverter.java index 86e4184aed..8979bcef76 100644 --- a/server/src/main/java/com/vaadin/ui/declarative/converters/DesignToStringConverter.java +++ b/server/src/main/java/com/vaadin/ui/declarative/converters/DesignToStringConverter.java @@ -18,8 +18,8 @@ package com.vaadin.ui.declarative.converters; import java.lang.reflect.InvocationTargetException; import java.util.Locale; -import com.vaadin.legacy.data.util.converter.LegacyConverter; import com.vaadin.ui.declarative.DesignAttributeHandler; +import com.vaadin.v7.data.util.converter.LegacyConverter; /** * Utility class for {@link DesignAttributeHandler} that deals with converting diff --git a/server/src/main/java/com/vaadin/legacy/data/Validatable.java b/server/src/main/java/com/vaadin/v7/data/Validatable.java index 9910b0cc46..5c75d594ba 100644 --- a/server/src/main/java/com/vaadin/legacy/data/Validatable.java +++ b/server/src/main/java/com/vaadin/v7/data/Validatable.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.legacy.data; +package com.vaadin.v7.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.legacy.data.Validator + * @see com.vaadin.v7.data.Validator */ public interface Validatable extends Serializable { diff --git a/server/src/main/java/com/vaadin/legacy/data/Validator.java b/server/src/main/java/com/vaadin/v7/data/Validator.java index 92083b605a..cdc0fc3412 100644 --- a/server/src/main/java/com/vaadin/legacy/data/Validator.java +++ b/server/src/main/java/com/vaadin/v7/data/Validator.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.legacy.data; +package com.vaadin.v7.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.legacy.data.Validatable Validatable} implementor to verify + * {@link com.vaadin.v7.data.Validatable Validatable} implementor to verify * its value. * </p> * <p> diff --git a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyAbstractStringToNumberConverter.java b/server/src/main/java/com/vaadin/v7/data/util/converter/LegacyAbstractStringToNumberConverter.java index 28b2f625b6..d927bd57de 100644 --- a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyAbstractStringToNumberConverter.java +++ b/server/src/main/java/com/vaadin/v7/data/util/converter/LegacyAbstractStringToNumberConverter.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.legacy.data.util.converter; +package com.vaadin.v7.data.util.converter; import java.text.NumberFormat; import java.text.ParsePosition; diff --git a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyConverter.java b/server/src/main/java/com/vaadin/v7/data/util/converter/LegacyConverter.java index d7399944fe..ee1aea81c7 100644 --- a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyConverter.java +++ b/server/src/main/java/com/vaadin/v7/data/util/converter/LegacyConverter.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.legacy.data.util.converter; +package com.vaadin.v7.data.util.converter; import java.io.Serializable; import java.util.Locale; diff --git a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyConverterFactory.java b/server/src/main/java/com/vaadin/v7/data/util/converter/LegacyConverterFactory.java index f0961369da..a177e7673e 100644 --- a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyConverterFactory.java +++ b/server/src/main/java/com/vaadin/v7/data/util/converter/LegacyConverterFactory.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.legacy.data.util.converter; +package com.vaadin.v7.data.util.converter; import java.io.Serializable; diff --git a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyConverterUtil.java b/server/src/main/java/com/vaadin/v7/data/util/converter/LegacyConverterUtil.java index 9c6e763c2c..f6e0fec69c 100644 --- a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyConverterUtil.java +++ b/server/src/main/java/com/vaadin/v7/data/util/converter/LegacyConverterUtil.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.legacy.data.util.converter; +package com.vaadin.v7.data.util.converter; import java.io.Serializable; import java.util.Locale; diff --git a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyDateToLongConverter.java b/server/src/main/java/com/vaadin/v7/data/util/converter/LegacyDateToLongConverter.java index caa2d3498d..495d43d2de 100644 --- a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyDateToLongConverter.java +++ b/server/src/main/java/com/vaadin/v7/data/util/converter/LegacyDateToLongConverter.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.legacy.data.util.converter; +package com.vaadin.v7.data.util.converter; import java.util.Date; import java.util.Locale; diff --git a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyDateToSqlDateConverter.java b/server/src/main/java/com/vaadin/v7/data/util/converter/LegacyDateToSqlDateConverter.java index 4a50c39082..a64a7ab04c 100644 --- a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyDateToSqlDateConverter.java +++ b/server/src/main/java/com/vaadin/v7/data/util/converter/LegacyDateToSqlDateConverter.java @@ -17,7 +17,7 @@ /** * */ -package com.vaadin.legacy.data.util.converter; +package com.vaadin.v7.data.util.converter; import java.util.Date; import java.util.Locale; diff --git a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyDefaultConverterFactory.java b/server/src/main/java/com/vaadin/v7/data/util/converter/LegacyDefaultConverterFactory.java index 530bf6e301..5becb07143 100644 --- a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyDefaultConverterFactory.java +++ b/server/src/main/java/com/vaadin/v7/data/util/converter/LegacyDefaultConverterFactory.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.legacy.data.util.converter; +package com.vaadin.v7.data.util.converter; import java.math.BigDecimal; import java.math.BigInteger; diff --git a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyReverseConverter.java b/server/src/main/java/com/vaadin/v7/data/util/converter/LegacyReverseConverter.java index e219031fd0..7a4a968b99 100644 --- a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyReverseConverter.java +++ b/server/src/main/java/com/vaadin/v7/data/util/converter/LegacyReverseConverter.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.legacy.data.util.converter; +package com.vaadin.v7.data.util.converter; import java.util.Locale; @@ -56,7 +56,7 @@ public class LegacyReverseConverter<PRESENTATION, MODEL> @Override public MODEL convertToModel(PRESENTATION value, Class<? extends MODEL> targetType, Locale locale) - throws com.vaadin.legacy.data.util.converter.LegacyConverter.ConversionException { + throws com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException { return realConverter.convertToPresentation(value, targetType, locale); } @@ -70,7 +70,7 @@ public class LegacyReverseConverter<PRESENTATION, MODEL> @Override public PRESENTATION convertToPresentation(MODEL value, Class<? extends PRESENTATION> targetType, Locale locale) - throws com.vaadin.legacy.data.util.converter.LegacyConverter.ConversionException { + throws com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException { return realConverter.convertToModel(value, targetType, locale); } diff --git a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToBigDecimalConverter.java b/server/src/main/java/com/vaadin/v7/data/util/converter/LegacyStringToBigDecimalConverter.java index d5193071a2..60374d4255 100644 --- a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToBigDecimalConverter.java +++ b/server/src/main/java/com/vaadin/v7/data/util/converter/LegacyStringToBigDecimalConverter.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.legacy.data.util.converter; +package com.vaadin.v7.data.util.converter; import java.math.BigDecimal; import java.text.DecimalFormat; @@ -49,7 +49,7 @@ public class LegacyStringToBigDecimalConverter @Override public BigDecimal convertToModel(String value, Class<? extends BigDecimal> targetType, Locale locale) - throws com.vaadin.legacy.data.util.converter.LegacyConverter.ConversionException { + throws com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException { return (BigDecimal) convertToNumber(value, BigDecimal.class, locale); } diff --git a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToBigIntegerConverter.java b/server/src/main/java/com/vaadin/v7/data/util/converter/LegacyStringToBigIntegerConverter.java index 20fe02a4d0..76cd77d86f 100644 --- a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToBigIntegerConverter.java +++ b/server/src/main/java/com/vaadin/v7/data/util/converter/LegacyStringToBigIntegerConverter.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.legacy.data.util.converter; +package com.vaadin.v7.data.util.converter; import java.math.BigDecimal; import java.math.BigInteger; @@ -51,7 +51,7 @@ public class LegacyStringToBigIntegerConverter @Override public BigInteger convertToModel(String value, Class<? extends BigInteger> targetType, Locale locale) - throws com.vaadin.legacy.data.util.converter.LegacyConverter.ConversionException { + throws com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException { BigDecimal bigDecimalValue = (BigDecimal) convertToNumber(value, BigDecimal.class, locale); diff --git a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToBooleanConverter.java b/server/src/main/java/com/vaadin/v7/data/util/converter/LegacyStringToBooleanConverter.java index 079cb73530..f43144f56b 100644 --- a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToBooleanConverter.java +++ b/server/src/main/java/com/vaadin/v7/data/util/converter/LegacyStringToBooleanConverter.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.legacy.data.util.converter; +package com.vaadin.v7.data.util.converter; import java.util.Locale; diff --git a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToByteConverter.java b/server/src/main/java/com/vaadin/v7/data/util/converter/LegacyStringToByteConverter.java index c64a1ab162..5d24211286 100644 --- a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToByteConverter.java +++ b/server/src/main/java/com/vaadin/v7/data/util/converter/LegacyStringToByteConverter.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.legacy.data.util.converter; +package com.vaadin.v7.data.util.converter; import java.text.NumberFormat; import java.util.Locale; diff --git a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToCollectionConverter.java b/server/src/main/java/com/vaadin/v7/data/util/converter/LegacyStringToCollectionConverter.java index 71ef4c8ac8..f4475ad4a3 100644 --- a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToCollectionConverter.java +++ b/server/src/main/java/com/vaadin/v7/data/util/converter/LegacyStringToCollectionConverter.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.legacy.data.util.converter; +package com.vaadin.v7.data.util.converter; import java.io.Serializable; import java.lang.reflect.Modifier; diff --git a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToDateConverter.java b/server/src/main/java/com/vaadin/v7/data/util/converter/LegacyStringToDateConverter.java index 4b8d228595..8987f525f2 100644 --- a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToDateConverter.java +++ b/server/src/main/java/com/vaadin/v7/data/util/converter/LegacyStringToDateConverter.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.legacy.data.util.converter; +package com.vaadin.v7.data.util.converter; import java.text.DateFormat; import java.text.ParsePosition; @@ -67,7 +67,7 @@ public class LegacyStringToDateConverter @Override public Date convertToModel(String value, Class<? extends Date> targetType, Locale locale) - throws com.vaadin.legacy.data.util.converter.LegacyConverter.ConversionException { + throws com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException { if (targetType != getModelType()) { throw new ConversionException( "Converter only supports " + getModelType().getName() @@ -101,7 +101,7 @@ public class LegacyStringToDateConverter @Override public String convertToPresentation(Date value, Class<? extends String> targetType, Locale locale) - throws com.vaadin.legacy.data.util.converter.LegacyConverter.ConversionException { + throws com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException { if (value == null) { return null; } diff --git a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToDoubleConverter.java b/server/src/main/java/com/vaadin/v7/data/util/converter/LegacyStringToDoubleConverter.java index 8e90d0db0e..a1cdf53f51 100644 --- a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToDoubleConverter.java +++ b/server/src/main/java/com/vaadin/v7/data/util/converter/LegacyStringToDoubleConverter.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.legacy.data.util.converter; +package com.vaadin.v7.data.util.converter; import java.text.NumberFormat; import java.util.Locale; diff --git a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToEnumConverter.java b/server/src/main/java/com/vaadin/v7/data/util/converter/LegacyStringToEnumConverter.java index e343e8dc85..5b51fc5bfc 100644 --- a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToEnumConverter.java +++ b/server/src/main/java/com/vaadin/v7/data/util/converter/LegacyStringToEnumConverter.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.legacy.data.util.converter; +package com.vaadin.v7.data.util.converter; import java.util.EnumSet; import java.util.Locale; diff --git a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToFloatConverter.java b/server/src/main/java/com/vaadin/v7/data/util/converter/LegacyStringToFloatConverter.java index d4a36122db..49f1a19c84 100644 --- a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToFloatConverter.java +++ b/server/src/main/java/com/vaadin/v7/data/util/converter/LegacyStringToFloatConverter.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.legacy.data.util.converter; +package com.vaadin.v7.data.util.converter; import java.text.NumberFormat; import java.util.Locale; diff --git a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToIntegerConverter.java b/server/src/main/java/com/vaadin/v7/data/util/converter/LegacyStringToIntegerConverter.java index c3dc246837..52e57ee180 100644 --- a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToIntegerConverter.java +++ b/server/src/main/java/com/vaadin/v7/data/util/converter/LegacyStringToIntegerConverter.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.legacy.data.util.converter; +package com.vaadin.v7.data.util.converter; import java.text.NumberFormat; import java.util.Locale; diff --git a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToLongConverter.java b/server/src/main/java/com/vaadin/v7/data/util/converter/LegacyStringToLongConverter.java index 268ed9c234..6ce152f8db 100644 --- a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToLongConverter.java +++ b/server/src/main/java/com/vaadin/v7/data/util/converter/LegacyStringToLongConverter.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.legacy.data.util.converter; +package com.vaadin.v7.data.util.converter; import java.text.NumberFormat; import java.util.Locale; diff --git a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToShortConverter.java b/server/src/main/java/com/vaadin/v7/data/util/converter/LegacyStringToShortConverter.java index 0f4d4a4308..8f05fea8a3 100644 --- a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToShortConverter.java +++ b/server/src/main/java/com/vaadin/v7/data/util/converter/LegacyStringToShortConverter.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.legacy.data.util.converter; +package com.vaadin.v7.data.util.converter; import java.text.NumberFormat; import java.util.Locale; diff --git a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyAbstractStringValidator.java b/server/src/main/java/com/vaadin/v7/data/validator/LegacyAbstractStringValidator.java index 6a7cb03a76..c0eb3b5fa3 100644 --- a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyAbstractStringValidator.java +++ b/server/src/main/java/com/vaadin/v7/data/validator/LegacyAbstractStringValidator.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.legacy.data.validator; +package com.vaadin.v7.data.validator; /** * Validator base class for validating strings. diff --git a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyAbstractValidator.java b/server/src/main/java/com/vaadin/v7/data/validator/LegacyAbstractValidator.java index 4abddb60c6..8c1cc56010 100644 --- a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyAbstractValidator.java +++ b/server/src/main/java/com/vaadin/v7/data/validator/LegacyAbstractValidator.java @@ -13,12 +13,12 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.legacy.data.validator; +package com.vaadin.v7.data.validator; -import com.vaadin.legacy.data.Validator; +import com.vaadin.v7.data.Validator; /** - * Abstract {@link com.vaadin.legacy.data.Validator Validator} implementation + * Abstract {@link com.vaadin.v7.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/legacy/data/validator/LegacyBeanValidator.java b/server/src/main/java/com/vaadin/v7/data/validator/LegacyBeanValidator.java index dee52c471f..dfc107280f 100644 --- a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyBeanValidator.java +++ b/server/src/main/java/com/vaadin/v7/data/validator/LegacyBeanValidator.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.legacy.data.validator; +package com.vaadin.v7.data.validator; import java.io.Serializable; import java.util.Locale; @@ -26,7 +26,7 @@ import javax.validation.Validation; import javax.validation.ValidatorFactory; import javax.validation.metadata.ConstraintDescriptor; -import com.vaadin.legacy.data.Validator; +import com.vaadin.v7.data.Validator; /** * Vaadin {@link Validator} using the JSR-303 (javax.validation) diff --git a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyBigDecimalRangeValidator.java b/server/src/main/java/com/vaadin/v7/data/validator/LegacyBigDecimalRangeValidator.java index e2500e4df6..72c959e773 100644 --- a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyBigDecimalRangeValidator.java +++ b/server/src/main/java/com/vaadin/v7/data/validator/LegacyBigDecimalRangeValidator.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.legacy.data.validator; +package com.vaadin.v7.data.validator; import java.math.BigDecimal; diff --git a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyBigIntegerRangeValidator.java b/server/src/main/java/com/vaadin/v7/data/validator/LegacyBigIntegerRangeValidator.java index 32e16356ce..363a9bb82c 100644 --- a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyBigIntegerRangeValidator.java +++ b/server/src/main/java/com/vaadin/v7/data/validator/LegacyBigIntegerRangeValidator.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.legacy.data.validator; +package com.vaadin.v7.data.validator; import java.math.BigInteger; diff --git a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyByteRangeValidator.java b/server/src/main/java/com/vaadin/v7/data/validator/LegacyByteRangeValidator.java index 563727ea7b..14694c4a52 100644 --- a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyByteRangeValidator.java +++ b/server/src/main/java/com/vaadin/v7/data/validator/LegacyByteRangeValidator.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.legacy.data.validator; +package com.vaadin.v7.data.validator; /** * Validator for validating that an {@link Byte} is inside a given range. diff --git a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyCompositeValidator.java b/server/src/main/java/com/vaadin/v7/data/validator/LegacyCompositeValidator.java index ea1c8339c1..ecf4d121f2 100644 --- a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyCompositeValidator.java +++ b/server/src/main/java/com/vaadin/v7/data/validator/LegacyCompositeValidator.java @@ -14,14 +14,14 @@ * the License. */ -package com.vaadin.legacy.data.validator; +package com.vaadin.v7.data.validator; import java.util.Collection; import java.util.HashSet; import java.util.LinkedList; import java.util.List; -import com.vaadin.legacy.data.Validator; +import com.vaadin.v7.data.Validator; /** * The <code>CompositeValidator</code> allows you to chain (compose) many diff --git a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyDateRangeValidator.java b/server/src/main/java/com/vaadin/v7/data/validator/LegacyDateRangeValidator.java index f0ed5d869b..94cc2f78e7 100644 --- a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyDateRangeValidator.java +++ b/server/src/main/java/com/vaadin/v7/data/validator/LegacyDateRangeValidator.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.legacy.data.validator; +package com.vaadin.v7.data.validator; import java.util.Date; diff --git a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyDoubleRangeValidator.java b/server/src/main/java/com/vaadin/v7/data/validator/LegacyDoubleRangeValidator.java index 4dd8a142dd..7416ad60e6 100644 --- a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyDoubleRangeValidator.java +++ b/server/src/main/java/com/vaadin/v7/data/validator/LegacyDoubleRangeValidator.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.legacy.data.validator; +package com.vaadin.v7.data.validator; /** * Validator for validating that a {@link Double} is inside a given range. diff --git a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyDoubleValidator.java b/server/src/main/java/com/vaadin/v7/data/validator/LegacyDoubleValidator.java index 64a1521ca7..fcc94f6e7c 100644 --- a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyDoubleValidator.java +++ b/server/src/main/java/com/vaadin/v7/data/validator/LegacyDoubleValidator.java @@ -13,14 +13,14 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.legacy.data.validator; +package com.vaadin.v7.data.validator; import com.vaadin.data.Property; -import com.vaadin.legacy.data.util.converter.LegacyStringToDoubleConverter; +import com.vaadin.v7.data.util.converter.LegacyStringToDoubleConverter; /** * String validator for a double precision floating point number. See - * {@link com.vaadin.legacy.data.validator.LegacyAbstractStringValidator} for + * {@link com.vaadin.v7.data.validator.LegacyAbstractStringValidator} for * more information. * * @author Vaadin Ltd. diff --git a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyEmailValidator.java b/server/src/main/java/com/vaadin/v7/data/validator/LegacyEmailValidator.java index 772bd34e58..836ff5ff15 100644 --- a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyEmailValidator.java +++ b/server/src/main/java/com/vaadin/v7/data/validator/LegacyEmailValidator.java @@ -13,14 +13,14 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.legacy.data.validator; +package com.vaadin.v7.data.validator; /** * String validator for e-mail addresses. The e-mail address syntax is not * complete according to RFC 822 but handles the vast majority of valid e-mail * addresses correctly. * - * See {@link com.vaadin.legacy.data.validator.LegacyAbstractStringValidator} + * See {@link com.vaadin.v7.data.validator.LegacyAbstractStringValidator} * for more information. * * <p> diff --git a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyFloatRangeValidator.java b/server/src/main/java/com/vaadin/v7/data/validator/LegacyFloatRangeValidator.java index 3235fa9e5a..9dc27d3727 100644 --- a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyFloatRangeValidator.java +++ b/server/src/main/java/com/vaadin/v7/data/validator/LegacyFloatRangeValidator.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.legacy.data.validator; +package com.vaadin.v7.data.validator; /** * Validator for validating that a {@link Float} is inside a given range. diff --git a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyIntegerRangeValidator.java b/server/src/main/java/com/vaadin/v7/data/validator/LegacyIntegerRangeValidator.java index 900901b819..09de051e1d 100644 --- a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyIntegerRangeValidator.java +++ b/server/src/main/java/com/vaadin/v7/data/validator/LegacyIntegerRangeValidator.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.legacy.data.validator; +package com.vaadin.v7.data.validator; /** * Validator for validating that an {@link Integer} is inside a given range. diff --git a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyIntegerValidator.java b/server/src/main/java/com/vaadin/v7/data/validator/LegacyIntegerValidator.java index dfbc0eaf75..34d2e7e76b 100644 --- a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyIntegerValidator.java +++ b/server/src/main/java/com/vaadin/v7/data/validator/LegacyIntegerValidator.java @@ -13,14 +13,14 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.legacy.data.validator; +package com.vaadin.v7.data.validator; import com.vaadin.data.Property; -import com.vaadin.legacy.data.util.converter.LegacyStringToIntegerConverter; +import com.vaadin.v7.data.util.converter.LegacyStringToIntegerConverter; /** * String validator for integers. See - * {@link com.vaadin.legacy.data.validator.LegacyAbstractStringValidator} for + * {@link com.vaadin.v7.data.validator.LegacyAbstractStringValidator} for * more information. * * @author Vaadin Ltd. diff --git a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyLongRangeValidator.java b/server/src/main/java/com/vaadin/v7/data/validator/LegacyLongRangeValidator.java index 787a52670a..8e5523b46a 100644 --- a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyLongRangeValidator.java +++ b/server/src/main/java/com/vaadin/v7/data/validator/LegacyLongRangeValidator.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.legacy.data.validator; +package com.vaadin.v7.data.validator; /** * Validator for validating that an {@link Long} is inside a given range. diff --git a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyNullValidator.java b/server/src/main/java/com/vaadin/v7/data/validator/LegacyNullValidator.java index 31745ad058..282f5baf29 100644 --- a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyNullValidator.java +++ b/server/src/main/java/com/vaadin/v7/data/validator/LegacyNullValidator.java @@ -14,9 +14,9 @@ * the License. */ -package com.vaadin.legacy.data.validator; +package com.vaadin.v7.data.validator; -import com.vaadin.legacy.data.Validator; +import com.vaadin.v7.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/validator/LegacyRangeValidator.java b/server/src/main/java/com/vaadin/v7/data/validator/LegacyRangeValidator.java index fdedbf404b..27830be7dd 100644 --- a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyRangeValidator.java +++ b/server/src/main/java/com/vaadin/v7/data/validator/LegacyRangeValidator.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.legacy.data.validator; +package com.vaadin.v7.data.validator; /** * An base implementation for validating any objects that implement diff --git a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyRegexpValidator.java b/server/src/main/java/com/vaadin/v7/data/validator/LegacyRegexpValidator.java index ec8b43bc99..0649dd2f13 100644 --- a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyRegexpValidator.java +++ b/server/src/main/java/com/vaadin/v7/data/validator/LegacyRegexpValidator.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.legacy.data.validator; +package com.vaadin.v7.data.validator; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -27,7 +27,7 @@ import java.util.regex.Pattern; * {@link java.util.regex.Pattern#sum} * </p> * <p> - * See {@link com.vaadin.legacy.data.validator.LegacyAbstractStringValidator} + * See {@link com.vaadin.v7.data.validator.LegacyAbstractStringValidator} * for more information. * </p> * <p> diff --git a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyShortRangeValidator.java b/server/src/main/java/com/vaadin/v7/data/validator/LegacyShortRangeValidator.java index 2834930349..e23575e4d9 100644 --- a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyShortRangeValidator.java +++ b/server/src/main/java/com/vaadin/v7/data/validator/LegacyShortRangeValidator.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.legacy.data.validator; +package com.vaadin.v7.data.validator; /** * Validator for validating that an {@link Short} is inside a given range. diff --git a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyStringLengthValidator.java b/server/src/main/java/com/vaadin/v7/data/validator/LegacyStringLengthValidator.java index 2e870e796a..4bf7d430ba 100644 --- a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyStringLengthValidator.java +++ b/server/src/main/java/com/vaadin/v7/data/validator/LegacyStringLengthValidator.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.legacy.data.validator; +package com.vaadin.v7.data.validator; /** * This <code>StringLengthValidator</code> is used to validate the length of diff --git a/server/src/main/java/com/vaadin/legacy/ui/LegacyAbstractField.java b/server/src/main/java/com/vaadin/v7/ui/LegacyAbstractField.java index 65ef88c09c..8ebfa53b29 100644 --- a/server/src/main/java/com/vaadin/legacy/ui/LegacyAbstractField.java +++ b/server/src/main/java/com/vaadin/v7/ui/LegacyAbstractField.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.legacy.ui; +package com.vaadin.v7.ui; import java.io.Serializable; import java.lang.reflect.Method; @@ -35,12 +35,6 @@ import com.vaadin.data.Property; 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.legacy.data.util.converter.LegacyConverter; -import com.vaadin.legacy.data.util.converter.LegacyConverter.ConversionException; -import com.vaadin.legacy.data.util.converter.LegacyConverterUtil; import com.vaadin.server.AbstractErrorMessage; import com.vaadin.server.CompositeErrorMessage; import com.vaadin.server.ErrorMessage; @@ -50,6 +44,12 @@ import com.vaadin.ui.AbstractComponent; import com.vaadin.ui.Component; import com.vaadin.ui.declarative.DesignAttributeHandler; import com.vaadin.ui.declarative.DesignContext; +import com.vaadin.v7.data.Validatable; +import com.vaadin.v7.data.Validator; +import com.vaadin.v7.data.Validator.InvalidValueException; +import com.vaadin.v7.data.util.converter.LegacyConverter; +import com.vaadin.v7.data.util.converter.LegacyConverterUtil; +import com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException; /** * <p> @@ -68,7 +68,7 @@ import com.vaadin.ui.declarative.DesignContext; * </p> * * <p> - * The class also supports {@link com.vaadin.legacy.data.Validator validators} + * The class also supports {@link com.vaadin.v7.data.Validator validators} * to make sure the value contained in the field is valid. * </p> * @@ -926,7 +926,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.legacy.data.Validatable#validate() + * @see com.vaadin.v7.data.Validatable#validate() */ @Override public void validate() throws Validator.InvalidValueException { @@ -998,7 +998,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.legacy.data.Validatable#isInvalidAllowed() + * @see com.vaadin.v7.data.Validatable#isInvalidAllowed() */ @Override public boolean isInvalidAllowed() { @@ -1016,7 +1016,7 @@ public abstract class LegacyAbstractField<T> extends AbstractComponent * datasource is set. * </p> * - * @see com.vaadin.legacy.data.Validatable#setInvalidAllowed(boolean) + * @see com.vaadin.v7.data.Validatable#setInvalidAllowed(boolean) */ @Override public void setInvalidAllowed(boolean invalidAllowed) diff --git a/server/src/main/java/com/vaadin/legacy/ui/LegacyAbstractTextField.java b/server/src/main/java/com/vaadin/v7/ui/LegacyAbstractTextField.java index 2ebfe9a25e..31f794f8c9 100644 --- a/server/src/main/java/com/vaadin/legacy/ui/LegacyAbstractTextField.java +++ b/server/src/main/java/com/vaadin/v7/ui/LegacyAbstractTextField.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.legacy.ui; +package com.vaadin.v7.ui; import java.util.Collection; import java.util.Map; @@ -33,8 +33,8 @@ import com.vaadin.event.FieldEvents.TextChangeListener; import com.vaadin.event.FieldEvents.TextChangeNotifier; import com.vaadin.server.PaintException; import com.vaadin.server.PaintTarget; -import com.vaadin.shared.legacy.ui.textfield.LegacyAbstractTextFieldState; -import com.vaadin.shared.legacy.ui.textfield.LegacyTextFieldConstants; +import com.vaadin.shared.v7.ui.textfield.LegacyAbstractTextFieldState; +import com.vaadin.shared.v7.ui.textfield.LegacyTextFieldConstants; import com.vaadin.ui.LegacyComponent; import com.vaadin.ui.declarative.DesignAttributeHandler; import com.vaadin.ui.declarative.DesignContext; diff --git a/server/src/main/java/com/vaadin/legacy/ui/LegacyCheckBox.java b/server/src/main/java/com/vaadin/v7/ui/LegacyCheckBox.java index 9dbcc86770..4696e104a3 100644 --- a/server/src/main/java/com/vaadin/legacy/ui/LegacyCheckBox.java +++ b/server/src/main/java/com/vaadin/v7/ui/LegacyCheckBox.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.legacy.ui; +package com.vaadin.v7.ui; import java.util.Collection; diff --git a/server/src/main/java/com/vaadin/legacy/ui/LegacyDateField.java b/server/src/main/java/com/vaadin/v7/ui/LegacyDateField.java index a367b8b391..0d094c28bf 100644 --- a/server/src/main/java/com/vaadin/legacy/ui/LegacyDateField.java +++ b/server/src/main/java/com/vaadin/v7/ui/LegacyDateField.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.legacy.ui; +package com.vaadin.v7.ui; import java.text.SimpleDateFormat; import java.util.Calendar; @@ -33,10 +33,6 @@ 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.data.util.converter.LegacyConverter; -import com.vaadin.legacy.data.validator.LegacyDateRangeValidator; import com.vaadin.server.PaintException; import com.vaadin.server.PaintTarget; import com.vaadin.shared.ui.datefield.DateFieldConstants; @@ -46,6 +42,10 @@ import com.vaadin.ui.Component; import com.vaadin.ui.LegacyComponent; import com.vaadin.ui.declarative.DesignAttributeHandler; import com.vaadin.ui.declarative.DesignContext; +import com.vaadin.v7.data.Validator; +import com.vaadin.v7.data.Validator.InvalidValueException; +import com.vaadin.v7.data.util.converter.LegacyConverter; +import com.vaadin.v7.data.validator.LegacyDateRangeValidator; /** * <p> @@ -58,7 +58,7 @@ import com.vaadin.ui.declarative.DesignContext; * </p> * <p> * A <code>DateField</code> is in write-through mode by default, so - * {@link com.vaadin.legacy.ui.LegacyAbstractField#setWriteThrough(boolean)}must + * {@link com.vaadin.v7.ui.LegacyAbstractField#setWriteThrough(boolean)}must * be called to enable buffering. * </p> * @@ -886,7 +886,7 @@ public class LegacyDateField extends LegacyAbstractField<Date> implements * invalid if it contains text typed in by the user that couldn't be parsed * into a Date value. * - * @see com.vaadin.legacy.ui.LegacyAbstractField#validate() + * @see com.vaadin.v7.ui.LegacyAbstractField#validate() */ @Override public void validate() throws InvalidValueException { diff --git a/server/src/main/java/com/vaadin/legacy/ui/LegacyField.java b/server/src/main/java/com/vaadin/v7/ui/LegacyField.java index 4f028e651b..79b4a6f3fc 100644 --- a/server/src/main/java/com/vaadin/legacy/ui/LegacyField.java +++ b/server/src/main/java/com/vaadin/v7/ui/LegacyField.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.legacy.ui; +package com.vaadin.v7.ui; import com.vaadin.data.BufferedValidatable; import com.vaadin.data.HasRequired; diff --git a/server/src/main/java/com/vaadin/legacy/ui/LegacyInlineDateField.java b/server/src/main/java/com/vaadin/v7/ui/LegacyInlineDateField.java index 894295d5ad..4e1ad7e997 100644 --- a/server/src/main/java/com/vaadin/legacy/ui/LegacyInlineDateField.java +++ b/server/src/main/java/com/vaadin/v7/ui/LegacyInlineDateField.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.legacy.ui; +package com.vaadin.v7.ui; import java.util.Date; diff --git a/server/src/main/java/com/vaadin/legacy/ui/LegacyPopupDateField.java b/server/src/main/java/com/vaadin/v7/ui/LegacyPopupDateField.java index 4430fcf073..c2470daf26 100644 --- a/server/src/main/java/com/vaadin/legacy/ui/LegacyPopupDateField.java +++ b/server/src/main/java/com/vaadin/v7/ui/LegacyPopupDateField.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.legacy.ui; +package com.vaadin.v7.ui; import java.util.Date; diff --git a/server/src/main/java/com/vaadin/legacy/ui/LegacyTextField.java b/server/src/main/java/com/vaadin/v7/ui/LegacyTextField.java index 90ebf50f63..49da438660 100644 --- a/server/src/main/java/com/vaadin/legacy/ui/LegacyTextField.java +++ b/server/src/main/java/com/vaadin/v7/ui/LegacyTextField.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.legacy.ui; +package com.vaadin.v7.ui; import org.jsoup.nodes.Attributes; import org.jsoup.nodes.Element; @@ -34,7 +34,7 @@ import com.vaadin.ui.declarative.DesignContext; * Since <code>TextField</code> extends <code>LegacyAbstractField</code> it * implements the {@link com.vaadin.data.Buffered} interface. A * <code>TextField</code> is in write-through mode by default, so - * {@link com.vaadin.legacy.ui.LegacyAbstractField#setWriteThrough(boolean)} + * {@link com.vaadin.v7.ui.LegacyAbstractField#setWriteThrough(boolean)} * must be called to enable buffering. * </p> * diff --git a/server/src/main/javadoc/com/vaadin/data/package.html b/server/src/main/javadoc/com/vaadin/data/package.html index 2f3c718ba4..ba576b6200 100644 --- a/server/src/main/javadoc/com/vaadin/data/package.html +++ b/server/src/main/javadoc/com/vaadin/data/package.html @@ -39,7 +39,7 @@ to track and buffer changes and commit or discard them later.</p> <p>{@link com.vaadin.data.Validator Validator} implementations are used to validate data, typically the value of a {@link -com.vaadin.legacy.ui.LegacyField LegacyField}. One or more {@link com.vaadin.data.Validator +com.vaadin.v7.ui.LegacyField LegacyField}. One or more {@link com.vaadin.data.Validator Validators} can be added to a {@link com.vaadin.data.Validatable Validatable} implementor and then used to validate the value of the Validatable. </p> diff --git a/server/src/test/java/com/vaadin/data/DefaultFieldGroupFieldFactoryTest.java b/server/src/test/java/com/vaadin/data/DefaultFieldGroupFieldFactoryTest.java index a960cfe408..013d14c27d 100644 --- a/server/src/test/java/com/vaadin/data/DefaultFieldGroupFieldFactoryTest.java +++ b/server/src/test/java/com/vaadin/data/DefaultFieldGroupFieldFactoryTest.java @@ -23,14 +23,14 @@ import org.junit.Before; import org.junit.Test; import com.vaadin.data.fieldgroup.DefaultFieldGroupFieldFactory; -import com.vaadin.legacy.ui.LegacyDateField; -import com.vaadin.legacy.ui.LegacyField; -import com.vaadin.legacy.ui.LegacyInlineDateField; -import com.vaadin.legacy.ui.LegacyPopupDateField; -import com.vaadin.legacy.ui.LegacyTextField; import com.vaadin.ui.AbstractSelect; import com.vaadin.ui.ComboBox; import com.vaadin.ui.ListSelect; +import com.vaadin.v7.ui.LegacyDateField; +import com.vaadin.v7.ui.LegacyField; +import com.vaadin.v7.ui.LegacyInlineDateField; +import com.vaadin.v7.ui.LegacyPopupDateField; +import com.vaadin.v7.ui.LegacyTextField; public class DefaultFieldGroupFieldFactoryTest { diff --git a/server/src/test/java/com/vaadin/data/fieldgroup/FieldGroupDateTest.java b/server/src/test/java/com/vaadin/data/fieldgroup/FieldGroupDateTest.java index 3bf181418d..e270211abf 100644 --- a/server/src/test/java/com/vaadin/data/fieldgroup/FieldGroupDateTest.java +++ b/server/src/test/java/com/vaadin/data/fieldgroup/FieldGroupDateTest.java @@ -22,8 +22,8 @@ import org.junit.Before; import org.junit.Test; import com.vaadin.data.util.BeanItem; -import com.vaadin.legacy.ui.LegacyField; -import com.vaadin.legacy.ui.LegacyPopupDateField; +import com.vaadin.v7.ui.LegacyField; +import com.vaadin.v7.ui.LegacyPopupDateField; public class FieldGroupDateTest { diff --git a/server/src/test/java/com/vaadin/data/fieldgroup/FieldGroupExceptionTest.java b/server/src/test/java/com/vaadin/data/fieldgroup/FieldGroupExceptionTest.java index 8ece8d5a83..4622f0960e 100644 --- a/server/src/test/java/com/vaadin/data/fieldgroup/FieldGroupExceptionTest.java +++ b/server/src/test/java/com/vaadin/data/fieldgroup/FieldGroupExceptionTest.java @@ -18,7 +18,7 @@ package com.vaadin.data.fieldgroup; import org.junit.Test; import com.vaadin.data.fieldgroup.FieldGroup.CommitException; -import com.vaadin.legacy.ui.LegacyPopupDateField; +import com.vaadin.v7.ui.LegacyPopupDateField; public class FieldGroupExceptionTest { diff --git a/server/src/test/java/com/vaadin/data/fieldgroup/FieldGroupTest.java b/server/src/test/java/com/vaadin/data/fieldgroup/FieldGroupTest.java index e4aa59cdd7..c0039fc4fb 100644 --- a/server/src/test/java/com/vaadin/data/fieldgroup/FieldGroupTest.java +++ b/server/src/test/java/com/vaadin/data/fieldgroup/FieldGroupTest.java @@ -13,8 +13,8 @@ import com.vaadin.data.Property; import com.vaadin.data.Property.Transactional; import com.vaadin.data.util.BeanItem; import com.vaadin.data.util.TransactionalPropertyWrapper; -import com.vaadin.legacy.ui.LegacyField; -import com.vaadin.legacy.ui.LegacyTextField; +import com.vaadin.v7.ui.LegacyField; +import com.vaadin.v7.ui.LegacyTextField; public class FieldGroupTest { diff --git a/server/src/test/java/com/vaadin/data/util/ReflectToolsGetSuperFieldTest.java b/server/src/test/java/com/vaadin/data/util/ReflectToolsGetSuperFieldTest.java index 96cd0b190b..df4258f316 100644 --- a/server/src/test/java/com/vaadin/data/util/ReflectToolsGetSuperFieldTest.java +++ b/server/src/test/java/com/vaadin/data/util/ReflectToolsGetSuperFieldTest.java @@ -6,7 +6,7 @@ import org.junit.Test; import com.vaadin.data.fieldgroup.FieldGroup; import com.vaadin.data.fieldgroup.PropertyId; -import com.vaadin.legacy.ui.LegacyTextField; +import com.vaadin.v7.ui.LegacyTextField; public class ReflectToolsGetSuperFieldTest { diff --git a/server/src/test/java/com/vaadin/data/util/TransactionalPropertyWrapperTest.java b/server/src/test/java/com/vaadin/data/util/TransactionalPropertyWrapperTest.java index b621e437eb..ef3e416f96 100644 --- a/server/src/test/java/com/vaadin/data/util/TransactionalPropertyWrapperTest.java +++ b/server/src/test/java/com/vaadin/data/util/TransactionalPropertyWrapperTest.java @@ -23,7 +23,7 @@ import java.util.List; import org.junit.Test; import com.vaadin.data.fieldgroup.FieldGroup; -import com.vaadin.legacy.ui.LegacyTextField; +import com.vaadin.v7.ui.LegacyTextField; /** * Test verifying that TransactionalPropertyWrapper removes it's listener from diff --git a/server/src/test/java/com/vaadin/tests/VaadinClasses.java b/server/src/test/java/com/vaadin/tests/VaadinClasses.java index 063fdf537d..e5397c8b47 100644 --- a/server/src/test/java/com/vaadin/tests/VaadinClasses.java +++ b/server/src/test/java/com/vaadin/tests/VaadinClasses.java @@ -17,7 +17,6 @@ import java.util.jar.JarEntry; import org.junit.Test; -import com.vaadin.legacy.ui.LegacyField; import com.vaadin.server.VaadinSession; import com.vaadin.ui.Component; import com.vaadin.ui.ComponentContainer; @@ -30,6 +29,7 @@ import com.vaadin.ui.UI; import com.vaadin.ui.VerticalSplitPanel; import com.vaadin.ui.Window; import com.vaadin.ui.themes.BaseTheme; +import com.vaadin.v7.ui.LegacyField; @SuppressWarnings("deprecation") public class VaadinClasses { diff --git a/server/src/test/java/com/vaadin/tests/data/converter/AnyEnumToStringConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/AnyEnumToStringConverterTest.java index 8306b8de8c..e727687228 100644 --- a/server/src/test/java/com/vaadin/tests/data/converter/AnyEnumToStringConverterTest.java +++ b/server/src/test/java/com/vaadin/tests/data/converter/AnyEnumToStringConverterTest.java @@ -23,11 +23,11 @@ import org.junit.Before; import org.junit.Test; import com.vaadin.data.util.ObjectProperty; -import com.vaadin.legacy.data.util.converter.LegacyConverter; -import com.vaadin.legacy.data.util.converter.LegacyReverseConverter; -import com.vaadin.legacy.ui.LegacyTextField; import com.vaadin.tests.data.bean.AnotherTestEnum; import com.vaadin.tests.data.bean.TestEnum; +import com.vaadin.v7.data.util.converter.LegacyConverter; +import com.vaadin.v7.data.util.converter.LegacyReverseConverter; +import com.vaadin.v7.ui.LegacyTextField; public class AnyEnumToStringConverterTest { @@ -40,7 +40,7 @@ public class AnyEnumToStringConverterTest { @Override public String convertToModel(Enum value, Class<? extends String> targetType, Locale locale) - throws com.vaadin.legacy.data.util.converter.LegacyConverter.ConversionException { + throws com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException { if (value == null) { return null; } @@ -51,7 +51,7 @@ public class AnyEnumToStringConverterTest { @Override public Enum convertToPresentation(String value, Class<? extends Enum> targetType, Locale locale) - throws com.vaadin.legacy.data.util.converter.LegacyConverter.ConversionException { + throws com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException { if (value == null) { return null; } diff --git a/server/src/test/java/com/vaadin/tests/data/converter/ConverterFactoryTest.java b/server/src/test/java/com/vaadin/tests/data/converter/ConverterFactoryTest.java index a79799fab3..41886edc62 100644 --- a/server/src/test/java/com/vaadin/tests/data/converter/ConverterFactoryTest.java +++ b/server/src/test/java/com/vaadin/tests/data/converter/ConverterFactoryTest.java @@ -20,11 +20,11 @@ import java.util.Locale; import org.junit.Assert; import org.junit.Test; -import com.vaadin.legacy.data.util.converter.LegacyConverter; -import com.vaadin.legacy.data.util.converter.LegacyDefaultConverterFactory; -import com.vaadin.legacy.ui.LegacyTextField; import com.vaadin.server.VaadinSession; import com.vaadin.tests.util.AlwaysLockedVaadinSession; +import com.vaadin.v7.data.util.converter.LegacyConverter; +import com.vaadin.v7.data.util.converter.LegacyDefaultConverterFactory; +import com.vaadin.v7.ui.LegacyTextField; public class ConverterFactoryTest { @@ -34,14 +34,14 @@ public class ConverterFactoryTest { @Override public Integer convertToModel(String value, Class<? extends Integer> targetType, Locale locale) - throws com.vaadin.legacy.data.util.converter.LegacyConverter.ConversionException { + throws com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException { return 42; } @Override public String convertToPresentation(Integer value, Class<? extends String> targetType, Locale locale) - throws com.vaadin.legacy.data.util.converter.LegacyConverter.ConversionException { + throws com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException { return "42"; } diff --git a/server/src/test/java/com/vaadin/tests/data/converter/DateToLongConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/DateToLongConverterTest.java index 611db57109..ff64465282 100644 --- a/server/src/test/java/com/vaadin/tests/data/converter/DateToLongConverterTest.java +++ b/server/src/test/java/com/vaadin/tests/data/converter/DateToLongConverterTest.java @@ -5,7 +5,7 @@ import java.util.Date; import org.junit.Assert; import org.junit.Test; -import com.vaadin.legacy.data.util.converter.LegacyDateToLongConverter; +import com.vaadin.v7.data.util.converter.LegacyDateToLongConverter; public class DateToLongConverterTest { diff --git a/server/src/test/java/com/vaadin/tests/data/converter/DateToSqlDateConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/DateToSqlDateConverterTest.java index cf59f3989b..87b2ab6e85 100644 --- a/server/src/test/java/com/vaadin/tests/data/converter/DateToSqlDateConverterTest.java +++ b/server/src/test/java/com/vaadin/tests/data/converter/DateToSqlDateConverterTest.java @@ -6,7 +6,7 @@ import java.util.Locale; import org.junit.Assert; import org.junit.Test; -import com.vaadin.legacy.data.util.converter.LegacyDateToSqlDateConverter; +import com.vaadin.v7.data.util.converter.LegacyDateToSqlDateConverter; public class DateToSqlDateConverterTest { diff --git a/server/src/test/java/com/vaadin/tests/data/converter/DefaultConverterFactoryTest.java b/server/src/test/java/com/vaadin/tests/data/converter/DefaultConverterFactoryTest.java index be88f00933..f5e8213e80 100644 --- a/server/src/test/java/com/vaadin/tests/data/converter/DefaultConverterFactoryTest.java +++ b/server/src/test/java/com/vaadin/tests/data/converter/DefaultConverterFactoryTest.java @@ -23,7 +23,7 @@ import java.util.Locale; import org.junit.Assert; import org.junit.Test; -import com.vaadin.legacy.data.util.converter.LegacyDefaultConverterFactory; +import com.vaadin.v7.data.util.converter.LegacyDefaultConverterFactory; public class DefaultConverterFactoryTest { diff --git a/server/src/test/java/com/vaadin/tests/data/converter/SpecificEnumToStringConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/SpecificEnumToStringConverterTest.java index d50d7d5d38..87080e1151 100644 --- a/server/src/test/java/com/vaadin/tests/data/converter/SpecificEnumToStringConverterTest.java +++ b/server/src/test/java/com/vaadin/tests/data/converter/SpecificEnumToStringConverterTest.java @@ -23,11 +23,11 @@ import org.junit.Before; import org.junit.Test; import com.vaadin.data.util.ObjectProperty; -import com.vaadin.legacy.data.util.converter.LegacyConverter; -import com.vaadin.legacy.data.util.converter.LegacyReverseConverter; -import com.vaadin.legacy.ui.LegacyTextField; import com.vaadin.tests.data.bean.AnotherTestEnum; import com.vaadin.tests.data.bean.TestEnum; +import com.vaadin.v7.data.util.converter.LegacyConverter; +import com.vaadin.v7.data.util.converter.LegacyReverseConverter; +import com.vaadin.v7.ui.LegacyTextField; public class SpecificEnumToStringConverterTest { @@ -43,7 +43,7 @@ public class SpecificEnumToStringConverterTest { @Override public String convertToModel(Enum value, Class<? extends String> targetType, Locale locale) - throws com.vaadin.legacy.data.util.converter.LegacyConverter.ConversionException { + throws com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException { if (value == null) { return null; } @@ -54,7 +54,7 @@ public class SpecificEnumToStringConverterTest { @Override public Enum convertToPresentation(String value, Class<? extends Enum> targetType, Locale locale) - throws com.vaadin.legacy.data.util.converter.LegacyConverter.ConversionException { + throws com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException { if (value == null) { return null; } diff --git a/server/src/test/java/com/vaadin/tests/data/converter/StringToBigDecimalConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/StringToBigDecimalConverterTest.java index 7a5b976912..9fdd6f01b4 100644 --- a/server/src/test/java/com/vaadin/tests/data/converter/StringToBigDecimalConverterTest.java +++ b/server/src/test/java/com/vaadin/tests/data/converter/StringToBigDecimalConverterTest.java @@ -21,7 +21,7 @@ import java.util.Locale; import org.junit.Assert; import org.junit.Test; -import com.vaadin.legacy.data.util.converter.LegacyStringToBigDecimalConverter; +import com.vaadin.v7.data.util.converter.LegacyStringToBigDecimalConverter; public class StringToBigDecimalConverterTest { diff --git a/server/src/test/java/com/vaadin/tests/data/converter/StringToBigIntegerConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/StringToBigIntegerConverterTest.java index 1e10db4739..e40abf162a 100644 --- a/server/src/test/java/com/vaadin/tests/data/converter/StringToBigIntegerConverterTest.java +++ b/server/src/test/java/com/vaadin/tests/data/converter/StringToBigIntegerConverterTest.java @@ -21,7 +21,7 @@ import java.util.Locale; import org.junit.Assert; import org.junit.Test; -import com.vaadin.legacy.data.util.converter.LegacyStringToBigIntegerConverter; +import com.vaadin.v7.data.util.converter.LegacyStringToBigIntegerConverter; public class StringToBigIntegerConverterTest { diff --git a/server/src/test/java/com/vaadin/tests/data/converter/StringToBooleanConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/StringToBooleanConverterTest.java index db88717d7e..1225b59f23 100644 --- a/server/src/test/java/com/vaadin/tests/data/converter/StringToBooleanConverterTest.java +++ b/server/src/test/java/com/vaadin/tests/data/converter/StringToBooleanConverterTest.java @@ -7,7 +7,7 @@ import java.util.Locale; import org.junit.Assert; import org.junit.Test; -import com.vaadin.legacy.data.util.converter.LegacyStringToBooleanConverter; +import com.vaadin.v7.data.util.converter.LegacyStringToBooleanConverter; public class StringToBooleanConverterTest { diff --git a/server/src/test/java/com/vaadin/tests/data/converter/StringToByteConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/StringToByteConverterTest.java index afbab3301d..9f0be5cd06 100644 --- a/server/src/test/java/com/vaadin/tests/data/converter/StringToByteConverterTest.java +++ b/server/src/test/java/com/vaadin/tests/data/converter/StringToByteConverterTest.java @@ -3,10 +3,10 @@ package com.vaadin.tests.data.converter; import org.junit.Assert; import org.junit.Test; -import com.vaadin.legacy.data.util.converter.LegacyConverter; -import com.vaadin.legacy.data.util.converter.LegacyReverseConverter; -import com.vaadin.legacy.data.util.converter.LegacyStringToByteConverter; -import com.vaadin.legacy.data.util.converter.LegacyConverter.ConversionException; +import com.vaadin.v7.data.util.converter.LegacyConverter; +import com.vaadin.v7.data.util.converter.LegacyReverseConverter; +import com.vaadin.v7.data.util.converter.LegacyStringToByteConverter; +import com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException; public class StringToByteConverterTest { diff --git a/server/src/test/java/com/vaadin/tests/data/converter/StringToCollectionConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/StringToCollectionConverterTest.java index 1f65dd0ae8..daa6bdb080 100644 --- a/server/src/test/java/com/vaadin/tests/data/converter/StringToCollectionConverterTest.java +++ b/server/src/test/java/com/vaadin/tests/data/converter/StringToCollectionConverterTest.java @@ -29,10 +29,10 @@ import java.util.Vector; import org.junit.Assert; import org.junit.Test; -import com.vaadin.legacy.data.util.converter.LegacyStringToCollectionConverter; -import com.vaadin.legacy.data.util.converter.LegacyStringToEnumConverter; -import com.vaadin.legacy.data.util.converter.LegacyStringToIntegerConverter; -import com.vaadin.legacy.data.util.converter.LegacyStringToCollectionConverter.CollectionFactory; +import com.vaadin.v7.data.util.converter.LegacyStringToCollectionConverter; +import com.vaadin.v7.data.util.converter.LegacyStringToEnumConverter; +import com.vaadin.v7.data.util.converter.LegacyStringToIntegerConverter; +import com.vaadin.v7.data.util.converter.LegacyStringToCollectionConverter.CollectionFactory; /** * Tests for {@link LegacyStringToCollectionConverter}. diff --git a/server/src/test/java/com/vaadin/tests/data/converter/StringToDateConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/StringToDateConverterTest.java index 5900ce3650..3a5fbde5e7 100644 --- a/server/src/test/java/com/vaadin/tests/data/converter/StringToDateConverterTest.java +++ b/server/src/test/java/com/vaadin/tests/data/converter/StringToDateConverterTest.java @@ -6,7 +6,7 @@ import java.util.Locale; import org.junit.Assert; import org.junit.Test; -import com.vaadin.legacy.data.util.converter.LegacyStringToDateConverter; +import com.vaadin.v7.data.util.converter.LegacyStringToDateConverter; public class StringToDateConverterTest { diff --git a/server/src/test/java/com/vaadin/tests/data/converter/StringToDoubleConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/StringToDoubleConverterTest.java index dd245355ea..427606e942 100644 --- a/server/src/test/java/com/vaadin/tests/data/converter/StringToDoubleConverterTest.java +++ b/server/src/test/java/com/vaadin/tests/data/converter/StringToDoubleConverterTest.java @@ -3,7 +3,7 @@ package com.vaadin.tests.data.converter; import org.junit.Assert; import org.junit.Test; -import com.vaadin.legacy.data.util.converter.LegacyStringToDoubleConverter; +import com.vaadin.v7.data.util.converter.LegacyStringToDoubleConverter; public class StringToDoubleConverterTest { diff --git a/server/src/test/java/com/vaadin/tests/data/converter/StringToEnumConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/StringToEnumConverterTest.java index a0188cf0d6..60cd8052e9 100644 --- a/server/src/test/java/com/vaadin/tests/data/converter/StringToEnumConverterTest.java +++ b/server/src/test/java/com/vaadin/tests/data/converter/StringToEnumConverterTest.java @@ -3,10 +3,10 @@ package com.vaadin.tests.data.converter; import org.junit.Assert; import org.junit.Test; -import com.vaadin.legacy.data.util.converter.LegacyConverter; -import com.vaadin.legacy.data.util.converter.LegacyReverseConverter; -import com.vaadin.legacy.data.util.converter.LegacyStringToEnumConverter; -import com.vaadin.legacy.data.util.converter.LegacyConverter.ConversionException; +import com.vaadin.v7.data.util.converter.LegacyConverter; +import com.vaadin.v7.data.util.converter.LegacyReverseConverter; +import com.vaadin.v7.data.util.converter.LegacyStringToEnumConverter; +import com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException; public class StringToEnumConverterTest { diff --git a/server/src/test/java/com/vaadin/tests/data/converter/StringToFloatConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/StringToFloatConverterTest.java index 8e38ac58ec..fee3612a88 100644 --- a/server/src/test/java/com/vaadin/tests/data/converter/StringToFloatConverterTest.java +++ b/server/src/test/java/com/vaadin/tests/data/converter/StringToFloatConverterTest.java @@ -3,7 +3,7 @@ package com.vaadin.tests.data.converter; import org.junit.Assert; import org.junit.Test; -import com.vaadin.legacy.data.util.converter.LegacyStringToFloatConverter; +import com.vaadin.v7.data.util.converter.LegacyStringToFloatConverter; public class StringToFloatConverterTest { diff --git a/server/src/test/java/com/vaadin/tests/data/converter/StringToIntegerConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/StringToIntegerConverterTest.java index 74fc7f4712..8673bc6cfc 100644 --- a/server/src/test/java/com/vaadin/tests/data/converter/StringToIntegerConverterTest.java +++ b/server/src/test/java/com/vaadin/tests/data/converter/StringToIntegerConverterTest.java @@ -3,8 +3,8 @@ package com.vaadin.tests.data.converter; import org.junit.Assert; import org.junit.Test; -import com.vaadin.legacy.data.util.converter.LegacyStringToIntegerConverter; -import com.vaadin.legacy.data.util.converter.LegacyConverter.ConversionException; +import com.vaadin.v7.data.util.converter.LegacyStringToIntegerConverter; +import com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException; public class StringToIntegerConverterTest { diff --git a/server/src/test/java/com/vaadin/tests/data/converter/StringToLongConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/StringToLongConverterTest.java index 8def94e636..c1a749326d 100644 --- a/server/src/test/java/com/vaadin/tests/data/converter/StringToLongConverterTest.java +++ b/server/src/test/java/com/vaadin/tests/data/converter/StringToLongConverterTest.java @@ -5,9 +5,9 @@ import java.util.Locale; import org.junit.Assert; import org.junit.Test; -import com.vaadin.legacy.data.util.converter.LegacyConverter; -import com.vaadin.legacy.data.util.converter.LegacyReverseConverter; -import com.vaadin.legacy.data.util.converter.LegacyStringToLongConverter; +import com.vaadin.v7.data.util.converter.LegacyConverter; +import com.vaadin.v7.data.util.converter.LegacyReverseConverter; +import com.vaadin.v7.data.util.converter.LegacyStringToLongConverter; public class StringToLongConverterTest { diff --git a/server/src/test/java/com/vaadin/tests/data/converter/StringToShortConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/StringToShortConverterTest.java index 850561c55b..34efd94831 100644 --- a/server/src/test/java/com/vaadin/tests/data/converter/StringToShortConverterTest.java +++ b/server/src/test/java/com/vaadin/tests/data/converter/StringToShortConverterTest.java @@ -3,10 +3,10 @@ package com.vaadin.tests.data.converter; import org.junit.Assert; import org.junit.Test; -import com.vaadin.legacy.data.util.converter.LegacyConverter; -import com.vaadin.legacy.data.util.converter.LegacyReverseConverter; -import com.vaadin.legacy.data.util.converter.LegacyStringToShortConverter; -import com.vaadin.legacy.data.util.converter.LegacyConverter.ConversionException; +import com.vaadin.v7.data.util.converter.LegacyConverter; +import com.vaadin.v7.data.util.converter.LegacyReverseConverter; +import com.vaadin.v7.data.util.converter.LegacyStringToShortConverter; +import com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException; public class StringToShortConverterTest { diff --git a/server/src/test/java/com/vaadin/tests/data/validator/BigDecimalRangeValidatorTest.java b/server/src/test/java/com/vaadin/tests/data/validator/BigDecimalRangeValidatorTest.java index 3821e7c587..3fe6d1f6ff 100644 --- a/server/src/test/java/com/vaadin/tests/data/validator/BigDecimalRangeValidatorTest.java +++ b/server/src/test/java/com/vaadin/tests/data/validator/BigDecimalRangeValidatorTest.java @@ -5,7 +5,7 @@ import java.math.BigDecimal; import org.junit.Assert; import org.junit.Test; -import com.vaadin.legacy.data.validator.LegacyBigDecimalRangeValidator; +import com.vaadin.v7.data.validator.LegacyBigDecimalRangeValidator; public class BigDecimalRangeValidatorTest { diff --git a/server/src/test/java/com/vaadin/tests/data/validator/BigIntegerRangeValidatorTest.java b/server/src/test/java/com/vaadin/tests/data/validator/BigIntegerRangeValidatorTest.java index 66d45d31ee..c54e868e64 100644 --- a/server/src/test/java/com/vaadin/tests/data/validator/BigIntegerRangeValidatorTest.java +++ b/server/src/test/java/com/vaadin/tests/data/validator/BigIntegerRangeValidatorTest.java @@ -5,7 +5,7 @@ import java.math.BigInteger; import org.junit.Assert; import org.junit.Test; -import com.vaadin.legacy.data.validator.LegacyBigIntegerRangeValidator; +import com.vaadin.v7.data.validator.LegacyBigIntegerRangeValidator; public class BigIntegerRangeValidatorTest { diff --git a/server/src/test/java/com/vaadin/tests/data/validator/ByteRangeValidatorTest.java b/server/src/test/java/com/vaadin/tests/data/validator/ByteRangeValidatorTest.java index 70b1e7391b..fa6dd8f098 100644 --- a/server/src/test/java/com/vaadin/tests/data/validator/ByteRangeValidatorTest.java +++ b/server/src/test/java/com/vaadin/tests/data/validator/ByteRangeValidatorTest.java @@ -5,7 +5,7 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; -import com.vaadin.legacy.data.validator.LegacyByteRangeValidator; +import com.vaadin.v7.data.validator.LegacyByteRangeValidator; public class ByteRangeValidatorTest { 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 573bb98aad..126c9c7e8a 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,11 +8,11 @@ import static org.junit.Assert.fail; import org.junit.Before; import org.junit.Test; -import com.vaadin.legacy.data.Validator; -import com.vaadin.legacy.data.validator.LegacyCompositeValidator; -import com.vaadin.legacy.data.validator.LegacyEmailValidator; -import com.vaadin.legacy.data.validator.LegacyRegexpValidator; -import com.vaadin.legacy.data.validator.LegacyCompositeValidator.CombinationMode; +import com.vaadin.v7.data.Validator; +import com.vaadin.v7.data.validator.LegacyCompositeValidator; +import com.vaadin.v7.data.validator.LegacyEmailValidator; +import com.vaadin.v7.data.validator.LegacyRegexpValidator; +import com.vaadin.v7.data.validator.LegacyCompositeValidator.CombinationMode; public class CompositeValidatorTest { diff --git a/server/src/test/java/com/vaadin/tests/data/validator/DateRangeValidatorTest.java b/server/src/test/java/com/vaadin/tests/data/validator/DateRangeValidatorTest.java index 70d16b3816..a0afc9c617 100644 --- a/server/src/test/java/com/vaadin/tests/data/validator/DateRangeValidatorTest.java +++ b/server/src/test/java/com/vaadin/tests/data/validator/DateRangeValidatorTest.java @@ -11,8 +11,8 @@ import java.util.TimeZone; import org.junit.Before; import org.junit.Test; -import com.vaadin.legacy.data.validator.LegacyDateRangeValidator; import com.vaadin.shared.ui.datefield.Resolution; +import com.vaadin.v7.data.validator.LegacyDateRangeValidator; public class DateRangeValidatorTest { Calendar startDate = new GregorianCalendar(TimeZone.getTimeZone("GMT"), diff --git a/server/src/test/java/com/vaadin/tests/data/validator/DoubleRangeValidatorTest.java b/server/src/test/java/com/vaadin/tests/data/validator/DoubleRangeValidatorTest.java index bab8c6bbad..ec3a34bfa6 100644 --- a/server/src/test/java/com/vaadin/tests/data/validator/DoubleRangeValidatorTest.java +++ b/server/src/test/java/com/vaadin/tests/data/validator/DoubleRangeValidatorTest.java @@ -5,7 +5,7 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; -import com.vaadin.legacy.data.validator.LegacyDoubleRangeValidator; +import com.vaadin.v7.data.validator.LegacyDoubleRangeValidator; public class DoubleRangeValidatorTest { diff --git a/server/src/test/java/com/vaadin/tests/data/validator/EmailValidatorTest.java b/server/src/test/java/com/vaadin/tests/data/validator/EmailValidatorTest.java index 9c810449dc..92eef3d4b8 100644 --- a/server/src/test/java/com/vaadin/tests/data/validator/EmailValidatorTest.java +++ b/server/src/test/java/com/vaadin/tests/data/validator/EmailValidatorTest.java @@ -3,7 +3,7 @@ package com.vaadin.tests.data.validator; import org.junit.Assert; import org.junit.Test; -import com.vaadin.legacy.data.validator.LegacyEmailValidator; +import com.vaadin.v7.data.validator.LegacyEmailValidator; public class EmailValidatorTest { diff --git a/server/src/test/java/com/vaadin/tests/data/validator/FloatRangeValidatorTest.java b/server/src/test/java/com/vaadin/tests/data/validator/FloatRangeValidatorTest.java index ad95519c98..36bd41864c 100644 --- a/server/src/test/java/com/vaadin/tests/data/validator/FloatRangeValidatorTest.java +++ b/server/src/test/java/com/vaadin/tests/data/validator/FloatRangeValidatorTest.java @@ -5,7 +5,7 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; -import com.vaadin.legacy.data.validator.LegacyFloatRangeValidator; +import com.vaadin.v7.data.validator.LegacyFloatRangeValidator; public class FloatRangeValidatorTest { diff --git a/server/src/test/java/com/vaadin/tests/data/validator/IntegerRangeValidatorTest.java b/server/src/test/java/com/vaadin/tests/data/validator/IntegerRangeValidatorTest.java index 5d5869289a..595d5f4ab8 100644 --- a/server/src/test/java/com/vaadin/tests/data/validator/IntegerRangeValidatorTest.java +++ b/server/src/test/java/com/vaadin/tests/data/validator/IntegerRangeValidatorTest.java @@ -5,7 +5,7 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; -import com.vaadin.legacy.data.validator.LegacyIntegerRangeValidator; +import com.vaadin.v7.data.validator.LegacyIntegerRangeValidator; public class IntegerRangeValidatorTest { diff --git a/server/src/test/java/com/vaadin/tests/data/validator/LongRangeValidatorTest.java b/server/src/test/java/com/vaadin/tests/data/validator/LongRangeValidatorTest.java index c61cab98ff..6ecd21984c 100644 --- a/server/src/test/java/com/vaadin/tests/data/validator/LongRangeValidatorTest.java +++ b/server/src/test/java/com/vaadin/tests/data/validator/LongRangeValidatorTest.java @@ -5,7 +5,7 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; -import com.vaadin.legacy.data.validator.LegacyLongRangeValidator; +import com.vaadin.v7.data.validator.LegacyLongRangeValidator; public class LongRangeValidatorTest { 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 ba67bf0300..6e43b30cdf 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.legacy.data.Validator; -import com.vaadin.legacy.data.validator.LegacyNullValidator; +import com.vaadin.v7.data.Validator; +import com.vaadin.v7.data.validator.LegacyNullValidator; public class NullValidatorTest { diff --git a/server/src/test/java/com/vaadin/tests/data/validator/RegexpValidatorTest.java b/server/src/test/java/com/vaadin/tests/data/validator/RegexpValidatorTest.java index aeb50448c7..1768999969 100644 --- a/server/src/test/java/com/vaadin/tests/data/validator/RegexpValidatorTest.java +++ b/server/src/test/java/com/vaadin/tests/data/validator/RegexpValidatorTest.java @@ -5,7 +5,7 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; -import com.vaadin.legacy.data.validator.LegacyRegexpValidator; +import com.vaadin.v7.data.validator.LegacyRegexpValidator; public class RegexpValidatorTest { diff --git a/server/src/test/java/com/vaadin/tests/data/validator/ShortRangeValidatorTest.java b/server/src/test/java/com/vaadin/tests/data/validator/ShortRangeValidatorTest.java index a4cb5f7d3a..41c3e67942 100644 --- a/server/src/test/java/com/vaadin/tests/data/validator/ShortRangeValidatorTest.java +++ b/server/src/test/java/com/vaadin/tests/data/validator/ShortRangeValidatorTest.java @@ -5,7 +5,7 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; -import com.vaadin.legacy.data.validator.LegacyShortRangeValidator; +import com.vaadin.v7.data.validator.LegacyShortRangeValidator; public class ShortRangeValidatorTest { diff --git a/server/src/test/java/com/vaadin/tests/data/validator/StringLengthValidatorTest.java b/server/src/test/java/com/vaadin/tests/data/validator/StringLengthValidatorTest.java index 8e5897bf3b..e24e8fcd5d 100644 --- a/server/src/test/java/com/vaadin/tests/data/validator/StringLengthValidatorTest.java +++ b/server/src/test/java/com/vaadin/tests/data/validator/StringLengthValidatorTest.java @@ -5,7 +5,7 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; -import com.vaadin.legacy.data.validator.LegacyStringLengthValidator; +import com.vaadin.v7.data.validator.LegacyStringLengthValidator; public class StringLengthValidatorTest { diff --git a/server/src/test/java/com/vaadin/tests/design/ComponentFactoryTest.java b/server/src/test/java/com/vaadin/tests/design/ComponentFactoryTest.java index 8016eb1670..3a0fca2acd 100644 --- a/server/src/test/java/com/vaadin/tests/design/ComponentFactoryTest.java +++ b/server/src/test/java/com/vaadin/tests/design/ComponentFactoryTest.java @@ -19,7 +19,6 @@ import java.io.ByteArrayInputStream; import java.util.ArrayList; import java.util.List; -import com.vaadin.legacy.ui.LegacyTextField; import com.vaadin.ui.AbstractComponent; import org.junit.After; @@ -30,6 +29,7 @@ import com.vaadin.ui.Component; import com.vaadin.ui.Label; import com.vaadin.ui.declarative.Design; import com.vaadin.ui.declarative.Design.ComponentFactory; +import com.vaadin.v7.ui.LegacyTextField; import com.vaadin.ui.declarative.DesignContext; import com.vaadin.ui.declarative.DesignException; diff --git a/server/src/test/java/com/vaadin/tests/design/DesignFormatterTest.java b/server/src/test/java/com/vaadin/tests/design/DesignFormatterTest.java index 56a1eed569..3f304b6eb2 100644 --- a/server/src/test/java/com/vaadin/tests/design/DesignFormatterTest.java +++ b/server/src/test/java/com/vaadin/tests/design/DesignFormatterTest.java @@ -32,7 +32,6 @@ import org.junit.Test; import com.vaadin.event.ShortcutAction; import com.vaadin.event.ShortcutAction.KeyCode; import com.vaadin.event.ShortcutAction.ModifierKey; -import com.vaadin.legacy.data.util.converter.LegacyConverter.ConversionException; import com.vaadin.server.ExternalResource; import com.vaadin.server.FileResource; import com.vaadin.server.FontAwesome; @@ -43,6 +42,7 @@ import com.vaadin.server.ThemeResource; import com.vaadin.shared.ApplicationConstants; import com.vaadin.shared.util.SharedUtil; import com.vaadin.ui.declarative.DesignFormatter; +import com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException; /** * Various tests related to formatter. diff --git a/server/src/test/java/com/vaadin/tests/design/InvalidLayoutTemplate.java b/server/src/test/java/com/vaadin/tests/design/InvalidLayoutTemplate.java index 888b23008f..104f563b49 100644 --- a/server/src/test/java/com/vaadin/tests/design/InvalidLayoutTemplate.java +++ b/server/src/test/java/com/vaadin/tests/design/InvalidLayoutTemplate.java @@ -15,10 +15,10 @@ */ package com.vaadin.tests.design; -import com.vaadin.legacy.ui.LegacyTextField; import com.vaadin.ui.Button; import com.vaadin.ui.NativeButton; import com.vaadin.ui.VerticalLayout; +import com.vaadin.v7.ui.LegacyTextField; /** * diff --git a/server/src/test/java/com/vaadin/tests/design/designroot/ExtendedDesignWithAnnotation.java b/server/src/test/java/com/vaadin/tests/design/designroot/ExtendedDesignWithAnnotation.java index bb7061fa1b..62abcaecb9 100644 --- a/server/src/test/java/com/vaadin/tests/design/designroot/ExtendedDesignWithAnnotation.java +++ b/server/src/test/java/com/vaadin/tests/design/designroot/ExtendedDesignWithAnnotation.java @@ -15,7 +15,7 @@ */ package com.vaadin.tests.design.designroot; -import com.vaadin.legacy.ui.LegacyTextField; +import com.vaadin.v7.ui.LegacyTextField; public class ExtendedDesignWithAnnotation extends DesignWithAnnotation { private LegacyTextField customField = new LegacyTextField(); diff --git a/server/src/test/java/com/vaadin/tests/design/designroot/ExtendedDesignWithEmptyAnnotation.java b/server/src/test/java/com/vaadin/tests/design/designroot/ExtendedDesignWithEmptyAnnotation.java index 7565955829..ab2b2c1d49 100644 --- a/server/src/test/java/com/vaadin/tests/design/designroot/ExtendedDesignWithEmptyAnnotation.java +++ b/server/src/test/java/com/vaadin/tests/design/designroot/ExtendedDesignWithEmptyAnnotation.java @@ -17,7 +17,7 @@ package com.vaadin.tests.design.designroot; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; -import com.vaadin.legacy.ui.LegacyTextField; +import com.vaadin.v7.ui.LegacyTextField; import com.vaadin.ui.Notification; public class ExtendedDesignWithEmptyAnnotation diff --git a/server/src/test/java/com/vaadin/tests/server/EventRouterTest.java b/server/src/test/java/com/vaadin/tests/server/EventRouterTest.java index 4f6ef7f818..920b2a7915 100644 --- a/server/src/test/java/com/vaadin/tests/server/EventRouterTest.java +++ b/server/src/test/java/com/vaadin/tests/server/EventRouterTest.java @@ -4,7 +4,7 @@ import org.junit.Test; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.Property.ValueChangeListener; -import com.vaadin.legacy.ui.LegacyTextField; +import com.vaadin.v7.ui.LegacyTextField; public class EventRouterTest { diff --git a/server/src/test/java/com/vaadin/tests/server/ExtensionTest.java b/server/src/test/java/com/vaadin/tests/server/ExtensionTest.java index 181aa366cb..df50893420 100644 --- a/server/src/test/java/com/vaadin/tests/server/ExtensionTest.java +++ b/server/src/test/java/com/vaadin/tests/server/ExtensionTest.java @@ -17,10 +17,10 @@ package com.vaadin.tests.server; import org.junit.Test; -import com.vaadin.legacy.ui.LegacyTextField; import com.vaadin.server.AbstractClientConnector; import com.vaadin.server.AbstractExtension; import com.vaadin.ui.Label; +import com.vaadin.v7.ui.LegacyTextField; public class ExtensionTest { diff --git a/server/src/test/java/com/vaadin/tests/server/SerializationTest.java b/server/src/test/java/com/vaadin/tests/server/SerializationTest.java index 6a7c0f1755..30b0729ace 100644 --- a/server/src/test/java/com/vaadin/tests/server/SerializationTest.java +++ b/server/src/test/java/com/vaadin/tests/server/SerializationTest.java @@ -15,8 +15,8 @@ import com.vaadin.data.Item; import com.vaadin.data.Property; import com.vaadin.data.util.IndexedContainer; import com.vaadin.data.util.MethodProperty; -import com.vaadin.legacy.data.validator.LegacyRegexpValidator; import com.vaadin.server.VaadinSession; +import com.vaadin.v7.data.validator.LegacyRegexpValidator; public class SerializationTest { diff --git a/server/src/test/java/com/vaadin/tests/server/component/FieldDefaultValuesTest.java b/server/src/test/java/com/vaadin/tests/server/component/FieldDefaultValuesTest.java index 38e671917d..e96f3d36f3 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/FieldDefaultValuesTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/FieldDefaultValuesTest.java @@ -21,9 +21,9 @@ import java.util.List; import org.junit.Assert; import org.junit.Test; -import com.vaadin.legacy.ui.LegacyField; import com.vaadin.tests.VaadinClasses; import com.vaadin.ui.Slider; +import com.vaadin.v7.ui.LegacyField; public class FieldDefaultValuesTest { 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 08d8770ac4..6efd37ff45 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,8 +8,8 @@ import static org.junit.Assert.assertTrue; import org.easymock.EasyMock; import org.junit.Test; -import com.vaadin.legacy.data.Validator; -import com.vaadin.legacy.ui.LegacyAbstractField; +import com.vaadin.v7.data.Validator; +import com.vaadin.v7.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 9f77877fd6..44ab13ef6f 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 @@ -6,14 +6,14 @@ import org.junit.Assert; import org.junit.Test; import com.vaadin.data.util.MethodProperty; -import com.vaadin.legacy.data.Validator.InvalidValueException; -import com.vaadin.legacy.data.util.converter.LegacyConverter.ConversionException; -import com.vaadin.legacy.data.util.converter.LegacyStringToIntegerConverter; -import com.vaadin.legacy.ui.LegacyTextField; import com.vaadin.tests.data.bean.Address; import com.vaadin.tests.data.bean.Country; import com.vaadin.tests.data.bean.Person; import com.vaadin.tests.data.bean.Sex; +import com.vaadin.v7.data.Validator.InvalidValueException; +import com.vaadin.v7.data.util.converter.LegacyStringToIntegerConverter; +import com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException; +import com.vaadin.v7.ui.LegacyTextField; public class AbsFieldValueConversionErrorTest { diff --git a/server/src/test/java/com/vaadin/tests/server/component/abstractfield/AbsFieldValueConversionsTest.java b/server/src/test/java/com/vaadin/tests/server/component/abstractfield/AbsFieldValueConversionsTest.java index f65ce79330..d10a4ee48e 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/abstractfield/AbsFieldValueConversionsTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/abstractfield/AbsFieldValueConversionsTest.java @@ -10,16 +10,16 @@ import org.junit.Test; import com.vaadin.data.util.MethodProperty; import com.vaadin.data.util.ObjectProperty; -import com.vaadin.legacy.data.util.converter.LegacyConverter; -import com.vaadin.legacy.data.util.converter.LegacyConverter.ConversionException; -import com.vaadin.legacy.data.util.converter.LegacyStringToIntegerConverter; -import com.vaadin.legacy.ui.LegacyTextField; import com.vaadin.server.VaadinSession; import com.vaadin.tests.data.bean.Address; import com.vaadin.tests.data.bean.Country; import com.vaadin.tests.data.bean.Person; import com.vaadin.tests.data.bean.Sex; import com.vaadin.tests.util.AlwaysLockedVaadinSession; +import com.vaadin.v7.data.util.converter.LegacyConverter; +import com.vaadin.v7.data.util.converter.LegacyStringToIntegerConverter; +import com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException; +import com.vaadin.v7.ui.LegacyTextField; public class AbsFieldValueConversionsTest { diff --git a/server/src/test/java/com/vaadin/tests/server/component/abstractfield/AbstractFieldReadOnlyTest.java b/server/src/test/java/com/vaadin/tests/server/component/abstractfield/AbstractFieldReadOnlyTest.java index 7385caaf30..8fe1cc89db 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/abstractfield/AbstractFieldReadOnlyTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/abstractfield/AbstractFieldReadOnlyTest.java @@ -8,12 +8,12 @@ import org.junit.Test; import com.vaadin.data.Property.ReadOnlyStatusChangeEvent; import com.vaadin.data.Property.ReadOnlyStatusChangeListener; import com.vaadin.data.util.MethodProperty; -import com.vaadin.legacy.ui.LegacyTextField; import com.vaadin.tests.data.bean.Address; import com.vaadin.tests.data.bean.Country; import com.vaadin.tests.data.bean.Person; import com.vaadin.tests.data.bean.Sex; import com.vaadin.ui.Label; +import com.vaadin.v7.ui.LegacyTextField; public class AbstractFieldReadOnlyTest { diff --git a/server/src/test/java/com/vaadin/tests/server/component/abstractfield/DefaultConverterFactoryTest.java b/server/src/test/java/com/vaadin/tests/server/component/abstractfield/DefaultConverterFactoryTest.java index aa9364c4b3..61c94cd061 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/abstractfield/DefaultConverterFactoryTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/abstractfield/DefaultConverterFactoryTest.java @@ -8,13 +8,13 @@ import java.util.Locale; import org.junit.Test; import com.vaadin.data.util.MethodProperty; -import com.vaadin.legacy.ui.LegacyTextField; import com.vaadin.server.VaadinSession; import com.vaadin.tests.data.bean.Address; import com.vaadin.tests.data.bean.Country; import com.vaadin.tests.data.bean.Person; import com.vaadin.tests.data.bean.Sex; import com.vaadin.tests.util.AlwaysLockedVaadinSession; +import com.vaadin.v7.ui.LegacyTextField; public class DefaultConverterFactoryTest { diff --git a/server/src/test/java/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetachTest.java b/server/src/test/java/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetachTest.java index fe6c4a9b9a..a3fa5a7af6 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetachTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetachTest.java @@ -6,12 +6,12 @@ import org.junit.Test; import com.vaadin.data.Property; import com.vaadin.data.util.AbstractProperty; -import com.vaadin.legacy.data.util.converter.LegacyConverter.ConversionException; -import com.vaadin.legacy.ui.LegacyAbstractField; import com.vaadin.server.VaadinRequest; import com.vaadin.server.VaadinSession; import com.vaadin.tests.util.AlwaysLockedVaadinSession; import com.vaadin.ui.UI; +import com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException; +import com.vaadin.v7.ui.LegacyAbstractField; public class RemoveListenersOnDetachTest { diff --git a/server/src/test/java/com/vaadin/tests/server/component/abstracttextfield/AbstractTextFieldListenersTest.java b/server/src/test/java/com/vaadin/tests/server/component/abstracttextfield/AbstractTextFieldListenersTest.java index c8f353b97e..f501daf54b 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/abstracttextfield/AbstractTextFieldListenersTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/abstracttextfield/AbstractTextFieldListenersTest.java @@ -8,8 +8,8 @@ import com.vaadin.event.FieldEvents.FocusEvent; import com.vaadin.event.FieldEvents.FocusListener; import com.vaadin.event.FieldEvents.TextChangeEvent; import com.vaadin.event.FieldEvents.TextChangeListener; -import com.vaadin.legacy.ui.LegacyTextField; import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase; +import com.vaadin.v7.ui.LegacyTextField; public class AbstractTextFieldListenersTest extends AbstractListenerMethodsTestBase { diff --git a/server/src/test/java/com/vaadin/tests/server/component/datefield/DateFieldConverterTest.java b/server/src/test/java/com/vaadin/tests/server/component/datefield/DateFieldConverterTest.java index 85388089c5..5b4e8c7352 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/datefield/DateFieldConverterTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/datefield/DateFieldConverterTest.java @@ -24,9 +24,9 @@ import org.junit.Test; import com.vaadin.data.Property; import com.vaadin.data.util.ObjectProperty; -import com.vaadin.legacy.data.util.converter.LegacyConverter; -import com.vaadin.legacy.ui.LegacyDateField; import com.vaadin.shared.ui.datefield.Resolution; +import com.vaadin.v7.data.util.converter.LegacyConverter; +import com.vaadin.v7.ui.LegacyDateField; public class DateFieldConverterTest { diff --git a/server/src/test/java/com/vaadin/tests/server/component/datefield/LegacyDateFieldDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/datefield/LegacyDateFieldDeclarativeTest.java index ab84077ab2..97e944a0a7 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/datefield/LegacyDateFieldDeclarativeTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/datefield/LegacyDateFieldDeclarativeTest.java @@ -21,9 +21,9 @@ import java.util.TimeZone; import org.junit.Test; -import com.vaadin.legacy.ui.LegacyDateField; import com.vaadin.shared.ui.datefield.Resolution; import com.vaadin.tests.design.DeclarativeTestBase; +import com.vaadin.v7.ui.LegacyDateField; /** * Tests the declarative support for implementations of {@link LegacyDateField}. @@ -34,8 +34,10 @@ import com.vaadin.tests.design.DeclarativeTestBase; public class LegacyDateFieldDeclarativeTest extends DeclarativeTestBase<LegacyDateField> { + private static final String TAG_NAME = "com_vaadin_v7_ui-legacy-date-field"; + private String getYearResolutionDesign() { - return "<com_vaadin_legacy_ui-legacy-date-field resolution='year' value='2020'/>"; + return "<" + TAG_NAME + " resolution='year' value='2020'/>"; } private LegacyDateField getYearResolutionExpected() { @@ -48,7 +50,8 @@ public class LegacyDateFieldDeclarativeTest private String getTimezoneDesign() { String timeZone = new SimpleDateFormat("Z").format(new Date()); return String.format( - "<com_vaadin_legacy_ui-legacy-date-field range-start=\"2014-05-05 00:00:00%1$s\" range-end=\"2014-06-05 00:00:00%1$s\" date-out-of-range-message=\"Please select a sensible date\" date-format=\"yyyy-MM-dd\" lenient show-iso-week-numbers parse-error-message=\"You are doing it wrong\" time-zone=\"GMT+05:00\" value=\"2014-05-15 00:00:00%1$s\"/>", + "<" + TAG_NAME + + " range-start=\"2014-05-05 00:00:00%1$s\" range-end=\"2014-06-05 00:00:00%1$s\" date-out-of-range-message=\"Please select a sensible date\" date-format=\"yyyy-MM-dd\" lenient show-iso-week-numbers parse-error-message=\"You are doing it wrong\" time-zone=\"GMT+05:00\" value=\"2014-05-15 00:00:00%1$s\"/>", timeZone); } @@ -99,7 +102,8 @@ public class LegacyDateFieldDeclarativeTest public void testReadOnlyValue() { Date date = new Date(2020 - 1900, 1 - 1, 1); String timeZone = new SimpleDateFormat("Z").format(date); - String design = "<com_vaadin_legacy_ui-legacy-date-field readonly resolution='year' value='2020-01-01 00:00:00" + String design = "<" + TAG_NAME + + " readonly resolution='year' value='2020-01-01 00:00:00" + timeZone + "'/>"; LegacyDateField df = new LegacyDateField(); df.setResolution(Resolution.YEAR); @@ -113,7 +117,7 @@ public class LegacyDateFieldDeclarativeTest @Override public LegacyDateField testRead(String design, LegacyDateField expected) { return super.testRead( - "<html><head><meta charset='UTF-8' name='package-mapping' content='com_vaadin_legacy_ui:com.vaadin.legacy.ui'></head> " + "<html><head><meta charset='UTF-8' name='package-mapping' content='com_vaadin_v7_ui:com.vaadin.v7.ui'></head> " + design + "</html>", expected); } diff --git a/server/src/test/java/com/vaadin/tests/server/component/datefield/LegacyPopupDateFieldDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/datefield/LegacyPopupDateFieldDeclarativeTest.java index 5ab9db7432..0777a0c782 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/datefield/LegacyPopupDateFieldDeclarativeTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/datefield/LegacyPopupDateFieldDeclarativeTest.java @@ -19,9 +19,9 @@ import java.util.Date; import org.junit.Test; -import com.vaadin.legacy.ui.LegacyPopupDateField; import com.vaadin.shared.ui.datefield.Resolution; import com.vaadin.tests.design.DeclarativeTestBase; +import com.vaadin.v7.ui.LegacyPopupDateField; /** * Tests the declarative support for implementations of @@ -33,8 +33,11 @@ import com.vaadin.tests.design.DeclarativeTestBase; public class LegacyPopupDateFieldDeclarativeTest extends DeclarativeTestBase<LegacyPopupDateField> { + private static final String TAG_NAME = "com_vaadin_v7_ui-legacy-popup-date-field"; + private String getBasicDesign() { - return "<com_vaadin_legacy_ui-legacy-popup-date-field assistive-text='at' text-field-enabled='false' show-iso-week-numbers resolution=\"MINUTE\" range-end=\"2019-01-15\" input-prompt=\"Pick a day\" value=\"2003-02-27 07:15\"></vaadin-popup-date-field>"; + return "<" + TAG_NAME + + " assistive-text='at' text-field-enabled='false' show-iso-week-numbers resolution=\"MINUTE\" range-end=\"2019-01-15\" input-prompt=\"Pick a day\" value=\"2003-02-27 07:15\"></vaadin-popup-date-field>"; } private LegacyPopupDateField getBasicExpected() { @@ -63,7 +66,7 @@ public class LegacyPopupDateFieldDeclarativeTest public LegacyPopupDateField testRead(String design, LegacyPopupDateField expected) { return super.testRead( - "<html><head><meta charset='UTF-8' name='package-mapping' content='com_vaadin_legacy_ui:com.vaadin.legacy.ui'></head> " + "<html><head><meta charset='UTF-8' name='package-mapping' content='com_vaadin_v7_ui:com.vaadin.v7.ui'></head> " + design + "</html>", expected); } diff --git a/server/src/test/java/com/vaadin/tests/server/component/fieldgroup/BeanFieldGroupTest.java b/server/src/test/java/com/vaadin/tests/server/component/fieldgroup/BeanFieldGroupTest.java index 8d58fecdef..f5c315b440 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/fieldgroup/BeanFieldGroupTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/fieldgroup/BeanFieldGroupTest.java @@ -10,9 +10,9 @@ 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.legacy.ui.LegacyField; -import com.vaadin.legacy.ui.LegacyTextField; import com.vaadin.ui.RichTextArea; +import com.vaadin.v7.ui.LegacyField; +import com.vaadin.v7.ui.LegacyTextField; public class BeanFieldGroupTest { @@ -132,7 +132,7 @@ public class BeanFieldGroupTest { BeanFieldGroup<MyBean> bfg = new BeanFieldGroup<MyBean>(MyBean.class); bfg.setItemDataSource(bean); - com.vaadin.legacy.ui.LegacyField<?> helloField = bfg + com.vaadin.v7.ui.LegacyField<?> helloField = bfg .buildAndBind("Hello string", "nestedBean.hello"); assertEquals(bean.nestedBean.hello, helloField.getValue().toString()); } diff --git a/server/src/test/java/com/vaadin/tests/server/component/fieldgroup/CaseInsensitiveBindingTest.java b/server/src/test/java/com/vaadin/tests/server/component/fieldgroup/CaseInsensitiveBindingTest.java index 45c41fac1e..a324c02cfc 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/fieldgroup/CaseInsensitiveBindingTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/fieldgroup/CaseInsensitiveBindingTest.java @@ -7,8 +7,8 @@ import org.junit.Test; import com.vaadin.data.fieldgroup.FieldGroup; import com.vaadin.data.util.ObjectProperty; import com.vaadin.data.util.PropertysetItem; -import com.vaadin.legacy.ui.LegacyTextField; import com.vaadin.ui.FormLayout; +import com.vaadin.v7.ui.LegacyTextField; public class CaseInsensitiveBindingTest { 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 be51e17914..43d2bf8a6a 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 @@ -30,9 +30,9 @@ import com.vaadin.data.Property; 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.legacy.ui.LegacyTextField; +import com.vaadin.v7.data.Validator.InvalidValueException; +import com.vaadin.v7.ui.LegacyField; +import com.vaadin.v7.ui.LegacyTextField; /** * diff --git a/server/src/test/java/com/vaadin/tests/server/component/fieldgroup/FieldGroupWithReadOnlyPropertiesTest.java b/server/src/test/java/com/vaadin/tests/server/component/fieldgroup/FieldGroupWithReadOnlyPropertiesTest.java index 5c4ff444ae..f14b966a2d 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/fieldgroup/FieldGroupWithReadOnlyPropertiesTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/fieldgroup/FieldGroupWithReadOnlyPropertiesTest.java @@ -7,8 +7,8 @@ import org.junit.Test; import com.vaadin.data.fieldgroup.FieldGroup; import com.vaadin.data.util.BeanItem; -import com.vaadin.legacy.ui.LegacyTextField; import com.vaadin.tests.data.bean.BeanWithReadOnlyField; +import com.vaadin.v7.ui.LegacyTextField; public class FieldGroupWithReadOnlyPropertiesTest { diff --git a/server/src/test/java/com/vaadin/tests/server/component/fieldgroup/FieldNamedDescriptionTest.java b/server/src/test/java/com/vaadin/tests/server/component/fieldgroup/FieldNamedDescriptionTest.java index 3d6d308ed5..0ef30316ac 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/fieldgroup/FieldNamedDescriptionTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/fieldgroup/FieldNamedDescriptionTest.java @@ -8,8 +8,8 @@ import com.vaadin.data.fieldgroup.FieldGroup; import com.vaadin.data.fieldgroup.PropertyId; import com.vaadin.data.util.ObjectProperty; import com.vaadin.data.util.PropertysetItem; -import com.vaadin.legacy.ui.LegacyTextField; import com.vaadin.ui.FormLayout; +import com.vaadin.v7.ui.LegacyTextField; public class FieldNamedDescriptionTest { diff --git a/server/src/test/java/com/vaadin/tests/server/component/grid/GridColumnsTest.java b/server/src/test/java/com/vaadin/tests/server/component/grid/GridColumnsTest.java index bf0a5c8ae1..570e9b92fc 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/grid/GridColumnsTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/grid/GridColumnsTest.java @@ -41,7 +41,6 @@ import org.junit.Before; import org.junit.Test; import com.vaadin.data.util.IndexedContainer; -import com.vaadin.legacy.ui.LegacyTextField; import com.vaadin.server.KeyMapper; import com.vaadin.shared.ui.grid.GridColumnState; import com.vaadin.shared.ui.grid.GridState; @@ -49,6 +48,7 @@ import com.vaadin.shared.util.SharedUtil; import com.vaadin.ui.LegacyGrid.Column; import com.vaadin.ui.LegacyGrid.ColumnResizeEvent; import com.vaadin.ui.LegacyGrid.ColumnResizeListener; +import com.vaadin.v7.ui.LegacyTextField; public class GridColumnsTest { diff --git a/server/src/test/java/com/vaadin/tests/server/component/grid/GridEditorTest.java b/server/src/test/java/com/vaadin/tests/server/component/grid/GridEditorTest.java index d30a84bd49..15daa264d9 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/grid/GridEditorTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/grid/GridEditorTest.java @@ -25,6 +25,9 @@ import static org.junit.Assert.assertTrue; import java.lang.reflect.Method; import com.vaadin.ui.LegacyGrid; +import com.vaadin.v7.ui.LegacyField; +import com.vaadin.v7.ui.LegacyTextField; + import org.easymock.EasyMock; import org.junit.After; import org.junit.Assert; @@ -36,8 +39,6 @@ import com.vaadin.data.Property; import com.vaadin.data.fieldgroup.FieldGroup; import com.vaadin.data.fieldgroup.FieldGroup.CommitException; import com.vaadin.data.util.IndexedContainer; -import com.vaadin.legacy.ui.LegacyField; -import com.vaadin.legacy.ui.LegacyTextField; import com.vaadin.server.MockVaadinSession; import com.vaadin.server.VaadinService; import com.vaadin.server.VaadinSession; diff --git a/server/src/test/java/com/vaadin/tests/server/component/gridlayout/DefaultAlignmentTest.java b/server/src/test/java/com/vaadin/tests/server/component/gridlayout/DefaultAlignmentTest.java index 6a54c84c7b..4e7d5c1e79 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/gridlayout/DefaultAlignmentTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/gridlayout/DefaultAlignmentTest.java @@ -4,10 +4,10 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import com.vaadin.legacy.ui.LegacyTextField; import com.vaadin.ui.Alignment; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; +import com.vaadin.v7.ui.LegacyTextField; public class DefaultAlignmentTest { diff --git a/server/src/test/java/com/vaadin/tests/server/component/orderedlayout/DefaultAlignmentTest.java b/server/src/test/java/com/vaadin/tests/server/component/orderedlayout/DefaultAlignmentTest.java index 3894dcc02b..f0e21992d7 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/orderedlayout/DefaultAlignmentTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/orderedlayout/DefaultAlignmentTest.java @@ -4,12 +4,12 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import com.vaadin.legacy.ui.LegacyTextField; import com.vaadin.ui.AbstractOrderedLayout; import com.vaadin.ui.Alignment; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; import com.vaadin.ui.VerticalLayout; +import com.vaadin.v7.ui.LegacyTextField; public class DefaultAlignmentTest { diff --git a/server/src/test/java/com/vaadin/tests/server/component/table/TablePropertyValueConverterTest.java b/server/src/test/java/com/vaadin/tests/server/component/table/TablePropertyValueConverterTest.java index 2b11026360..5a9297014c 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/table/TablePropertyValueConverterTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/table/TablePropertyValueConverterTest.java @@ -34,8 +34,8 @@ import com.vaadin.data.Container; import com.vaadin.data.Item; import com.vaadin.data.Property; import com.vaadin.data.util.IndexedContainer; -import com.vaadin.legacy.data.util.converter.LegacyConverter; import com.vaadin.ui.Table; +import com.vaadin.v7.data.util.converter.LegacyConverter; public class TablePropertyValueConverterTest { protected TestableTable table; @@ -90,14 +90,14 @@ public class TablePropertyValueConverterTest { @Override public String convertToModel(String value, Class<? extends String> targetType, Locale locale) - throws com.vaadin.legacy.data.util.converter.LegacyConverter.ConversionException { + throws com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException { return "model"; } @Override public String convertToPresentation(String value, Class<? extends String> targetType, Locale locale) - throws com.vaadin.legacy.data.util.converter.LegacyConverter.ConversionException { + throws com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException { return "presentation"; } @@ -120,7 +120,7 @@ public class TablePropertyValueConverterTest { public BaseClass convertToModel(String value, Class<? extends BaseClass> targetType, Locale locale) - throws com.vaadin.legacy.data.util.converter.LegacyConverter.ConversionException { + throws com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException { return new BaseClass("model"); } @@ -137,7 +137,7 @@ public class TablePropertyValueConverterTest { @Override public String convertToPresentation(BaseClass value, Class<? extends String> targetType, Locale locale) - throws com.vaadin.legacy.data.util.converter.LegacyConverter.ConversionException { + throws com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException { return null; } }); @@ -149,7 +149,7 @@ public class TablePropertyValueConverterTest { public DerivedClass convertToModel(String value, Class<? extends DerivedClass> targetType, Locale locale) - throws com.vaadin.legacy.data.util.converter.LegacyConverter.ConversionException { + throws com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException { return new DerivedClass("derived" + 1001); } @@ -166,7 +166,7 @@ public class TablePropertyValueConverterTest { @Override public String convertToPresentation(DerivedClass value, Class<? extends String> targetType, Locale locale) - throws com.vaadin.legacy.data.util.converter.LegacyConverter.ConversionException { + throws com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException { return null; } }); @@ -198,14 +198,14 @@ public class TablePropertyValueConverterTest { @Override public Integer convertToModel(String value, Class<? extends Integer> targetType, Locale locale) - throws com.vaadin.legacy.data.util.converter.LegacyConverter.ConversionException { + throws com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException { return 11; } @Override public String convertToPresentation(Integer value, Class<? extends String> targetType, Locale locale) - throws com.vaadin.legacy.data.util.converter.LegacyConverter.ConversionException { + throws com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException { return "presentation"; } @@ -241,14 +241,14 @@ public class TablePropertyValueConverterTest { @Override public String convertToModel(String value, Class<? extends String> targetType, Locale locale) - throws com.vaadin.legacy.data.util.converter.LegacyConverter.ConversionException { + throws com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException { return "model"; } @Override public String convertToPresentation(String value, Class<? extends String> targetType, Locale locale) - throws com.vaadin.legacy.data.util.converter.LegacyConverter.ConversionException { + throws com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException { return "presentation"; } @@ -270,14 +270,14 @@ public class TablePropertyValueConverterTest { @Override public String convertToModel(String value, Class<? extends String> targetType, Locale locale) - throws com.vaadin.legacy.data.util.converter.LegacyConverter.ConversionException { + throws com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException { return "model2"; } @Override public String convertToPresentation(String value, Class<? extends String> targetType, Locale locale) - throws com.vaadin.legacy.data.util.converter.LegacyConverter.ConversionException { + throws com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException { return "presentation2"; } diff --git a/server/src/test/java/com/vaadin/tests/server/component/textfield/TextFieldWithConverterAndValidatorTest.java b/server/src/test/java/com/vaadin/tests/server/component/textfield/TextFieldWithConverterAndValidatorTest.java index 2d6361f627..caea12d024 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/textfield/TextFieldWithConverterAndValidatorTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/textfield/TextFieldWithConverterAndValidatorTest.java @@ -4,9 +4,9 @@ import org.junit.Before; import org.junit.Test; import com.vaadin.data.util.ObjectProperty; -import com.vaadin.legacy.data.validator.LegacyRangeValidator; -import com.vaadin.legacy.ui.LegacyTextField; import com.vaadin.tests.data.converter.ConverterFactoryTest.ConvertTo42; +import com.vaadin.v7.data.validator.LegacyRangeValidator; +import com.vaadin.v7.ui.LegacyTextField; public class TextFieldWithConverterAndValidatorTest { diff --git a/server/src/test/java/com/vaadin/tests/server/component/textfield/TextFieldWithPropertyFormatterTest.java b/server/src/test/java/com/vaadin/tests/server/component/textfield/TextFieldWithPropertyFormatterTest.java index 27fc19e967..633269a0ab 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/textfield/TextFieldWithPropertyFormatterTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/textfield/TextFieldWithPropertyFormatterTest.java @@ -13,7 +13,7 @@ import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.Property.ValueChangeListener; import com.vaadin.data.util.ObjectProperty; import com.vaadin.data.util.PropertyFormatter; -import com.vaadin.legacy.ui.LegacyTextField; +import com.vaadin.v7.ui.LegacyTextField; public class TextFieldWithPropertyFormatterTest { 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 c4bde560bf..6fc2108b63 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 @@ -6,12 +6,12 @@ import org.junit.Before; import org.junit.Test; import com.vaadin.data.util.ObjectProperty; -import com.vaadin.legacy.data.Validator; -import com.vaadin.legacy.data.Validator.InvalidValueException; -import com.vaadin.legacy.data.validator.LegacyEmailValidator; -import com.vaadin.legacy.data.validator.LegacyRegexpValidator; -import com.vaadin.legacy.data.validator.LegacyStringLengthValidator; -import com.vaadin.legacy.ui.LegacyTextField; +import com.vaadin.v7.data.Validator; +import com.vaadin.v7.data.Validator.InvalidValueException; +import com.vaadin.v7.data.validator.LegacyEmailValidator; +import com.vaadin.v7.data.validator.LegacyRegexpValidator; +import com.vaadin.v7.data.validator.LegacyStringLengthValidator; +import com.vaadin.v7.ui.LegacyTextField; public class TextFieldWithValidatorTest { diff --git a/server/src/test/java/com/vaadin/tests/server/components/AbstractFieldValueChangeTestBase.java b/server/src/test/java/com/vaadin/tests/server/components/AbstractFieldValueChangeTestBase.java index 1c7dcdf504..52c8f61466 100644 --- a/server/src/test/java/com/vaadin/tests/server/components/AbstractFieldValueChangeTestBase.java +++ b/server/src/test/java/com/vaadin/tests/server/components/AbstractFieldValueChangeTestBase.java @@ -7,7 +7,7 @@ import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.Property.ValueChangeListener; import com.vaadin.data.Property.ValueChangeNotifier; import com.vaadin.data.util.ObjectProperty; -import com.vaadin.legacy.ui.LegacyAbstractField; +import com.vaadin.v7.ui.LegacyAbstractField; /** * Base class for tests for checking that value change listeners for fields are diff --git a/server/src/test/java/com/vaadin/tests/server/components/ComboBoxValueChangeTest.java b/server/src/test/java/com/vaadin/tests/server/components/ComboBoxValueChangeTest.java index 891ddc4561..66a4ec2370 100644 --- a/server/src/test/java/com/vaadin/tests/server/components/ComboBoxValueChangeTest.java +++ b/server/src/test/java/com/vaadin/tests/server/components/ComboBoxValueChangeTest.java @@ -2,11 +2,11 @@ package com.vaadin.tests.server.components; import org.junit.Before; -import com.vaadin.legacy.ui.LegacyAbstractField; import com.vaadin.server.ServerRpcManager; import com.vaadin.server.ServerRpcMethodInvocation; import com.vaadin.shared.ui.combobox.ComboBoxServerRpc; import com.vaadin.ui.ComboBox; +import com.vaadin.v7.ui.LegacyAbstractField; /** * Check that the value change listener for a combo box is triggered exactly diff --git a/server/src/test/java/com/vaadin/tests/server/components/TextFieldValueChangeTest.java b/server/src/test/java/com/vaadin/tests/server/components/TextFieldValueChangeTest.java index 3ceb60219d..4f2fc60bfe 100644 --- a/server/src/test/java/com/vaadin/tests/server/components/TextFieldValueChangeTest.java +++ b/server/src/test/java/com/vaadin/tests/server/components/TextFieldValueChangeTest.java @@ -10,8 +10,8 @@ import org.junit.Test; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.util.ObjectProperty; -import com.vaadin.legacy.ui.LegacyAbstractField; -import com.vaadin.legacy.ui.LegacyTextField; +import com.vaadin.v7.ui.LegacyAbstractField; +import com.vaadin.v7.ui.LegacyTextField; /** * Check that the value change listener for a text field is triggered exactly diff --git a/server/src/test/java/com/vaadin/tests/server/renderer/RendererTest.java b/server/src/test/java/com/vaadin/tests/server/renderer/RendererTest.java index eb0e3b641c..5eec5b6ea8 100644 --- a/server/src/test/java/com/vaadin/tests/server/renderer/RendererTest.java +++ b/server/src/test/java/com/vaadin/tests/server/renderer/RendererTest.java @@ -27,8 +27,6 @@ import org.junit.Test; import com.vaadin.data.Item; import com.vaadin.data.util.IndexedContainer; -import com.vaadin.legacy.data.util.converter.LegacyConverter; -import com.vaadin.legacy.data.util.converter.LegacyStringToIntegerConverter; import com.vaadin.server.VaadinSession; import com.vaadin.tests.server.component.grid.TestGrid; import com.vaadin.tests.util.AlwaysLockedVaadinSession; @@ -40,6 +38,8 @@ import com.vaadin.ui.renderers.DateRenderer; import com.vaadin.ui.renderers.HtmlRenderer; import com.vaadin.ui.renderers.NumberRenderer; import com.vaadin.ui.renderers.TextRenderer; +import com.vaadin.v7.data.util.converter.LegacyConverter; +import com.vaadin.v7.data.util.converter.LegacyStringToIntegerConverter; import elemental.json.JsonValue; 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 241e7d4f7c..a8e6238d4b 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 @@ -4,10 +4,10 @@ import org.junit.Assert; import org.junit.Test; import com.vaadin.data.fieldgroup.BeanFieldGroup; -import com.vaadin.legacy.data.Validator.InvalidValueException; -import com.vaadin.legacy.data.validator.LegacyBeanValidator; -import com.vaadin.legacy.ui.LegacyField; import com.vaadin.tests.data.bean.BeanToValidate; +import com.vaadin.v7.data.Validator.InvalidValueException; +import com.vaadin.v7.data.validator.LegacyBeanValidator; +import com.vaadin.v7.ui.LegacyField; public class BeanValidationTest { @Test(expected = InvalidValueException.class) diff --git a/server/src/test/java/com/vaadin/tests/server/validation/RangeValidatorTest.java b/server/src/test/java/com/vaadin/tests/server/validation/RangeValidatorTest.java index 667abb4529..1d5032e956 100644 --- a/server/src/test/java/com/vaadin/tests/server/validation/RangeValidatorTest.java +++ b/server/src/test/java/com/vaadin/tests/server/validation/RangeValidatorTest.java @@ -5,7 +5,7 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; -import com.vaadin.legacy.data.validator.LegacyIntegerRangeValidator; +import com.vaadin.v7.data.validator.LegacyIntegerRangeValidator; public class RangeValidatorTest { diff --git a/server/src/test/java/com/vaadin/tests/server/validation/ReadOnlyValidationTest.java b/server/src/test/java/com/vaadin/tests/server/validation/ReadOnlyValidationTest.java index c4c376c2ac..503ba455fd 100644 --- a/server/src/test/java/com/vaadin/tests/server/validation/ReadOnlyValidationTest.java +++ b/server/src/test/java/com/vaadin/tests/server/validation/ReadOnlyValidationTest.java @@ -2,8 +2,8 @@ package com.vaadin.tests.server.validation; import org.junit.Test; -import com.vaadin.legacy.data.validator.LegacyIntegerValidator; -import com.vaadin.legacy.ui.LegacyTextField; +import com.vaadin.v7.data.validator.LegacyIntegerValidator; +import com.vaadin.v7.ui.LegacyTextField; public class ReadOnlyValidationTest { diff --git a/server/src/test/java/com/vaadin/ui/AbsFieldDataSourceLocaleChangeTest.java b/server/src/test/java/com/vaadin/ui/AbsFieldDataSourceLocaleChangeTest.java index 7789eafa99..1844495f6d 100644 --- a/server/src/test/java/com/vaadin/ui/AbsFieldDataSourceLocaleChangeTest.java +++ b/server/src/test/java/com/vaadin/ui/AbsFieldDataSourceLocaleChangeTest.java @@ -7,11 +7,11 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import com.vaadin.legacy.data.util.converter.LegacyStringToIntegerConverter; -import com.vaadin.legacy.ui.LegacyTextField; import com.vaadin.server.VaadinRequest; import com.vaadin.server.VaadinSession; import com.vaadin.tests.util.AlwaysLockedVaadinSession; +import com.vaadin.v7.data.util.converter.LegacyStringToIntegerConverter; +import com.vaadin.v7.ui.LegacyTextField; public class AbsFieldDataSourceLocaleChangeTest { diff --git a/server/src/test/java/com/vaadin/ui/TextFieldTest.java b/server/src/test/java/com/vaadin/ui/TextFieldTest.java index d2b9173af0..9093b40bea 100644 --- a/server/src/test/java/com/vaadin/ui/TextFieldTest.java +++ b/server/src/test/java/com/vaadin/ui/TextFieldTest.java @@ -19,7 +19,7 @@ import org.junit.Assert; import org.junit.Test; import com.vaadin.data.util.ObjectProperty; -import com.vaadin.legacy.ui.LegacyTextField; +import com.vaadin.v7.ui.LegacyTextField; public class TextFieldTest { |