diff options
Diffstat (limited to 'Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/scoping')
-rw-r--r-- | Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/scoping/ApplicationConfigurationScopeProvider.xtend | 14 |
1 files changed, 7 insertions, 7 deletions
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 | |||
49 | 49 | ||
50 | protected def scopeForMetamodelElement(MetamodelElement context, EReference reference, ConfigurationScript document) { | 50 | protected def scopeForMetamodelElement(MetamodelElement context, EReference reference, ConfigurationScript document) { |
51 | if(reference === language.metamodelEntry_Package) { | 51 | if(reference === language.metamodelEntry_Package) { |
52 | if(context.classifier !== null) { | 52 | return Scopes.scopeFor(document.allEPackages) |
53 | return Scopes.scopeFor(#[context.classifier.EPackage]) | ||
54 | } else { | ||
55 | return Scopes.scopeFor(document.allEPackages) | ||
56 | } | ||
57 | } if(reference === language.metamodelElement_Classifier) { | 53 | } if(reference === language.metamodelElement_Classifier) { |
58 | if(context.package != null) { | 54 | if(context.package !== null) { |
59 | return Scopes.scopeFor(context.package.EClassifiers) | 55 | return Scopes.scopeFor(context.package.EClassifiers) |
60 | } else { | 56 | } else { |
61 | return Scopes.scopeFor(document.allEClassifiers) | 57 | return Scopes.scopeFor(document.allEClassifiers) |
@@ -77,18 +73,22 @@ class ApplicationConfigurationScopeProvider extends AbstractApplicationConfigura | |||
77 | return Scopes.scopeFor(document.allEPackages) | 73 | return Scopes.scopeFor(document.allEPackages) |
78 | } else if(reference ===language.metamodelElement_Classifier) { | 74 | } else if(reference ===language.metamodelElement_Classifier) { |
79 | return Scopes.scopeFor(document.allEClassifiers) | 75 | return Scopes.scopeFor(document.allEClassifiers) |
76 | } else { | ||
77 | return super.getScope(context,reference) | ||
80 | } | 78 | } |
81 | } | 79 | } |
82 | 80 | ||
83 | protected def scopeForAllPackageEntry(AllPackageEntry context, EReference reference, ConfigurationScript document) { | 81 | protected def scopeForAllPackageEntry(AllPackageEntry context, EReference reference, ConfigurationScript document) { |
84 | if(reference === language.metamodelEntry_Package) { | 82 | if(reference === language.metamodelEntry_Package) { |
85 | return Scopes.scopeFor(document.allEPackages) | 83 | return Scopes.scopeFor(document.allEPackages) |
86 | } else if(reference === language.metamodelEntry_Package) { | 84 | } else if(reference === language.metamodelElement_Classifier) { |
87 | if(context.package === null) { | 85 | if(context.package === null) { |
88 | return Scopes.scopeFor(document.allEClassifiers) | 86 | return Scopes.scopeFor(document.allEClassifiers) |
89 | } else { | 87 | } else { |
90 | return Scopes.scopeFor(context.package.EClassifiers) | 88 | return Scopes.scopeFor(context.package.EClassifiers) |
91 | } | 89 | } |
90 | } else { | ||
91 | return super.getScope(context,reference) | ||
92 | } | 92 | } |
93 | } | 93 | } |
94 | } | 94 | } |