From fc46480cd4a5249a6c05cb9ef895ffba9ac6ca4b Mon Sep 17 00:00:00 2001 From: sefftinge Date: Tue, 15 Jul 2008 14:38:55 +0000 Subject: [PATCH] service framework refactored (made xtext independent) --- .../generator/resource/ResourceTest.java | 8 +++--- .../grammarinheritance/InheritanceTest.java | 2 +- .../xtext/tests/AbstractGeneratorTest.java | 26 +++++++++---------- .../eclipse/xtext/xtext2ecore/ActionTest.java | 2 +- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/generator/resource/ResourceTest.java b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/generator/resource/ResourceTest.java index 7e9417ba0..fa0d76fac 100644 --- a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/generator/resource/ResourceTest.java +++ b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/generator/resource/ResourceTest.java @@ -10,9 +10,9 @@ import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; import org.eclipse.xtext.resource.IResourceFactory; -import org.eclipse.xtext.service.ILanguageDescriptor; -import org.eclipse.xtext.service.LanguageDescriptorFactory; +import org.eclipse.xtext.service.IServiceScope; import org.eclipse.xtext.service.ServiceRegistry; +import org.eclipse.xtext.service.ServiceScopeFactory; import org.eclipse.xtext.testlanguages.ITestLanguage; import org.eclipse.xtext.tests.AbstractGeneratorTest; import org.eclipse.xtext.xtext2ecore.EcoreModelComparator; @@ -21,8 +21,8 @@ public class ResourceTest extends AbstractGeneratorTest { public void testResource() throws Exception { new Object(); // workaround for Java bug on MacOSX - ILanguageDescriptor languageDescriptor = LanguageDescriptorFactory.get(ITestLanguage.ID); - IResourceFactory resourceFactory = ServiceRegistry.getService(languageDescriptor, IResourceFactory.class); + IServiceScope serviceScope = ServiceScopeFactory.get(ITestLanguage.ID); + IResourceFactory resourceFactory = ServiceRegistry.getService(serviceScope, IResourceFactory.class); File modelFile = File.createTempFile("testfile", "." + resourceFactory.getModelFileExtensions()[0]); modelFile.deleteOnExit(); diff --git a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/grammarinheritance/InheritanceTest.java b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/grammarinheritance/InheritanceTest.java index 79f687212..ea8ca413e 100644 --- a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/grammarinheritance/InheritanceTest.java +++ b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/grammarinheritance/InheritanceTest.java @@ -7,7 +7,7 @@ import org.eclipse.xtext.tests.AbstractGeneratorTest; public class InheritanceTest extends AbstractGeneratorTest { static { - ServiceRegistry.registerService(AbstractTestLanguageStandaloneSetup.getLanguageDescriptor(), + ServiceRegistry.registerService(AbstractTestLanguageStandaloneSetup.getServiceScope(), IValueConverterService.class, AbstractTestLanguageValueConverters.class); } 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 5fbbee147..6d576ada9 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 @@ -30,7 +30,7 @@ import org.eclipse.xtext.parsetree.reconstr.IParseTreeConstructor; import org.eclipse.xtext.resource.IResourceFactory; import org.eclipse.xtext.resource.XtextResource; import org.eclipse.xtext.resource.XtextResourceSet; -import org.eclipse.xtext.service.ILanguageDescriptor; +import org.eclipse.xtext.service.IServiceScope; import org.eclipse.xtext.service.ServiceRegistry; import org.eclipse.xtext.util.StringInputStream; import org.openarchitectureware.expression.ExecutionContextImpl; @@ -58,10 +58,10 @@ public abstract class AbstractGeneratorTest extends TestCase { } - private ILanguageDescriptor currentLanguageDescriptor; + private IServiceScope currentScope; - public ILanguageDescriptor getCurrentLanguageDescriptor() { - return currentLanguageDescriptor; + public IServiceScope getCurrentServiceScope() { + return currentScope; } @Override @@ -73,36 +73,36 @@ public abstract class AbstractGeneratorTest extends TestCase { @Override protected void tearDown() throws Exception { super.tearDown(); - currentLanguageDescriptor = null; + currentScope = null; } /** * call this to set the language class to be used in the current test. */ protected void with(Class standaloneSetup) throws Exception { - Method getLangDescMethod = standaloneSetup.getMethod("getLanguageDescriptor"); - currentLanguageDescriptor = (ILanguageDescriptor) getLangDescMethod.invoke(null); - assert currentLanguageDescriptor != null; + Method getLangDescMethod = standaloneSetup.getMethod("getServiceScope"); + currentScope = (IServiceScope) getLangDescMethod.invoke(null); + assert currentScope != null; } protected IParser getParser() { - return ServiceRegistry.getService(currentLanguageDescriptor, IParser.class); + return ServiceRegistry.getService(currentScope, IParser.class); } protected IAstFactory getASTFactory() { - return ServiceRegistry.getService(currentLanguageDescriptor, IAstFactory.class); + return ServiceRegistry.getService(currentScope, IAstFactory.class); } protected IParseTreeConstructor getParseTreeConstructor() { - return ServiceRegistry.getService(currentLanguageDescriptor, IParseTreeConstructor.class); + return ServiceRegistry.getService(currentScope, IParseTreeConstructor.class); } protected IResourceFactory getResourceFactory() { - return ServiceRegistry.getService(currentLanguageDescriptor, IResourceFactory.class); + return ServiceRegistry.getService(currentScope, IResourceFactory.class); } protected IValueConverterService getValueConverterService() { - return ServiceRegistry.getService(currentLanguageDescriptor, IValueConverterService.class); + return ServiceRegistry.getService(currentScope, IValueConverterService.class); } // parse methods diff --git a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/xtext2ecore/ActionTest.java b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/xtext2ecore/ActionTest.java index 5b6f625c7..f548a3ff6 100644 --- a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/xtext2ecore/ActionTest.java +++ b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/xtext2ecore/ActionTest.java @@ -40,7 +40,7 @@ public class ActionTest extends AbstractGeneratorTest { } private EPackage getActionLangEPackage() { - IMetamodelAccess metaModelAccess = ServiceRegistry.getService(ActionTestLanguageStandaloneSetup.getLanguageDescriptor(), IMetamodelAccess.class); + IMetamodelAccess metaModelAccess = ServiceRegistry.getService(ActionTestLanguageStandaloneSetup.getServiceScope(), IMetamodelAccess.class); EPackage actionLangEPackage = metaModelAccess.getGeneratedEPackages()[0]; return actionLangEPackage; }