diff options
Diffstat (limited to 'server')
6 files changed, 0 insertions, 14 deletions
diff --git a/server/src/com/vaadin/ui/AbsoluteLayout.java b/server/src/com/vaadin/ui/AbsoluteLayout.java index 47ebdd12cd..aac544ae18 100644 --- a/server/src/com/vaadin/ui/AbsoluteLayout.java +++ b/server/src/com/vaadin/ui/AbsoluteLayout.java @@ -684,8 +684,6 @@ public class AbsoluteLayout extends AbstractLayout implements public void readDesign(Element design, DesignContext designContext) { // process default attributes super.readDesign(design, designContext); - // remove current children - removeAllComponents(); // handle children for (Element childComponent : design.children()) { Attributes attr = childComponent.attributes(); diff --git a/server/src/com/vaadin/ui/AbstractSingleComponentContainer.java b/server/src/com/vaadin/ui/AbstractSingleComponentContainer.java index 23fa8a78c7..a646f17f23 100644 --- a/server/src/com/vaadin/ui/AbstractSingleComponentContainer.java +++ b/server/src/com/vaadin/ui/AbstractSingleComponentContainer.java @@ -299,8 +299,6 @@ public abstract class AbstractSingleComponentContainer extends Element childElement = design.children().get(0); Component newChild = designContext.createChild(childElement); setContent(newChild); - } else { - setContent(null); } } diff --git a/server/src/com/vaadin/ui/AbstractSplitPanel.java b/server/src/com/vaadin/ui/AbstractSplitPanel.java index 8d1db549a9..3daf759c30 100644 --- a/server/src/com/vaadin/ui/AbstractSplitPanel.java +++ b/server/src/com/vaadin/ui/AbstractSplitPanel.java @@ -592,8 +592,6 @@ public abstract class AbstractSplitPanel extends AbstractComponentContainer { setMaxSplitPosition(maxSplitPosition.getSize(), maxSplitPosition.getUnit()); } - // remove current children - removeAllComponents(); // handle children if (design.children().size() > 2) { throw new DesignException( diff --git a/server/src/com/vaadin/ui/CssLayout.java b/server/src/com/vaadin/ui/CssLayout.java index 1042947f21..541d369c55 100644 --- a/server/src/com/vaadin/ui/CssLayout.java +++ b/server/src/com/vaadin/ui/CssLayout.java @@ -371,8 +371,6 @@ public class CssLayout extends AbstractLayout implements LayoutClickNotifier { public void readDesign(Element design, DesignContext designContext) { // process default attributes super.readDesign(design, designContext); - // remove current children - removeAllComponents(); // handle children for (Element childComponent : design.children()) { Component newChild = designContext.createChild(childComponent); diff --git a/server/src/com/vaadin/ui/TabSheet.java b/server/src/com/vaadin/ui/TabSheet.java index ef3ef80960..6bd5ef2221 100644 --- a/server/src/com/vaadin/ui/TabSheet.java +++ b/server/src/com/vaadin/ui/TabSheet.java @@ -1464,8 +1464,6 @@ public class TabSheet extends AbstractComponentContainer implements Focusable, @Override public void readDesign(Element design, DesignContext designContext) { super.readDesign(design, designContext); - // clear old tabs - removeAllComponents(); // create new tabs for (Element tab : design.children()) { if (!tab.tagName().equals("tab")) { diff --git a/server/tests/src/com/vaadin/tests/server/component/tabsheet/TestReadDesign.java b/server/tests/src/com/vaadin/tests/server/component/tabsheet/TestReadDesign.java index 6a34d6584a..f7c4f16cdc 100644 --- a/server/tests/src/com/vaadin/tests/server/component/tabsheet/TestReadDesign.java +++ b/server/tests/src/com/vaadin/tests/server/component/tabsheet/TestReadDesign.java @@ -22,7 +22,6 @@ import org.jsoup.nodes.Element; import org.jsoup.parser.Tag; import com.vaadin.server.ExternalResource; -import com.vaadin.ui.Label; import com.vaadin.ui.TabSheet; import com.vaadin.ui.TabSheet.Tab; import com.vaadin.ui.TextField; @@ -80,9 +79,6 @@ public class TestReadDesign extends TestCase { private TabSheet createTabSheet() { TabSheet tabSheet = new TabSheet(); - // add some tabs that should be cleared on sync - tabSheet.addComponent(new Label("tab1")); - tabSheet.addComponent(new Label("tab2")); DesignContext ctx = new DesignContext(); Element design = createDesign(); tabSheet.readDesign(design, ctx); |