From 79a6f890e794df686fc28d2dea831515b23953d8 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur.signell@itmill.com>
Date: Wed, 19 Sep 2012 13:45:09 +0000
Subject: Merged AbstractSelect now listens to changes in icon property (#9663)

svn changeset:24490/svn branch:6.8

Change-Id: Id5fdf46295fba758fc4be7d1b3b47e29651e0535
---
 server/src/com/vaadin/ui/AbstractSelect.java | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'server/src/com/vaadin')

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() {
-- 
cgit v1.2.3