summaryrefslogtreecommitdiffstats
path: root/server/src
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2014-12-15 23:21:49 +0200
committerVaadin Code Review <review@vaadin.com>2014-12-16 13:22:35 +0000
commit6d96447d5d3d4c1f22c7d49478c1b10a62bf64e7 (patch)
tree6c7bebfa4286bf0d0f1ef38aeb8688a007d2ce13 /server/src
parent9bc83cdce75d39ae8c3c7e07f20b006111c193b6 (diff)
downloadvaadin-framework-6d96447d5d3d4c1f22c7d49478c1b10a62bf64e7.tar.gz
vaadin-framework-6d96447d5d3d4c1f22c7d49478c1b10a62bf64e7.zip
Do not remove children in read to ensure @DesignRoot reading works
properly (#7749) Change-Id: I8a3111e7007911adfd97c15373b634b2c57f5cd5
Diffstat (limited to 'server/src')
-rw-r--r--server/src/com/vaadin/ui/AbsoluteLayout.java2
-rw-r--r--server/src/com/vaadin/ui/AbstractSingleComponentContainer.java2
-rw-r--r--server/src/com/vaadin/ui/AbstractSplitPanel.java2
-rw-r--r--server/src/com/vaadin/ui/CssLayout.java2
-rw-r--r--server/src/com/vaadin/ui/TabSheet.java2
5 files changed, 0 insertions, 10 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")) {