Move and duplicate client side and state to compatibility package

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

Change-Id: Iba8915195e4d205fb4db9a4df5d96a4a10ab2f96

8 files changed, 10 insertions, 10 deletions

diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java b/uitest/src/main/java/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java
index 7b6f9c858f..a72fe7b722 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java
+++ b/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 {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponents.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponents.java
index 717d1a1548..925d39f46b 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponents.java
+++ b/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;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableMatchesMouseDownMouseUpElement.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableMatchesMouseDownMouseUpElement.java
index 1842449a57..664cc39ed1 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableMatchesMouseDownMouseUpElement.java
+++ b/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 {
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/ClientRpcClassWidget.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/ClientRpcClassWidget.java
index 6c0ebada45..946c952304 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/ClientRpcClassWidget.java
+++ b/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 {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/DummyLabelConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/DummyLabelConnector.java
index 8287125f8f..327113b886 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/DummyLabelConnector.java
+++ b/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
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/MissingFromDefaultWidgetsetConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/MissingFromDefaultWidgetsetConnector.java
index 775dbd5db4..d036e2a6ae 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/MissingFromDefaultWidgetsetConnector.java
+++ b/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
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/VIdTestLabel.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/VIdTestLabel.java
index 9271f562b7..c1bb4c314a 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/VIdTestLabel.java
+++ b/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).
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridBasicClientFeaturesWidget.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridBasicClientFeaturesWidget.java
index 7edba039e1..0921c868c1 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridBasicClientFeaturesWidget.java
+++ b/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;