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

+added complete meta-model support for 1.4.1 



Change-Id: Iaa1f560d3990810f6bf0415e8b7e1e1d5104751e
Signed-off-by: default avatarmakedonski <makedonski@informatik.uni-goettingen.de>
parent 6847d0b9

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

+80 −11
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="tdl" nsURI="http://www.etsi.org/spec/TDL/1.4.0" nsPrefix="tdl">

    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="tdl" nsURI="http://www.etsi.org/spec/TDL/1.4.1" nsPrefix="tdl">

  <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"/>
@@ -490,6 +490,12 @@ 
        <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestConfiguration.&lt;/p>"/>

      </eAnnotations>

    </eStructuralFeatures>

    <eStructuralFeatures xsi:type="ecore:EAttribute" name="kind" lowerBound="1" eType="#//GateTypeKind"

        defaultValueLiteral="Message">

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

        <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestConfiguration.&lt;/p>"/>

      </eAnnotations>

    </eStructuralFeatures>

  </eClassifiers>

  <eClassifiers xsi:type="ecore:EClass" name="Timer" eSuperTypes="#//NamedElement">

    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
@@ -691,6 +697,12 @@ 
        <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Time.&lt;/p>"/>

      </eAnnotations>

    </eStructuralFeatures>

    <eStructuralFeatures xsi:type="ecore:EAttribute" name="kind" lowerBound="1" eType="#//TimeLabelUseKind"

        defaultValueLiteral="Last">

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

        <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestConfiguration.&lt;/p>"/>

      </eAnnotations>

    </eStructuralFeatures>

  </eClassifiers>

  <eClassifiers xsi:type="ecore:EClass" name="TestConfiguration" eSuperTypes="#//PackageableElement">

    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
@@ -914,10 +926,14 @@ 
        <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestBehaviour::CombinedBehaviour.&lt;/p>"/>

      </eAnnotations>

    </eStructuralFeatures>

    <eStructuralFeatures xsi:type="ecore:EReference" name="variable" eType="#//Variable">

    <eStructuralFeatures xsi:type="ecore:EReference" name="valueAssignment" upperBound="-1"

        eType="#//ValueAssignment" containment="true">

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

        <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestBehaviour::CombinedBehaviour.&lt;/p>"/>

      </eAnnotations>

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

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

      </eAnnotations>

    </eStructuralFeatures>

  </eClassifiers>

  <eClassifiers xsi:type="ecore:EClass" name="VerdictAssignment" eSuperTypes="#//AtomicBehaviour">
@@ -931,7 +947,7 @@ 
      </eAnnotations>

    </eStructuralFeatures>

  </eClassifiers>

  <eClassifiers xsi:type="ecore:EClass" name="Assertion" eSuperTypes="#//AtomicBehaviour">

  <eClassifiers xsi:type="ecore:EClass" name="Assertion" eSuperTypes="#//ActionBehaviour">

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

      <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestBehaviour::AtomicBehaviour.&lt;/p>"/>

    </eAnnotations>
@@ -1006,7 +1022,7 @@ 
      </eAnnotations>

    </eStructuralFeatures>

    <eStructuralFeatures xsi:type="ecore:EReference" name="actualParameter" upperBound="-1"

        eType="#//DataUse" containment="true">

        eType="#//ParameterBinding" containment="true">

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

        <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestBehaviour::AtomicBehaviour.&lt;/p>"/>

      </eAnnotations>
@@ -1029,7 +1045,7 @@ 
      </eAnnotations>

    </eStructuralFeatures>

    <eStructuralFeatures xsi:type="ecore:EReference" name="actualParameter" upperBound="-1"

        eType="#//DataUse" containment="true">

        eType="#//ParameterBinding" containment="true">

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

        <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestBehaviour::AtomicBehaviour.&lt;/p>"/>

      </eAnnotations>
@@ -1068,12 +1084,6 @@ 
        <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestBehaviour::AtomicBehaviour.&lt;/p>"/>

      </eAnnotations>

    </eStructuralFeatures>

    <eStructuralFeatures xsi:type="ecore:EReference" name="argument" lowerBound="1"

        eType="#//DataUse" containment="true">

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

        <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestBehaviour::AtomicBehaviour.&lt;/p>"/>

      </eAnnotations>

    </eStructuralFeatures>

  </eClassifiers>

  <eClassifiers xsi:type="ecore:EClass" name="Message" eSuperTypes="#//Interaction">

    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
@@ -1085,6 +1095,12 @@ 
        <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestBehaviour::AtomicBehaviour.&lt;/p>"/>

      </eAnnotations>

    </eStructuralFeatures>

    <eStructuralFeatures xsi:type="ecore:EReference" name="argument" lowerBound="1"

        eType="#//DataUse" containment="true">

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

        <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestBehaviour::AtomicBehaviour.&lt;/p>"/>

      </eAnnotations>

    </eStructuralFeatures>

  </eClassifiers>

  <eClassifiers xsi:type="ecore:EClass" name="PredefinedFunction" eSuperTypes="#//PackageableElement">

    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
@@ -1121,4 +1137,57 @@ 
        eType="#//DataUse" containment="true"/>

    <eStructuralFeatures xsi:type="ecore:EReference" name="scope" eType="#//ComponentInstance"/>

  </eClassifiers>

  <eClassifiers xsi:type="ecore:EEnum" name="GateTypeKind">

    <eLiterals name="Message"/>

    <eLiterals name="Procedure" value="1"/>

  </eClassifiers>

  <eClassifiers xsi:type="ecore:EEnum" name="TimeLabelUseKind">

    <eLiterals name="Last"/>

    <eLiterals name="Previous" value="1"/>

    <eLiterals name="First" value="2"/>

  </eClassifiers>

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

    <eStructuralFeatures xsi:type="ecore:EReference" name="variable" lowerBound="1"

        eType="#//Variable"/>

    <eStructuralFeatures xsi:type="ecore:EReference" name="parameter" eType="#//Parameter"/>

  </eClassifiers>

  <eClassifiers xsi:type="ecore:EClass" name="ProcedureCall" eSuperTypes="#//Interaction">

    <eStructuralFeatures xsi:type="ecore:EReference" name="signature" lowerBound="1"

        eType="#//ProcedureSignature"/>

    <eStructuralFeatures xsi:type="ecore:EReference" name="argument" lowerBound="1"

        upperBound="-1" eType="#//ParameterBinding" containment="true">

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

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

      </eAnnotations>

    </eStructuralFeatures>

    <eStructuralFeatures xsi:type="ecore:EReference" name="replyTo" eType="#//ProcedureCall"/>

  </eClassifiers>

  <eClassifiers xsi:type="ecore:EClass" name="ProcedureSignature" eSuperTypes="#//DataType">

    <eStructuralFeatures xsi:type="ecore:EReference" name="parameter" lowerBound="1"

        upperBound="-1" eType="#//ProcedureParameter" containment="true">

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

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

      </eAnnotations>

    </eStructuralFeatures>

  </eClassifiers>

  <eClassifiers xsi:type="ecore:EClass" name="ProcedureParameter" eSuperTypes="#//Parameter">

    <eStructuralFeatures xsi:type="ecore:EAttribute" name="kind" lowerBound="1" eType="#//ParameterKind"/>

  </eClassifiers>

  <eClassifiers xsi:type="ecore:EEnum" name="ParameterKind">

    <eLiterals name="In"/>

    <eLiterals name="Out" value="1"/>

    <eLiterals name="Exception" value="2"/>

  </eClassifiers>

  <eClassifiers xsi:type="ecore:EClass" name="CollectionDataType" eSuperTypes="#//DataType">

    <eStructuralFeatures xsi:type="ecore:EReference" name="itemType" lowerBound="1"

        eType="#//DataType"/>

  </eClassifiers>

  <eClassifiers xsi:type="ecore:EClass" name="CollectionDataInstance" eSuperTypes="#//DataInstance">

    <eStructuralFeatures xsi:type="ecore:EReference" name="item" upperBound="-1" eType="#//StaticDataUse"

        containment="true">

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

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

      </eAnnotations>

    </eStructuralFeatures>

  </eClassifiers>

</ecore:EPackage>

plugins/org.etsi.mts.tdl.model/plugin.xml

+11 −11
Original line number Diff line number Diff line
@@ -9,10 +9,20 @@ 
   <extension point="org.eclipse.emf.ecore.generated_package">

      <!-- @generated tdl -->

      <package

            uri="http://www.etsi.org/spec/TDL/1.4.0"

            uri="http://www.etsi.org/spec/TDL/1.4.1"

            class="org.etsi.mts.tdl.tdlPackage"

            genModel="model/tdl.genmodel"/>

   </extension>



   <extension point="org.eclipse.emf.ecore.extension_parser">

      <!-- @generated tdl -->

      <parser

            type="tdl"

            class="org.etsi.mts.tdl.util.tdlResourceFactoryImpl"/>

      <parser

            type="xmi"

            class="org.etsi.mts.tdl.util.tdlResourceFactoryImpl"/>

   </extension>

   <extension point="org.eclipse.emf.ecore.generated_package">

      <!-- @generated tdl -->

      <package
@@ -30,14 +40,4 @@ 
      </package>

   </extension>



   <extension point="org.eclipse.emf.ecore.extension_parser">

      <!-- @generated tdl -->

      <parser

            type="tdl"

            class="org.etsi.mts.tdl.resources.TDLResourceFactory"/>

      <parser

            type="xmi"

            class="org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl"/>

   </extension>



</plugin>