diff options
| author | Artur Signell <artur@vaadin.com> | 2014-12-14 21:34:01 +0200 |
|---|---|---|
| committer | Matti Hosio <mhosio@vaadin.com> | 2014-12-15 14:29:25 +0200 |
| commit | 3b75f2b14833f78c00d0032cbd76b09fca058100 (patch) | |
| tree | d229d3ccc47bc41ab0f9647601c755b08393426c /server/src/com/vaadin/ui/AbstractSingleComponentContainer.java | |
| parent | 5d5e8c4c05b9ab765cebcae10f96144c2f570681 (diff) | |
| download | vaadin-framework-3b75f2b14833f78c00d0032cbd76b09fca058100.tar.gz vaadin-framework-3b75f2b14833f78c00d0032cbd76b09fca058100.zip | |
SynchronizeFrom/ToDesign -> read/writeDesign (#7749)
Change-Id: Ie5e420ac5d62a2aa3206051888e6dd0f8f30df11
Diffstat (limited to 'server/src/com/vaadin/ui/AbstractSingleComponentContainer.java')
| -rw-r--r-- | server/src/com/vaadin/ui/AbstractSingleComponentContainer.java | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/server/src/com/vaadin/ui/AbstractSingleComponentContainer.java b/server/src/com/vaadin/ui/AbstractSingleComponentContainer.java index 6c8d4fcde2..330fcfeae1 100644 --- a/server/src/com/vaadin/ui/AbstractSingleComponentContainer.java +++ b/server/src/com/vaadin/ui/AbstractSingleComponentContainer.java @@ -281,15 +281,13 @@ public abstract class AbstractSingleComponentContainer extends /* * (non-Javadoc) * - * @see - * com.vaadin.ui.AbstractComponent#synchronizeFromDesign(org.jsoup.nodes - * .Element, com.vaadin.ui.declarative.DesignContext) + * @see com.vaadin.ui.AbstractComponent#readDesign(org.jsoup.nodes .Element, + * com.vaadin.ui.declarative.DesignContext) */ @Override - public void synchronizeFromDesign(Element design, - DesignContext designContext) { + public void readDesign(Element design, DesignContext designContext) { // process default attributes - super.synchronizeFromDesign(design, designContext); + super.readDesign(design, designContext); // handle child element, checking that the design specifies at most one // child int childCount = design.children().size(); @@ -309,14 +307,13 @@ public abstract class AbstractSingleComponentContainer extends /* * (non-Javadoc) * - * @see - * com.vaadin.ui.AbstractComponent#synchronizeToDesign(org.jsoup.nodes.Element + * @see com.vaadin.ui.AbstractComponent#writeDesign(org.jsoup.nodes.Element * , com.vaadin.ui.declarative.DesignContext) */ @Override - public void synchronizeToDesign(Element design, DesignContext designContext) { + public void writeDesign(Element design, DesignContext designContext) { // synchronize default attributes (also clears children and attributes) - super.synchronizeToDesign(design, designContext); + super.writeDesign(design, designContext); // handle child component Component child = getContent(); if (child != null) { |