Move and duplicate client side and state to compatibility package

* Calendar
* CheckBox
* CustomField
* Label
* RichTextArea
* TextField
* TextArea

Change-Id: Iba8915195e4d205fb4db9a4df5d96a4a10ab2f96

compatibility-client/src/main/java/com/vaadin/v7/client/ui/VCalendar.java

@@ -31,7 +31,6 @@ import com.google.gwt.user.client.ui.DockPanel;
 import com.google.gwt.user.client.ui.ScrollPanel;
 import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.client.ui.dd.VHasDropHandler;
-import com.vaadin.shared.ui.calendar.DateConstants;
 import com.vaadin.v7.client.ui.calendar.schedule.CalendarDay;
 import com.vaadin.v7.client.ui.calendar.schedule.CalendarEvent;
 import com.vaadin.v7.client.ui.calendar.schedule.DayToolbar;
@@ -42,6 +41,7 @@ import com.vaadin.v7.client.ui.calendar.schedule.SimpleWeekToolbar;
 import com.vaadin.v7.client.ui.calendar.schedule.WeekGrid;
 import com.vaadin.v7.client.ui.calendar.schedule.WeeklyLongEvents;
 import com.vaadin.v7.client.ui.calendar.schedule.dd.CalendarDropHandler;
+import com.vaadin.v7.shared.ui.calendar.DateConstants;
 
 /**
  * Client side implementation for Calendar

compatibility-client/src/main/java/com/vaadin/v7/client/ui/VCustomComponent.java

@@ -0,0 +1,30 @@
+/*
+ * Copyright 2000-2016 Vaadin Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package com.vaadin.v7.client.ui;
+
+import com.google.gwt.user.client.ui.SimplePanel;
+
+public class VCustomComponent extends SimplePanel {
+
+    private static final String CLASSNAME = "v-customcomponent";
+
+    public VCustomComponent() {
+        super();
+        setStyleName(CLASSNAME);
+    }
+
+}

compatibility-client/src/main/java/com/vaadin/v7/client/ui/VLabel.java

@@ -0,0 +1,60 @@
+/*
+ * Copyright 2000-2016 Vaadin Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package com.vaadin.v7.client.ui;
+
+import com.google.gwt.user.client.Event;
+import com.google.gwt.user.client.ui.HTML;
+import com.vaadin.client.Util;
+import com.vaadin.client.VTooltip;
+
+public class VLabel extends HTML {
+
+    public static final String CLASSNAME = "v-label";
+    private static final String CLASSNAME_UNDEFINED_WIDTH = "v-label-undef-w";
+
+    public VLabel() {
+        super();
+        setStyleName(CLASSNAME);
+        sinkEvents(VTooltip.TOOLTIP_EVENTS);
+    }
+
+    public VLabel(String text) {
+        super(text);
+        setStyleName(CLASSNAME);
+    }
+
+    @Override
+    public void onBrowserEvent(Event event) {
+        super.onBrowserEvent(event);
+        if (event.getTypeInt() == Event.ONLOAD) {
+            Util.notifyParentOfSizeChange(this, true);
+            event.stopPropagation();
+            return;
+        }
+    }
+
+    @Override
+    public void setWidth(String width) {
+        super.setWidth(width);
+        if (width == null || width.equals("")) {
+            setStyleName(getElement(), CLASSNAME_UNDEFINED_WIDTH, true);
+        } else {
+            setStyleName(getElement(), CLASSNAME_UNDEFINED_WIDTH, false);
+        }
+    }
+
+}

compatibility-client/src/main/java/com/vaadin/v7/client/ui/VScrollTable.java

@@ -102,7 +102,6 @@ import com.vaadin.client.ui.TouchScrollDelegate;
 import com.vaadin.client.ui.TreeAction;
 import com.vaadin.client.ui.VContextMenu;
 import com.vaadin.client.ui.VEmbedded;
-import com.vaadin.client.ui.VLabel;
 import com.vaadin.client.ui.VOverlay;
 import com.vaadin.client.ui.dd.DDUtil;
 import com.vaadin.client.ui.dd.VAbstractDropHandler;

compatibility-client/src/main/java/com/vaadin/v7/client/ui/VTextField.java

@@ -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.v7.ui.textfield.LegacyTextFieldConstants;
+import com.vaadin.v7.shared.ui.textfield.LegacyTextFieldConstants;
 
 /**
  * This class represents a basic text input field with one row.

compatibility-client/src/main/java/com/vaadin/v7/client/ui/calendar/CalendarConnector.java

@@ -45,11 +45,6 @@ import com.vaadin.client.ui.ActionOwner;
 import com.vaadin.client.ui.SimpleManagedLayout;
 import com.vaadin.shared.ui.Connect;
 import com.vaadin.shared.ui.Connect.LoadStyle;
-import com.vaadin.shared.ui.calendar.CalendarClientRpc;
-import com.vaadin.shared.ui.calendar.CalendarEventId;
-import com.vaadin.shared.ui.calendar.CalendarServerRpc;
-import com.vaadin.shared.ui.calendar.CalendarState;
-import com.vaadin.shared.ui.calendar.DateConstants;
 import com.vaadin.v7.client.ui.VCalendar;
 import com.vaadin.v7.client.ui.VCalendar.BackwardListener;
 import com.vaadin.v7.client.ui.VCalendar.DateClickListener;
@@ -72,6 +67,11 @@ import com.vaadin.v7.client.ui.calendar.schedule.DateCell.DateCellSlot;
 import com.vaadin.v7.client.ui.calendar.schedule.dd.CalendarDropHandler;
 import com.vaadin.v7.client.ui.calendar.schedule.dd.CalendarMonthDropHandler;
 import com.vaadin.v7.client.ui.calendar.schedule.dd.CalendarWeekDropHandler;
+import com.vaadin.v7.shared.ui.calendar.CalendarClientRpc;
+import com.vaadin.v7.shared.ui.calendar.CalendarEventId;
+import com.vaadin.v7.shared.ui.calendar.CalendarServerRpc;
+import com.vaadin.v7.shared.ui.calendar.CalendarState;
+import com.vaadin.v7.shared.ui.calendar.DateConstants;
 import com.vaadin.v7.ui.Calendar;
 
 /**

compatibility-client/src/main/java/com/vaadin/v7/client/ui/calendar/VCalendarAction.java

@@ -19,9 +19,9 @@ import java.util.Date;
 
 import com.google.gwt.i18n.client.DateTimeFormat;
 import com.vaadin.client.ui.Action;
-import com.vaadin.shared.ui.calendar.CalendarServerRpc;
-import com.vaadin.shared.ui.calendar.DateConstants;
 import com.vaadin.v7.client.ui.calendar.schedule.CalendarEvent;
+import com.vaadin.v7.shared.ui.calendar.CalendarServerRpc;
+import com.vaadin.v7.shared.ui.calendar.DateConstants;
 
 /**
  * Action performed by the calendar

compatibility-client/src/main/java/com/vaadin/v7/client/ui/calendar/schedule/CalendarEvent.java

@@ -18,7 +18,7 @@ package com.vaadin.v7.client.ui.calendar.schedule;
 import java.util.Date;
 
 import com.google.gwt.i18n.client.DateTimeFormat;
-import com.vaadin.shared.ui.calendar.DateConstants;
+import com.vaadin.v7.shared.ui.calendar.DateConstants;
 
 /**
  * A client side implementation of a calendar event

compatibility-client/src/main/java/com/vaadin/v7/client/ui/calendar/schedule/DateCellDayEvent.java

@@ -42,7 +42,7 @@ import com.google.gwt.user.client.DOM;
 import com.google.gwt.user.client.Event;
 import com.google.gwt.user.client.ui.HorizontalPanel;
 import com.vaadin.client.WidgetUtil;
-import com.vaadin.shared.ui.calendar.DateConstants;
+import com.vaadin.v7.shared.ui.calendar.DateConstants;
 
 /**
  * Internally used by the calendar

compatibility-client/src/main/java/com/vaadin/v7/client/ui/calendar/schedule/DateUtil.java

@@ -18,7 +18,7 @@ package com.vaadin.v7.client.ui.calendar.schedule;
 import java.util.Date;
 
 import com.google.gwt.i18n.client.DateTimeFormat;
-import com.vaadin.shared.ui.calendar.DateConstants;
+import com.vaadin.v7.shared.ui.calendar.DateConstants;
 
 /**
  * Utility class for {@link Date} operations

compatibility-client/src/main/java/com/vaadin/v7/client/ui/calendar/schedule/SimpleDayCell.java

@@ -38,8 +38,8 @@ import com.google.gwt.user.client.ui.HTML;
 import com.google.gwt.user.client.ui.Label;
 import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.client.ui.FocusableFlowPanel;
-import com.vaadin.shared.ui.calendar.DateConstants;
 import com.vaadin.v7.client.ui.VCalendar;
+import com.vaadin.v7.shared.ui.calendar.DateConstants;
 
 /**
  * A class representing a single cell within the calendar in month-view

compatibility-client/src/main/java/com/vaadin/v7/client/ui/calendar/schedule/WeekGrid.java

@@ -32,8 +32,8 @@ import com.google.gwt.user.client.ui.SimplePanel;
 import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.client.DateTimeService;
 import com.vaadin.client.WidgetUtil;
-import com.vaadin.shared.ui.calendar.DateConstants;
 import com.vaadin.v7.client.ui.VCalendar;
+import com.vaadin.v7.shared.ui.calendar.DateConstants;
 
 /**
  *

compatibility-client/src/main/java/com/vaadin/v7/client/ui/checkbox/CheckBoxConnector.java

@@ -31,9 +31,9 @@ import com.vaadin.client.ui.VCheckBox;
 import com.vaadin.shared.EventId;
 import com.vaadin.shared.MouseEventDetails;
 import com.vaadin.shared.ui.Connect;
-import com.vaadin.shared.ui.checkbox.CheckBoxServerRpc;
-import com.vaadin.shared.ui.checkbox.CheckBoxState;
 import com.vaadin.v7.client.ui.AbstractFieldConnector;
+import com.vaadin.v7.shared.ui.checkbox.CheckBoxServerRpc;
+import com.vaadin.v7.shared.ui.checkbox.CheckBoxState;
 import com.vaadin.v7.ui.CheckBox;
 
 @Connect(CheckBox.class)

compatibility-client/src/main/java/com/vaadin/v7/client/ui/customfield/CustomFieldConnector.java

@@ -25,8 +25,8 @@ import com.vaadin.client.ConnectorHierarchyChangeEvent;
 import com.vaadin.client.ConnectorHierarchyChangeEvent.ConnectorHierarchyChangeHandler;
 import com.vaadin.client.HasComponentsConnector;
 import com.vaadin.client.ui.AbstractFieldConnector;
-import com.vaadin.client.ui.VCustomComponent;
 import com.vaadin.shared.ui.Connect;
+import com.vaadin.v7.client.ui.VCustomComponent;
 import com.vaadin.v7.ui.CustomField;
 
 @Connect(value = CustomField.class)

compatibility-client/src/main/java/com/vaadin/v7/client/ui/label/LabelConnector.java

@@ -21,9 +21,9 @@ import com.vaadin.client.Profiler;
 import com.vaadin.client.WidgetUtil;
 import com.vaadin.client.communication.StateChangeEvent;
 import com.vaadin.client.ui.AbstractComponentConnector;
-import com.vaadin.client.ui.VLabel;
 import com.vaadin.shared.ui.Connect;
 import com.vaadin.shared.ui.Connect.LoadStyle;
+import com.vaadin.v7.client.ui.VLabel;
 import com.vaadin.v7.shared.ui.label.LabelState;
 import com.vaadin.v7.ui.Label;
 

compatibility-client/src/main/java/com/vaadin/v7/client/ui/richtextarea/RichTextAreaConnector.java

@@ -23,10 +23,10 @@ import com.vaadin.client.UIDL;
 import com.vaadin.client.ui.SimpleManagedLayout;
 import com.vaadin.shared.ui.Connect;
 import com.vaadin.shared.ui.Connect.LoadStyle;
-import com.vaadin.shared.ui.textarea.RichTextAreaState;
 import com.vaadin.shared.util.SharedUtil;
 import com.vaadin.v7.client.ui.AbstractFieldConnector;
 import com.vaadin.v7.client.ui.VRichTextArea;
+import com.vaadin.v7.shared.ui.textarea.RichTextAreaState;
 import com.vaadin.v7.ui.RichTextArea;
 
 @Connect(value = RichTextArea.class, loadStyle = LoadStyle.LAZY)

compatibility-client/src/main/java/com/vaadin/v7/client/ui/textfield/TextFieldConnector.java

@@ -25,9 +25,9 @@ import com.vaadin.client.Util;
 import com.vaadin.client.ui.AbstractFieldConnector;
 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.client.ui.VTextField;
+import com.vaadin.v7.shared.ui.textfield.AbstractTextFieldState;
+import com.vaadin.v7.shared.ui.textfield.LegacyTextFieldConstants;
 import com.vaadin.v7.ui.TextField;
 
 @Deprecated
@@ -36,8 +36,8 @@ public class TextFieldConnector extends AbstractFieldConnector
         implements Paintable {
 
     @Override
-    public LegacyAbstractTextFieldState getState() {
-        return (LegacyAbstractTextFieldState) super.getState();
+    public AbstractTextFieldState getState() {
+        return (AbstractTextFieldState) super.getState();
     }
 
     @Override

compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractTextField.java

@@ -30,14 +30,14 @@ import com.vaadin.event.FieldEvents.FocusListener;
 import com.vaadin.event.FieldEvents.FocusNotifier;
 import com.vaadin.server.PaintException;
 import com.vaadin.server.PaintTarget;
-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;
 import com.vaadin.v7.event.FieldEvents.TextChangeEvent;
 import com.vaadin.v7.event.FieldEvents.TextChangeListener;
 import com.vaadin.v7.event.FieldEvents.TextChangeNotifier;
+import com.vaadin.v7.shared.ui.textfield.AbstractTextFieldState;
+import com.vaadin.v7.shared.ui.textfield.LegacyTextFieldConstants;
 
 @Deprecated
 public abstract class AbstractTextField extends AbstractField<String> implements
@@ -99,13 +99,13 @@ public abstract class AbstractTextField extends AbstractField<String> implements
     }
 
     @Override
-    protected LegacyAbstractTextFieldState getState() {
-        return (LegacyAbstractTextFieldState) super.getState();
+    protected AbstractTextFieldState getState() {
+        return (AbstractTextFieldState) super.getState();
     }
 
     @Override
-    protected LegacyAbstractTextFieldState getState(boolean markAsDirty) {
-        return (LegacyAbstractTextFieldState) super.getState(markAsDirty);
+    protected AbstractTextFieldState getState(boolean markAsDirty) {
+        return (AbstractTextFieldState) super.getState(markAsDirty);
     }
 
     @Override

compatibility-server/src/main/java/com/vaadin/v7/ui/Calendar.java

@@ -49,16 +49,16 @@ import com.vaadin.event.dd.TargetDetails;
 import com.vaadin.server.KeyMapper;
 import com.vaadin.server.PaintException;
 import com.vaadin.server.PaintTarget;
-import com.vaadin.shared.ui.calendar.CalendarEventId;
-import com.vaadin.shared.ui.calendar.CalendarServerRpc;
-import com.vaadin.shared.ui.calendar.CalendarState;
-import com.vaadin.shared.ui.calendar.DateConstants;
 import com.vaadin.ui.AbstractComponent;
 import com.vaadin.ui.LegacyComponent;
 import com.vaadin.ui.declarative.DesignAttributeHandler;
 import com.vaadin.ui.declarative.DesignContext;
 import com.vaadin.v7.data.Container;
 import com.vaadin.v7.data.util.BeanItemContainer;
+import com.vaadin.v7.shared.ui.calendar.CalendarEventId;
+import com.vaadin.v7.shared.ui.calendar.CalendarServerRpc;
+import com.vaadin.v7.shared.ui.calendar.CalendarState;
+import com.vaadin.v7.shared.ui.calendar.DateConstants;
 import com.vaadin.v7.ui.components.calendar.CalendarComponentEvent;
 import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents;
 import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.BackwardEvent;

compatibility-server/src/main/java/com/vaadin/v7/ui/CheckBox.java

@@ -27,11 +27,11 @@ import com.vaadin.event.FieldEvents.FocusAndBlurServerRpcImpl;
 import com.vaadin.event.FieldEvents.FocusEvent;
 import com.vaadin.event.FieldEvents.FocusListener;
 import com.vaadin.shared.MouseEventDetails;
-import com.vaadin.shared.ui.checkbox.CheckBoxServerRpc;
-import com.vaadin.shared.ui.checkbox.CheckBoxState;
 import com.vaadin.ui.declarative.DesignAttributeHandler;
 import com.vaadin.ui.declarative.DesignContext;
 import com.vaadin.v7.data.Property;
+import com.vaadin.v7.shared.ui.checkbox.CheckBoxServerRpc;
+import com.vaadin.v7.shared.ui.checkbox.CheckBoxState;
 
 public class CheckBox extends AbstractField<Boolean> {
 

compatibility-server/src/main/java/com/vaadin/v7/ui/RichTextArea.java

@@ -22,10 +22,10 @@ import org.jsoup.nodes.Element;
 
 import com.vaadin.server.PaintException;
 import com.vaadin.server.PaintTarget;
-import com.vaadin.shared.ui.textarea.RichTextAreaState;
 import com.vaadin.ui.LegacyComponent;
 import com.vaadin.ui.declarative.DesignContext;
 import com.vaadin.v7.data.Property;
+import com.vaadin.v7.shared.ui.textarea.RichTextAreaState;
 
 /**
  * A simple RichTextArea to edit HTML format text.

compatibility-server/src/main/java/com/vaadin/v7/ui/TextArea.java

@@ -18,10 +18,10 @@ package com.vaadin.v7.ui;
 
 import org.jsoup.nodes.Element;
 
-import com.vaadin.shared.v7.ui.textarea.LegacyTextAreaState;
 import com.vaadin.ui.declarative.DesignContext;
 import com.vaadin.ui.declarative.DesignFormatter;
 import com.vaadin.v7.data.Property;
+import com.vaadin.v7.shared.ui.textarea.LegacyTextAreaState;
 
 /**
  * A text field that supports multi line editing.

compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/CalendarComponentEvents.java

@@ -20,8 +20,8 @@ import java.lang.reflect.Method;
 import java.util.Date;
 import java.util.EventListener;
 
-import com.vaadin.shared.ui.calendar.CalendarEventId;
 import com.vaadin.util.ReflectTools;
+import com.vaadin.v7.shared.ui.calendar.CalendarEventId;
 import com.vaadin.v7.ui.Calendar;
 import com.vaadin.v7.ui.components.calendar.event.CalendarEvent;
 

compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicBackwardHandler.java

@@ -18,7 +18,7 @@ package com.vaadin.v7.ui.components.calendar.handler;
 import java.util.Calendar;
 import java.util.Date;
 
-import com.vaadin.shared.ui.calendar.DateConstants;
+import com.vaadin.v7.shared.ui.calendar.DateConstants;
 import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.BackwardEvent;
 import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.BackwardHandler;
 

compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicForwardHandler.java

@@ -18,7 +18,7 @@ package com.vaadin.v7.ui.components.calendar.handler;
 import java.util.Calendar;
 import java.util.Date;
 
-import com.vaadin.shared.ui.calendar.DateConstants;
+import com.vaadin.v7.shared.ui.calendar.DateConstants;
 import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.ForwardEvent;
 import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.ForwardHandler;
 

compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/richtextarea/RichTextAreaStateTest.java

@@ -18,7 +18,7 @@ package com.vaadin.v7.tests.server.component.richtextarea;
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.vaadin.shared.ui.textarea.RichTextAreaState;
+import com.vaadin.v7.shared.ui.textarea.RichTextAreaState;
 import com.vaadin.v7.ui.RichTextArea;
 
 /**

shared/src/main/java/com/vaadin/shared/ui/calendar/CalendarClientRpc.java → compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/calendar/CalendarClientRpc.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.shared.ui.calendar;
+package com.vaadin.v7.shared.ui.calendar;
 
 import com.vaadin.shared.communication.ClientRpc;
 

shared/src/main/java/com/vaadin/shared/ui/calendar/CalendarEventId.java → compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/calendar/CalendarEventId.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.shared.ui.calendar;
+package com.vaadin.v7.shared.ui.calendar;
 
 import java.io.Serializable;
 

shared/src/main/java/com/vaadin/shared/ui/calendar/CalendarServerRpc.java → compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/calendar/CalendarServerRpc.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.shared.ui.calendar;
+package com.vaadin.v7.shared.ui.calendar;
 
 import com.vaadin.shared.annotations.Delayed;
 import com.vaadin.shared.communication.ServerRpc;

shared/src/main/java/com/vaadin/shared/ui/calendar/CalendarState.java → compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/calendar/CalendarState.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.shared.ui.calendar;
+package com.vaadin.v7.shared.ui.calendar;
 
 import java.util.List;
 

shared/src/main/java/com/vaadin/shared/ui/calendar/DateConstants.java → compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/calendar/DateConstants.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.shared.ui.calendar;
+package com.vaadin.v7.shared.ui.calendar;
 
 import java.io.Serializable;
 

compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/checkbox/CheckBoxServerRpc.java

@@ -0,0 +1,26 @@
+/*
+ * Copyright 2000-2016 Vaadin Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.vaadin.v7.shared.ui.checkbox;
+
+import com.vaadin.shared.MouseEventDetails;
+import com.vaadin.shared.annotations.Delayed;
+import com.vaadin.shared.communication.ServerRpc;
+
+public interface CheckBoxServerRpc extends ServerRpc {
+    @Delayed
+    public void setChecked(boolean checked,
+            MouseEventDetails mouseEventDetails);
+}

compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/checkbox/CheckBoxState.java

@@ -0,0 +1,26 @@
+/*
+ * Copyright 2000-2016 Vaadin Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.vaadin.v7.shared.ui.checkbox;
+
+import com.vaadin.shared.AbstractFieldState;
+
+public class CheckBoxState extends AbstractFieldState {
+    {
+        primaryStyleName = "v-checkbox";
+    }
+
+    public boolean checked = false;
+}

shared/src/main/java/com/vaadin/shared/v7/ui/textarea/LegacyTextAreaState.java → compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/textarea/LegacyTextAreaState.java

@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.shared.v7.ui.textarea;
+package com.vaadin.v7.shared.ui.textarea;
 
 import com.vaadin.shared.annotations.DelegateToWidget;
 import com.vaadin.shared.annotations.NoLayout;
-import com.vaadin.shared.v7.ui.textfield.LegacyAbstractTextFieldState;
+import com.vaadin.v7.shared.ui.textfield.AbstractTextFieldState;
 
 @Deprecated
-public class LegacyTextAreaState extends LegacyAbstractTextFieldState {
+public class LegacyTextAreaState extends AbstractTextFieldState {
     {
         primaryStyleName = "v-textarea";
     }

shared/src/main/java/com/vaadin/shared/ui/textarea/RichTextAreaState.java → compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/textarea/RichTextAreaState.java

@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.shared.ui.textarea;
+package com.vaadin.v7.shared.ui.textarea;
 
-import com.vaadin.shared.v7.ui.textfield.LegacyAbstractTextFieldState;
+import com.vaadin.v7.shared.ui.textfield.AbstractTextFieldState;
 
 /**
  *
@@ -23,7 +23,7 @@ import com.vaadin.shared.v7.ui.textfield.LegacyAbstractTextFieldState;
  *
  * @since 7.6
  */
-public class RichTextAreaState extends LegacyAbstractTextFieldState {
+public class RichTextAreaState extends AbstractTextFieldState {
 
     {
         primaryStyleName = "v-richtextarea";

compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/textarea/TextAreaState.java

@@ -17,10 +17,10 @@ package com.vaadin.v7.shared.ui.textarea;
 
 import com.vaadin.shared.annotations.DelegateToWidget;
 import com.vaadin.shared.annotations.NoLayout;
-import com.vaadin.shared.v7.ui.textfield.LegacyAbstractTextFieldState;
+import com.vaadin.v7.shared.ui.textfield.AbstractTextFieldState;
 
 @Deprecated
-public class TextAreaState extends LegacyAbstractTextFieldState {
+public class TextAreaState extends AbstractTextFieldState {
     {
         primaryStyleName = "v-textarea";
     }

shared/src/main/java/com/vaadin/shared/v7/ui/textfield/LegacyAbstractTextFieldState.java → compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/textfield/AbstractTextFieldState.java

@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.shared.v7.ui.textfield;
+package com.vaadin.v7.shared.ui.textfield;
 
 import com.vaadin.shared.AbstractFieldState;
 import com.vaadin.shared.annotations.NoLayout;
 
 @Deprecated
-public class LegacyAbstractTextFieldState extends AbstractFieldState {
+public class AbstractTextFieldState extends AbstractFieldState {
     {
         primaryStyleName = "v-textfield";
     }

shared/src/main/java/com/vaadin/shared/v7/ui/textfield/LegacyTextFieldConstants.java → compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/textfield/LegacyTextFieldConstants.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.shared.v7.ui.textfield;
+package com.vaadin.v7.shared.ui.textfield;
 
 import java.io.Serializable;
 

server/src/main/java/com/vaadin/server/FontIcon.java

@@ -16,8 +16,8 @@
 
 package com.vaadin.server;
 
+import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.Label;
-import com.vaadin.v7.shared.ui.label.ContentMode;
 
 /**
  * A font icon is a type of icon that is made by displaying one character from a

uitest/src/main/java/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java

@@ -5,11 +5,11 @@ import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.Embedded;
-import com.vaadin.ui.Label;
 import com.vaadin.v7.data.Item;
 import com.vaadin.v7.event.ItemClickEvent;
 import com.vaadin.v7.event.ItemClickEvent.ItemClickListener;
-import com.vaadin.shared.ui.label.ContentMode;
+import com.vaadin.v7.shared.ui.label.ContentMode;
+import com.vaadin.v7.ui.Label;
 import com.vaadin.v7.ui.Table;
 
 public class LabelEmbeddedClickThroughForTable extends AbstractTestUI {

uitest/src/main/java/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponents.java

@@ -10,11 +10,11 @@ import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.Embedded;
-import com.vaadin.ui.Label;
 import com.vaadin.v7.data.Item;
 import com.vaadin.v7.data.util.IndexedContainer;
 import com.vaadin.v7.event.DataBoundTransferable;
 import com.vaadin.v7.ui.AbstractSelect.AbstractSelectTargetDetails;
+import com.vaadin.v7.ui.Label;
 import com.vaadin.v7.ui.Table;
 import com.vaadin.v7.ui.Table.ColumnGenerator;
 import com.vaadin.v7.ui.Table.RowHeaderMode;

uitest/src/main/java/com/vaadin/tests/components/table/TableMatchesMouseDownMouseUpElement.java

@@ -6,10 +6,10 @@ import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
 import com.vaadin.ui.Component;
-import com.vaadin.ui.Label;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.v7.data.Item;
-import com.vaadin.shared.ui.label.ContentMode;
+import com.vaadin.v7.shared.ui.label.ContentMode;
+import com.vaadin.v7.ui.Label;
 import com.vaadin.v7.ui.Table;
 
 public class TableMatchesMouseDownMouseUpElement extends AbstractTestUI {

uitest/src/main/java/com/vaadin/tests/widgetset/client/ClientRpcClassWidget.java

@@ -15,8 +15,8 @@
  */
 package com.vaadin.tests.widgetset.client;
 
-import com.vaadin.client.ui.VLabel;
 import com.vaadin.shared.ui.MediaControl;
+import com.vaadin.v7.client.ui.VLabel;
 
 public class ClientRpcClassWidget extends VLabel implements MediaControl {
 

uitest/src/main/java/com/vaadin/tests/widgetset/client/DummyLabelConnector.java

@@ -18,9 +18,9 @@ package com.vaadin.tests.widgetset.client;
 
 import com.vaadin.client.communication.StateChangeEvent;
 import com.vaadin.client.ui.AbstractComponentConnector;
-import com.vaadin.client.ui.VLabel;
 import com.vaadin.shared.ui.Connect;
 import com.vaadin.tests.widgetset.server.DummyLabel;
+import com.vaadin.v7.client.ui.VLabel;
 
 /**
  * Dummy connector just to cause {@link LabelState} to be used to test #8683

uitest/src/main/java/com/vaadin/tests/widgetset/client/MissingFromDefaultWidgetsetConnector.java

@@ -16,9 +16,9 @@
 package com.vaadin.tests.widgetset.client;
 
 import com.vaadin.client.ui.AbstractComponentConnector;
-import com.vaadin.client.ui.VLabel;
 import com.vaadin.shared.ui.Connect;
 import com.vaadin.tests.widgetset.server.MissingFromDefaultWidgetsetComponent;
+import com.vaadin.v7.client.ui.VLabel;
 
 @Connect(MissingFromDefaultWidgetsetComponent.class)
 public class MissingFromDefaultWidgetsetConnector

uitest/src/main/java/com/vaadin/tests/widgetset/client/VIdTestLabel.java

@@ -1,6 +1,6 @@
 package com.vaadin.tests.widgetset.client;
 
-import com.vaadin.client.ui.VLabel;
+import com.vaadin.v7.client.ui.VLabel;
 
 /**
  * Client-side implementation for IdTestLabel (#10179).

uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridBasicClientFeaturesWidget.java

@@ -46,13 +46,13 @@ import com.google.gwt.user.client.ui.TextBox;
 import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.client.data.DataSource;
 import com.vaadin.client.data.DataSource.RowHandle;
-import com.vaadin.client.ui.VLabel;
 import com.vaadin.tests.widgetset.client.grid.GridBasicClientFeaturesWidget.Data;
 import com.vaadin.v7.client.renderers.DateRenderer;
 import com.vaadin.v7.client.renderers.HtmlRenderer;
 import com.vaadin.v7.client.renderers.NumberRenderer;
 import com.vaadin.v7.client.renderers.Renderer;
 import com.vaadin.v7.client.renderers.TextRenderer;
+import com.vaadin.v7.client.ui.VLabel;
 import com.vaadin.v7.client.widget.grid.CellReference;
 import com.vaadin.v7.client.widget.grid.CellStyleGenerator;
 import com.vaadin.v7.client.widget.grid.DetailsGenerator;