From 46aae376ae1bb0a1f4aafa9a73d9530b1eb10a34 Mon Sep 17 00:00:00 2001 From: jkohnlein Date: Thu, 3 Jul 2008 12:35:34 +0000 Subject: [PATCH] Renamed IElementFactory to IAstFactory --- .../src/org/eclipse/xtext/parser/AbstractParser.java | 10 +++++----- .../xtext/parser/GenericEcoreElementFactory.java | 2 +- .../parser/{IElementFactory.java => IAstFactory.java} | 2 +- .../src/org/eclipse/xtext/parser/IParser.java | 2 +- .../xtext/parser/antlr/AbstractAntlrParser.java | 4 ++-- .../xtext/parsetree/AbstractParseTreeConstructor.java | 4 ++-- .../src/org/eclipse/xtext/resource/XtextResource.java | 4 ++-- .../metamodelreferencing/tests/MetamodelRefTest.java | 4 ++-- .../metamodelreferencing/tests/MultiGenMMTest.java | 4 ++-- .../xtext/parser/PartialParsingPerformanceTest.java | 2 +- .../org/eclipse/xtext/tests/AbstractGeneratorTest.java | 6 +++--- 11 files changed, 22 insertions(+), 22 deletions(-) rename plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/{IElementFactory.java => IAstFactory.java} (96%) diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/AbstractParser.java b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/AbstractParser.java index fb124bb4e..da188e9e2 100755 --- a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/AbstractParser.java +++ b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/AbstractParser.java @@ -25,12 +25,12 @@ import org.eclipse.xtext.service.Inject; public abstract class AbstractParser implements IParser { @Inject - private IElementFactory astElementFactory; + private IAstFactory astElementFactory; @Inject protected IGrammarAccess grammarAccess; - public IParseResult parse(String ruleName, InputStream in, IElementFactory factory) { + public IParseResult parse(String ruleName, InputStream in, IAstFactory factory) { try { IParseResult parseResult = (IParseResult) parse(ruleName, new ANTLRInputStream(in), factory); return parseResult; @@ -39,7 +39,7 @@ public abstract class AbstractParser implements IParser { } } - public IParseResult parse(InputStream in, IElementFactory factory) { + public IParseResult parse(InputStream in, IAstFactory factory) { return parse(getDefaultRuleName(), in, factory); } @@ -55,11 +55,11 @@ public abstract class AbstractParser implements IParser { return parse(ruleName, in, getDefaultASTFactory()); } - protected IElementFactory getDefaultASTFactory() { + protected IAstFactory getDefaultASTFactory() { return astElementFactory; } protected abstract String getDefaultRuleName(); - protected abstract IParseResult parse(String ruleName, ANTLRInputStream in, IElementFactory factory); + protected abstract IParseResult parse(String ruleName, ANTLRInputStream in, IAstFactory factory); } diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/GenericEcoreElementFactory.java b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/GenericEcoreElementFactory.java index dc3454f0a..8afac9e61 100755 --- a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/GenericEcoreElementFactory.java +++ b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/GenericEcoreElementFactory.java @@ -26,7 +26,7 @@ import org.eclipse.xtext.service.Inject; * @author Sven Efftinge - Initial contribution and API * */ -public class GenericEcoreElementFactory implements IElementFactory { +public class GenericEcoreElementFactory implements IAstFactory { @Inject protected IMetamodelAccess metamodelAccess; diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/IElementFactory.java b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/IAstFactory.java similarity index 96% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/IElementFactory.java rename to plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/IAstFactory.java index 7a588a1b6..870b76ace 100755 --- a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/IElementFactory.java +++ b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/IAstFactory.java @@ -16,7 +16,7 @@ import org.eclipse.xtext.service.ILanguageService; * @author sven efftinge * */ -public interface IElementFactory extends ILanguageService { +public interface IAstFactory extends ILanguageService { /** * creates an instance of the given typename diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/IParser.java b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/IParser.java index 1d84d865f..c2f846fa0 100755 --- a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/IParser.java +++ b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/IParser.java @@ -26,7 +26,7 @@ public interface IParser extends ILanguageService { * @param handler * @return */ - IParseResult parse(InputStream in, IElementFactory factory); + IParseResult parse(InputStream in, IAstFactory factory); /** * @param in diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/AbstractAntlrParser.java b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/AbstractAntlrParser.java index c09233c4c..2856f0954 100644 --- a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/AbstractAntlrParser.java +++ b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/AbstractAntlrParser.java @@ -28,7 +28,7 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.xtext.AbstractRule; import org.eclipse.xtext.GrammarUtil; import org.eclipse.xtext.LexerRule; -import org.eclipse.xtext.parser.IElementFactory; +import org.eclipse.xtext.parser.IAstFactory; import org.eclipse.xtext.parser.IParseResult; import org.eclipse.xtext.parser.ParseException; import org.eclipse.xtext.parser.ParseResult; @@ -50,7 +50,7 @@ public abstract class AbstractAntlrParser extends Parser { protected org.eclipse.xtext.Grammar grammar; - protected IElementFactory factory; + protected IAstFactory factory; protected int lastConsumedIndex = -1; diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/AbstractParseTreeConstructor.java b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/AbstractParseTreeConstructor.java index 986d0885e..6b3c31862 100644 --- a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/AbstractParseTreeConstructor.java +++ b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/AbstractParseTreeConstructor.java @@ -4,7 +4,7 @@ import org.eclipse.xtext.Grammar; import org.eclipse.xtext.IGrammarAccess; import org.eclipse.xtext.conversion.IValueConverterService; import org.eclipse.xtext.parser.GenericEcoreElementFactory; -import org.eclipse.xtext.parser.IElementFactory; +import org.eclipse.xtext.parser.IAstFactory; import org.eclipse.xtext.service.Inject; public abstract class AbstractParseTreeConstructor implements IParseTreeConstructor { @@ -20,7 +20,7 @@ public abstract class AbstractParseTreeConstructor implements IParseTreeConstruc private Grammar grammar; @Inject - protected void setElementFactory(IElementFactory astElementFactory) { + protected void setElementFactory(IAstFactory astElementFactory) { this.astElementFactory = (GenericEcoreElementFactory) astElementFactory; } diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/XtextResource.java b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/XtextResource.java index 39291f4bc..c416498c8 100644 --- a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/XtextResource.java +++ b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/XtextResource.java @@ -18,7 +18,7 @@ import org.eclipse.emf.common.util.EList; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.resource.impl.ResourceImpl; -import org.eclipse.xtext.parser.IElementFactory; +import org.eclipse.xtext.parser.IAstFactory; import org.eclipse.xtext.parser.IParseResult; import org.eclipse.xtext.parser.IParser; import org.eclipse.xtext.parsetree.AbstractNode; @@ -38,7 +38,7 @@ public class XtextResource extends ResourceImpl { private IParser parser; @Inject - private IElementFactory elementFactory; + private IAstFactory elementFactory; @Inject private IParseTreeConstructor parsetreeConstructor; diff --git a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/metamodelreferencing/tests/MetamodelRefTest.java b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/metamodelreferencing/tests/MetamodelRefTest.java index d6e9702b0..834dc74ff 100644 --- a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/metamodelreferencing/tests/MetamodelRefTest.java +++ b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/metamodelreferencing/tests/MetamodelRefTest.java @@ -12,7 +12,7 @@ import org.eclipse.emf.ecore.EPackage; import org.eclipse.xtext.XtextPackage; import org.eclipse.xtext.metamodelreferencing.tests.services.MetamodelRefTestMetamodelAccess; import org.eclipse.xtext.parser.GenericEcoreElementFactory; -import org.eclipse.xtext.parser.IElementFactory; +import org.eclipse.xtext.parser.IAstFactory; import org.eclipse.xtext.service.ILanguageDescriptor; import org.eclipse.xtext.service.LanguageDescriptorFactory; import org.eclipse.xtext.service.ServiceRegistry; @@ -33,7 +33,7 @@ public class MetamodelRefTest extends AbstractGeneratorTest { with(MetamodelRefTestStandaloneSetup.class); ILanguageDescriptor languageDescriptor = LanguageDescriptorFactory.get(IMetamodelRefTest.ID); GenericEcoreElementFactory astFactory = (GenericEcoreElementFactory) ServiceRegistry.getService(languageDescriptor, - IElementFactory.class); + IAstFactory.class); astFactory.setMetamodelAccess(new MetamodelRefTestMetamodelAccess() { @Override public EPackage[] getGeneratedEPackages() { diff --git a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/metamodelreferencing/tests/MultiGenMMTest.java b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/metamodelreferencing/tests/MultiGenMMTest.java index 53e75b2f5..357d600f5 100644 --- a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/metamodelreferencing/tests/MultiGenMMTest.java +++ b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/metamodelreferencing/tests/MultiGenMMTest.java @@ -12,7 +12,7 @@ import org.eclipse.emf.ecore.EPackage; import org.eclipse.xtext.XtextPackage; import org.eclipse.xtext.metamodelreferencing.tests.services.MetamodelRefTestMetamodelAccess; import org.eclipse.xtext.parser.GenericEcoreElementFactory; -import org.eclipse.xtext.parser.IElementFactory; +import org.eclipse.xtext.parser.IAstFactory; import org.eclipse.xtext.service.ILanguageDescriptor; import org.eclipse.xtext.service.LanguageDescriptorFactory; import org.eclipse.xtext.service.ServiceRegistry; @@ -33,7 +33,7 @@ public class MultiGenMMTest extends AbstractGeneratorTest { with(MetamodelRefTestStandaloneSetup.class); ILanguageDescriptor languageDescriptor = LanguageDescriptorFactory.get(IMetamodelRefTest.ID); GenericEcoreElementFactory astFactory = (GenericEcoreElementFactory) ServiceRegistry.getService(languageDescriptor, - IElementFactory.class); + IAstFactory.class); astFactory.setMetamodelAccess(new MetamodelRefTestMetamodelAccess() { @Override public EPackage[] getGeneratedEPackages() { diff --git a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parser/PartialParsingPerformanceTest.java b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parser/PartialParsingPerformanceTest.java index 945af90d4..6ab993ed3 100644 --- a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parser/PartialParsingPerformanceTest.java +++ b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parser/PartialParsingPerformanceTest.java @@ -18,7 +18,7 @@ import org.eclipse.xtext.testlanguages.SimpleExpressionsStandaloneSetup; */ public class PartialParsingPerformanceTest extends AbstractPartialParserTest { - private static final int NUM_ELEMENTS = 10; + private static final int NUM_ELEMENTS = 200; public void testExpression() throws Exception { with(SimpleExpressionsStandaloneSetup.class); StringBuffer modelBuffer = new StringBuffer(); diff --git a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/tests/AbstractGeneratorTest.java b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/tests/AbstractGeneratorTest.java index 9835cd922..4fb3f474d 100755 --- a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/tests/AbstractGeneratorTest.java +++ b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/tests/AbstractGeneratorTest.java @@ -22,7 +22,7 @@ import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.m2t.type.emf.EmfRegistryMetaModel; import org.eclipse.xtext.GenerateAllTestGrammars; import org.eclipse.xtext.XtextStandaloneSetup; -import org.eclipse.xtext.parser.IElementFactory; +import org.eclipse.xtext.parser.IAstFactory; import org.eclipse.xtext.parser.IParser; import org.eclipse.xtext.parsetree.CompositeNode; import org.eclipse.xtext.parsetree.IParseTreeConstructor; @@ -89,8 +89,8 @@ public abstract class AbstractGeneratorTest extends TestCase { return ServiceRegistry.getService(currentLanguageDescriptor, IParser.class); } - protected IElementFactory getASTFactory() throws Exception { - return ServiceRegistry.getService(currentLanguageDescriptor, IElementFactory.class); + protected IAstFactory getASTFactory() throws Exception { + return ServiceRegistry.getService(currentLanguageDescriptor, IAstFactory.class); } protected IParseTreeConstructor getParseTreeConstructor() throws Exception {