diff options
| author | Marc Englund <marc@vaadin.com> | 2012-10-15 12:48:56 +0000 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2012-10-15 12:48:56 +0000 |
| commit | 6075149eb323d9d63414e917b5b9d43519682217 (patch) | |
| tree | 7724e4c6cdd9b4ec61a5ae5f904a0afb1d002c6b /server | |
| parent | 63dc0d1c4387036f52c6a8875d2bacd619b422dc (diff) | |
| parent | 79a6f890e794df686fc28d2dea831515b23953d8 (diff) | |
| download | vaadin-framework-6075149eb323d9d63414e917b5b9d43519682217.tar.gz vaadin-framework-6075149eb323d9d63414e917b5b9d43519682217.zip | |
Merge "Merged AbstractSelect now listens to changes in icon property (#9663)"
Diffstat (limited to 'server')
| -rw-r--r-- | server/src/com/vaadin/ui/AbstractSelect.java | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/server/src/com/vaadin/ui/AbstractSelect.java b/server/src/com/vaadin/ui/AbstractSelect.java index 45df42a9be..78fab068dd 100644 --- a/server/src/com/vaadin/ui/AbstractSelect.java +++ b/server/src/com/vaadin/ui/AbstractSelect.java @@ -1858,6 +1858,15 @@ public abstract class AbstractSelect extends AbstractField<Object> implements break; } + if (getItemIconPropertyId() != null) { + final Property p = getContainerProperty(itemId, + getItemIconPropertyId()); + if (p != null && p instanceof Property.ValueChangeNotifier) { + ((Property.ValueChangeNotifier) p) + .addListener(getCaptionChangeListener()); + captionChangeNotifiers.add(p); + } + } } public void clear() { |