From f00309bf9c19e4ef16f8c6d6619a75a4212b7cee Mon Sep 17 00:00:00 2001
From: Philip Makedonski <philip.makedonski@gmail.com>
Date: Tue, 28 Apr 2020 10:21:04 +0200
Subject: [PATCH] + updated TO scoping
---
.../etsi/mts/tdl/scoping/TPLan2ScopeProvider.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/plugins/org.etsi.mts.tdl.TPLan2/src/org/etsi/mts/tdl/scoping/TPLan2ScopeProvider.java b/plugins/org.etsi.mts.tdl.TPLan2/src/org/etsi/mts/tdl/scoping/TPLan2ScopeProvider.java
index baa4ada5..9835f5d5 100644
--- a/plugins/org.etsi.mts.tdl.TPLan2/src/org/etsi/mts/tdl/scoping/TPLan2ScopeProvider.java
+++ b/plugins/org.etsi.mts.tdl.TPLan2/src/org/etsi/mts/tdl/scoping/TPLan2ScopeProvider.java
@@ -52,13 +52,13 @@ public class TPLan2ScopeProvider extends AbstractDeclarativeScopeProvider {
} else if (Parameter.class.isAssignableFrom(reference.getEType().getInstanceClass())) {
if (context instanceof MemberAssignment) {
if (context.eContainer() instanceof StructuredDataInstance) {
- IScope scope = Scopes.scopeFor(((StructuredDataType)((StructuredDataInstance)context.eContainer()).getDataType()).getMember());
+ IScope scope = Scopes.scopeFor(((StructuredDataType)((StructuredDataInstance)context.eContainer()).getDataType()).allMembers());
return scope;
}
} else if (context instanceof ParameterBinding) {
if (context.eContainer() instanceof DataInstanceUse) {
if (((DataInstanceUse)context.eContainer()).getDataInstance() instanceof StructuredDataInstance) {
- IScope scope = Scopes.scopeFor(((StructuredDataType)((StructuredDataInstance)((DataInstanceUse)context.eContainer()).getDataInstance()).getDataType()).getMember());
+ IScope scope = Scopes.scopeFor(((StructuredDataType)((StructuredDataInstance)((DataInstanceUse)context.eContainer()).getDataInstance()).getDataType()).allMembers());
return scope;
}
}
@@ -67,26 +67,26 @@ public class TPLan2ScopeProvider extends AbstractDeclarativeScopeProvider {
EObject targetContext = ((DataUse)context.eContainer()).getReduction().get(((DataUse)context.eContainer()).getReduction().indexOf(context)-1);
if (((MemberReference)targetContext).getMember()!=null) {
if (((MemberReference)targetContext).getMember().getDataType() instanceof StructuredDataType) {
- IScope scope = Scopes.scopeFor(((StructuredDataType)((MemberReference)targetContext).getMember().getDataType()).getMember());
+ IScope scope = Scopes.scopeFor(((StructuredDataType)((MemberReference)targetContext).getMember().getDataType()).allMembers());
return scope;
}
}
}
if (context.eContainer() instanceof DataInstanceUse) {
if (((DataInstanceUse)context.eContainer()).getDataInstance() instanceof StructuredDataInstance) {
- IScope scope = Scopes.scopeFor(((StructuredDataType)((StructuredDataInstance)((DataInstanceUse)context.eContainer()).getDataInstance()).getDataType()).getMember());
+ IScope scope = Scopes.scopeFor(((StructuredDataType)((StructuredDataInstance)((DataInstanceUse)context.eContainer()).getDataInstance()).getDataType()).allMembers());
return scope;
}
}
} else if (context instanceof Content) {
if (context.eContainer() instanceof LiteralValue) {
if (((LiteralValue)context.eContainer()).getDataType() instanceof StructuredDataType) {
- IScope scope = Scopes.scopeFor(((StructuredDataType)((LiteralValue)context.eContainer()).getDataType()).getMember());
+ IScope scope = Scopes.scopeFor(((StructuredDataType)((LiteralValue)context.eContainer()).getDataType()).allMembers());
return scope;
}
} else if (context.eContainer() instanceof Content) {
if (((Content)context.eContainer()).getMember().getDataType() instanceof StructuredDataType) {
- IScope scope = Scopes.scopeFor(((StructuredDataType)((Content)context.eContainer()).getMember().getDataType()).getMember());
+ IScope scope = Scopes.scopeFor(((StructuredDataType)((Content)context.eContainer()).getMember().getDataType()).allMembers());
return scope;
}
}
--
GitLab