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

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 7e8da70ac8d8fd9107af4ac2aa826d8e52b761af..87fcaef72d21052ba02baf563c63919ca87501c2 100644 (file)
--- 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<JClassType> 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 87c5b938e688964c2e5e12b96afafa89cc31b3c5..8911682e0a55d38ec59d2e50bfbb5b3590a53109 100644 (file)
--- 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 {