From cbbd1710fe1a72a841860fedeb274007ebf7ec3b Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Tue, 1 Nov 2016 22:52:48 +0200 Subject: Show a sensible message for missing extensions (#10799) Also remove ComponentMissingFromDefaultWidgetsetTest since it's identical to UnknownComponentConnectorTest Change-Id: I4b4b8f40c8376f4ea26b73d41191a3e7e811df01 --- .../vaadin/server/widgetsetutils/ConnectorBundleLoaderFactory.java | 3 +++ .../com/vaadin/server/widgetsetutils/metadata/ConnectorBundle.java | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'client-compiler/src') 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 87fcaef72d..2f2feba32d 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 @@ -58,6 +58,7 @@ import com.vaadin.client.metadata.TypeData; import com.vaadin.client.metadata.TypeDataStore; import com.vaadin.client.metadata.TypeDataStore.MethodAttribute; import com.vaadin.client.ui.UnknownComponentConnector; +import com.vaadin.client.ui.UnknownExtensionConnector; import com.vaadin.server.widgetsetutils.metadata.ClientRpcVisitor; import com.vaadin.server.widgetsetutils.metadata.ConnectorBundle; import com.vaadin.server.widgetsetutils.metadata.ConnectorInitVisitor; @@ -1123,6 +1124,8 @@ public class ConnectorBundleLoaderFactory extends Generator { connectorsByLoadStyle.get(LoadStyle.EAGER)); eagerBundle.processType(eagerLogger, typeOracle .findType(UnknownComponentConnector.class.getCanonicalName())); + eagerBundle.processType(eagerLogger, typeOracle + .findType(UnknownExtensionConnector.class.getCanonicalName())); eagerBundle.processSubTypes(eagerLogger, typeOracle.getType(ClientRpc.class.getName())); eagerBundle.processSubTypes(eagerLogger, diff --git a/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/ConnectorBundle.java b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/ConnectorBundle.java index 7428c643c9..98fecce8c5 100644 --- a/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/ConnectorBundle.java +++ b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/ConnectorBundle.java @@ -48,6 +48,7 @@ import com.vaadin.client.communication.JSONSerializer; import com.vaadin.client.connectors.AbstractRendererConnector; import com.vaadin.client.metadata.TypeDataStore.MethodAttribute; import com.vaadin.client.ui.UnknownComponentConnector; +import com.vaadin.client.ui.UnknownExtensionConnector; import com.vaadin.shared.communication.ClientRpc; import com.vaadin.shared.communication.ServerRpc; import com.vaadin.shared.ui.Connect; @@ -469,7 +470,9 @@ public class ConnectorBundle { private static boolean isConnected(JClassType type) { return type.isAnnotationPresent(Connect.class) || type.getQualifiedSourceName().equals( - UnknownComponentConnector.class.getCanonicalName()); + UnknownComponentConnector.class.getCanonicalName()) + || type.getQualifiedSourceName().equals( + UnknownExtensionConnector.class.getCanonicalName()); } public static boolean isConnectedComponentConnector(JClassType type) { -- cgit v1.2.3