From e3d78d77bd0489d08bf7b6d430073921e012c50c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Sp=C3=B6nemann?= Date: Tue, 10 Nov 2015 11:49:41 +0100 Subject: [PATCH] [generator] Fixed Java templates for web project, turned content assist generate methods to protected MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miro Spönemann --- .../xtext/generator/XtextGeneratorTemplates.xtend | 15 ++++++++------- .../ui/contentAssist/ContentAssistFragment2.xtend | 4 ++-- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/XtextGeneratorTemplates.xtend b/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/XtextGeneratorTemplates.xtend index 9a3300f13..eef17081c 100644 --- a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/XtextGeneratorTemplates.xtend +++ b/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/XtextGeneratorTemplates.xtend @@ -349,7 +349,7 @@ class XtextGeneratorTemplates { */ public class «webModule.simpleName» extends «webGenModule» { - public «webGenModule.simpleName»(«Provider»<«ExecutorService»> executorServiceProvider) { + public «webModule.simpleName»(«Provider»<«ExecutorService»> executorServiceProvider) { super(executorServiceProvider); } } @@ -413,15 +413,16 @@ class XtextGeneratorTemplates { public class «webSetup.simpleName» extends «runtimeSetup» { private final «Provider»<«ExecutorService»> executorServiceProvider; - + «webSetup.simpleName»(«Provider»<«ExecutorService»> executorServiceProvider) { - this.executorServiceProvider = executorServiceProvider + this.executorServiceProvider = executorServiceProvider; } - + + @Override public «Injector» createInjector() { - val runtimeModule = new «runtimeModule»() - val webModule = new «webModule»(executorServiceProvider) - return «Guice».createInjector(«Modules».override(runtimeModule).with(webModule)) + «runtimeModule» runtimeModule = new «runtimeModule»(); + «webModule» webModule = new «webModule»(executorServiceProvider); + return «Guice».createInjector(«Modules».override(runtimeModule).with(webModule)); } } diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ui/contentAssist/ContentAssistFragment2.xtend b/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ui/contentAssist/ContentAssistFragment2.xtend index 8ce34363a..4fb40a30b 100644 --- a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ui/contentAssist/ContentAssistFragment2.xtend +++ b/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ui/contentAssist/ContentAssistFragment2.xtend @@ -115,7 +115,7 @@ class ContentAssistFragment2 extends AbstractInheritingFragment { ''').writeTo(projectConfig.eclipsePlugin.src) } - def generateJavaProposalProviderStub() { + protected def generateJavaProposalProviderStub() { fileAccessFactory.createJavaFile(grammar.proposalProviderClass, ''' /** * See https://www.eclipse.org/Xtext/documentation/304_ide_concepts.html#content-assist @@ -129,7 +129,7 @@ class ContentAssistFragment2 extends AbstractInheritingFragment { // generation of the 'Abstract...ProposalProvider' - def generateGenJavaProposalProvider() { + protected def generateGenJavaProposalProvider() { // excluded features are those that stem from inherited grammars, // they are handled by the super grammars' proposal provider val excludedFqnFeatureNames = grammar.getFQFeatureNamesToExclude