Move and duplicate client side and state to compatibility package

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

Change-Id: Iba8915195e4d205fb4db9a4df5d96a4a10ab2f96

9 files changed, 18 insertions, 18 deletions

diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractTextField.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractTextField.java
index f534662583..f72ee383e5 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractTextField.java
+++ b/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
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/Calendar.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/Calendar.java
index 5c6e0de421..cb0ce7d220 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/Calendar.java
+++ b/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;
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/CheckBox.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/CheckBox.java
index 84488bc875..47323f001c 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/CheckBox.java
+++ b/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> {
 
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/RichTextArea.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/RichTextArea.java
index e7a790a2cc..15887e0fb0 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/RichTextArea.java
+++ b/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.
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/TextArea.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/TextArea.java
index 852dd76c2c..b1f50859d6 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/TextArea.java
+++ b/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.
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/CalendarComponentEvents.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/CalendarComponentEvents.java
index 14494eedbe..ea892a6b9d 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/CalendarComponentEvents.java
+++ b/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;
 
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicBackwardHandler.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicBackwardHandler.java
index 956db6b179..3f38d19a4f 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicBackwardHandler.java
+++ b/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;
 
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicForwardHandler.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicForwardHandler.java
index d71958536e..aa13c650ef 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicForwardHandler.java
+++ b/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;
 
diff --git a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/richtextarea/RichTextAreaStateTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/richtextarea/RichTextAreaStateTest.java
index 56a60de396..131dfa329b 100644
--- a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/richtextarea/RichTextAreaStateTest.java
+++ b/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;
 
 /**