Declarative: Use Element in DesingSynchronizable method parameters

Change-Id: I18f49d3248e3ecacd08bfa2e2baa03dd0329b0c7

9 files changed, 94 insertions, 101 deletions

diff --git a/server/src/com/vaadin/ui/AbstractComponent.java b/server/src/com/vaadin/ui/AbstractComponent.java
index 3b0402b2a9..b1927f8580 100644
--- a/server/src/com/vaadin/ui/AbstractComponent.java
+++ b/server/src/com/vaadin/ui/AbstractComponent.java
@@ -27,7 +27,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import org.jsoup.nodes.Attributes;
-import org.jsoup.nodes.Node;
+import org.jsoup.nodes.Element;
 
 import com.vaadin.event.ActionManager;
 import com.vaadin.event.ConnectorActionManager;
@@ -909,10 +909,11 @@ public abstract class AbstractComponent extends AbstractClientConnector
      * 
      * @see
      * com.vaadin.ui.DesignSynchronizable#synchronizeFromDesign(org.jsoup.nodes
-     * .Node, com.vaadin.ui.declarative.DesignContext)
+     * .Element, com.vaadin.ui.declarative.DesignContext)
      */
     @Override
-    public void synchronizeFromDesign(Node design, DesignContext designContext) {
+    public void synchronizeFromDesign(Element design,
+            DesignContext designContext) {
         Attributes attr = design.attributes();
         AbstractComponent def = designContext.getDefaultInstance(this
                 .getClass());
@@ -958,10 +959,10 @@ public abstract class AbstractComponent extends AbstractClientConnector
      * 
      * @see
      * com.vaadin.ui.DesignSynchronizable#synchronizeToDesign(org.jsoup.nodes
-     * .Node, com.vaadin.ui.declarative.DesignContext)
+     * .Element, com.vaadin.ui.declarative.DesignContext)
      */
     @Override
-    public void synchronizeToDesign(Node design, DesignContext designContext) {
+    public void synchronizeToDesign(Element design, DesignContext designContext) {
         // clear node contents
         DesignAttributeHandler.clearNode(design);
         AbstractComponent def = designContext.getDefaultInstance(this
diff --git a/server/src/com/vaadin/ui/AbstractOrderedLayout.java b/server/src/com/vaadin/ui/AbstractOrderedLayout.java
index 13c11ddf17..bbaaffe789 100644
--- a/server/src/com/vaadin/ui/AbstractOrderedLayout.java
+++ b/server/src/com/vaadin/ui/AbstractOrderedLayout.java
@@ -472,10 +472,11 @@ public abstract class AbstractOrderedLayout extends AbstractLayout implements
      * 
      * @see
      * com.vaadin.ui.AbstractComponent#synchronizeFromDesign(org.jsoup.nodes
-     * .Node, com.vaadin.ui.declarative.DesignContext)
+     * .Element, com.vaadin.ui.declarative.DesignContext)
      */
     @Override
-    public void synchronizeFromDesign(Node design, DesignContext designContext) {
+    public void synchronizeFromDesign(Element design,
+            DesignContext designContext) {
         // process default attributes
         super.synchronizeFromDesign(design, designContext);
         // remove current children
@@ -485,7 +486,7 @@ public abstract class AbstractOrderedLayout extends AbstractLayout implements
             if (childComponent instanceof Element) {
                 Attributes attr = childComponent.attributes();
                 DesignSynchronizable newChild = designContext
-                        .createChild(childComponent);
+                        .createChild((Element) childComponent);
                 addComponent(newChild);
                 // handle alignment
                 int bitMask = 0;
@@ -527,45 +528,39 @@ public abstract class AbstractOrderedLayout extends AbstractLayout implements
      * (non-Javadoc)
      * 
      * @see
-     * com.vaadin.ui.AbstractComponent#synchronizeToDesign(org.jsoup.nodes.Node,
-     * com.vaadin.ui.declarative.DesignContext)
+     * com.vaadin.ui.AbstractComponent#synchronizeToDesign(org.jsoup.nodes.Element
+     * , com.vaadin.ui.declarative.DesignContext)
      */
     @Override
-    public void synchronizeToDesign(Node design, DesignContext designContext) {
+    public void synchronizeToDesign(Element design, DesignContext designContext) {
         // synchronize default attributes
         super.synchronizeToDesign(design, designContext);
         // handle children
-        if (this instanceof HasComponents) {
-            if (!(design instanceof Element)) {
-                throw new RuntimeException(
-                        "Attempted to create child elements for a node that cannot have children.");
+        Element designElement = design;
+        for (Component child : this) {
+            DesignSynchronizable childComponent = (DesignSynchronizable) child;
+            Element childNode = designContext.createNode(childComponent);
+            designElement.appendChild(childNode);
+            childComponent.synchronizeToDesign(childNode, designContext);
+            // handle alignment
+            Alignment alignment = getComponentAlignment(child);
+            if (alignment.isMiddle()) {
+                childNode.attr(":middle", "");
+            } else if (alignment.isBottom()) {
+                childNode.attr(":bottom", "");
             }
-            Element designElement = (Element) design;
-            for (Component child : this) {
-                DesignSynchronizable childComponent = (DesignSynchronizable) child;
-                Node childNode = designContext.createNode(childComponent);
-                designElement.appendChild(childNode);
-                childComponent.synchronizeToDesign(childNode, designContext);
-                // handle alignment
-                Alignment alignment = getComponentAlignment(child);
-                if (alignment.isMiddle()) {
-                    childNode.attr(":middle", "");
-                } else if (alignment.isBottom()) {
-                    childNode.attr(":bottom", "");
-                }
-                if (alignment.isCenter()) {
-                    childNode.attr(":center", "");
-                } else if (alignment.isRight()) {
-                    childNode.attr(":right", "");
-                }
-                // handle expand ratio
-                float expandRatio = getExpandRatio(child);
-                if (expandRatio == 1.0f) {
-                    childNode.attr(":expand", "");
-                } else if (expandRatio > 0) {
-                    childNode.attr(":expand", DesignAttributeHandler
-                            .formatDesignAttribute(expandRatio));
-                }
+            if (alignment.isCenter()) {
+                childNode.attr(":center", "");
+            } else if (alignment.isRight()) {
+                childNode.attr(":right", "");
+            }
+            // handle expand ratio
+            float expandRatio = getExpandRatio(child);
+            if (expandRatio == 1.0f) {
+                childNode.attr(":expand", "");
+            } else if (expandRatio > 0) {
+                childNode.attr(":expand", DesignAttributeHandler
+                        .formatDesignAttribute(expandRatio));
             }
         }
     }
diff --git a/server/src/com/vaadin/ui/DesignSynchronizable.java b/server/src/com/vaadin/ui/DesignSynchronizable.java
index dc421bc47d..91533cc93b 100644
--- a/server/src/com/vaadin/ui/DesignSynchronizable.java
+++ b/server/src/com/vaadin/ui/DesignSynchronizable.java
@@ -15,7 +15,7 @@
  */
 package com.vaadin.ui;
 
-import org.jsoup.nodes.Node;
+import org.jsoup.nodes.Element;
 
 import com.vaadin.ui.declarative.DesignContext;
 
@@ -42,7 +42,8 @@ public interface DesignSynchronizable extends Component {
      * @param designContext
      *            The DesignContext instance used for parsing the design
      */
-    public void synchronizeFromDesign(Node design, DesignContext designContext);
+    public void synchronizeFromDesign(Element design,
+            DesignContext designContext);
 
     /**
      * Update the given design based on the component state. The component is
@@ -58,5 +59,5 @@ public interface DesignSynchronizable extends Component {
      *            The design as HTML to update with the current state
      * @param designContext
      */
-    public void synchronizeToDesign(Node design, DesignContext designContext);
+    public void synchronizeToDesign(Element design, DesignContext designContext);
 }
diff --git a/server/src/com/vaadin/ui/declarative/DesignContext.java b/server/src/com/vaadin/ui/declarative/DesignContext.java
index 54d74f417c..1af8fc4fcd 100644
--- a/server/src/com/vaadin/ui/declarative/DesignContext.java
+++ b/server/src/com/vaadin/ui/declarative/DesignContext.java
@@ -302,7 +302,7 @@ public class DesignContext {
      *         name of the created node is derived from the class name of
      *         childComponent.
      */
-    public Node createNode(DesignSynchronizable childComponent) {
+    public Element createNode(DesignSynchronizable childComponent) {
         Class<?> componentClass = childComponent.getClass();
         String packageName = componentClass.getPackage().getName();
         String prefix = packageToPrefix.get(packageName);
@@ -364,7 +364,7 @@ public class DesignContext {
      * @return a DesignSynchronizable object corresponding to componentDesign,
      *         with no attributes set.
      */
-    public DesignSynchronizable createChild(Node componentDesign) {
+    public DesignSynchronizable createChild(Element componentDesign) {
         // Create the component.
         DesignSynchronizable component = instantiateComponent(componentDesign);
         component.synchronizeFromDesign(componentDesign, this);
diff --git a/server/src/com/vaadin/ui/declarative/LayoutHandler.java b/server/src/com/vaadin/ui/declarative/LayoutHandler.java
index 132bf5f5b5..045fb43b2c 100644
--- a/server/src/com/vaadin/ui/declarative/LayoutHandler.java
+++ b/server/src/com/vaadin/ui/declarative/LayoutHandler.java
@@ -70,7 +70,7 @@ public class LayoutHandler {
         designContext.getPrefixes(doc);
         // No special handling for a document without a body element - should be
         // taken care of by jsoup.
-        Node root = doc.body();
+        Element root = doc.body();
         DesignSynchronizable componentRoot = null;
         for (Node element : root.childNodes()) {
             if (element instanceof Element) {
@@ -83,7 +83,7 @@ public class LayoutHandler {
                                     + element + ".");
                 }
                 // createChild creates the entire component hierarchy
-                componentRoot = designContext.createChild(element);
+                componentRoot = designContext.createChild((Element) element);
                 designContext.setComponentRoot(componentRoot);
             }
         }
diff --git a/server/tests/src/com/vaadin/tests/server/component/abstractcomponent/TestSynchronizeFromDesign.java b/server/tests/src/com/vaadin/tests/server/component/abstractcomponent/TestSynchronizeFromDesign.java
index ae59550461..e18f52195d 100644
--- a/server/tests/src/com/vaadin/tests/server/component/abstractcomponent/TestSynchronizeFromDesign.java
+++ b/server/tests/src/com/vaadin/tests/server/component/abstractcomponent/TestSynchronizeFromDesign.java
@@ -19,7 +19,6 @@ import junit.framework.TestCase;
 
 import org.jsoup.nodes.Attributes;
 import org.jsoup.nodes.Element;
-import org.jsoup.nodes.Node;
 import org.jsoup.parser.Tag;
 
 import com.vaadin.server.ExternalResource;
@@ -45,28 +44,28 @@ public class TestSynchronizeFromDesign extends TestCase {
     }
 
     public void testSynchronizeId() {
-        Node design = createDesign("id", "testId");
+        Element design = createDesign("id", "testId");
         AbstractComponent component = getComponent();
         component.synchronizeFromDesign(design, ctx);
         assertEquals("testId", component.getId());
     }
 
     public void testSynchronizePrimaryStyleName() {
-        Node design = createDesign("primary-style-name", "test-style");
+        Element design = createDesign("primary-style-name", "test-style");
         AbstractComponent component = getComponent();
         component.synchronizeFromDesign(design, ctx);
         assertEquals("test-style", component.getPrimaryStyleName());
     }
 
     public void testSynchronizeCaption() {
-        Node design = createDesign("caption", "test-caption");
+        Element design = createDesign("caption", "test-caption");
         AbstractComponent component = getComponent();
         component.synchronizeFromDesign(design, ctx);
         assertEquals("test-caption", component.getCaption());
     }
 
     public void testSynchronizeLocale() {
-        Node design = createDesign("locale", "fi_FI");
+        Element design = createDesign("locale", "fi_FI");
         AbstractComponent component = getComponent();
         component.synchronizeFromDesign(design, ctx);
         assertEquals("fi", component.getLocale().getLanguage());
@@ -74,7 +73,7 @@ public class TestSynchronizeFromDesign extends TestCase {
     }
 
     public void testSynchronizeExternalIcon() {
-        Node design = createDesign("icon", "http://example.com/example.gif");
+        Element design = createDesign("icon", "http://example.com/example.gif");
         AbstractComponent component = getComponent();
         component.synchronizeFromDesign(design, ctx);
         assertTrue("Incorrect resource type returned", component.getIcon()
@@ -82,7 +81,7 @@ public class TestSynchronizeFromDesign extends TestCase {
     }
 
     public void testSynchronizeThemeIcon() {
-        Node design = createDesign("icon", "theme://example.gif");
+        Element design = createDesign("icon", "theme://example.gif");
         AbstractComponent component = getComponent();
         component.synchronizeFromDesign(design, ctx);
         assertTrue("Incorrect resource type returned", component.getIcon()
@@ -90,7 +89,7 @@ public class TestSynchronizeFromDesign extends TestCase {
     }
 
     public void testSynchronizeFileResource() {
-        Node design = createDesign("icon", "img/example.gif");
+        Element design = createDesign("icon", "img/example.gif");
         AbstractComponent component = getComponent();
         component.synchronizeFromDesign(design, ctx);
         assertTrue("Incorrect resource type returned", component.getIcon()
@@ -98,21 +97,21 @@ public class TestSynchronizeFromDesign extends TestCase {
     }
 
     public void testSynchronizeImmediate() {
-        Node design = createDesign("immediate", "true");
+        Element design = createDesign("immediate", "true");
         AbstractComponent component = getComponent();
         component.synchronizeFromDesign(design, ctx);
         assertEquals(true, component.isImmediate());
     }
 
     public void testSynchronizeDescription() {
-        Node design = createDesign("description", "test-description");
+        Element design = createDesign("description", "test-description");
         AbstractComponent component = getComponent();
         component.synchronizeFromDesign(design, ctx);
         assertEquals("test-description", component.getDescription());
     }
 
     public void testSynchronizeComponentError() {
-        Node design = createDesign("error", "<div>test-error</div>");
+        Element design = createDesign("error", "<div>test-error</div>");
         AbstractComponent component = getComponent();
         component.synchronizeFromDesign(design, ctx);
         assertEquals("<div>test-error</div>", component.getComponentError()
@@ -120,7 +119,7 @@ public class TestSynchronizeFromDesign extends TestCase {
     }
 
     public void testSynchronizeSizeFull() {
-        Node design = createDesign("size-full", "");
+        Element design = createDesign("size-full", "");
         AbstractComponent component = getComponent();
         component.synchronizeFromDesign(design, ctx);
         assertEquals(100, component.getWidth(), 0.1f);
@@ -128,7 +127,7 @@ public class TestSynchronizeFromDesign extends TestCase {
     }
 
     public void testSynchronizeSizeAuto() {
-        Node design = createDesign("size-auto", "");
+        Element design = createDesign("size-auto", "");
         AbstractComponent component = getComponent();
         component.synchronizeFromDesign(design, ctx);
         assertEquals(-1, component.getWidth(), 0.1f);
@@ -136,35 +135,35 @@ public class TestSynchronizeFromDesign extends TestCase {
     }
 
     public void testSynchronizeHeightFull() {
-        Node design = createDesign("height-full", "");
+        Element design = createDesign("height-full", "");
         AbstractComponent component = getComponent();
         component.synchronizeFromDesign(design, ctx);
         assertEquals(100, component.getHeight(), 0.1f);
     }
 
     public void testSynchronizeHeightAuto() {
-        Node design = createDesign("height-auto", "");
+        Element design = createDesign("height-auto", "");
         AbstractComponent component = getComponent();
         component.synchronizeFromDesign(design, ctx);
         assertEquals(-1, component.getHeight(), 0.1f);
     }
 
     public void testSynchronizeWidthFull() {
-        Node design = createDesign("width-full", "");
+        Element design = createDesign("width-full", "");
         AbstractComponent component = getComponent();
         component.synchronizeFromDesign(design, ctx);
         assertEquals(100, component.getWidth(), 0.1f);
     }
 
     public void testSynchronizeWidthAuto() {
-        Node design = createDesign("width-auto", "");
+        Element design = createDesign("width-auto", "");
         AbstractComponent component = getComponent();
         component.synchronizeFromDesign(design, ctx);
         assertEquals(-1, component.getWidth(), 0.1f);
     }
 
     public void testSynchronizeWidth() {
-        Node design = createDesign("width", "12px");
+        Element design = createDesign("width", "12px");
         AbstractComponent component = getComponent();
         component.synchronizeFromDesign(design, ctx);
         assertEquals(12, component.getWidth(), 0.1f);
@@ -173,7 +172,7 @@ public class TestSynchronizeFromDesign extends TestCase {
     }
 
     public void testSynchronizeHeight() {
-        Node design = createDesign("height", "12px");
+        Element design = createDesign("height", "12px");
         AbstractComponent component = getComponent();
         component.synchronizeFromDesign(design, ctx);
         assertEquals(12, component.getHeight(), 0.1f);
@@ -186,7 +185,7 @@ public class TestSynchronizeFromDesign extends TestCase {
         return new Label();
     }
 
-    private Node createDesign(String key, String value) {
+    private Element createDesign(String key, String value) {
         Attributes attributes = new Attributes();
         attributes.put(key, value);
         Element node = new Element(Tag.valueOf("v-label"), "", attributes);
diff --git a/server/tests/src/com/vaadin/tests/server/component/abstractcomponent/TestSynchronizeToDesign.java b/server/tests/src/com/vaadin/tests/server/component/abstractcomponent/TestSynchronizeToDesign.java
index add223c839..00505e1e19 100644
--- a/server/tests/src/com/vaadin/tests/server/component/abstractcomponent/TestSynchronizeToDesign.java
+++ b/server/tests/src/com/vaadin/tests/server/component/abstractcomponent/TestSynchronizeToDesign.java
@@ -22,7 +22,6 @@ import junit.framework.TestCase;
 
 import org.jsoup.nodes.Attributes;
 import org.jsoup.nodes.Element;
-import org.jsoup.nodes.Node;
 import org.jsoup.parser.Tag;
 
 import com.vaadin.server.AbstractErrorMessage.ContentMode;
@@ -52,7 +51,7 @@ public class TestSynchronizeToDesign extends TestCase {
     }
 
     public void testSynchronizeId() {
-        Node design = createDesign();
+        Element design = createDesign();
         AbstractComponent component = getComponent();
         component.setId("testId");
         component.synchronizeToDesign(design, ctx);
@@ -62,7 +61,7 @@ public class TestSynchronizeToDesign extends TestCase {
     }
 
     public void testSynchronizePrimaryStyleName() {
-        Node design = createDesign();
+        Element design = createDesign();
         AbstractComponent component = getComponent();
         component.setPrimaryStyleName("test-style");
         component.synchronizeToDesign(design, ctx);
@@ -72,7 +71,7 @@ public class TestSynchronizeToDesign extends TestCase {
     }
 
     public void testSynchronizeCaption() {
-        Node design = createDesign();
+        Element design = createDesign();
         AbstractComponent component = getComponent();
         component.setCaption("test-caption");
         component.synchronizeToDesign(design, ctx);
@@ -82,7 +81,7 @@ public class TestSynchronizeToDesign extends TestCase {
     }
 
     public void testSynchronizeLocale() {
-        Node design = createDesign();
+        Element design = createDesign();
         AbstractComponent component = getComponent();
         component.setLocale(new Locale("fi", "FI"));
         component.synchronizeToDesign(design, ctx);
@@ -92,7 +91,7 @@ public class TestSynchronizeToDesign extends TestCase {
     }
 
     public void testSynchronizeExternalIcon() {
-        Node design = createDesign();
+        Element design = createDesign();
         AbstractComponent component = getComponent();
         component
                 .setIcon(new ExternalResource("http://example.com/example.gif"));
@@ -103,7 +102,7 @@ public class TestSynchronizeToDesign extends TestCase {
     }
 
     public void testSynchronizeThemeIcon() {
-        Node design = createDesign();
+        Element design = createDesign();
         AbstractComponent component = getComponent();
         component.setIcon(new ThemeResource("example.gif"));
         component.synchronizeToDesign(design, ctx);
@@ -113,7 +112,7 @@ public class TestSynchronizeToDesign extends TestCase {
     }
 
     public void testSynchronizeFileResource() {
-        Node design = createDesign();
+        Element design = createDesign();
         AbstractComponent component = getComponent();
         component.setIcon(new FileResource(new File("img/example.gif")));
         component.synchronizeToDesign(design, ctx);
@@ -123,7 +122,7 @@ public class TestSynchronizeToDesign extends TestCase {
     }
 
     public void testSynchronizeImmediate() {
-        Node design = createDesign();
+        Element design = createDesign();
         AbstractComponent component = getComponent();
         component.setImmediate(true);
         component.synchronizeToDesign(design, ctx);
@@ -133,7 +132,7 @@ public class TestSynchronizeToDesign extends TestCase {
     }
 
     public void testSynchronizeDescription() {
-        Node design = createDesign();
+        Element design = createDesign();
         AbstractComponent component = getComponent();
         component.setDescription("test-description");
         component.synchronizeToDesign(design, ctx);
@@ -143,7 +142,7 @@ public class TestSynchronizeToDesign extends TestCase {
     }
 
     public void testSynchronizeComponentError() {
-        Node design = createDesign();
+        Element design = createDesign();
         AbstractComponent component = getComponent();
         component.setComponentError(new UserError("<div>test-error</div>",
                 ContentMode.HTML, ErrorLevel.ERROR));
@@ -154,7 +153,7 @@ public class TestSynchronizeToDesign extends TestCase {
     }
 
     public void testSynchronizeSizeFull() {
-        Node design = createDesign();
+        Element design = createDesign();
         AbstractComponent component = getComponent();
         component.setSizeFull();
         component.synchronizeToDesign(design, ctx);
@@ -164,7 +163,7 @@ public class TestSynchronizeToDesign extends TestCase {
     }
 
     public void testSynchronizeSizeAuto() {
-        Node design = createDesign();
+        Element design = createDesign();
         AbstractComponent component = getPanel();
         component.setSizeUndefined();
         component.synchronizeToDesign(design, ctx);
@@ -174,7 +173,7 @@ public class TestSynchronizeToDesign extends TestCase {
     }
 
     public void testSynchronizeHeightFull() {
-        Node design = createDesign();
+        Element design = createDesign();
         AbstractComponent component = getComponent();
         component.setHeight("100%");
         component.setWidth("20px");
@@ -183,7 +182,7 @@ public class TestSynchronizeToDesign extends TestCase {
     }
 
     public void testSynchronizeHeightAuto() {
-        Node design = createDesign();
+        Element design = createDesign();
         // we need to have default height of 100% -> use split panel
         AbstractComponent component = getPanel();
         component.setHeight(null);
@@ -193,7 +192,7 @@ public class TestSynchronizeToDesign extends TestCase {
     }
 
     public void testSynchronizeWidthFull() {
-        Node design = createDesign();
+        Element design = createDesign();
         AbstractComponent component = getComponent();
         component.setHeight("20px");
         component.setWidth("100%");
@@ -202,7 +201,7 @@ public class TestSynchronizeToDesign extends TestCase {
     }
 
     public void testSynchronizeWidthAuto() {
-        Node design = createDesign();
+        Element design = createDesign();
         // need to get label, otherwise the default would be auto
         AbstractComponent component = getPanel();
         component.setHeight("20px");
@@ -212,7 +211,7 @@ public class TestSynchronizeToDesign extends TestCase {
     }
 
     public void testSynchronizeWidth() {
-        Node design = createDesign();
+        Element design = createDesign();
         AbstractComponent component = getComponent();
         component.setHeight("20px");
         component.setWidth("70%");
@@ -221,7 +220,7 @@ public class TestSynchronizeToDesign extends TestCase {
     }
 
     public void testSynchronizeHeight() {
-        Node design = createDesign();
+        Element design = createDesign();
         AbstractComponent component = getComponent();
         component.setHeight("20px");
         component.setWidth("70%");
@@ -237,7 +236,7 @@ public class TestSynchronizeToDesign extends TestCase {
         return new HorizontalSplitPanel();
     }
 
-    private Node createDesign() {
+    private Element createDesign() {
         Attributes attr = new Attributes();
         attr.put("should_be_removed", "foo");
         Element node = new Element(Tag.valueOf("v-button"), "", attr);
diff --git a/server/tests/src/com/vaadin/tests/server/component/abstractorderedlayout/TestSynchronizeFromDesign.java b/server/tests/src/com/vaadin/tests/server/component/abstractorderedlayout/TestSynchronizeFromDesign.java
index e7dc4fc091..038801844d 100644
--- a/server/tests/src/com/vaadin/tests/server/component/abstractorderedlayout/TestSynchronizeFromDesign.java
+++ b/server/tests/src/com/vaadin/tests/server/component/abstractorderedlayout/TestSynchronizeFromDesign.java
@@ -19,7 +19,6 @@ import junit.framework.TestCase;
 
 import org.jsoup.nodes.Attributes;
 import org.jsoup.nodes.Element;
-import org.jsoup.nodes.Node;
 import org.jsoup.parser.Tag;
 
 import com.vaadin.ui.Alignment;
@@ -72,12 +71,12 @@ public class TestSynchronizeFromDesign extends TestCase {
 
     private VerticalLayout createLayout(float expandRatio, String... alignments) {
         DesignContext ctx = new DesignContext();
-        Node design = createDesign(expandRatio, alignments);
+        Element design = createDesign(expandRatio, alignments);
         DesignSynchronizable child = ctx.createChild(design);
         return (VerticalLayout) child;
     }
 
-    private Node createDesign(float expandRatio, String... alignments) {
+    private Element createDesign(float expandRatio, String... alignments) {
 
         Attributes rootAttributes = new Attributes();
         rootAttributes.put("caption", "test-layout");
diff --git a/server/tests/src/com/vaadin/tests/server/component/abstractorderedlayout/TestSynchronizeToDesign.java b/server/tests/src/com/vaadin/tests/server/component/abstractorderedlayout/TestSynchronizeToDesign.java
index 4c0397f182..55f1763397 100644
--- a/server/tests/src/com/vaadin/tests/server/component/abstractorderedlayout/TestSynchronizeToDesign.java
+++ b/server/tests/src/com/vaadin/tests/server/component/abstractorderedlayout/TestSynchronizeToDesign.java
@@ -19,7 +19,6 @@ import junit.framework.TestCase;
 
 import org.jsoup.nodes.Attributes;
 import org.jsoup.nodes.Element;
-import org.jsoup.nodes.Node;
 import org.jsoup.parser.Tag;
 
 import com.vaadin.ui.Alignment;
@@ -38,7 +37,7 @@ public class TestSynchronizeToDesign extends TestCase {
     public void testSynchronizeEmptyLayout() {
         VerticalLayout layout = new VerticalLayout();
         layout.setCaption("changed-caption");
-        Node design = createDesign();
+        Element design = createDesign();
         layout.synchronizeToDesign(design, createDesignContext());
         assertEquals(0, design.childNodes().size());
         assertEquals("changed-caption", design.attr("caption"));
@@ -49,7 +48,7 @@ public class TestSynchronizeToDesign extends TestCase {
         layout.addComponent(new Label("test-label"));
         layout.getComponent(0).setCaption("test-caption");
         layout.addComponent(new Label("test-label-2"));
-        Node design = createDesign();
+        Element design = createDesign();
         layout.synchronizeToDesign(design, createDesignContext());
         assertEquals(2, design.childNodes().size());
         assertEquals("v-label", ((Element) design.childNode(0)).tagName());
@@ -60,7 +59,7 @@ public class TestSynchronizeToDesign extends TestCase {
         VerticalLayout layout = new VerticalLayout();
         layout.addComponent(new Label("test-label"));
         layout.setExpandRatio(layout.getComponent(0), 1.0f);
-        Node design = createDesign();
+        Element design = createDesign();
         layout.synchronizeToDesign(design, createDesignContext());
         assertTrue(design.childNode(0).hasAttr(":expand"));
         assertEquals("", design.childNode(0).attr(":expand"));
@@ -70,14 +69,14 @@ public class TestSynchronizeToDesign extends TestCase {
         VerticalLayout layout = new VerticalLayout();
         layout.addComponent(new Label("test-label"));
         layout.setExpandRatio(layout.getComponent(0), 2.40f);
-        Node design = createDesign();
+        Element design = createDesign();
         layout.synchronizeToDesign(design, createDesignContext());
         assertTrue(design.childNode(0).hasAttr(":expand"));
         assertEquals("2.4", design.childNode(0).attr(":expand"));
     }
 
     public void testSynchronizeDefaultAlignment() {
-        Node design = createDesign();
+        Element design = createDesign();
         VerticalLayout layout = createLayoutWithAlignment(design, null);
         layout.synchronizeToDesign(design, createDesignContext());
         assertFalse(design.childNode(0).hasAttr(":top"));
@@ -85,7 +84,7 @@ public class TestSynchronizeToDesign extends TestCase {
     }
 
     public void testSynchronizeMiddleCenter() {
-        Node design = createDesign();
+        Element design = createDesign();
         VerticalLayout layout = createLayoutWithAlignment(design,
                 Alignment.MIDDLE_CENTER);
         layout.synchronizeToDesign(design, createDesignContext());
@@ -94,7 +93,7 @@ public class TestSynchronizeToDesign extends TestCase {
     }
 
     public void testSynchronizeBottomRight() {
-        Node design = createDesign();
+        Element design = createDesign();
         VerticalLayout layout = createLayoutWithAlignment(design,
                 Alignment.BOTTOM_RIGHT);
         layout.synchronizeToDesign(design, createDesignContext());
@@ -102,7 +101,7 @@ public class TestSynchronizeToDesign extends TestCase {
         assertTrue(design.childNode(0).hasAttr(":right"));
     }
 
-    private VerticalLayout createLayoutWithAlignment(Node design,
+    private VerticalLayout createLayoutWithAlignment(Element design,
             Alignment alignment) {
         VerticalLayout layout = new VerticalLayout();
         layout.addComponent(new Label("test-label"));
@@ -113,7 +112,7 @@ public class TestSynchronizeToDesign extends TestCase {
         return layout;
     }
 
-    private Node createDesign() {
+    private Element createDesign() {
         // make sure that the design node has old content that should be removed
         Attributes rootAttributes = new Attributes();
         rootAttributes.put("caption", "test-layout");