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

+ improved handling of qualified names (for time labels in particular) 



Change-Id: I69e1e858b99b6348c611f8493855977470724667
Signed-off-by: default avatarmakedonski <makedonski@informatik.uni-goettingen.de>
parent 3e140365

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

+4 −5
Original line number Original line Diff line number Diff line
@@ -87,7 +87,7 @@ 
        <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Foundation.&lt;/p>"/>

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

      </eAnnotations>

      </eAnnotations>

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

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

        <details key="derivation" value="&#xA;&#x9;&#x9;&#x9;if (not self.oclContainer().oclIsUndefined()) then&#xA;&#x9;&#x9;&#x9;&#x9;self.oclContainer().oclAsType(NamedElement).qualifiedName + '::' + self.name&#xA;&#x9;&#x9;&#x9;else&#xA;&#x9;&#x9;&#x9;&#x9;self.name&#xA;&#x9;&#x9;&#x9;endif"/>

        <details key="derivation" value="&#xA;&#x9;&#x9;&#x9;if (not self.oclContainer().oclIsUndefined()) then&#xA;&#x9;&#x9;&#x9;&#x9;if (self.oclContainer().oclIsKindOf(NamedElement)) then&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;self.oclContainer().oclAsType(NamedElement).qualifiedName + '::' + self.name&#xA;&#x9;&#x9;&#x9;&#x9;else&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;self.oclAsType(ocl::OclElement)->closure(oclContainer())&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;->select(c | c.oclIsKindOf(NamedElement))&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;->asOrderedSet()&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;->last().oclAsType(NamedElement).qualifiedName + '::' + self.name&#xA;&#x9;&#x9;&#x9;&#x9;endif&#xA;&#x9;&#x9;&#x9;else&#xA;&#x9;&#x9;&#x9;&#x9;self.name&#xA;&#x9;&#x9;&#x9;endif"/>

      </eAnnotations>

      </eAnnotations>

    </eStructuralFeatures>

    </eStructuralFeatures>

  </eClassifiers>

  </eClassifiers>
@@ -914,8 +914,7 @@ 
        <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestBehaviour::CombinedBehaviour.&lt;/p>"/>

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

      </eAnnotations>

      </eAnnotations>

    </eStructuralFeatures>

    </eStructuralFeatures>

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

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

        eType="#//Variable">

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

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

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

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

      </eAnnotations>

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

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

      </eAnnotations>

      </eAnnotations>

    </eStructuralFeatures>

    </eStructuralFeatures>

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

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

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

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

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

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

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

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

      </eAnnotations>

      </eAnnotations>