diff --git a/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/xbase/XbaseGeneratorFragment2.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/xbase/XbaseGeneratorFragment2.xtend index 3c0ffa53c..3b54d7327 100644 --- a/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/xbase/XbaseGeneratorFragment2.xtend +++ b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/xbase/XbaseGeneratorFragment2.xtend @@ -75,6 +75,8 @@ class XbaseGeneratorFragment2 extends AbstractXtextGeneratorFragment { 'org.eclipse.xtext.xbase.ui', 'org.eclipse.jdt.debug.ui' ]) } + + language.webGenModule.superClass = 'org.eclipse.xtext.xbase.web.DefaultXbaseWebModule'.typeRef } protected def contributeRuntimeGuiceBindings() { @@ -180,7 +182,6 @@ class XbaseGeneratorFragment2 extends AbstractXtextGeneratorFragment { language.eclipsePluginGenModule.superClass = 'org.eclipse.xtext.xbase.annotations.ui.DefaultXbaseWithAnnotationsUiModule'.typeRef else language.eclipsePluginGenModule.superClass = 'org.eclipse.xtext.xbase.ui.DefaultXbaseUiModule'.typeRef - language.webGenModule.superClass = 'org.eclipse.xtext.xbase.web.DefaultXbaseWebModule'.typeRef } protected def doGenerateXtendInferrer() { diff --git a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/xbase/XbaseGeneratorFragment2.java b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/xbase/XbaseGeneratorFragment2.java index 44118728e..e16d694dc 100644 --- a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/xbase/XbaseGeneratorFragment2.java +++ b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/xbase/XbaseGeneratorFragment2.java @@ -138,6 +138,10 @@ public class XbaseGeneratorFragment2 extends AbstractXtextGeneratorFragment { _requiredBundles_1.addAll( Collections.unmodifiableList(CollectionLiterals.newArrayList("org.eclipse.xtext.xbase.ui", "org.eclipse.jdt.debug.ui"))); } + IXtextGeneratorLanguage _language = this.getLanguage(); + GuiceModuleAccess _webGenModule = _language.getWebGenModule(); + TypeReference _typeRef = TypeReference.typeRef("org.eclipse.xtext.xbase.web.DefaultXbaseWebModule"); + _webGenModule.setSuperClass(_typeRef); } protected void contributeRuntimeGuiceBindings() { @@ -304,10 +308,6 @@ public class XbaseGeneratorFragment2 extends AbstractXtextGeneratorFragment { TypeReference _typeRef_30 = TypeReference.typeRef("org.eclipse.xtext.xbase.ui.DefaultXbaseUiModule"); _eclipsePluginGenModule_2.setSuperClass(_typeRef_30); } - IXtextGeneratorLanguage _language_5 = this.getLanguage(); - GuiceModuleAccess _webGenModule = _language_5.getWebGenModule(); - TypeReference _typeRef_31 = TypeReference.typeRef("org.eclipse.xtext.xbase.web.DefaultXbaseWebModule"); - _webGenModule.setSuperClass(_typeRef_31); } protected void doGenerateXtendInferrer() {