* fix for resolveBaseDataType in default Member/Parameter/SimpleDataInstance values, #213, #214 (5d04d6bb) · Commits · TDL Open Source / TOP IDE

plugins/org.etsi.mts.tdl.model/model/tdl.ecore

+4 −4

Original line number	Diff line number	Diff line
		@@ -361,7 +361,7 @@
		<eClassifiers xsi:type="ecore:EClass" name="AnyValue" eSuperTypes="#//SpecialValueUse">
		<eOperations name="resolveBaseDataType" eType="#//DataType">
		<eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot">
		<details key="body" value=" if (not self.dataType.oclIsUndefined()) then self.dataType else if (self.container().oclIsTypeOf(MemberAssignment)) then self.container().oclAsType(MemberAssignment).member.dataType else if (self.container().oclIsTypeOf(ParameterBinding)) then self.container().oclAsType(ParameterBinding).parameter.dataType else if (self.container().oclIsTypeOf(CollectionDataInstance)) then self.container().oclAsType(CollectionDataInstance).dataType.oclAsType(CollectionDataType).itemType else if (self.container().oclIsTypeOf(DataElementUse)) then self.container().oclAsType(DataElementUse).resolveDataType().oclAsType(CollectionDataType).itemType else if (self.container().oclIsTypeOf(DataInstanceUse)) then self.container().oclAsType(DataInstanceUse).resolveDataType().oclAsType(CollectionDataType).itemType else null endif endif endif endif endif endif "/>
		<details key="body" value=" if (not self.dataType.oclIsUndefined()) then self.dataType else if (self.container().oclIsTypeOf(MemberAssignment)) then self.container().oclAsType(MemberAssignment).member.dataType else if (self.container().oclIsTypeOf(ParameterBinding)) then self.container().oclAsType(ParameterBinding).parameter.dataType else if (self.container().oclIsTypeOf(CollectionDataInstance)) then self.container().oclAsType(CollectionDataInstance).dataType.oclAsType(CollectionDataType).itemType else if (self.container().oclIsTypeOf(DataElementUse)) then self.container().oclAsType(DataElementUse).resolveDataType().oclAsType(CollectionDataType).itemType else if (self.container().oclIsTypeOf(DataInstanceUse)) then self.container().oclAsType(DataInstanceUse).resolveDataType().oclAsType(CollectionDataType).itemType else if (self.container().oclIsKindOf(Parameter)) then self.container().oclAsType(Parameter).dataType else if (self.container().oclIsTypeOf(SimpleDataInstance)) then self.container().oclAsType(SimpleDataInstance).dataType else null endif endif endif endif endif endif endif endif "/>
		</eAnnotations>
		</eOperations>
		<eStructuralFeatures xsi:type="ecore:EReference" name="dataType" eType="#//DataType"/>
		@@ -370,7 +370,7 @@
		<eClassifiers xsi:type="ecore:EClass" name="DataInstanceUse" eSuperTypes="#//StaticDataUse">
		<eOperations name="resolveBaseDataType" eType="#//DataType">
		<eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot">
		<details key="body" value=" if (not self.dataInstance.oclIsUndefined()) then self.dataInstance.dataType else if (not self.dataType.oclIsUndefined()) then self.dataType else if (self.container().oclIsTypeOf(MemberAssignment)) then self.container().oclAsType(MemberAssignment).member.dataType else if (self.container().oclIsTypeOf(ParameterBinding)) then self.container().oclAsType(ParameterBinding).parameter.dataType else if (self.container().oclIsTypeOf(CollectionDataInstance)) then self.container().oclAsType(CollectionDataInstance).dataType.oclAsType(CollectionDataType).itemType else if (self.container().oclIsTypeOf(DataElementUse)) then self.container().oclAsType(DataElementUse).resolveDataType().oclAsType(CollectionDataType).itemType else if (self.container().oclIsTypeOf(DataInstanceUse)) then self.container().oclAsType(DataInstanceUse).resolveDataType().oclAsType(CollectionDataType).itemType else null endif endif endif endif endif endif endif "/>
		<details key="body" value=" if (not self.dataInstance.oclIsUndefined()) then self.dataInstance.dataType else if (not self.dataType.oclIsUndefined()) then self.dataType else if (self.container().oclIsTypeOf(MemberAssignment)) then self.container().oclAsType(MemberAssignment).member.dataType else if (self.container().oclIsTypeOf(ParameterBinding)) then self.container().oclAsType(ParameterBinding).parameter.dataType else if (self.container().oclIsTypeOf(CollectionDataInstance)) then self.container().oclAsType(CollectionDataInstance).dataType.oclAsType(CollectionDataType).itemType else if (self.container().oclIsTypeOf(DataElementUse)) then self.container().oclAsType(DataElementUse).resolveDataType().oclAsType(CollectionDataType).itemType else if (self.container().oclIsTypeOf(DataInstanceUse)) then self.container().oclAsType(DataInstanceUse).resolveDataType().oclAsType(CollectionDataType).itemType else if (self.container().oclIsKindOf(Parameter)) then self.container().oclAsType(Parameter).dataType else null endif endif endif endif endif endif endif endif "/>
		</eAnnotations>
		</eOperations>
		<eStructuralFeatures xsi:type="ecore:EReference" name="dataInstance" eType="#//DataInstance"/>
		@@ -500,7 +500,7 @@
		<eClassifiers xsi:type="ecore:EClass" name="TestConfiguration" eSuperTypes="#//PackageableElement">
		<eOperations name="compatibleWith" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
		<eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot">
		<details key="body" value="self.componentInstance->forAll(c \| cb->exists(formalComponent = c)) and self.connection->forAll(c1 \| tc.connection->exists(c2 \| c1.endPoint->reject(ep1 \| c2.endPoint->exists(ep2 \| cb->any(formalComponent = ep1.component).actualComponent = ep2.component and ep1.gate = ep2.gate ))->isEmpty() ))"/>
		<details key="body" value="self.componentInstance->forAll(c \| cb->exists(formalComponent = c)) and self.connection->forAll(c1 \| tc.connection->exists(c2 \| c1.endPoint->reject(ep1 \| c2.endPoint->exists(ep2 \| cb->any(formalComponent = ep1.component).actualComponent = ep2.component and ep1.gate = ep2.gate ))->isEmpty() ))"/>
		</eAnnotations>
		<eParameters name="tc" lowerBound="1" eType="#//TestConfiguration"/>
		<eParameters name="cb" ordered="false" upperBound="-1" eType="#//ComponentInstanceBinding"/>
		@@ -871,7 +871,7 @@
		<eClassifiers xsi:type="ecore:EClass" name="DataElementUse" eSuperTypes="#//DataUse">
		<eOperations name="resolveBaseDataType" eType="#//DataType">
		<eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot">
		<details key="body" value=" if (not self.dataElement.oclIsUndefined()) then if (self.dataElement.oclIsKindOf(DataType)) then self.dataElement.oclAsType(DataType) else if (self.dataElement.oclIsKindOf(DataInstance)) then self.dataElement.oclAsType(DataInstance).dataType else if (self.dataElement.oclIsTypeOf(FormalParameter)) then self.dataElement.oclAsType(FormalParameter).dataType else if (self.dataElement.oclIsTypeOf(Function)) then self.dataElement.oclAsType(Function).returnType else if (self.dataElement.oclIsTypeOf(Variable)) then self.dataElement.oclAsType(Variable).dataType else null endif endif endif endif endif else if (self.container().oclIsTypeOf(MemberAssignment)) then self.container().oclAsType(MemberAssignment).member.dataType else if (self.container().oclIsTypeOf(ParameterBinding)) then self.container().oclAsType(ParameterBinding).resolveParameterType() else if (self.container().oclIsTypeOf(CollectionDataInstance)) then self.container().oclAsType(CollectionDataInstance).dataType.oclAsType(CollectionDataType).itemType else if (self.container().oclIsTypeOf(DataElementUse)) then if (self.container().oclAsType(DataElementUse).resolveDataType()->isEmpty()) then null else self.container().oclAsType(DataElementUse).resolveDataType().oclAsType(CollectionDataType).itemType endif else if (self.container().oclIsTypeOf(DataInstanceUse)) then if (self.container().oclAsType(DataInstanceUse).resolveDataType()->isEmpty()) then null else self.container().oclAsType(DataInstanceUse).resolveDataType().oclAsType(CollectionDataType).itemType endif else null endif endif endif endif endif endif "/>
		<details key="body" value=" if (not self.dataElement.oclIsUndefined()) then if (self.dataElement.oclIsKindOf(DataType)) then self.dataElement.oclAsType(DataType) else if (self.dataElement.oclIsKindOf(DataInstance)) then self.dataElement.oclAsType(DataInstance).dataType else if (self.dataElement.oclIsTypeOf(FormalParameter)) then self.dataElement.oclAsType(FormalParameter).dataType else if (self.dataElement.oclIsTypeOf(Function)) then self.dataElement.oclAsType(Function).returnType else if (self.dataElement.oclIsTypeOf(Variable)) then self.dataElement.oclAsType(Variable).dataType else null endif endif endif endif endif else if (self.container().oclIsTypeOf(MemberAssignment)) then self.container().oclAsType(MemberAssignment).member.dataType else if (self.container().oclIsTypeOf(ParameterBinding)) then self.container().oclAsType(ParameterBinding).resolveParameterType() else if (self.container().oclIsTypeOf(CollectionDataInstance)) then self.container().oclAsType(CollectionDataInstance).dataType.oclAsType(CollectionDataType).itemType else if (self.container().oclIsTypeOf(DataElementUse)) then if (self.container().oclAsType(DataElementUse).resolveDataType()->isEmpty()) then null else self.container().oclAsType(DataElementUse).resolveDataType().oclAsType(CollectionDataType).itemType endif else if (self.container().oclIsTypeOf(DataInstanceUse)) then if (self.container().oclAsType(DataInstanceUse).resolveDataType()->isEmpty()) then null else self.container().oclAsType(DataInstanceUse).resolveDataType().oclAsType(CollectionDataType).itemType endif else if (self.container().oclIsKindOf(Parameter)) then self.container().oclAsType(Parameter).dataType else if (self.container().oclIsTypeOf(SimpleDataInstance)) then self.container().oclAsType(SimpleDataInstance).dataType else null endif endif endif endif endif endif endif endif "/>
		</eAnnotations>
		</eOperations>
		<eStructuralFeatures xsi:type="ecore:EAttribute" name="unassignedMember" eType="#//UnassignedMemberTreatment"/>