From 8bd1b807d2823be3b87d1263f7901028844fb009 Mon Sep 17 00:00:00 2001 From: OszkarSemerath Date: Sat, 13 Jan 2018 21:01:56 +0100 Subject: Scope patched for metamodel specification --- .../scoping/ApplicationConfigurationScopeProvider.xtend | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/scoping') diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/scoping/ApplicationConfigurationScopeProvider.xtend b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/scoping/ApplicationConfigurationScopeProvider.xtend index 4eef53d7..3aa349f3 100644 --- a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/scoping/ApplicationConfigurationScopeProvider.xtend +++ b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/scoping/ApplicationConfigurationScopeProvider.xtend @@ -49,13 +49,9 @@ class ApplicationConfigurationScopeProvider extends AbstractApplicationConfigura protected def scopeForMetamodelElement(MetamodelElement context, EReference reference, ConfigurationScript document) { if(reference === language.metamodelEntry_Package) { - if(context.classifier !== null) { - return Scopes.scopeFor(#[context.classifier.EPackage]) - } else { - return Scopes.scopeFor(document.allEPackages) - } + return Scopes.scopeFor(document.allEPackages) } if(reference === language.metamodelElement_Classifier) { - if(context.package != null) { + if(context.package !== null) { return Scopes.scopeFor(context.package.EClassifiers) } else { return Scopes.scopeFor(document.allEClassifiers) @@ -77,18 +73,22 @@ class ApplicationConfigurationScopeProvider extends AbstractApplicationConfigura return Scopes.scopeFor(document.allEPackages) } else if(reference ===language.metamodelElement_Classifier) { return Scopes.scopeFor(document.allEClassifiers) + } else { + return super.getScope(context,reference) } } protected def scopeForAllPackageEntry(AllPackageEntry context, EReference reference, ConfigurationScript document) { if(reference === language.metamodelEntry_Package) { return Scopes.scopeFor(document.allEPackages) - } else if(reference === language.metamodelEntry_Package) { + } else if(reference === language.metamodelElement_Classifier) { if(context.package === null) { return Scopes.scopeFor(document.allEClassifiers) } else { return Scopes.scopeFor(context.package.EClassifiers) } + } else { + return super.getScope(context,reference) } } } -- cgit v1.2.3-70-g09d2