#3752 - Refactor TextFields

Made PasswordField, TextArea extend AbstractTextField instead of TextField

Moved commonalities "columns", "input prompt", "text change event" and "cursor position" to AbstractTextField



svn changeset:16354/svn branch:6.5

4 files changed, 11 insertions, 12 deletions

diff --git a/tests/src/com/vaadin/tests/components/textarea/TextAreaTest.java b/tests/src/com/vaadin/tests/components/textarea/TextAreaTest.java
index 34ed567b78..1977067a19 100644
--- a/tests/src/com/vaadin/tests/components/textarea/TextAreaTest.java
+++ b/tests/src/com/vaadin/tests/components/textarea/TextAreaTest.java
@@ -7,8 +7,8 @@ import java.util.List;
 import com.vaadin.event.FieldEvents.TextChangeEvent;

 import com.vaadin.event.FieldEvents.TextChangeListener;

 import com.vaadin.tests.components.abstractfield.AbstractTextFieldTest;

+import com.vaadin.ui.AbstractTextField.TextChangeEventMode;

 import com.vaadin.ui.TextArea;

-import com.vaadin.ui.TextField.TextChangeEventMode;

 

 public class TextAreaTest extends AbstractTextFieldTest<TextArea> implements

         TextChangeListener {

diff --git a/tests/src/com/vaadin/tests/components/textfield/TextChangeEvents.java b/tests/src/com/vaadin/tests/components/textfield/TextChangeEvents.java
index 4317000812..f754beb792 100644
--- a/tests/src/com/vaadin/tests/components/textfield/TextChangeEvents.java
+++ b/tests/src/com/vaadin/tests/components/textfield/TextChangeEvents.java
@@ -5,9 +5,9 @@ import com.vaadin.event.FieldEvents.TextChangeListener;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.tests.util.Log;
 import com.vaadin.tests.util.TestUtils;
+import com.vaadin.ui.AbstractTextField.TextChangeEventMode;
 import com.vaadin.ui.TextArea;
 import com.vaadin.ui.TextField;
-import com.vaadin.ui.TextField.TextChangeEventMode;
 
 public class TextChangeEvents extends TestBase {
     Log l = new Log(10);
@@ -22,9 +22,8 @@ public class TextChangeEvents extends TestBase {
             public void textChange(TextChangeEvent event) {
                 l.log("Text change event for  "
                         + event.getComponent().getCaption()
-                        + ", text content currently:'"
-                        + event.getText() + "' Cursor at index:"
-                        + event.getCursorPosition());
+                        + ", text content currently:'" + event.getText()
+                        + "' Cursor at index:" + event.getCursorPosition());
             }
         };
 
@@ -47,7 +46,7 @@ public class TextChangeEvents extends TestBase {
         ta.addListener(inputEventListener);
         getLayout().addComponent(ta);
 
-        VaadinDeveloeprNameField vd = new VaadinDeveloeprNameField();
+        VaadinDeveloperNameField vd = new VaadinDeveloperNameField();
         vd.addListener(inputEventListener);
         getLayout().addComponent(vd);
 
@@ -73,13 +72,13 @@ public class TextChangeEvents extends TestBase {
      * 2010-10
      * 
      */
-    private class VaadinDeveloeprNameField extends TextField implements
+    private class VaadinDeveloperNameField extends TextField implements
             TextChangeListener {
         private String[] names = new String[] { "Matti Tahvonen",
                 "Marc Englund", "Joonas Lehtinen", "Jouni Koivuviita",
                 "Marko Grönroos", "Artur Signell" };
 
-        public VaadinDeveloeprNameField() {
+        public VaadinDeveloperNameField() {
             setCaption("Start typing 'old' Vaadin developers.");
             addListener((TextChangeListener) this);
             setStyleName("nomatch");
diff --git a/tests/src/com/vaadin/tests/components/textfield/TextChangeEvents2.java b/tests/src/com/vaadin/tests/components/textfield/TextChangeEvents2.java
index 523d8f4057..b40ebb2434 100644
--- a/tests/src/com/vaadin/tests/components/textfield/TextChangeEvents2.java
+++ b/tests/src/com/vaadin/tests/components/textfield/TextChangeEvents2.java
@@ -9,10 +9,10 @@ import com.vaadin.event.FieldEvents.FocusListener;
 import com.vaadin.event.FieldEvents.TextChangeEvent;
 import com.vaadin.event.FieldEvents.TextChangeListener;
 import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.AbstractTextField.TextChangeEventMode;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.TextField;
-import com.vaadin.ui.TextField.TextChangeEventMode;
 
 public class TextChangeEvents2 extends TestBase {
     @Override
diff --git a/tests/src/com/vaadin/tests/components/textfield/TextFieldTest.java b/tests/src/com/vaadin/tests/components/textfield/TextFieldTest.java
index 1b1041f053..5937993e83 100644
--- a/tests/src/com/vaadin/tests/components/textfield/TextFieldTest.java
+++ b/tests/src/com/vaadin/tests/components/textfield/TextFieldTest.java
@@ -7,11 +7,11 @@ import java.util.List;
 import com.vaadin.event.FieldEvents.TextChangeEvent;

 import com.vaadin.event.FieldEvents.TextChangeListener;

 import com.vaadin.tests.components.abstractfield.AbstractTextFieldTest;

+import com.vaadin.ui.AbstractTextField.TextChangeEventMode;

 import com.vaadin.ui.TextField;

-import com.vaadin.ui.TextField.TextChangeEventMode;

 

-public class TextFieldTest extends AbstractTextFieldTest<TextField>

-        implements TextChangeListener {

+public class TextFieldTest extends AbstractTextFieldTest<TextField> implements

+        TextChangeListener {

 

     private Command<TextField, Boolean> secretCommand = new Command<TextField, Boolean>() {

         @SuppressWarnings("deprecation")