Commit 37702df7 authored by Martti Käärik's avatar Martti Käärik
Browse files

Reverted most meta-model changes from 1afc3ff4 

Change-Id: I57948478c1a71a70223409c1ef6002e778b86411
parent 75e612d9

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

+6 −79
Original line number Diff line number Diff line
@@ -320,12 +320,6 @@ 
        <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Data::DataUse.&lt;/p>"/>

      </eAnnotations>

    </eStructuralFeatures>

    <eStructuralFeatures xsi:type="ecore:EReference" name="collectionIndex" ordered="false"

        upperBound="-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::Data::DataUse.&lt;/p>"/>

      </eAnnotations>

    </eStructuralFeatures>

  </eClassifiers>

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

    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
@@ -421,46 +415,6 @@ 
      </eAnnotations>

    </eStructuralFeatures>

  </eClassifiers>

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

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

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

    </eAnnotations>

    <eStructuralFeatures xsi:type="ecore:EReference" name="parameter" ordered="false"

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

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

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

      </eAnnotations>

    </eStructuralFeatures>

  </eClassifiers>

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

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

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

    </eAnnotations>

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

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

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

      </eAnnotations>

    </eStructuralFeatures>

  </eClassifiers>

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

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

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

    </eAnnotations>

    <eLiterals name="IN"/>

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

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

  </eClassifiers>

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

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

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

    </eAnnotations>

    <eStructuralFeatures xsi:type="ecore:EReference" name="member" ordered="false"

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

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

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

      </eAnnotations>

    </eStructuralFeatures>

  </eClassifiers>

  <eClassifiers xsi:type="ecore:EClass" name="VariableUse" eSuperTypes="#//DynamicDataUse">

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

      <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Data::DataUse.&lt;/p>"/>
@@ -845,11 +799,6 @@ 
        <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestBehaviour::CombinedBehaviour.&lt;/p>"/>

      </eAnnotations>

    </eStructuralFeatures>

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

      <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>

    </eStructuralFeatures>

  </eClassifiers>

  <eClassifiers xsi:type="ecore:EClass" name="PeriodicBehaviour" eSuperTypes="#//Behaviour">

    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
@@ -966,7 +915,7 @@ 
      </eAnnotations>

    </eStructuralFeatures>

    <eStructuralFeatures xsi:type="ecore:EReference" name="variable" ordered="false"

        upperBound="-1" eType="#//Variable">

        eType="#//Variable">

      <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>
@@ -999,11 +948,6 @@ 
        <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestBehaviour::AtomicBehaviour.&lt;/p>"/>

      </eAnnotations>

    </eStructuralFeatures>

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

      <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="Stop" eSuperTypes="#//AtomicBehaviour">

    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
@@ -1113,31 +1057,20 @@ 
    <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 xsi:type="ecore:EReference" name="target" ordered="false"

        lowerBound="1" upperBound="-1" eType="#//Target" 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>

    <eStructuralFeatures xsi:type="ecore:EReference" name="argument" ordered="false"

        lowerBound="1" upperBound="-1" eType="#//DataUse" containment="true">

        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="ProcedureCall" eSuperTypes="#//Interaction">

    <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 xsi:type="ecore:EReference" name="procedure" lowerBound="1"

        eType="#//Procedure">

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

        eType="#//GateReference">

      <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>

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

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

    <eStructuralFeatures xsi:type="ecore:EReference" name="target" ordered="false"

        lowerBound="1" upperBound="-1" eType="#//Target" 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>
@@ -1153,11 +1086,5 @@ 
        <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestBehaviour::AtomicBehaviour.&lt;/p>"/>

      </eAnnotations>

    </eStructuralFeatures>

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

        eType="#//GateReference">

      <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>

</ecore:EPackage>

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

+2 −23
Original line number Diff line number Diff line
@@ -122,11 +122,6 @@ 
      <genEnumLiterals ecoreEnumLiteral="tdl.ecore#//UnassignedMemberTreatment/AnyValue"/>

      <genEnumLiterals ecoreEnumLiteral="tdl.ecore#//UnassignedMemberTreatment/AnyValueOrOmit"/>

    </genEnums>

    <genEnums typeSafeEnumCompatible="false" ecoreEnum="tdl.ecore#//ParameterKind">

      <genEnumLiterals ecoreEnumLiteral="tdl.ecore#//ParameterKind/IN"/>

      <genEnumLiterals ecoreEnumLiteral="tdl.ecore#//ParameterKind/OUT"/>

      <genEnumLiterals ecoreEnumLiteral="tdl.ecore#//ParameterKind/EXCEPTION"/>

    </genEnums>

    <genEnums typeSafeEnumCompatible="false" ecoreEnum="tdl.ecore#//ComponentInstanceRole">

      <genEnumLiterals ecoreEnumLiteral="tdl.ecore#//ComponentInstanceRole/SUT"/>

      <genEnumLiterals ecoreEnumLiteral="tdl.ecore#//ComponentInstanceRole/Tester"/>
@@ -204,7 +199,6 @@ 
    <genClasses image="false" ecoreClass="tdl.ecore#//DataUse">

      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tdl.ecore#//DataUse/argument"/>

      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference tdl.ecore#//DataUse/reduction"/>

      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tdl.ecore#//DataUse/collectionIndex"/>

    </genClasses>

    <genClasses ecoreClass="tdl.ecore#//ParameterBinding">

      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tdl.ecore#//ParameterBinding/dataUse"/>
@@ -228,15 +222,6 @@ 
    <genClasses ecoreClass="tdl.ecore#//FunctionCall">

      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference tdl.ecore#//FunctionCall/function"/>

    </genClasses>

    <genClasses ecoreClass="tdl.ecore#//Procedure">

      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tdl.ecore#//Procedure/parameter"/>

    </genClasses>

    <genClasses ecoreClass="tdl.ecore#//ProcedureParameter">

      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tdl.ecore#//ProcedureParameter/kind"/>

    </genClasses>

    <genClasses ecoreClass="tdl.ecore#//CollectionDataInstance">

      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tdl.ecore#//CollectionDataInstance/member"/>

    </genClasses>

    <genClasses ecoreClass="tdl.ecore#//VariableUse">

      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference tdl.ecore#//VariableUse/componentInstance"/>

      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference tdl.ecore#//VariableUse/variable"/>
@@ -328,7 +313,6 @@ 
    <genClasses image="false" ecoreClass="tdl.ecore#//CombinedBehaviour">

      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tdl.ecore#//CombinedBehaviour/periodic"/>

      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tdl.ecore#//CombinedBehaviour/exceptional"/>

      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference tdl.ecore#//CombinedBehaviour/scope"/>

    </genClasses>

    <genClasses ecoreClass="tdl.ecore#//PeriodicBehaviour">

      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tdl.ecore#//PeriodicBehaviour/block"/>
@@ -364,7 +348,6 @@ 
    <genClasses ecoreClass="tdl.ecore#//Assertion">

      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tdl.ecore#//Assertion/otherwise"/>

      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tdl.ecore#//Assertion/condition"/>

      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference tdl.ecore#//Assertion/scope"/>

    </genClasses>

    <genClasses ecoreClass="tdl.ecore#//Stop"/>

    <genClasses ecoreClass="tdl.ecore#//Break"/>
@@ -392,16 +375,12 @@ 
      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference tdl.ecore#//ComponentInstanceBinding/actualComponent"/>

    </genClasses>

    <genClasses ecoreClass="tdl.ecore#//Interaction">

      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tdl.ecore#//Interaction/target"/>

      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tdl.ecore#//Interaction/argument"/>

    </genClasses>

    <genClasses ecoreClass="tdl.ecore#//ProcedureCall">

      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference tdl.ecore#//ProcedureCall/procedure"/>

      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tdl.ecore#//ProcedureCall/source"/>

      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference tdl.ecore#//Interaction/sourceGate"/>

      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tdl.ecore#//Interaction/target"/>

    </genClasses>

    <genClasses ecoreClass="tdl.ecore#//Message">

      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tdl.ecore#//Message/isTrigger"/>

      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference tdl.ecore#//Message/sourceGate"/>

    </genClasses>

  </genPackages>

</genmodel:GenModel>