diff options
| author | Johannes Dahlström <johannesd@vaadin.com> | 2015-04-22 15:08:30 +0300 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2015-04-28 10:07:46 +0000 |
| commit | 9f6bec29fae7cbdde914db342ca3f825bbd1b80f (patch) | |
| tree | 734142f1087403d6c166129be1a01edb0e87c57d /server/src/com/vaadin/ui/AbstractSelect.java | |
| parent | 6b3c1c02e82182333c29de984065d61f65d691f4 (diff) | |
| download | vaadin-framework-9f6bec29fae7cbdde914db342ca3f825bbd1b80f.tar.gz vaadin-framework-9f6bec29fae7cbdde914db342ca3f825bbd1b80f.zip | |
Fix TreeTable declarative support (#16368)
Also fix some small issues in Table declarative:
* Write null property values as empty strings instead of NPEing
* Read/write item ids from/to <tr item-id="...">
Change-Id: Ieccc3f49c5021f8a4a50d4ea671f9086ad8f997c
Diffstat (limited to 'server/src/com/vaadin/ui/AbstractSelect.java')
| -rw-r--r-- | server/src/com/vaadin/ui/AbstractSelect.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/server/src/com/vaadin/ui/AbstractSelect.java b/server/src/com/vaadin/ui/AbstractSelect.java index 0e3cfef4ce..237cdbddb6 100644 --- a/server/src/com/vaadin/ui/AbstractSelect.java +++ b/server/src/com/vaadin/ui/AbstractSelect.java @@ -2231,7 +2231,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements * if the tag name of the {@code child} element is not * {@code option}. */ - protected String readItem(Element child, Set<String> selected, + protected Object readItem(Element child, Set<String> selected, DesignContext context) { if (!"option".equals(child.tagName())) { throw new DesignException("Unrecognized child element in " |