From 71c030d1f9bd33cfeae55c8d4f5b4b34b6feb12b Mon Sep 17 00:00:00 2001 From: Moritz Eysholdt Date: Mon, 5 Oct 2015 14:04:07 +0200 Subject: [PATCH] Move class 'RuleNames' to o.e.xtext.xtext Signed-off-by: Moritz Eysholdt --- .../antlr/AbstractPartialContentAssistParser.java | 2 +- .../contentassist/antlr/RequiredRuleNameComputer.java | 2 +- .../eclipse/xtext/xtext/generator/LanguageConfig2.xtend | 5 +++-- .../eclipse/xtext/xtext/generator/LanguageModule.xtend | 2 +- .../grammarAccess/GrammarAccessExtensions.xtend | 2 +- .../generator/normalization/FlattenedGrammarAccess.xtend | 2 +- .../parser/antlr/AbstractAntlrGrammarGenerator.xtend | 6 +++--- .../generator/parser/antlr/AntlrGrammarGenUtil.java | 2 +- plugins/org.eclipse.xtext/META-INF/MANIFEST.MF | 2 +- .../impl/AbstractDeclarativeValueConverterService.java | 2 +- .../reconstr/impl/DefaultHiddenTokenHelper.java | 2 +- .../xtext/serializer/analysis/Context2NameFunction.java | 2 +- .../serializer/analysis/GrammarConstraintProvider.java | 2 +- .../analysis/SemanticSequencerNfaProvider.java | 2 +- .../xtext/serializer/sequencer/ContextFinder.java | 2 +- .../serializer/sequencer/NodeModelSemanticSequencer.java | 2 +- .../eclipse/xtext/serializer/tokens/ValueSerializer.java | 2 +- .../src/org/eclipse/xtext/{ => xtext}/RuleNames.java | 9 ++++++++- .../xtext/xtext/generator/GrammarFlatteningTest.xtend | 6 +++--- 19 files changed, 32 insertions(+), 24 deletions(-) rename plugins/org.eclipse.xtext/src/org/eclipse/xtext/{ => xtext}/RuleNames.java (96%) diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/AbstractPartialContentAssistParser.java b/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/AbstractPartialContentAssistParser.java index 7cec88e86..6eb8e5eb2 100644 --- a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/AbstractPartialContentAssistParser.java +++ b/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/AbstractPartialContentAssistParser.java @@ -21,7 +21,6 @@ import org.eclipse.xtext.CrossReference; import org.eclipse.xtext.GrammarUtil; import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; -import org.eclipse.xtext.RuleNames; import org.eclipse.xtext.ide.editor.contentassist.antlr.internal.AbstractInternalContentAssistParser; import org.eclipse.xtext.ide.editor.contentassist.antlr.internal.InfiniteRecursion; import org.eclipse.xtext.nodemodel.ICompositeNode; @@ -29,6 +28,7 @@ import org.eclipse.xtext.nodemodel.ILeafNode; import org.eclipse.xtext.nodemodel.INode; import org.eclipse.xtext.parser.IParseResult; import org.eclipse.xtext.parser.antlr.IUnorderedGroupHelper; +import org.eclipse.xtext.xtext.RuleNames; import com.google.common.collect.Lists; import com.google.inject.Inject; diff --git a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/RequiredRuleNameComputer.java b/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/RequiredRuleNameComputer.java index d34c017b2..79a9da092 100644 --- a/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/RequiredRuleNameComputer.java +++ b/plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/RequiredRuleNameComputer.java @@ -18,7 +18,7 @@ import org.eclipse.xtext.Group; import org.eclipse.xtext.Parameter; import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; -import org.eclipse.xtext.RuleNames; +import org.eclipse.xtext.xtext.RuleNames; import com.google.inject.Inject; import com.google.inject.Singleton; diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/LanguageConfig2.xtend b/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/LanguageConfig2.xtend index 99786568b..72e244a86 100644 --- a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/LanguageConfig2.xtend +++ b/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/LanguageConfig2.xtend @@ -30,7 +30,6 @@ import org.eclipse.xtend2.lib.StringConcatenationClient import org.eclipse.xtext.Grammar import org.eclipse.xtext.GrammarUtil import org.eclipse.xtext.ReferencedMetamodel -import org.eclipse.xtext.RuleNames import org.eclipse.xtext.XtextPackage import org.eclipse.xtext.ecore.EcoreSupportStandaloneSetup import org.eclipse.xtext.nodemodel.util.NodeModelUtils @@ -39,12 +38,14 @@ import org.eclipse.xtext.resource.XtextResource import org.eclipse.xtext.resource.containers.IAllContainersState import org.eclipse.xtext.resource.impl.ResourceDescriptionsData import org.eclipse.xtext.util.internal.Log +import org.eclipse.xtext.xtext.RuleNames import org.eclipse.xtext.xtext.generator.model.GuiceModuleAccess import org.eclipse.xtext.xtext.generator.model.StandaloneSetupAccess import org.eclipse.xtext.xtext.generator.xbase.XbaseUsageDetector -import static extension org.eclipse.xtext.xtext.generator.model.TypeReference.* import static extension org.eclipse.xtext.GrammarUtil.* +import static extension org.eclipse.xtext.xtext.generator.model.TypeReference.* + @Log class LanguageConfig2 extends CompositeGeneratorFragment2 implements ILanguageConfig { diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/LanguageModule.xtend b/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/LanguageModule.xtend index 5bc2827d2..b5d47f659 100644 --- a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/LanguageModule.xtend +++ b/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/LanguageModule.xtend @@ -10,8 +10,8 @@ package org.eclipse.xtext.xtext.generator import com.google.inject.Binder import org.eclipse.xtend.lib.annotations.FinalFieldsConstructor import org.eclipse.xtext.Grammar -import org.eclipse.xtext.RuleNames import org.eclipse.xtext.service.AbstractGenericModule +import org.eclipse.xtext.xtext.RuleNames @FinalFieldsConstructor class LanguageModule extends AbstractGenericModule { diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/grammarAccess/GrammarAccessExtensions.xtend b/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/grammarAccess/GrammarAccessExtensions.xtend index e57e17963..d9ddb3373 100644 --- a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/grammarAccess/GrammarAccessExtensions.xtend +++ b/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/grammarAccess/GrammarAccessExtensions.xtend @@ -31,13 +31,13 @@ import org.eclipse.xtext.Group import org.eclipse.xtext.Keyword import org.eclipse.xtext.ParserRule import org.eclipse.xtext.RuleCall -import org.eclipse.xtext.RuleNames import org.eclipse.xtext.TypeRef import org.eclipse.xtext.UnorderedGroup import org.eclipse.xtext.XtextRuntimeModule import org.eclipse.xtext.formatting.ILineSeparatorInformation import org.eclipse.xtext.resource.SaveOptions import org.eclipse.xtext.serializer.ISerializer +import org.eclipse.xtext.xtext.RuleNames import org.eclipse.xtext.xtext.generator.CodeConfig import org.eclipse.xtext.xtext.generator.XtextGeneratorNaming import org.eclipse.xtext.xtext.generator.model.TypeReference diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/normalization/FlattenedGrammarAccess.xtend b/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/normalization/FlattenedGrammarAccess.xtend index 2ab931b02..a37d434ac 100644 --- a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/normalization/FlattenedGrammarAccess.xtend +++ b/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/normalization/FlattenedGrammarAccess.xtend @@ -32,11 +32,11 @@ import org.eclipse.xtext.Group import org.eclipse.xtext.Parameter import org.eclipse.xtext.ParserRule import org.eclipse.xtext.RuleCall -import org.eclipse.xtext.RuleNames import org.eclipse.xtext.TerminalRule import org.eclipse.xtext.XtextPackage import org.eclipse.xtext.util.internal.EmfAdaptable import org.eclipse.xtext.xtext.ConditionEvaluator +import org.eclipse.xtext.xtext.RuleNames import org.eclipse.xtext.xtext.UsedRulesFinder import static extension org.eclipse.xtext.xtext.generator.normalization.RuleWithParameterValues.* diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/AbstractAntlrGrammarGenerator.xtend b/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/AbstractAntlrGrammarGenerator.xtend index 1c010e811..97e59aeec 100644 --- a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/AbstractAntlrGrammarGenerator.xtend +++ b/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/AbstractAntlrGrammarGenerator.xtend @@ -23,18 +23,18 @@ import org.eclipse.xtext.ParserRule import org.eclipse.xtext.RuleCall import org.eclipse.xtext.TerminalRule import org.eclipse.xtext.UnorderedGroup +import org.eclipse.xtext.xtext.RuleNames import org.eclipse.xtext.xtext.generator.CodeConfig import org.eclipse.xtext.xtext.generator.XtextGeneratorNaming import org.eclipse.xtext.xtext.generator.grammarAccess.GrammarAccessExtensions import org.eclipse.xtext.xtext.generator.model.IXtextGeneratorFileSystemAccess import org.eclipse.xtext.xtext.generator.model.TypeReference +import org.eclipse.xtext.xtext.generator.normalization.FlattenedGrammarAccess +import org.eclipse.xtext.xtext.generator.normalization.RuleFilter import static extension org.eclipse.xtext.GrammarUtil.* import static extension org.eclipse.xtext.xtext.generator.parser.antlr.AntlrGrammarGenUtil.* import static extension org.eclipse.xtext.xtext.generator.parser.antlr.TerminalRuleToLexerBody.* -import org.eclipse.xtext.xtext.generator.normalization.RuleFilter -import org.eclipse.xtext.RuleNames -import org.eclipse.xtext.xtext.generator.normalization.FlattenedGrammarAccess abstract class AbstractAntlrGrammarGenerator { diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/AntlrGrammarGenUtil.java b/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/AntlrGrammarGenUtil.java index 42ffdcd81..392b93515 100644 --- a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/AntlrGrammarGenUtil.java +++ b/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/AntlrGrammarGenUtil.java @@ -30,12 +30,12 @@ import org.eclipse.xtext.Parameter; import org.eclipse.xtext.ParameterReference; import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; -import org.eclipse.xtext.RuleNames; import org.eclipse.xtext.XtextFactory; import org.eclipse.xtext.util.Strings; import org.eclipse.xtext.util.XtextSwitch; import org.eclipse.xtext.xbase.lib.Functions; import org.eclipse.xtext.xbase.lib.IterableExtensions; +import org.eclipse.xtext.xtext.RuleNames; import org.eclipse.xtext.xtext.generator.normalization.OriginalElement; import org.eclipse.xtext.xtext.generator.normalization.OriginalGrammar; import org.eclipse.xtext.xtext.generator.normalization.RuleWithParameterValues; diff --git a/plugins/org.eclipse.xtext/META-INF/MANIFEST.MF b/plugins/org.eclipse.xtext/META-INF/MANIFEST.MF index bb0038b17..a926cd756 100644 --- a/plugins/org.eclipse.xtext/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.xtext/META-INF/MANIFEST.MF @@ -87,7 +87,7 @@ Export-Package: org.eclipse.xtext, org.eclipse.xtext.validation, org.eclipse.xtext.validation.impl, org.eclipse.xtext.workspace;x-friends:="org.eclipse.xtext.xbase.ui", - org.eclipse.xtext.xtext;x-friends:="org.eclipse.xtext.xtext.ui,org.eclipse.xtext.xtext.generator", + org.eclipse.xtext.xtext;x-friends:="org.eclipse.xtext.xtext.ui,org.eclipse.xtext.xtext.generator,org.eclipse.xtext.idea.generator", org.eclipse.xtext.xtext.ecoreInference;x-internal:=true, org.eclipse.xtext.xtext.parser;x-friends:="org.eclipse.xtext.tests" Require-Bundle: org.eclipse.emf.ecore.xmi;bundle-version="2.10.2";visibility:=reexport, diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/conversion/impl/AbstractDeclarativeValueConverterService.java b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/conversion/impl/AbstractDeclarativeValueConverterService.java index 6f084b751..f1eeb0c7e 100644 --- a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/conversion/impl/AbstractDeclarativeValueConverterService.java +++ b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/conversion/impl/AbstractDeclarativeValueConverterService.java @@ -23,13 +23,13 @@ import org.eclipse.xtext.Grammar; import org.eclipse.xtext.GrammarUtil; import org.eclipse.xtext.IGrammarAccess; import org.eclipse.xtext.ParserRule; -import org.eclipse.xtext.RuleNames; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.conversion.IValueConverter; import org.eclipse.xtext.conversion.IValueConverterService; import org.eclipse.xtext.conversion.ValueConverter; import org.eclipse.xtext.conversion.ValueConverterException; import org.eclipse.xtext.nodemodel.INode; +import org.eclipse.xtext.xtext.RuleNames; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/DefaultHiddenTokenHelper.java b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/DefaultHiddenTokenHelper.java index cdd509bcd..31d4d6ed9 100644 --- a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/DefaultHiddenTokenHelper.java +++ b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/DefaultHiddenTokenHelper.java @@ -9,7 +9,7 @@ package org.eclipse.xtext.parsetree.reconstr.impl; import org.eclipse.xtext.AbstractRule; import org.eclipse.xtext.ParserRule; -import org.eclipse.xtext.RuleNames; +import org.eclipse.xtext.xtext.RuleNames; import com.google.common.collect.Iterables; import com.google.inject.Inject; diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/Context2NameFunction.java b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/Context2NameFunction.java index b10197589..7d7029867 100644 --- a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/Context2NameFunction.java +++ b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/Context2NameFunction.java @@ -17,8 +17,8 @@ import org.eclipse.xtext.EcoreUtil2; import org.eclipse.xtext.Grammar; import org.eclipse.xtext.GrammarUtil; import org.eclipse.xtext.ParserRule; -import org.eclipse.xtext.RuleNames; import org.eclipse.xtext.util.EmfFormatter; +import org.eclipse.xtext.xtext.RuleNames; import com.google.common.base.Function; import com.google.common.base.Joiner; diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/GrammarConstraintProvider.java b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/GrammarConstraintProvider.java index e1c0a0ee6..206a53a85 100644 --- a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/GrammarConstraintProvider.java +++ b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/GrammarConstraintProvider.java @@ -32,7 +32,6 @@ import org.eclipse.xtext.Group; import org.eclipse.xtext.Keyword; import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; -import org.eclipse.xtext.RuleNames; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.TypeRef; import org.eclipse.xtext.UnorderedGroup; @@ -43,6 +42,7 @@ import org.eclipse.xtext.util.EmfFormatter; import org.eclipse.xtext.util.Pair; import org.eclipse.xtext.util.Tuples; import org.eclipse.xtext.util.formallang.ProductionFormatter; +import org.eclipse.xtext.xtext.RuleNames; import com.google.common.base.Function; import com.google.common.base.Joiner; diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/SemanticSequencerNfaProvider.java b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/SemanticSequencerNfaProvider.java index e946fde84..1e65affd5 100644 --- a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/SemanticSequencerNfaProvider.java +++ b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/SemanticSequencerNfaProvider.java @@ -26,7 +26,6 @@ import org.eclipse.xtext.CrossReference; import org.eclipse.xtext.EcoreUtil2; import org.eclipse.xtext.GrammarUtil; import org.eclipse.xtext.ParserRule; -import org.eclipse.xtext.RuleNames; import org.eclipse.xtext.grammaranalysis.impl.GrammarElementTitleSwitch; import org.eclipse.xtext.serializer.analysis.ISyntacticSequencerPDAProvider.ISynAbsorberState; import org.eclipse.xtext.serializer.analysis.ISyntacticSequencerPDAProvider.SynAbsorberNfaAdapter; @@ -36,6 +35,7 @@ import org.eclipse.xtext.util.Tuples; import org.eclipse.xtext.util.formallang.Nfa; import org.eclipse.xtext.util.formallang.NfaFactory; import org.eclipse.xtext.util.formallang.NfaUtil; +import org.eclipse.xtext.xtext.RuleNames; import com.google.common.collect.HashMultimap; import com.google.common.collect.Lists; diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/ContextFinder.java b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/ContextFinder.java index a424d5725..24c2f5aac 100644 --- a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/ContextFinder.java +++ b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/ContextFinder.java @@ -20,7 +20,6 @@ import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.xtext.AbstractElement; import org.eclipse.xtext.AbstractRule; import org.eclipse.xtext.GrammarUtil; -import org.eclipse.xtext.RuleNames; import org.eclipse.xtext.nodemodel.INode; import org.eclipse.xtext.serializer.analysis.IGrammarConstraintProvider; import org.eclipse.xtext.serializer.analysis.IGrammarConstraintProvider.IConstraint; @@ -31,6 +30,7 @@ import org.eclipse.xtext.serializer.sequencer.ISemanticNodeProvider.INodesForEOb import org.eclipse.xtext.serializer.sequencer.ITransientValueService.ValueTransient; import org.eclipse.xtext.util.Pair; import org.eclipse.xtext.util.Tuples; +import org.eclipse.xtext.xtext.RuleNames; import com.google.common.collect.Iterables; import com.google.common.collect.LinkedHashMultimap; diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/NodeModelSemanticSequencer.java b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/NodeModelSemanticSequencer.java index ec61fea5a..b62387316 100644 --- a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/NodeModelSemanticSequencer.java +++ b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/NodeModelSemanticSequencer.java @@ -14,7 +14,6 @@ import org.eclipse.xtext.GrammarUtil; import org.eclipse.xtext.Keyword; import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; -import org.eclipse.xtext.RuleNames; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.TypeRef; import org.eclipse.xtext.conversion.IValueConverterService; @@ -25,6 +24,7 @@ import org.eclipse.xtext.nodemodel.INode; import org.eclipse.xtext.nodemodel.util.NodeModelUtils; import org.eclipse.xtext.serializer.impl.FeatureFinderUtil; import org.eclipse.xtext.util.Triple; +import org.eclipse.xtext.xtext.RuleNames; import com.google.inject.Inject; diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/tokens/ValueSerializer.java b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/tokens/ValueSerializer.java index 0eda3760d..1c43091a8 100644 --- a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/tokens/ValueSerializer.java +++ b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/tokens/ValueSerializer.java @@ -9,12 +9,12 @@ package org.eclipse.xtext.serializer.tokens; import org.eclipse.emf.ecore.EObject; import org.eclipse.xtext.RuleCall; -import org.eclipse.xtext.RuleNames; import org.eclipse.xtext.conversion.IValueConverterService; import org.eclipse.xtext.nodemodel.INode; import org.eclipse.xtext.nodemodel.util.NodeModelUtils; import org.eclipse.xtext.parsetree.reconstr.impl.TokenUtil; import org.eclipse.xtext.serializer.diagnostic.ISerializationDiagnostic.Acceptor; +import org.eclipse.xtext.xtext.RuleNames; import org.eclipse.xtext.serializer.diagnostic.ITokenDiagnosticProvider; import com.google.inject.Inject; diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/RuleNames.java b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/RuleNames.java similarity index 96% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/RuleNames.java rename to plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/RuleNames.java index 29bea6282..e80f0fb8f 100644 --- a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/RuleNames.java +++ b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/RuleNames.java @@ -5,7 +5,7 @@ * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html *******************************************************************************/ -package org.eclipse.xtext; +package org.eclipse.xtext.xtext; import java.util.List; import java.util.Map; @@ -14,6 +14,13 @@ import java.util.Set; import org.eclipse.emf.common.notify.impl.AdapterImpl; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.util.EcoreUtil; +import org.eclipse.xtext.AbstractRule; +import org.eclipse.xtext.EnumRule; +import org.eclipse.xtext.Grammar; +import org.eclipse.xtext.GrammarUtil; +import org.eclipse.xtext.IGrammarAccess; +import org.eclipse.xtext.ParserRule; +import org.eclipse.xtext.TerminalRule; import com.google.common.collect.BiMap; import com.google.common.collect.ImmutableBiMap; diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/generator/GrammarFlatteningTest.xtend b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/generator/GrammarFlatteningTest.xtend index b991952b3..447ea38a6 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/generator/GrammarFlatteningTest.xtend +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/generator/GrammarFlatteningTest.xtend @@ -9,13 +9,13 @@ package org.eclipse.xtext.xtext.generator import org.eclipse.emf.common.util.URI import org.eclipse.xtext.Grammar -import org.eclipse.xtext.RuleNames import org.eclipse.xtext.XtextStandaloneSetup import org.eclipse.xtext.junit4.AbstractXtextTests import org.eclipse.xtext.resource.XtextResource -import org.junit.Test -import org.eclipse.xtext.xtext.generator.normalization.RuleFilter +import org.eclipse.xtext.xtext.RuleNames import org.eclipse.xtext.xtext.generator.normalization.FlattenedGrammarAccess +import org.eclipse.xtext.xtext.generator.normalization.RuleFilter +import org.junit.Test /** * @author Sebastian Zarnekow - Initial contribution and API