From: Artur Signell <artur@vaadin.com>
Date: Sat, 10 Sep 2016 20:20:36 +0000 (+0300)
Subject: Use fully qualified name for bundles
X-Git-Tag: 8.0.0.alpha2~32
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=712f8ad610ad3854d6a5f52f3c5e7725ebee1785;p=vaadin-framework.git

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 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<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 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 {