Commit 156f6789 authored by Philip Makedonski's avatar Philip Makedonski
Browse files

+ fix for transitiveExtending in SimpleDataType (and others), #229

parent cb3650ee

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

+1 −1
Original line number Diff line number Diff line
@@ -827,7 +827,7 @@ 
  <eClassifiers xsi:type="ecore:EClass" name="Extension" eSuperTypes="#//Element">

    <eOperations name="transitiveExtending" upperBound="-1" eType="#//Extension">

      <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot">

        <details key="body" value="&#xA;                if (self.extending.oclIsKindOf(AnnotationType)) then&#xA;                    OrderedSet { self.extending.oclAsType(AnnotationType).extension }->reject(oclIsUndefined())&#xA;                else&#xA;                    if (self.extending.oclIsKindOf(ComponentType)) then&#xA;                        OrderedSet { self.extending.oclAsType(ComponentType).extension }->reject(oclIsUndefined())&#xA;                    else&#xA;                        if (self.extending.oclIsKindOf(GateType)) then&#xA;                            OrderedSet { self.extending.oclAsType(GateType).extension }->reject(oclIsUndefined())&#xA;                        else&#xA;                            if (self.extending.oclIsKindOf(StructuredDataType)) then&#xA;                                self.extending.oclAsType(StructuredDataType).extension->reject(oclIsUndefined())&#xA;                            else&#xA;                                if (self.extending.oclIsKindOf(SimpleDataType)) then&#xA;                                    OrderedSet { self.extending.oclAsType(SimpleDataType).extension }->reject(oclIsUndefined())&#xA;                                else&#xA;                                    OrderedSet { }&#xA;                                endif&#xA;                            endif&#xA;                        endif&#xA;                    endif&#xA;                endif&#xA;                "/>

        <details key="body" value="&#xA;                if (self.extending.oclIsKindOf(AnnotationType) and not self.extending.oclAsType(AnnotationType).extension.oclIsUndefined()) then&#xA;                    OrderedSet { self.extending.oclAsType(AnnotationType).extension }->reject(oclIsUndefined())&#xA;                else&#xA;                    if (self.extending.oclIsKindOf(ComponentType) and not self.extending.oclAsType(ComponentType).extension.oclIsUndefined()) then&#xA;                        OrderedSet { self.extending.oclAsType(ComponentType).extension }->reject(oclIsUndefined())&#xA;                    else&#xA;                        if (self.extending.oclIsKindOf(GateType) and not self.extending.oclAsType(GateType).extension.oclIsUndefined()) then&#xA;                            OrderedSet { self.extending.oclAsType(GateType).extension }->reject(oclIsUndefined())&#xA;                        else&#xA;                            if (self.extending.oclIsKindOf(StructuredDataType)) then&#xA;                                self.extending.oclAsType(StructuredDataType).extension->reject(oclIsUndefined())&#xA;                            else&#xA;                                if (self.extending.oclIsKindOf(SimpleDataType) and not self.extending.oclAsType(SimpleDataType).extension.oclIsUndefined()) then&#xA;                                    OrderedSet { self.extending.oclAsType(SimpleDataType).extension }->reject(oclIsUndefined())&#xA;                                else&#xA;                                    OrderedSet { }&#xA;                                endif&#xA;                            endif&#xA;                        endif&#xA;                    endif&#xA;                endif&#xA;                "/>

      </eAnnotations>

      <eAnnotations source="http://www.eclipse.org/OCL/Collection">

        <details key="nullFree" value="false"/>