1 files changed, 12 insertions, 7 deletions
diff --git a/client-compiler/src/com/vaadin/server/widgetsetutils/ConnectorBundleLoaderFactory.java b/client-compiler/src/com/vaadin/server/widgetsetutils/ConnectorBundleLoaderFactory.java
index cc1841ec05..cb41463ec6 100644
--- a/client-compiler/src/com/vaadin/server/widgetsetutils/ConnectorBundleLoaderFactory.java
+++ b/client-compiler/src/com/vaadin/server/widgetsetutils/ConnectorBundleLoaderFactory.java
@@ -605,13 +605,18 @@ public class ConnectorBundleLoaderFactory extends Generator {
 
     private void writeDelegateToWidget(TreeLogger logger,
             SplittingSourceWriter w, ConnectorBundle bundle) {
-        Set<Property> needsDelegateToWidget = bundle.getNeedsDelegateToWidget();
-        for (Property property : needsDelegateToWidget) {
-            w.println("store.setDelegateToWidget(%s, \"%s\", \"%s\");",
-                    getClassLiteralString(property.getBeanType()),
-                    property.getName(),
-                    property.getAnnotation(DelegateToWidget.class).value());
-
+        Map<JClassType, Set<Property>> needsDelegateToWidget = bundle
+                .getNeedsDelegateToWidgetMap();
+        for (Entry<JClassType, Set<Property>> entry : needsDelegateToWidget
+                .entrySet()) {
+            JClassType beanType = entry.getKey();
+            for (Property property : entry.getValue()) {
+                w.println(
+                        "store.setDelegateToWidget(%s, \"%s\", \"%s\");",
+                        getClassLiteralString(beanType),// property.getBeanType()),
+                        property.getName(),
+                        property.getAnnotation(DelegateToWidget.class).value());
+            }
             w.splitIfNeeded();
         }
     }