Declarative support for RichTextArea (#16326)

Change-Id: I1e373124f371947eabbf330145fe507caf24fd62

diff --git a/server/src/com/vaadin/ui/RichTextArea.java b/server/src/com/vaadin/ui/RichTextArea.java
index 31327b3a6ff663edd959f4f06fbd665b47528f02..763e42ad8bbb4046625ec265b714b8a588f8a898 100644 (file)
--- a/server/src/com/vaadin/ui/RichTextArea.java
+++ b/server/src/com/vaadin/ui/RichTextArea.java
@@ -18,9 +18,12 @@ package com.vaadin.ui;
 
 import java.util.Map;
 
+import org.jsoup.nodes.Element;
+
 import com.vaadin.data.Property;
 import com.vaadin.server.PaintException;
 import com.vaadin.server.PaintTarget;
+import com.vaadin.ui.declarative.DesignContext;
 
 /**
  * A simple RichTextArea to edit HTML format text.
@@ -289,4 +292,15 @@ public class RichTextArea extends AbstractField<String> implements
         return super.isEmpty() || getValue().length() == 0;
     }
 
+    @Override
+    public void readDesign(Element design, DesignContext designContext) {
+        super.readDesign(design, designContext);
+        setValue(design.html());
+    }
+
+    @Override
+    public void writeDesign(Element design, DesignContext designContext) {
+        super.writeDesign(design, designContext);
+        design.html(getValue());
+    }
 }

diff --git a/server/tests/src/com/vaadin/tests/server/component/richtextarea/RichTextAreaDeclarativeTest.java b/server/tests/src/com/vaadin/tests/server/component/richtextarea/RichTextAreaDeclarativeTest.java
new file mode 100644 (file)
index 0000000..9d61656
--- /dev/null
+++ b/server/tests/src/com/vaadin/tests/server/component/richtextarea/RichTextAreaDeclarativeTest.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2000-2014 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.tests.server.component.richtextarea;
+
+import org.junit.Test;
+
+import com.vaadin.tests.design.DeclarativeTestBase;
+import com.vaadin.ui.RichTextArea;
+
+public class RichTextAreaDeclarativeTest extends
+        DeclarativeTestBase<RichTextArea> {
+
+    private String getBasicDesign() {
+        return "<v-rich-text-area null-representation='' null-setting-allowed='true'>\n"
+                + "\n      <b>Header</b> <br/>Some text\n      "
+                + "</v-rich-text-area>";
+    }
+
+    private RichTextArea getBasicExpected() {
+        RichTextArea rta = new RichTextArea();
+        rta.setNullRepresentation("");
+        rta.setNullSettingAllowed(true);
+        rta.setValue("<b>Header</b> \n<br>Some text");
+        return rta;
+    }
+
+    @Test
+    public void testBasicRead() {
+        testRead(getBasicDesign(), getBasicExpected());
+    }
+
+    @Test
+    public void testBasicWrite() {
+        testWrite(getBasicDesign(), getBasicExpected());
+    }
+
+    @Test
+    public void testReadEmpty() {
+        testRead("<v-rich-text-area />", new RichTextArea());
+    }
+
+    @Test
+    public void testWriteEmpty() {
+        testWrite("<v-rich-text-area />", new RichTextArea());
+    }
+}