Commit 18ec4487 authored by Martti Käärik's avatar Martti Käärik
Browse files

Added extension property to AnnotationType, StructuredDataType, ComponentType... 

Added extension property to AnnotationType, StructuredDataType, ComponentType and GateType + updated Miscellaneous, StructuredData and ConfigTypes diagrams.
parent 426a670f

TestDescriptionLanguage/tdl.notation

+1224 −788

File changed.

Preview size limit exceeded, changes collapsed.

TestDescriptionLanguage/tdl.uml

+40 −0
Original line number Diff line number Diff line
@@ -116,6 +116,10 @@ 
        </packagedElement>

        <packagedElement xmi:type="uml:Class" xmi:id="_xmeZMBQPEeOImOhKB9FC0A" name="AnnotationType">

          <generalization xmi:type="uml:Generalization" xmi:id="_8cqfoBQPEeOImOhKB9FC0A" general="_4aQ_sM6LEeKrteq_aJ3viA"/>

          <ownedAttribute xmi:type="uml:Property" xmi:id="_Pva1sEQREeqBvYJaFSFI5A" name="extension" type="_Lp3BcEQEEeqBvYJaFSFI5A" aggregation="composite" association="_PvZnkEQREeqBvYJaFSFI5A">

            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Pva1sUQREeqBvYJaFSFI5A"/>

            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Pva1skQREeqBvYJaFSFI5A" value="1"/>

          </ownedAttribute>

        </packagedElement>

        <packagedElement xmi:type="uml:Association" xmi:id="_zL3psBQPEeOImOhKB9FC0A" name="annotation_annotationType_1" memberEnd="_zL3psRQPEeOImOhKB9FC0A _zLzYQBQPEeOImOhKB9FC0A">

          <ownedEnd xmi:type="uml:Property" xmi:id="_zL3psRQPEeOImOhKB9FC0A" name="annotation" type="_fNbZQM6KEeKrteq_aJ3viA" association="_zL3psBQPEeOImOhKB9FC0A">
@@ -156,6 +160,12 @@ 
          </eAnnotations>

          <ownedEnd xmi:type="uml:Property" xmi:id="_gpcZwUQEEeqBvYJaFSFI5A" name="extension" type="_Lp3BcEQEEeqBvYJaFSFI5A" association="_gpbLoEQEEeqBvYJaFSFI5A"/>

        </packagedElement>

        <packagedElement xmi:type="uml:Association" xmi:id="_PvZnkEQREeqBvYJaFSFI5A" memberEnd="_Pva1sEQREeqBvYJaFSFI5A _Pva1s0QREeqBvYJaFSFI5A">

          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PvaOoEQREeqBvYJaFSFI5A" source="org.eclipse.papyrus">

            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PvaOoUQREeqBvYJaFSFI5A" key="nature" value="UML_Nature"/>

          </eAnnotations>

          <ownedEnd xmi:type="uml:Property" xmi:id="_Pva1s0QREeqBvYJaFSFI5A" name="annotationtype" type="_xmeZMBQPEeOImOhKB9FC0A" association="_PvZnkEQREeqBvYJaFSFI5A"/>

        </packagedElement>

      </packagedElement>

      <packagedElement xmi:type="uml:Package" xmi:id="_7URIQOy_EeKqo4Ny4D-vKA" name="Data">

        <packagedElement xmi:type="uml:Package" xmi:id="_R1-b8HlFEeSVko5r_SJ_NA" name="DataDefinition">
@@ -224,6 +234,10 @@ 
              <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_adoZwQwiEeSyW5TlhCAZUA"/>

              <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_adoZwgwiEeSyW5TlhCAZUA" value="*"/>

            </ownedAttribute>

            <ownedAttribute xmi:type="uml:Property" xmi:id="_T3uc8kQTEeqBvYJaFSFI5A" name="extension" type="_Lp3BcEQEEeqBvYJaFSFI5A" aggregation="composite" association="_T3t14EQTEeqBvYJaFSFI5A">

              <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_T3uc80QTEeqBvYJaFSFI5A"/>

              <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_T3uc9EQTEeqBvYJaFSFI5A" value="1"/>

            </ownedAttribute>

          </packagedElement>

          <packagedElement xmi:type="uml:Class" xmi:id="_OlvQoAwgEeSyW5TlhCAZUA" name="StructuredDataInstance">

            <generalization xmi:type="uml:Generalization" xmi:id="_Z9GqIAwjEeSyW5TlhCAZUA" general="_--G8wOy_EeKqo4Ny4D-vKA"/>
@@ -644,6 +658,12 @@ 
            <ownedEnd xmi:type="uml:Property" xmi:id="_uKQ0EUP8EeqBvYJaFSFI5A" name="literalvalueuse" type="_ySa5gEN-Eeq6JfofCdGheg" association="_uKLUgEP8EeqBvYJaFSFI5A"/>

          </packagedElement>

        </packagedElement>

        <packagedElement xmi:type="uml:Association" xmi:id="_T3t14EQTEeqBvYJaFSFI5A" memberEnd="_T3uc8kQTEeqBvYJaFSFI5A _T3uc9UQTEeqBvYJaFSFI5A">

          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_T3uc8EQTEeqBvYJaFSFI5A" source="org.eclipse.papyrus">

            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_T3uc8UQTEeqBvYJaFSFI5A" key="nature" value="UML_Nature"/>

          </eAnnotations>

          <ownedEnd xmi:type="uml:Property" xmi:id="_T3uc9UQTEeqBvYJaFSFI5A" name="structureddatainstance" type="_GPy5YAwgEeSyW5TlhCAZUA" association="_T3t14EQTEeqBvYJaFSFI5A"/>

        </packagedElement>

      </packagedElement>

      <packagedElement xmi:type="uml:Package" xmi:id="_wKKK0OzAEeKqo4Ny4D-vKA" name="Time">

        <packagedElement xmi:type="uml:Class" xmi:id="_EX8C4iH4EeSpDonUzsDrRg" name="Time">
@@ -798,6 +818,10 @@ 
            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_6dFywRmFEeSoEOoWvEZQEA"/>

            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_6dFywhmFEeSoEOoWvEZQEA" value="*"/>

          </ownedAttribute>

          <ownedAttribute xmi:type="uml:Property" xmi:id="__wpIAkQUEeqBvYJaFSFI5A" name="extension" type="_Lp3BcEQEEeqBvYJaFSFI5A" aggregation="composite" association="__wog8EQUEeqBvYJaFSFI5A">

            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="__wpIA0QUEeqBvYJaFSFI5A"/>

            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="__wpIBEQUEeqBvYJaFSFI5A" value="1"/>

          </ownedAttribute>

        </packagedElement>

        <packagedElement xmi:type="uml:Class" xmi:id="_50dQEO7oEeKEI7DGGPzGog" name="TestConfiguration">

          <generalization xmi:type="uml:Generalization" xmi:id="_D7uesAr7EeOfdc1Ie2nqvA" general="_4aQ_sM6LEeKrteq_aJ3viA"/>
@@ -842,6 +866,10 @@ 
            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_x3t1MtaJEeedNORd7vYpsg" value="1"/>

            <defaultValue xmi:type="uml:InstanceValue" xmi:id="_Foq3MNaKEeedNORd7vYpsg" instance="_ZLDHIdaJEeedNORd7vYpsg"/>

          </ownedAttribute>

          <ownedAttribute xmi:type="uml:Property" xmi:id="_-NaaskQUEeqBvYJaFSFI5A" name="extension" type="_Lp3BcEQEEeqBvYJaFSFI5A" aggregation="composite" association="_-NZzoEQUEeqBvYJaFSFI5A">

            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_-Naas0QUEeqBvYJaFSFI5A"/>

            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_-NaatEQUEeqBvYJaFSFI5A" value="1"/>

          </ownedAttribute>

        </packagedElement>

        <packagedElement xmi:type="uml:Association" xmi:id="_f7yhkO7rEeKEI7DGGPzGog" name="gate_dataInstance_2" memberEnd="_f7yhke7rEeKEI7DGGPzGog _f7u3MO7rEeKEI7DGGPzGog">

          <ownedEnd xmi:type="uml:Property" xmi:id="_f7yhke7rEeKEI7DGGPzGog" name="gateType" type="_on-ggO7pEeKEI7DGGPzGog" isUnique="false" association="_f7yhkO7rEeKEI7DGGPzGog">
@@ -935,6 +963,18 @@ 
          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ZLDHIdaJEeedNORd7vYpsg" name="Message"/>

          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ZLDHItaJEeedNORd7vYpsg" name="Procedure"/>

        </packagedElement>

        <packagedElement xmi:type="uml:Association" xmi:id="_-NZzoEQUEeqBvYJaFSFI5A" memberEnd="_-NaaskQUEeqBvYJaFSFI5A _-NbBwEQUEeqBvYJaFSFI5A">

          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-NaasEQUEeqBvYJaFSFI5A" source="org.eclipse.papyrus">

            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-NaasUQUEeqBvYJaFSFI5A" key="nature" value="UML_Nature"/>

          </eAnnotations>

          <ownedEnd xmi:type="uml:Property" xmi:id="_-NbBwEQUEeqBvYJaFSFI5A" name="gatetype" type="_on-ggO7pEeKEI7DGGPzGog" association="_-NZzoEQUEeqBvYJaFSFI5A"/>

        </packagedElement>

        <packagedElement xmi:type="uml:Association" xmi:id="__wog8EQUEeqBvYJaFSFI5A" memberEnd="__wpIAkQUEeqBvYJaFSFI5A __wpIBUQUEeqBvYJaFSFI5A">

          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__wpIAEQUEeqBvYJaFSFI5A" source="org.eclipse.papyrus">

            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__wpIAUQUEeqBvYJaFSFI5A" key="nature" value="UML_Nature"/>

          </eAnnotations>

          <ownedEnd xmi:type="uml:Property" xmi:id="__wpIBUQUEeqBvYJaFSFI5A" name="componenttype" type="_xv8nEO7oEeKEI7DGGPzGog" association="__wog8EQUEeqBvYJaFSFI5A"/>

        </packagedElement>

      </packagedElement>

      <packagedElement xmi:type="uml:Package" xmi:id="_rPlOAO6_EeKIkeRJcyj9VQ" name="TestBehaviour">

        <packagedElement xmi:type="uml:Package" xmi:id="_Sl6asO7tEeKEI7DGGPzGog" name="TestDescription">