From 7f699c85c8f74ba2dcddfa879288a6c416fb0a79 Mon Sep 17 00:00:00 2001 From: Christian Schneider Date: Wed, 28 Oct 2015 11:44:59 +0100 Subject: [PATCH] [xtext generator] renamed new 'CompositeGeneratorFragment' to 'CompositeGeneratorFragment2' in order to avoid simple name conflicts Signed-off-by: Christian Schneider --- ...eneratorFragment.xtend => CompositeGeneratorFragment2.xtend} | 2 +- .../eclipse/xtext/xtext/generator/XtextGeneratorLanguage.xtend | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/{CompositeGeneratorFragment.xtend => CompositeGeneratorFragment2.xtend} (95%) diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/CompositeGeneratorFragment.xtend b/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/CompositeGeneratorFragment2.xtend similarity index 95% rename from plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/CompositeGeneratorFragment.xtend rename to plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/CompositeGeneratorFragment2.xtend index 4de37b85d..5e3e306df 100644 --- a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/CompositeGeneratorFragment.xtend +++ b/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/CompositeGeneratorFragment2.xtend @@ -14,7 +14,7 @@ import org.eclipse.xtend.lib.annotations.Accessors /** * @noreference */ -class CompositeGeneratorFragment implements IXtextGeneratorFragment { +class CompositeGeneratorFragment2 implements IXtextGeneratorFragment { @Accessors(PROTECTED_GETTER) val List fragments = newArrayList diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/XtextGeneratorLanguage.xtend b/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/XtextGeneratorLanguage.xtend index c9ab1cc9f..776d84aa8 100644 --- a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/XtextGeneratorLanguage.xtend +++ b/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/XtextGeneratorLanguage.xtend @@ -43,7 +43,7 @@ import org.eclipse.xtext.xtext.generator.model.project.IXtextProjectConfig * @noextend */ @Log -class XtextGeneratorLanguage extends CompositeGeneratorFragment implements IXtextGeneratorLanguage { +class XtextGeneratorLanguage extends CompositeGeneratorFragment2 implements IXtextGeneratorLanguage { String grammarUri