From 556e10edaa09ece627713c8590f750ca5de61eab Mon Sep 17 00:00:00 2001 From: =?utf8?q?Leif=20=C3=85strand?= Date: Fri, 18 Sep 2015 11:27:18 +0300 Subject: [PATCH] Fail during compile if required methods are missing (#18924) A ComponentConnector must override either getWidget or createWidget for the framework to know the type of the component's widget. Similarly either getRenderer och createRenderer must be overridden for AbstractRendererConnector. Prior to this patch, the compilation succeeded when critical methods were missing - the user just got various hard-to-debug issues when the broken connector was used. Change-Id: I9e00e0fb7ef40349f9a07311f3b34047174b5ecd --- .../widgetsetutils/metadata/RendererVisitor.java | 8 +++++++- .../widgetsetutils/metadata/WidgetInitVisitor.java | 10 ++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/RendererVisitor.java b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/RendererVisitor.java index 12e67988eb..2e54d00aab 100644 --- a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/RendererVisitor.java +++ b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/RendererVisitor.java @@ -52,7 +52,7 @@ public class RendererVisitor extends TypeVisitor { } private static void doRendererType(TreeLogger logger, JClassType type, - ConnectorBundle bundle) { + ConnectorBundle bundle) throws UnableToCompleteException { // The class in which createRenderer is implemented JClassType createRendererClass = ConnectorBundle.findInheritedMethod( type, "createRenderer").getEnclosingType(); @@ -63,6 +63,12 @@ public class RendererVisitor extends TypeVisitor { JMethod getRenderer = ConnectorBundle.findInheritedMethod(type, "getRenderer"); + if (getRenderer.getEnclosingType().getQualifiedSourceName() + .equals(AbstractRendererConnector.class.getCanonicalName())) { + logger.log(Type.ERROR, type.getQualifiedSourceName() + + " must override either createRenderer or getRenderer"); + throw new UnableToCompleteException(); + } JClassType rendererType = getRenderer.getReturnType().isClass(); bundle.setNeedsGwtConstructor(rendererType); diff --git a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/WidgetInitVisitor.java b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/WidgetInitVisitor.java index a77b523d14..9a9cac18ba 100644 --- a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/WidgetInitVisitor.java +++ b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/WidgetInitVisitor.java @@ -42,6 +42,16 @@ public class WidgetInitVisitor extends TypeVisitor { // Needs GWT constructor if createWidget is not overridden if (createWidgetClass.getQualifiedSourceName().equals( AbstractComponentConnector.class.getCanonicalName())) { + if (getWidget + .getEnclosingType() + .getQualifiedSourceName() + .equals(AbstractComponentConnector.class + .getCanonicalName())) { + logger.log(Type.ERROR, type.getQualifiedSourceName() + + " must override either createWidget or getWidget"); + throw new UnableToCompleteException(); + } + bundle.setNeedsGwtConstructor(widgetType); // Also needs widget type to find the right GWT constructor -- 2.39.5