From eba4be8428a41f67b4d51888d52f8ef109f0a61f Mon Sep 17 00:00:00 2001 From: Karsten Thoms Date: Mon, 19 Sep 2016 11:43:43 +0200 Subject: [PATCH] [#108] Ecore2Xtext use new formatter fragment Signed-off-by: Karsten Thoms --- .../xtext/wizard/RuntimeProjectDescriptor.xtend | 15 +++++++++++++-- .../xtext/wizard/RuntimeProjectDescriptor.java | 15 +++++++++++++-- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.xtend b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.xtend index 6ec2dfe9f..31a3712ca 100644 --- a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.xtend +++ b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.xtend @@ -12,6 +12,17 @@ import org.eclipse.xtext.xtext.wizard.ecore2xtext.Ecore2XtextGrammarCreator import static org.eclipse.xtext.xtext.wizard.ExternalDependency.* +/** + * @author Dennis Huebner - Initial contribution and API + * @author Sven Efftinge + * @author Miro Spoenemann + * @author Stefan Oehme + * @author Christian Schneider + * @author Moritz Eysholdt + * @author Lorenzo Bettini - bug#494176 + * @author Karsten Thoms - bug#484500, issue#108 + * @since 2.9 + */ class RuntimeProjectDescriptor extends TestedProjectDescriptor { val grammarCreator = new Ecore2XtextGrammarCreator @@ -229,8 +240,8 @@ class RuntimeProjectDescriptor extends TestedProjectDescriptor { fragment = ecore2xtext.Ecore2XtextValueConverterServiceFragment2 auto-inject {} - fragment = org.eclipse.xtext.generator.adapter.FragmentAdapter { - fragment = org.eclipse.xtext.generator.ecore2xtext.FormatterFragment {} + formatter = { + generateStub = true } «ENDIF» diff --git a/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.java b/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.java index 58eb5056d..2a06f0571 100644 --- a/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.java +++ b/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.java @@ -47,6 +47,17 @@ import org.eclipse.xtext.xtext.wizard.WebProjectDescriptor; import org.eclipse.xtext.xtext.wizard.WizardConfiguration; import org.eclipse.xtext.xtext.wizard.ecore2xtext.Ecore2XtextGrammarCreator; +/** + * @author Dennis Huebner - Initial contribution and API + * @author Sven Efftinge + * @author Miro Spoenemann + * @author Stefan Oehme + * @author Christian Schneider + * @author Moritz Eysholdt + * @author Lorenzo Bettini - bug#494176 + * @author Karsten Thoms - bug#484500, issue#108 + * @since 2.9 + */ @SuppressWarnings("all") public class RuntimeProjectDescriptor extends TestedProjectDescriptor { private final Ecore2XtextGrammarCreator grammarCreator = new Ecore2XtextGrammarCreator(); @@ -553,11 +564,11 @@ public class RuntimeProjectDescriptor extends TestedProjectDescriptor { _builder.newLine(); _builder.newLine(); _builder.append("\t\t\t"); - _builder.append("fragment = org.eclipse.xtext.generator.adapter.FragmentAdapter {"); + _builder.append("formatter = {"); _builder.newLine(); _builder.append("\t\t\t"); _builder.append("\t"); - _builder.append("fragment = org.eclipse.xtext.generator.ecore2xtext.FormatterFragment {}"); + _builder.append("generateStub = true"); _builder.newLine(); _builder.append("\t\t\t"); _builder.append("}");