Update TextArea to extend AbstractFieldNew (#53)

Change-Id: I72400695f3b015add07be9709e48b5f99ce619cf

4 files changed, 71 insertions, 7 deletions

diff --git a/shared/src/main/java/com/vaadin/shared/ui/textarea/TextAreaServerRpc.java b/shared/src/main/java/com/vaadin/shared/ui/textarea/TextAreaServerRpc.java
new file mode 100644
index 0000000000..d7a1388ef8
--- /dev/null
+++ b/shared/src/main/java/com/vaadin/shared/ui/textarea/TextAreaServerRpc.java
@@ -0,0 +1,25 @@
+/*
+ * 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.shared.ui.textarea;
+
+import com.vaadin.shared.communication.ServerRpc;
+
+public interface TextAreaServerRpc extends ServerRpc {
+
+    public void setHeight(String height);
+
+    public void setWidth(String width);
+}
diff --git a/shared/src/main/java/com/vaadin/shared/ui/textarea/TextAreaState.java b/shared/src/main/java/com/vaadin/shared/ui/textarea/TextAreaState.java
index cd4ea10519..a56b45ea7e 100644
--- a/shared/src/main/java/com/vaadin/shared/ui/textarea/TextAreaState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/textarea/TextAreaState.java
@@ -17,9 +17,9 @@ package com.vaadin.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.shared.ui.textfield.TextFieldState;
 
-public class TextAreaState extends LegacyAbstractTextFieldState {
+public class TextAreaState extends TextFieldState {
     {
         primaryStyleName = "v-textarea";
     }
@@ -35,6 +35,5 @@ public class TextAreaState extends LegacyAbstractTextFieldState {
      */
     @DelegateToWidget
     @NoLayout
-    public boolean wordwrap = true;
-
+    public boolean wordWrap = true;
 }
diff --git a/shared/src/main/java/com/vaadin/shared/ui/textfield/AbstractTextFieldServerRpc.java b/shared/src/main/java/com/vaadin/shared/ui/textfield/AbstractTextFieldServerRpc.java
index 3c1e77fa30..e11d4cedec 100644
--- a/shared/src/main/java/com/vaadin/shared/ui/textfield/AbstractTextFieldServerRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/textfield/AbstractTextFieldServerRpc.java
@@ -13,12 +13,11 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-
 package com.vaadin.shared.ui.textfield;
 
-import com.vaadin.shared.communication.FieldRpc.FocusAndBlurServerRpc;
+import com.vaadin.shared.communication.ServerRpc;
 
-public interface AbstractTextFieldServerRpc extends FocusAndBlurServerRpc {
+public interface AbstractTextFieldServerRpc extends ServerRpc {
 
     void setText(String text, int cursorPosition);
 }
diff --git a/shared/src/main/java/com/vaadin/shared/v7/ui/textarea/LegacyTextAreaState.java b/shared/src/main/java/com/vaadin/shared/v7/ui/textarea/LegacyTextAreaState.java
new file mode 100644
index 0000000000..a3aa758499
--- /dev/null
+++ b/shared/src/main/java/com/vaadin/shared/v7/ui/textarea/LegacyTextAreaState.java
@@ -0,0 +1,41 @@
+/*
+ * 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.shared.v7.ui.textarea;
+
+import com.vaadin.shared.annotations.DelegateToWidget;
+import com.vaadin.shared.annotations.NoLayout;
+import com.vaadin.shared.v7.ui.textfield.LegacyAbstractTextFieldState;
+
+@Deprecated
+public class LegacyTextAreaState extends LegacyAbstractTextFieldState {
+    {
+        primaryStyleName = "v-textarea";
+    }
+
+    /**
+     * Number of visible rows in the text area. The default is 5.
+     */
+    @DelegateToWidget
+    public int rows = 5;
+
+    /**
+     * Tells if word-wrapping should be used in the text area.
+     */
+    @DelegateToWidget
+    @NoLayout
+    public boolean wordwrap = true;
+
+}