Commit de3b354d authored by Philip Makedonski's avatar Philip Makedonski
Browse files

+ fixes to operation implementations in part 4

parent 57730498

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

+9 −3
Original line number Diff line number Diff line
@@ -3,8 +3,14 @@ 
    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="structuredobjectives" nsURI="http://www.etsi.org/spec/TDL/1.3.1/structured"

    nsPrefix="structured">

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

    <details key="ecore" value="http://www.eclipse.org/emf/2002/Ecore"/>

    <details key="tdl" value="tdl.ecore#/"/>

  </eAnnotations>

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

    <details key="invocationDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot"/>

    <details key="settingDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot"/>

    <details key="validationDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot"/>

  </eAnnotations>

  <eClassifiers xsi:type="ecore:EClass" name="Element" eSuperTypes="tdl.ecore#//Element">

    <eOperations name="getTestObjective" eType="#//StructuredTestObjective">

      <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot">
@@ -13,20 +19,20 @@ 
    </eOperations>

    <eOperations name="contains" 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->closure(oclContents())->includes(object)"/>

        <details key="body" value="self.oclContents()->closure(oclContents())->includes(object)"/>

      </eAnnotations>

      <eParameters name="object" eType="#//Element"/>

    </eOperations>

    <eOperations name="getNotes" ordered="false" upperBound="-1" eType="ecore:EClass tdl.ecore#//Comment">

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

        <details key="body" value="self->closure(oclContents())->select(e | &#xA;&#x9;e.oclIsKindOf(tdl::Comment) and not e.oclAsType(tdl::Comment).name.oclIsUndefined()&#xA;).oclAsType(tdl::Comment)->asSet()"/>

        <details key="body" value="self.oclContents()->closure(oclContents())->select(e | &#xA;&#x9;e.oclIsKindOf(tdl::Comment) and not e.oclAsType(tdl::Comment).name.oclIsUndefined()&#xA;).oclAsType(tdl::Comment)->asSet()"/>

      </eAnnotations>

    </eOperations>

  </eClassifiers>

  <eClassifiers xsi:type="ecore:EClass" name="StructuredTestObjective" eSuperTypes="tdl.ecore#//TestObjective #//Element">

    <eOperations name="indexOf" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt">

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

        <details key="body" value="self->asOrderedSet()->closure(oclContents())->indexOf(object)"/>

        <details key="body" value="OrderedSet{self}.oclContents()->closure(oclContents())->indexOf(object)"/>

      </eAnnotations>

      <eParameters name="object" eType="#//Element"/>

    </eOperations>