Move old TextField to compatibility package

Change-Id: Ic1e8d3f9859f5e496c0e27e2fece4b5a9da74f01

13 files changed, 41 insertions, 43 deletions

diff --git a/uitest/src/main/java/com/vaadin/tests/components/passwordfield/PasswordFieldTest.java b/uitest/src/main/java/com/vaadin/v7/tests/components/passwordfield/PasswordFieldTest.java
index 15933e1060..e5985641cd 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/passwordfield/PasswordFieldTest.java
+++ b/uitest/src/main/java/com/vaadin/v7/tests/components/passwordfield/PasswordFieldTest.java
@@ -1,11 +1,11 @@
-package com.vaadin.tests.components.passwordfield;
+package com.vaadin.v7.tests.components.passwordfield;
 
-import com.vaadin.event.FieldEvents.TextChangeListener;
-import com.vaadin.tests.components.abstractfield.LegacyAbstractTextFieldTest;
+import com.vaadin.v7.event.FieldEvents.TextChangeListener;
+import com.vaadin.v7.tests.components.textfield.AbstractTextFieldTest;
 import com.vaadin.v7.ui.PasswordField;
 
 public class PasswordFieldTest
-        extends LegacyAbstractTextFieldTest<PasswordField>
+        extends AbstractTextFieldTest<PasswordField>
         implements TextChangeListener {
 
     @Override
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textarea/TextAreaCursorPosition.java b/uitest/src/main/java/com/vaadin/v7/tests/components/textarea/TextAreaCursorPosition.java
index 9eeab8905e..eb08a9494b 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textarea/TextAreaCursorPosition.java
+++ b/uitest/src/main/java/com/vaadin/v7/tests/components/textarea/TextAreaCursorPosition.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.components.textarea;
+package com.vaadin.v7.tests.components.textarea;
 
 import com.vaadin.shared.ui.textfield.ValueChangeMode;
 import com.vaadin.tests.components.TestBase;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textarea/TextAreaTest.java b/uitest/src/main/java/com/vaadin/v7/tests/components/textarea/TextAreaTest.java
index 74a6e3a4d9..b4048fe9b2 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textarea/TextAreaTest.java
+++ b/uitest/src/main/java/com/vaadin/v7/tests/components/textarea/TextAreaTest.java
@@ -1,11 +1,11 @@
-package com.vaadin.tests.components.textarea;
+package com.vaadin.v7.tests.components.textarea;
 
 import java.util.LinkedHashMap;
 
-import com.vaadin.tests.components.abstractfield.LegacyAbstractTextFieldTest;
+import com.vaadin.v7.tests.components.textfield.AbstractTextFieldTest;
 import com.vaadin.v7.ui.TextArea;
 
-public class TextAreaTest extends LegacyAbstractTextFieldTest<TextArea> {
+public class TextAreaTest extends AbstractTextFieldTest<TextArea> {
 
     private Command<TextArea, Boolean> wordwrapCommand = new Command<TextArea, Boolean>() {
         @Override
diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/LegacyAbstractTextFieldTest.java b/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/AbstractTextFieldTest.java
index 71ed46eb66..604eb707ee 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/LegacyAbstractTextFieldTest.java
+++ b/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/AbstractTextFieldTest.java
@@ -1,15 +1,16 @@
-package com.vaadin.tests.components.abstractfield;
+package com.vaadin.v7.tests.components.textfield;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 
-import com.vaadin.event.FieldEvents.TextChangeEvent;
-import com.vaadin.event.FieldEvents.TextChangeListener;
+import com.vaadin.tests.components.abstractfield.LegacyAbstractFieldTest;
+import com.vaadin.v7.event.FieldEvents.TextChangeEvent;
+import com.vaadin.v7.event.FieldEvents.TextChangeListener;
 import com.vaadin.v7.ui.AbstractTextField;
 import com.vaadin.v7.ui.AbstractTextField.TextChangeEventMode;
 
-public abstract class LegacyAbstractTextFieldTest<T extends AbstractTextField>
+public abstract class AbstractTextFieldTest<T extends AbstractTextField>
         extends LegacyAbstractFieldTest<T> implements TextChangeListener {
 
     private Command<T, Integer> maxlengthCommand = new Command<T, Integer>() {
@@ -46,11 +47,10 @@ public abstract class LegacyAbstractTextFieldTest<T extends AbstractTextField>
         @Override
         public void execute(T c, Boolean value, Object data) {
             if (value) {
-                c.addListener(
-                        (TextChangeListener) LegacyAbstractTextFieldTest.this);
+                c.addListener((TextChangeListener) AbstractTextFieldTest.this);
             } else {
                 c.removeListener(
-                        (TextChangeListener) LegacyAbstractTextFieldTest.this);
+                        (TextChangeListener) AbstractTextFieldTest.this);
             }
         }
     };
@@ -245,8 +245,7 @@ public abstract class LegacyAbstractTextFieldTest<T extends AbstractTextField>
 
     @Override
     public void textChange(TextChangeEvent event) {
-        AbstractTextField tf = (AbstractTextField) event
-                .getComponent();
+        AbstractTextField tf = (AbstractTextField) event.getComponent();
         log("TextChangeEvent: text='" + event.getText() + "', cursor position="
                 + event.getCursorPosition() + " (field cursor pos: "
                 + tf.getCursorPosition() + ")");
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeEvents.java b/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeEvents.java
index 961c88374c..16e5d59a48 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeEvents.java
+++ b/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeEvents.java
@@ -1,7 +1,7 @@
-package com.vaadin.tests.components.textfield;
+package com.vaadin.v7.tests.components.textfield;
 
-import com.vaadin.event.FieldEvents.TextChangeEvent;
-import com.vaadin.event.FieldEvents.TextChangeListener;
+import com.vaadin.v7.event.FieldEvents.TextChangeEvent;
+import com.vaadin.v7.event.FieldEvents.TextChangeListener;
 import com.vaadin.shared.ui.textfield.ValueChangeMode;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.tests.util.Log;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeEvents2.java b/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeEvents2.java
index ee1b1b08db..f59f5aeb38 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeEvents2.java
+++ b/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeEvents2.java
@@ -1,11 +1,11 @@
-package com.vaadin.tests.components.textfield;
+package com.vaadin.v7.tests.components.textfield;
 
 import com.vaadin.event.FieldEvents.BlurEvent;
 import com.vaadin.event.FieldEvents.BlurListener;
 import com.vaadin.event.FieldEvents.FocusEvent;
 import com.vaadin.event.FieldEvents.FocusListener;
-import com.vaadin.event.FieldEvents.TextChangeEvent;
-import com.vaadin.event.FieldEvents.TextChangeListener;
+import com.vaadin.v7.event.FieldEvents.TextChangeEvent;
+import com.vaadin.v7.event.FieldEvents.TextChangeListener;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Label;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeEventsEternalLoop.java b/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeEventsEternalLoop.java
index 1c10817add..9ca79a3ed1 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeEventsEternalLoop.java
+++ b/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeEventsEternalLoop.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.components.textfield;
+package com.vaadin.v7.tests.components.textfield;
 
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.TextField;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeEventsWithNonImmediateValueChange.java b/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeEventsWithNonImmediateValueChange.java
index c0745aac00..8cd6cbed8f 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeEventsWithNonImmediateValueChange.java
+++ b/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeEventsWithNonImmediateValueChange.java
@@ -1,7 +1,7 @@
-package com.vaadin.tests.components.textfield;
+package com.vaadin.v7.tests.components.textfield;
 
-import com.vaadin.event.FieldEvents.TextChangeEvent;
-import com.vaadin.event.FieldEvents.TextChangeListener;
+import com.vaadin.v7.event.FieldEvents.TextChangeEvent;
+import com.vaadin.v7.event.FieldEvents.TextChangeListener;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.tests.util.Log;
 import com.vaadin.v7.data.Property.ValueChangeEvent;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeListenerChangingNonTextProperties.java b/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeListenerChangingNonTextProperties.java
index 206ef8e41b..458ac5f265 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeListenerChangingNonTextProperties.java
+++ b/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeListenerChangingNonTextProperties.java
@@ -1,7 +1,7 @@
-package com.vaadin.tests.components.textfield;
+package com.vaadin.v7.tests.components.textfield;
 
-import com.vaadin.event.FieldEvents.TextChangeEvent;
-import com.vaadin.event.FieldEvents.TextChangeListener;
+import com.vaadin.v7.event.FieldEvents.TextChangeEvent;
+import com.vaadin.v7.event.FieldEvents.TextChangeListener;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.tests.util.TestUtils;
 import com.vaadin.v7.ui.AbstractTextField.TextChangeEventMode;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeListenerLosesFocus.java b/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeListenerLosesFocus.java
index bac833f626..8fe5757649 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeListenerLosesFocus.java
+++ b/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeListenerLosesFocus.java
@@ -14,10 +14,10 @@
  * the License.
  */
 
-package com.vaadin.tests.components.textfield;
+package com.vaadin.v7.tests.components.textfield;
 
-import com.vaadin.event.FieldEvents.TextChangeEvent;
-import com.vaadin.event.FieldEvents.TextChangeListener;
+import com.vaadin.v7.event.FieldEvents.TextChangeEvent;
+import com.vaadin.v7.event.FieldEvents.TextChangeListener;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.tests.util.TestUtils;
 import com.vaadin.v7.ui.AbstractTextField;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeTimeoutAfterDetach.java b/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeTimeoutAfterDetach.java
index b6d16ab5fe..e546695844 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeTimeoutAfterDetach.java
+++ b/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeTimeoutAfterDetach.java
@@ -1,7 +1,7 @@
-package com.vaadin.tests.components.textfield;
+package com.vaadin.v7.tests.components.textfield;
 
-import com.vaadin.event.FieldEvents.TextChangeEvent;
-import com.vaadin.event.FieldEvents.TextChangeListener;
+import com.vaadin.v7.event.FieldEvents.TextChangeEvent;
+import com.vaadin.v7.event.FieldEvents.TextChangeListener;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldEagerRepaint.java b/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextFieldEagerRepaint.java
index a719515aa3..2a98224789 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldEagerRepaint.java
+++ b/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextFieldEagerRepaint.java
@@ -1,7 +1,7 @@
-package com.vaadin.tests.components.textfield;
+package com.vaadin.v7.tests.components.textfield;
 
-import com.vaadin.event.FieldEvents.TextChangeEvent;
-import com.vaadin.event.FieldEvents.TextChangeListener;
+import com.vaadin.v7.event.FieldEvents.TextChangeEvent;
+import com.vaadin.v7.event.FieldEvents.TextChangeListener;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.v7.ui.AbstractTextField.TextChangeEventMode;
 import com.vaadin.v7.ui.TextField;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldTest.java b/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextFieldTest.java
index 35f61f7419..fd26995abf 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldTest.java
+++ b/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextFieldTest.java
@@ -1,10 +1,9 @@
-package com.vaadin.tests.components.textfield;
+package com.vaadin.v7.tests.components.textfield;
 
-import com.vaadin.event.FieldEvents.TextChangeListener;
-import com.vaadin.tests.components.abstractfield.LegacyAbstractTextFieldTest;
+import com.vaadin.v7.event.FieldEvents.TextChangeListener;
 import com.vaadin.v7.ui.TextField;
 
-public class TextFieldTest extends LegacyAbstractTextFieldTest<TextField>
+public class TextFieldTest extends AbstractTextFieldTest<TextField>
         implements TextChangeListener {
 
     @Override