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/declarative | |
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/declarative')
-rw-r--r-- | server/src/com/vaadin/ui/declarative/DesignContext.java | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/server/src/com/vaadin/ui/declarative/DesignContext.java b/server/src/com/vaadin/ui/declarative/DesignContext.java index e84faa31ca..b196c84b02 100644 --- a/server/src/com/vaadin/ui/declarative/DesignContext.java +++ b/server/src/com/vaadin/ui/declarative/DesignContext.java @@ -331,9 +331,9 @@ public class DesignContext implements Serializable { /** * Creates an html tree node corresponding to the given element. Also - * initializes its attributes by calling synchronizeToDesign. As a result of - * the synchronizeToDesign() call, this method creates the entire subtree - * rooted at the returned Node. + * initializes its attributes by calling writeDesign. As a result of the + * writeDesign() call, this method creates the entire subtree rooted at the + * returned Node. * * @param childComponent * The component with state that is synchronized in to the node @@ -353,9 +353,9 @@ public class DesignContext implements Serializable { String className = classNameToElementName(componentClass .getSimpleName()); Element newElement = doc.createElement(prefix + className); - childComponent.synchronizeToDesign(newElement, this); + childComponent.writeDesign(newElement, this); // Handle the local id. Global id and caption should have been taken - // care of by synchronizeToDesign. + // care of by writeDesign. String localId = componentToLocalId.get(childComponent); if (localId != null) { newElement.attr(LOCAL_ID_ATTRIBUTE, localId); @@ -391,8 +391,8 @@ public class DesignContext implements Serializable { /** * Creates a Component corresponding to the given html node. Also calls - * synchronizeFromDesign() for the created node, in effect creating the - * entire component hierarchy rooted at the returned component. + * readDesign() for the created node, in effect creating the entire + * component hierarchy rooted at the returned component. * * @param componentDesign * The html tree node containing the description of the component @@ -408,11 +408,10 @@ public class DesignContext implements Serializable { } /** - * Calls synchronizeFromDesign() for the given component and passes the - * given component design as a parameter. This creates the entire component - * hierarchy rooted at the given component. Also registers the componentid, - * localId and caption of the given component and all its children to the - * context + * Calls readDesign() for the given component and passes the given component + * design as a parameter. This creates the entire component hierarchy rooted + * at the given component. Also registers the componentid, localId and + * caption of the given component and all its children to the context * * * @param component @@ -422,7 +421,7 @@ public class DesignContext implements Serializable { */ public void synchronizeAndRegister(Component component, Element componentDesign) { - component.synchronizeFromDesign(componentDesign, this); + component.readDesign(componentDesign, this); // Get the ids and the caption of the component and store them in the // maps of this design context. org.jsoup.nodes.Attributes attributes = componentDesign.attributes(); |