From 712f8ad610ad3854d6a5f52f3c5e7725ebee1785 Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Sat, 10 Sep 2016 23:20:36 +0300 Subject: [PATCH] Use fully qualified name for bundles Fixes problem with two LAZY connectors not being able to have the same simple class name. Change-Id: I97970979884c99162d52718449dc18f10e955e32 --- .../server/widgetsetutils/ConnectorBundleLoaderFactory.java | 4 ++-- .../vaadin/client/ui/richtextarea/RichTextAreaConnector.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/ConnectorBundleLoaderFactory.java b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/ConnectorBundleLoaderFactory.java index 7e8da70ac8..87fcaef72d 100644 --- a/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/ConnectorBundleLoaderFactory.java +++ b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/ConnectorBundleLoaderFactory.java @@ -1141,8 +1141,8 @@ public class ConnectorBundleLoaderFactory extends Generator { Collection lazy = connectorsByLoadStyle.get(LoadStyle.LAZY); for (JClassType type : lazy) { - ConnectorBundle bundle = new ConnectorBundle(type.getName(), - eagerBundle); + ConnectorBundle bundle = new ConnectorBundle( + type.getQualifiedSourceName(), eagerBundle); TreeLogger subLogger = logger.branch(Type.TRACE, "Populating " + type.getName() + " bundle"); bundle.processType(subLogger, type); diff --git a/client/src/main/java/com/vaadin/client/ui/richtextarea/RichTextAreaConnector.java b/client/src/main/java/com/vaadin/client/ui/richtextarea/RichTextAreaConnector.java index 87c5b938e6..8911682e0a 100644 --- a/client/src/main/java/com/vaadin/client/ui/richtextarea/RichTextAreaConnector.java +++ b/client/src/main/java/com/vaadin/client/ui/richtextarea/RichTextAreaConnector.java @@ -33,7 +33,7 @@ import com.vaadin.ui.RichTextArea; /** * Connector for RichTextArea. */ -@Connect(value = RichTextArea.class, loadStyle = LoadStyle.EAGER) +@Connect(value = RichTextArea.class, loadStyle = LoadStyle.LAZY) public class RichTextAreaConnector extends AbstractFieldConnector implements SimpleManagedLayout, ValueChangeHandler.Owner { -- 2.39.5