Rename legacy packages to v7

Change-Id: I53f3bd49c234a8d126887f6effa83a3c5c92b4e0

client/src/main/java/com/vaadin/client/ui/VOptionGroupBase.java

@@ -33,7 +33,7 @@ import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.client.ApplicationConnection;
 import com.vaadin.client.Focusable;
 import com.vaadin.client.UIDL;
-import com.vaadin.client.legacy.ui.VLegacyTextField;
+import com.vaadin.client.v7.ui.VLegacyTextField;
 
 public abstract class VOptionGroupBase extends Composite implements Field,
         ClickHandler, ChangeHandler, KeyPressHandler, Focusable, HasEnabled {

client/src/main/java/com/vaadin/client/ui/VPasswordField.java

@@ -17,7 +17,7 @@
 package com.vaadin.client.ui;
 
 import com.google.gwt.user.client.DOM;
-import com.vaadin.client.legacy.ui.VLegacyTextField;
+import com.vaadin.client.v7.ui.VLegacyTextField;
 
 /**
  * This class represents a password field.

client/src/main/java/com/vaadin/client/ui/VScrollTable.java

@@ -93,7 +93,6 @@ import com.vaadin.client.Util;
 import com.vaadin.client.VConsole;
 import com.vaadin.client.VTooltip;
 import com.vaadin.client.WidgetUtil;
-import com.vaadin.client.legacy.ui.VLegacyTextField;
 import com.vaadin.client.ui.VScrollTable.VScrollTableBody.VScrollTableRow;
 import com.vaadin.client.ui.dd.DDUtil;
 import com.vaadin.client.ui.dd.VAbstractDropHandler;
@@ -102,6 +101,7 @@ import com.vaadin.client.ui.dd.VDragAndDropManager;
 import com.vaadin.client.ui.dd.VDragEvent;
 import com.vaadin.client.ui.dd.VHasDropHandler;
 import com.vaadin.client.ui.dd.VTransferable;
+import com.vaadin.client.v7.ui.VLegacyTextField;
 import com.vaadin.shared.AbstractComponentState;
 import com.vaadin.shared.MouseEventDetails;
 import com.vaadin.shared.ui.dd.VerticalDropLocation;

client/src/main/java/com/vaadin/client/ui/VTextArea.java

@@ -33,8 +33,8 @@ import com.google.gwt.user.client.DOM;
 import com.google.gwt.user.client.Event;
 import com.vaadin.client.BrowserInfo;
 import com.vaadin.client.WidgetUtil;
-import com.vaadin.client.legacy.ui.VLegacyTextField;
 import com.vaadin.client.ui.dd.DragImageModifier;
+import com.vaadin.client.v7.ui.VLegacyTextField;
 
 /**
  * This class represents a multiline textfield (textarea).

client/src/main/java/com/vaadin/client/ui/VTextualDate.java

@@ -34,11 +34,11 @@ import com.vaadin.client.Focusable;
 import com.vaadin.client.LocaleNotLoadedException;
 import com.vaadin.client.LocaleService;
 import com.vaadin.client.VConsole;
-import com.vaadin.client.legacy.ui.VLegacyTextField;
 import com.vaadin.client.ui.aria.AriaHelper;
 import com.vaadin.client.ui.aria.HandlesAriaCaption;
 import com.vaadin.client.ui.aria.HandlesAriaInvalid;
 import com.vaadin.client.ui.aria.HandlesAriaRequired;
+import com.vaadin.client.v7.ui.VLegacyTextField;
 import com.vaadin.shared.EventId;
 import com.vaadin.shared.ui.datefield.Resolution;
 

client/src/main/java/com/vaadin/client/ui/loginform/LoginFormConnector.java

@@ -28,11 +28,11 @@ import com.google.gwt.user.client.ui.FormPanel;
 import com.vaadin.client.ComponentConnector;
 import com.vaadin.client.ConnectorHierarchyChangeEvent;
 import com.vaadin.client.communication.StateChangeEvent;
-import com.vaadin.client.legacy.ui.VLegacyTextField;
-import com.vaadin.client.legacy.ui.textfield.LegacyTextFieldConnector;
 import com.vaadin.client.ui.AbstractSingleComponentContainerConnector;
 import com.vaadin.client.ui.button.ButtonConnector;
 import com.vaadin.client.ui.nativebutton.NativeButtonConnector;
+import com.vaadin.client.v7.ui.VLegacyTextField;
+import com.vaadin.client.v7.ui.textfield.LegacyTextFieldConnector;
 import com.vaadin.shared.Connector;
 import com.vaadin.shared.ui.Connect;
 import com.vaadin.shared.ui.loginform.LoginFormConstants;

client/src/main/java/com/vaadin/client/ui/optiongroup/OptionGroupBaseConnector.java

@@ -20,10 +20,10 @@ import com.vaadin.client.ApplicationConnection;
 import com.vaadin.client.Paintable;
 import com.vaadin.client.StyleConstants;
 import com.vaadin.client.UIDL;
-import com.vaadin.client.legacy.ui.VLegacyTextField;
 import com.vaadin.client.ui.AbstractFieldConnector;
 import com.vaadin.client.ui.VNativeButton;
 import com.vaadin.client.ui.VOptionGroupBase;
+import com.vaadin.client.v7.ui.VLegacyTextField;
 import com.vaadin.shared.ui.select.AbstractSelectState;
 
 public abstract class OptionGroupBaseConnector extends AbstractFieldConnector

client/src/main/java/com/vaadin/client/ui/passwordfield/PasswordFieldConnector.java

@@ -16,8 +16,8 @@
 
 package com.vaadin.client.ui.passwordfield;
 
-import com.vaadin.client.legacy.ui.textfield.LegacyTextFieldConnector;
 import com.vaadin.client.ui.VPasswordField;
+import com.vaadin.client.v7.ui.textfield.LegacyTextFieldConnector;
 import com.vaadin.shared.ui.Connect;
 import com.vaadin.ui.PasswordField;
 

client/src/main/java/com/vaadin/client/ui/textarea/TextAreaConnector.java

@@ -20,8 +20,8 @@ import com.google.gwt.dom.client.Element;
 import com.google.gwt.event.dom.client.MouseUpEvent;
 import com.google.gwt.event.dom.client.MouseUpHandler;
 import com.vaadin.client.WidgetUtil.CssSize;
-import com.vaadin.client.legacy.ui.textfield.LegacyTextFieldConnector;
 import com.vaadin.client.ui.VTextArea;
+import com.vaadin.client.v7.ui.textfield.LegacyTextFieldConnector;
 import com.vaadin.shared.ui.Connect;
 import com.vaadin.shared.ui.textarea.TextAreaState;
 import com.vaadin.ui.TextArea;

client/src/main/java/com/vaadin/client/legacy/ui/LegacyDateFieldConnector.java → client/src/main/java/com/vaadin/client/v7/ui/LegacyDateFieldConnector.java

@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.client.legacy.ui;
+package com.vaadin.client.v7.ui;
 
 import com.vaadin.client.ui.datefield.DateFieldConnector;
-import com.vaadin.legacy.ui.LegacyDateField;
 import com.vaadin.shared.ui.Connect;
+import com.vaadin.v7.ui.LegacyDateField;
 
 /**
  * @author Vaadin Ltd

client/src/main/java/com/vaadin/client/legacy/ui/LegacyInlineDateFieldConnector.java → client/src/main/java/com/vaadin/client/v7/ui/LegacyInlineDateFieldConnector.java

@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.client.legacy.ui;
+package com.vaadin.client.v7.ui;
 
 import com.vaadin.client.ui.datefield.InlineDateFieldConnector;
-import com.vaadin.legacy.ui.LegacyInlineDateField;
 import com.vaadin.shared.ui.Connect;
+import com.vaadin.v7.ui.LegacyInlineDateField;
 
 /**
  * @author Vaadin Ltd

client/src/main/java/com/vaadin/client/legacy/ui/LegacyPopupDateFieldConnector.java → client/src/main/java/com/vaadin/client/v7/ui/LegacyPopupDateFieldConnector.java

@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.client.legacy.ui;
+package com.vaadin.client.v7.ui;
 
 import com.vaadin.client.ui.datefield.PopupDateFieldConnector;
-import com.vaadin.legacy.ui.LegacyPopupDateField;
 import com.vaadin.shared.ui.Connect;
+import com.vaadin.v7.ui.LegacyPopupDateField;
 
 /**
  * @author Vaadin Ltd

client/src/main/java/com/vaadin/client/legacy/ui/VLegacyTextField.java → client/src/main/java/com/vaadin/client/v7/ui/VLegacyTextField.java

@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.client.legacy.ui;
+package com.vaadin.client.v7.ui;
 
 import com.google.gwt.core.client.Scheduler;
 import com.google.gwt.core.client.Scheduler.ScheduledCommand;
@@ -37,7 +37,7 @@ import com.vaadin.client.BrowserInfo;
 import com.vaadin.client.WidgetUtil;
 import com.vaadin.client.ui.Field;
 import com.vaadin.shared.EventId;
-import com.vaadin.shared.legacy.ui.textfield.LegacyTextFieldConstants;
+import com.vaadin.shared.v7.ui.textfield.LegacyTextFieldConstants;
 
 /**
  * This class represents a basic text input field with one row.
@@ -249,7 +249,7 @@ public class VLegacyTextField extends TextBoxBase implements Field,
     /*-{
         var me = this;
         el.oncut = $entry(function() {
-            me.@com.vaadin.client.legacy.ui.VLegacyTextField::onCut()();
+            me.@com.vaadin.client.v7.ui.VLegacyTextField::onCut()();
         });
     }-*/;
 
@@ -291,7 +291,7 @@ public class VLegacyTextField extends TextBoxBase implements Field,
     /*-{
         var me = this;
         el.ondrop = $entry(function() {
-            me.@com.vaadin.client.legacy.ui.VLegacyTextField::scheduleOnDropEvent()();
+            me.@com.vaadin.client.v7.ui.VLegacyTextField::scheduleOnDropEvent()();
         });
     }-*/;
 
@@ -513,10 +513,10 @@ public class VLegacyTextField extends TextBoxBase implements Field,
 
     private native void addOnInputListener(Element el)
     /*-{
-        var self = this; 
+        var self = this;
         el.oninput = $entry(function() {
-            self.@com.vaadin.client.legacy.ui.VLegacyTextField::checkForInputError()();
-        }); 
+            self.@com.vaadin.client.v7.ui.VLegacyTextField::checkForInputError()();
+        });
     }-*/;
 
     private native void removeOnInputListener(Element el)

client/src/main/java/com/vaadin/client/legacy/ui/checkbox/LegacyCheckBoxConnector.java → client/src/main/java/com/vaadin/client/v7/ui/checkbox/LegacyCheckBoxConnector.java

@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.client.legacy.ui.checkbox;
+package com.vaadin.client.v7.ui.checkbox;
 
 import com.vaadin.client.ui.checkbox.CheckBoxConnector;
-import com.vaadin.legacy.ui.LegacyCheckBox;
 import com.vaadin.shared.ui.Connect;
+import com.vaadin.v7.ui.LegacyCheckBox;
 
 @Connect(LegacyCheckBox.class)
 public class LegacyCheckBoxConnector extends CheckBoxConnector {

client/src/main/java/com/vaadin/client/legacy/ui/textfield/LegacyTextFieldConnector.java → client/src/main/java/com/vaadin/client/v7/ui/textfield/LegacyTextFieldConnector.java

@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.client.legacy.ui.textfield;
+package com.vaadin.client.v7.ui.textfield;
 
 import com.google.gwt.core.client.Scheduler;
 import com.google.gwt.user.client.Command;
@@ -22,13 +22,13 @@ import com.vaadin.client.ApplicationConnection;
 import com.vaadin.client.Paintable;
 import com.vaadin.client.UIDL;
 import com.vaadin.client.Util;
-import com.vaadin.client.legacy.ui.VLegacyTextField;
 import com.vaadin.client.ui.AbstractFieldConnector;
-import com.vaadin.legacy.ui.LegacyTextField;
-import com.vaadin.shared.legacy.ui.textfield.LegacyAbstractTextFieldState;
-import com.vaadin.shared.legacy.ui.textfield.LegacyTextFieldConstants;
+import com.vaadin.client.v7.ui.VLegacyTextField;
 import com.vaadin.shared.ui.Connect;
 import com.vaadin.shared.ui.Connect.LoadStyle;
+import com.vaadin.shared.v7.ui.textfield.LegacyAbstractTextFieldState;
+import com.vaadin.shared.v7.ui.textfield.LegacyTextFieldConstants;
+import com.vaadin.v7.ui.LegacyTextField;
 
 @Deprecated
 @Connect(value = LegacyTextField.class, loadStyle = LoadStyle.EAGER)

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>

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>

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 {
 

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}

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

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

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}.

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.

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.

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.

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

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.

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.

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

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

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.

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() {

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

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,

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

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.

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.

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

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

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.

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.

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>

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

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.

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.

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

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

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

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;
         }

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;
         }

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

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}.

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

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

server/src/main/java/com/vaadin/legacy/data/Validatable.java → 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 {
 

server/src/main/java/com/vaadin/legacy/data/Validator.java → 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>

server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyAbstractStringToNumberConverter.java → 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;

server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyConverter.java → 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;

server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyConverterFactory.java → 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;
 

server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyConverterUtil.java → 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;

server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyDateToLongConverter.java → 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;

server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyDateToSqlDateConverter.java → 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;

server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyDefaultConverterFactory.java → 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;

server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyReverseConverter.java → 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);
     }
 

server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToBigDecimalConverter.java → 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);
     }
 

server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToBigIntegerConverter.java → 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);

server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToBooleanConverter.java → 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;
 

server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToByteConverter.java → 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;

server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToCollectionConverter.java → 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;

server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToDateConverter.java → 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;
         }

server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToDoubleConverter.java → 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;

server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToEnumConverter.java → 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;

server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToFloatConverter.java → 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;

server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToIntegerConverter.java → 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;

server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToLongConverter.java → 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;

server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToShortConverter.java → 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;

server/src/main/java/com/vaadin/legacy/data/validator/LegacyAbstractStringValidator.java → 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.

server/src/main/java/com/vaadin/legacy/data/validator/LegacyAbstractValidator.java → 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>

server/src/main/java/com/vaadin/legacy/data/validator/LegacyBeanValidator.java → 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)

server/src/main/java/com/vaadin/legacy/data/validator/LegacyBigDecimalRangeValidator.java → 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;
 

server/src/main/java/com/vaadin/legacy/data/validator/LegacyBigIntegerRangeValidator.java → 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;
 

server/src/main/java/com/vaadin/legacy/data/validator/LegacyByteRangeValidator.java → 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.

server/src/main/java/com/vaadin/legacy/data/validator/LegacyCompositeValidator.java → 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

server/src/main/java/com/vaadin/legacy/data/validator/LegacyDateRangeValidator.java → 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;
 

server/src/main/java/com/vaadin/legacy/data/validator/LegacyDoubleRangeValidator.java → 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.

server/src/main/java/com/vaadin/legacy/data/validator/LegacyDoubleValidator.java → 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.

server/src/main/java/com/vaadin/legacy/data/validator/LegacyEmailValidator.java → 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>

server/src/main/java/com/vaadin/legacy/data/validator/LegacyFloatRangeValidator.java → 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.

server/src/main/java/com/vaadin/legacy/data/validator/LegacyIntegerRangeValidator.java → 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.

server/src/main/java/com/vaadin/legacy/data/validator/LegacyIntegerValidator.java → 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.

server/src/main/java/com/vaadin/legacy/data/validator/LegacyLongRangeValidator.java → 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.

server/src/main/java/com/vaadin/legacy/data/validator/LegacyNullValidator.java → 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

server/src/main/java/com/vaadin/legacy/data/validator/LegacyRangeValidator.java → 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

server/src/main/java/com/vaadin/legacy/data/validator/LegacyRegexpValidator.java → 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>

server/src/main/java/com/vaadin/legacy/data/validator/LegacyShortRangeValidator.java → 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.

server/src/main/java/com/vaadin/legacy/data/validator/LegacyStringLengthValidator.java → 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

server/src/main/java/com/vaadin/legacy/ui/LegacyAbstractField.java → 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)

server/src/main/java/com/vaadin/legacy/ui/LegacyAbstractTextField.java → 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;

server/src/main/java/com/vaadin/legacy/ui/LegacyCheckBox.java → 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;