Added missing communication of rows and wordwrap attributes (#3752)

svn changeset:16390/svn branch:6.5

2 files changed, 15 insertions, 3 deletions

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VTextArea.java b/src/com/vaadin/terminal/gwt/client/ui/VTextArea.java
index cf81ce1fb8..75231c2715 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VTextArea.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VTextArea.java
@@ -34,9 +34,7 @@ public class VTextArea extends VTextField {
         // Call parent renderer explicitly

         super.updateFromUIDL(uidl, client);

 

-        if (uidl.hasAttribute("rows")) {

-            setRows(new Integer(uidl.getStringAttribute("rows")).intValue());

-        }

+        setRows(uidl.getIntAttribute("rows"));

 

         if (getMaxLength() >= 0) {

             sinkEvents(Event.ONKEYPRESS);

diff --git a/src/com/vaadin/ui/TextArea.java b/src/com/vaadin/ui/TextArea.java
index 0ae15968a8..e628e6e466 100644
--- a/src/com/vaadin/ui/TextArea.java
+++ b/src/com/vaadin/ui/TextArea.java
@@ -5,6 +5,8 @@
 package com.vaadin.ui;
 
 import com.vaadin.data.Property;
+import com.vaadin.terminal.PaintException;
+import com.vaadin.terminal.PaintTarget;
 import com.vaadin.terminal.gwt.client.ui.VTextArea;
 
 /**
@@ -132,4 +134,16 @@ public class TextArea extends AbstractTextField {
         return wordwrap;
     }
 
+    @Override
+    public void paintContent(PaintTarget target) throws PaintException {
+        super.paintContent(target);
+
+        target.addAttribute("rows", getRows());
+
+        // Optimization: the default true is assumed if not painted
+        if (!isWordwrap()) {
+            target.addAttribute("wordwrap", false);
+        }
+
+    }
 }