Commit 63663c93 authored by Philip Makedonski's avatar Philip Makedonski
Browse files

* updated merged / generated model

parent 12db83fc

org.etsi.mts.tdl/.settings/org.eclipse.core.resources.prefs

+2 −0
Original line number Diff line number Diff line 
eclipse.preferences.version=1

encoding//model/tdlXMI.xsd=UTF8

encoding//schemas/v141-published.xsd=UTF8

encoding//schemas/v161-draft.xsd=UTF8

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

+162 −99

File changed.

Preview size limit exceeded, changes collapsed.

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

+54 −33
Original line number Diff line number Diff line
@@ -106,12 +106,57 @@ 
      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute tdl.ecore#//TestObjective/objectiveURI"/>

      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute tdl.ecore#//TestObjective/description"/>

    </genClasses>

    <genClasses xsi:type="genmodel:GenClass" ecoreClass="tdl.ecore#//Constraint">

      <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"

          createChild="true" ecoreFeature="ecore:EReference tdl.ecore#//Constraint/quantifier"/>

      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

          propertySortChoices="true" ecoreFeature="ecore:EReference tdl.ecore#//Constraint/type"/>

    </genClasses>

    <genClasses xsi:type="genmodel:GenClass" ecoreClass="tdl.ecore#//LiteralValueUse">

      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute tdl.ecore#//LiteralValueUse/value"/>

      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

          propertySortChoices="true" ecoreFeature="ecore:EReference tdl.ecore#//LiteralValueUse/dataType"/>

      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute tdl.ecore#//LiteralValueUse/intValue"/>

      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute tdl.ecore#//LiteralValueUse/boolValue"/>

    </genClasses>

    <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="tdl.ecore#//StaticDataUse"/>

    <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="tdl.ecore#//DataUse">

      <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"

          createChild="true" ecoreFeature="ecore:EReference tdl.ecore#//DataUse/argument"/>

      <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"

          createChild="true" ecoreFeature="ecore:EReference tdl.ecore#//DataUse/reduction"/>

    </genClasses>

    <genClasses xsi:type="genmodel:GenClass" ecoreClass="tdl.ecore#//ParameterBinding">

      <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"

          createChild="true" ecoreFeature="ecore:EReference tdl.ecore#//ParameterBinding/dataUse"/>

      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

          propertySortChoices="true" ecoreFeature="ecore:EReference tdl.ecore#//ParameterBinding/parameter"/>

    </genClasses>

    <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="tdl.ecore#//Parameter">

      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

          propertySortChoices="true" ecoreFeature="ecore:EReference tdl.ecore#//Parameter/dataType"/>

    </genClasses>

    <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="tdl.ecore#//DataType">

      <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"

          createChild="true" ecoreFeature="ecore:EReference tdl.ecore#//DataType/constraint"/>

    </genClasses>

    <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="tdl.ecore#//MappableDataElement"/>

    <genClasses xsi:type="genmodel:GenClass" ecoreClass="tdl.ecore#//MemberReference">

      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

          propertySortChoices="true" ecoreFeature="ecore:EReference tdl.ecore#//MemberReference/member"/>

      <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"

          createChild="true" ecoreFeature="ecore:EReference tdl.ecore#//MemberReference/collectionIndex"/>

    </genClasses>

    <genClasses xsi:type="genmodel:GenClass" ecoreClass="tdl.ecore#//Member">

      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute tdl.ecore#//Member/isOptional"/>

      <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"

          createChild="true" ecoreFeature="ecore:EReference tdl.ecore#//Member/constraint"/>

    </genClasses>

    <genClasses xsi:type="genmodel:GenClass" ecoreClass="tdl.ecore#//ConstraintType"/>

    <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="tdl.ecore#//DataInstance">

      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

          propertySortChoices="true" ecoreFeature="ecore:EReference tdl.ecore#//DataInstance/dataType"/>

    </genClasses>

    <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="tdl.ecore#//MappableDataElement"/>

    <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="tdl.ecore#//DataType"/>

    <genClasses xsi:type="genmodel:GenClass" ecoreClass="tdl.ecore#//DataResourceMapping">

      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute tdl.ecore#//DataResourceMapping/resourceURI"/>

    </genClasses>
@@ -129,11 +174,10 @@ 
      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

          propertySortChoices="true" ecoreFeature="ecore:EReference tdl.ecore#//ParameterMapping/parameter"/>

    </genClasses>

    <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="tdl.ecore#//Parameter">

      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

          propertySortChoices="true" ecoreFeature="ecore:EReference tdl.ecore#//Parameter/dataType"/>

    <genClasses xsi:type="genmodel:GenClass" ecoreClass="tdl.ecore#//SimpleDataType">

      <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"

          createChild="true" ecoreFeature="ecore:EReference tdl.ecore#//SimpleDataType/extension"/>

    </genClasses>

    <genClasses xsi:type="genmodel:GenClass" ecoreClass="tdl.ecore#//SimpleDataType"/>

    <genClasses xsi:type="genmodel:GenClass" ecoreClass="tdl.ecore#//SimpleDataInstance"/>

    <genClasses xsi:type="genmodel:GenClass" ecoreClass="tdl.ecore#//StructuredDataType">

      <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"
@@ -141,9 +185,6 @@ 
      <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"

          createChild="true" ecoreFeature="ecore:EReference tdl.ecore#//StructuredDataType/extension"/>

    </genClasses>

    <genClasses xsi:type="genmodel:GenClass" ecoreClass="tdl.ecore#//Member">

      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute tdl.ecore#//Member/isOptional"/>

    </genClasses>

    <genClasses xsi:type="genmodel:GenClass" ecoreClass="tdl.ecore#//StructuredDataInstance">

      <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"

          createChild="true" ecoreFeature="ecore:EReference tdl.ecore#//StructuredDataInstance/memberAssignment"/>
@@ -155,25 +196,6 @@ 
      <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"

          createChild="true" ecoreFeature="ecore:EReference tdl.ecore#//MemberAssignment/memberSpec"/>

    </genClasses>

    <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="tdl.ecore#//StaticDataUse"/>

    <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="tdl.ecore#//DataUse">

      <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"

          createChild="true" ecoreFeature="ecore:EReference tdl.ecore#//DataUse/argument"/>

      <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"

          createChild="true" ecoreFeature="ecore:EReference tdl.ecore#//DataUse/reduction"/>

    </genClasses>

    <genClasses xsi:type="genmodel:GenClass" ecoreClass="tdl.ecore#//ParameterBinding">

      <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"

          createChild="true" ecoreFeature="ecore:EReference tdl.ecore#//ParameterBinding/dataUse"/>

      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

          propertySortChoices="true" ecoreFeature="ecore:EReference tdl.ecore#//ParameterBinding/parameter"/>

    </genClasses>

    <genClasses xsi:type="genmodel:GenClass" ecoreClass="tdl.ecore#//MemberReference">

      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

          propertySortChoices="true" ecoreFeature="ecore:EReference tdl.ecore#//MemberReference/member"/>

      <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"

          createChild="true" ecoreFeature="ecore:EReference tdl.ecore#//MemberReference/collectionIndex"/>

    </genClasses>

    <genClasses xsi:type="genmodel:GenClass" ecoreClass="tdl.ecore#//Action">

      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute tdl.ecore#//Action/body"/>

      <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"
@@ -216,6 +238,10 @@ 
      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

          propertySortChoices="true" ecoreFeature="ecore:EReference tdl.ecore#//PredefinedFunction/returnType"/>

    </genClasses>

    <genClasses xsi:type="genmodel:GenClass" ecoreClass="tdl.ecore#//EnumDataType">

      <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"

          createChild="true" ecoreFeature="ecore:EReference tdl.ecore#//EnumDataType/value"/>

    </genClasses>

    <genClasses xsi:type="genmodel:GenClass" ecoreClass="tdl.ecore#//VariableUse">

      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

          propertySortChoices="true" ecoreFeature="ecore:EReference tdl.ecore#//VariableUse/componentInstance"/>
@@ -269,11 +295,6 @@ 
      <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"

          createChild="true" ecoreFeature="ecore:EReference tdl.ecore#//PredefinedFunctionCall/actualParameter"/>

    </genClasses>

    <genClasses xsi:type="genmodel:GenClass" ecoreClass="tdl.ecore#//LiteralValueUse">

      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute tdl.ecore#//LiteralValueUse/value"/>

      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

          propertySortChoices="true" ecoreFeature="ecore:EReference tdl.ecore#//LiteralValueUse/dataType"/>

    </genClasses>

    <genClasses xsi:type="genmodel:GenClass" ecoreClass="tdl.ecore#//Time"/>

    <genClasses xsi:type="genmodel:GenClass" ecoreClass="tdl.ecore#//TimeLabel"/>

    <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="tdl.ecore#//TimerOperation">

org.etsi.mts.tdl/model/tdl.uml

+1602 −1519

File changed.

Preview size limit exceeded, changes collapsed.

org.etsi.mts.tdl/plugin.xml

+8 −0
Original line number Diff line number Diff line
@@ -12,4 +12,12 @@ 
      </package>

   </extension>



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

      <!-- @generated org.etsi.mts.tdl -->

      <package

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

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

            genModel="model/tdl.genmodel"/>

   </extension>



</plugin>