From 68c7963f085fc299ac9ebded9394b638c7392bb1 Mon Sep 17 00:00:00 2001 From: Johannes Dahlström Date: Thu, 9 Apr 2015 17:34:04 +0300 Subject: Declarative support for Tree inline data (#16321) elements may now contain a hierarchy of elements. Change-Id: I6b1703aa4ec598cf0b3a6221f615727efbcbf0ad --- server/src/com/vaadin/ui/AbstractSelect.java | 125 +++++++++++++++------ server/src/com/vaadin/ui/Tree.java | 106 +++++++++++++++++ .../server/component/tree/TreeDeclarativeTest.java | 59 ++++++---- 3 files changed, 235 insertions(+), 55 deletions(-) diff --git a/server/src/com/vaadin/ui/AbstractSelect.java b/server/src/com/vaadin/ui/AbstractSelect.java index 4c5e6b6ea3..629d2fb504 100644 --- a/server/src/com/vaadin/ui/AbstractSelect.java +++ b/server/src/com/vaadin/ui/AbstractSelect.java @@ -2188,28 +2188,13 @@ public abstract class AbstractSelect extends AbstractField implements } @Override - public void readDesign(Element design, DesignContext designContext) { + public void readDesign(Element design, DesignContext context) { // handle default attributes - super.readDesign(design, designContext); + super.readDesign(design, context); // handle children specifying selectable items (