Commit 9a151669 authored by Martti Käärik's avatar Martti Käärik
Browse files

Created ConstraintType and Constraint meta-classes. Added DataType.constraint... 

Created ConstraintType and Constraint meta-classes. Added DataType.constraint and Member.constraint properties. Added SimpleDataType.extension property. Changed StructuredDataType.extension property multiplicity to *. Created EnumDataType meta-class. Added intValue and boolValue properties to LiteralValueUse.
parent 683218a4

TestDescriptionLanguage/tdl.notation

+1272 −608

File changed.

Preview size limit exceeded, changes collapsed.

TestDescriptionLanguage/tdl.uml

+86 −7
Original line number Diff line number Diff line
@@ -166,6 +166,29 @@ 
          </eAnnotations>

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

        </packagedElement>

        <packagedElement xmi:type="uml:Class" xmi:id="__9maYJxbEeuGmLQ6wlnetA" name="Constraint">

          <generalization xmi:id="_Fbo38Jx-EeuGmLQ6wlnetA" general="_oFvnIM5xEeKBmZvNr53Zng"/>

          <ownedAttribute xmi:id="_zWsWspx7EeuGmLQ6wlnetA" name="quantifier" type="_ySa5gEN-Eeq6JfofCdGheg" aggregation="composite" association="_zWrIkJx7EeuGmLQ6wlnetA">

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

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

          </ownedAttribute>

          <ownedAttribute xmi:id="_fBlM0Jx9EeuGmLQ6wlnetA" name="type" type="_0C9xYJx8EeuGmLQ6wlnetA" association="_fBj-sJx9EeuGmLQ6wlnetA"/>

        </packagedElement>

        <packagedElement xmi:type="uml:Association" xmi:id="_zWrIkJx7EeuGmLQ6wlnetA" memberEnd="_zWsWspx7EeuGmLQ6wlnetA _zWtk0Zx7EeuGmLQ6wlnetA">

          <eAnnotations xmi:id="_zWsWsJx7EeuGmLQ6wlnetA" source="org.eclipse.papyrus">

            <details xmi:id="_zWsWsZx7EeuGmLQ6wlnetA" key="nature" value="UML_Nature"/>

          </eAnnotations>

          <ownedEnd xmi:id="_zWtk0Zx7EeuGmLQ6wlnetA" name="typeconstraint" type="__9maYJxbEeuGmLQ6wlnetA" association="_zWrIkJx7EeuGmLQ6wlnetA"/>

        </packagedElement>

        <packagedElement xmi:type="uml:Association" xmi:id="_fBj-sJx9EeuGmLQ6wlnetA" memberEnd="_fBlM0Jx9EeuGmLQ6wlnetA _fBlM05x9EeuGmLQ6wlnetA">

          <eAnnotations xmi:id="_fBklwJx9EeuGmLQ6wlnetA" source="org.eclipse.papyrus">

            <details xmi:id="_fBklwZx9EeuGmLQ6wlnetA" key="nature" value="UML_Nature"/>

          </eAnnotations>

          <ownedEnd xmi:id="_fBlM05x9EeuGmLQ6wlnetA" name="typeconstraint" type="__9maYJxbEeuGmLQ6wlnetA" association="_fBj-sJx9EeuGmLQ6wlnetA"/>

        </packagedElement>

        <packagedElement xmi:type="uml:Class" xmi:id="_0C9xYJx8EeuGmLQ6wlnetA" name="ConstraintType">

          <generalization xmi:id="_I1_7cJx9EeuGmLQ6wlnetA" general="_4aQ_sM6LEeKrteq_aJ3viA"/>

        </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">
@@ -178,6 +201,10 @@ 
          </packagedElement>

          <packagedElement xmi:type="uml:Class" xmi:id="_DFaAoO4xEeKygtYz46QGBw" name="DataType" isAbstract="true">

            <generalization xmi:id="_X0UzIPIhEeOq9otiFnFvGw" general="_HSF58FwCEeOpPZNGJe-gDQ"/>

            <ownedAttribute xmi:id="_YnkZwpxcEeuGmLQ6wlnetA" name="constraint" type="__9maYJxbEeuGmLQ6wlnetA" aggregation="composite" association="_YnjysJxcEeuGmLQ6wlnetA">

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

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

            </ownedAttribute>

          </packagedElement>

          <packagedElement xmi:type="uml:Class" xmi:id="_GcA7sBRzEeOImOhKB9FC0A" name="DataResourceMapping">

            <generalization xmi:id="_wv3woBR4EeOImOhKB9FC0A" general="_4aQ_sM6LEeKrteq_aJ3viA"/>
@@ -224,6 +251,10 @@ 
          </packagedElement>

          <packagedElement xmi:type="uml:Class" xmi:id="_YchMsAwZEeSyW5TlhCAZUA" name="SimpleDataType">

            <generalization xmi:id="_7CkTUAwcEeSyW5TlhCAZUA" general="_DFaAoO4xEeKygtYz46QGBw"/>

            <ownedAttribute xmi:id="_eYo18pxbEeuGmLQ6wlnetA" name="extension" type="_Lp3BcEQEEeqBvYJaFSFI5A" aggregation="composite" association="_eYoO4JxbEeuGmLQ6wlnetA">

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

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

            </ownedAttribute>

          </packagedElement>

          <packagedElement xmi:type="uml:Class" xmi:id="_g0xJsAwcEeSyW5TlhCAZUA" name="SimpleDataInstance">

            <generalization xmi:id="_--mrEAwcEeSyW5TlhCAZUA" general="_--G8wOy_EeKqo4Ny4D-vKA"/>
@@ -236,7 +267,7 @@ 
            </ownedAttribute>

            <ownedAttribute 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"/>

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

            </ownedAttribute>

          </packagedElement>

          <packagedElement xmi:type="uml:Class" xmi:id="_OlvQoAwgEeSyW5TlhCAZUA" name="StructuredDataInstance">
@@ -268,6 +299,10 @@ 
              <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>

              <defaultValue xmi:type="uml:LiteralBoolean" xmi:id="_to0q0FU1EeSKSvvl7HQHkA" name="false"/>

            </ownedAttribute>

            <ownedAttribute xmi:id="_4aUSMJ3nEeuoZ4mf2LxKWg" name="constraint" type="__9maYJxbEeuGmLQ6wlnetA" aggregation="composite" association="_4aG20J3nEeuoZ4mf2LxKWg">

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

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

            </ownedAttribute>

          </packagedElement>

          <packagedElement xmi:type="uml:Association" xmi:id="_adyKwAwiEeSyW5TlhCAZUA" name="A_structuredDataType_member_1" memberEnd="_adyKwQwiEeSyW5TlhCAZUA _adoZwAwiEeSyW5TlhCAZUA">

            <ownedEnd xmi:id="_adyKwQwiEeSyW5TlhCAZUA" name="structuredDataType" type="_GPy5YAwgEeSyW5TlhCAZUA" isOrdered="true" association="_adyKwAwiEeSyW5TlhCAZUA">
@@ -428,6 +463,42 @@ 
            </eAnnotations>

            <ownedEnd xmi:id="_ZN8tUeSBEeWMb9h0hGvbqQ" name="datainstanceuse" type="_WJp7y2jrEeSGaIFXgYnwew" association="_ZN0KcOSBEeWMb9h0hGvbqQ"/>

          </packagedElement>

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

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

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

            </eAnnotations>

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

          </packagedElement>

          <packagedElement xmi:type="uml:Class" xmi:id="_V4hEcJxaEeuGmLQ6wlnetA" name="EnumDataType">

            <generalization xmi:id="_bMOZwJxaEeuGmLQ6wlnetA" general="_YchMsAwZEeSyW5TlhCAZUA"/>

            <ownedAttribute xmi:id="_gqh1gJxaEeuGmLQ6wlnetA" name="value" type="_g0xJsAwcEeSyW5TlhCAZUA" aggregation="composite" association="_gqdkEJxaEeuGmLQ6wlnetA">

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

            </ownedAttribute>

          </packagedElement>

          <packagedElement xmi:type="uml:Association" xmi:id="_gqdkEJxaEeuGmLQ6wlnetA" memberEnd="_gqh1gJxaEeuGmLQ6wlnetA _gqjDoZxaEeuGmLQ6wlnetA">

            <eAnnotations xmi:id="_gqgnYJxaEeuGmLQ6wlnetA" source="org.eclipse.papyrus">

              <details xmi:id="_gqhOcJxaEeuGmLQ6wlnetA" key="nature" value="UML_Nature"/>

            </eAnnotations>

            <ownedEnd xmi:id="_gqjDoZxaEeuGmLQ6wlnetA" name="enumdatatype" type="_V4hEcJxaEeuGmLQ6wlnetA" association="_gqdkEJxaEeuGmLQ6wlnetA"/>

          </packagedElement>

          <packagedElement xmi:type="uml:Association" xmi:id="_eYoO4JxbEeuGmLQ6wlnetA" memberEnd="_eYo18pxbEeuGmLQ6wlnetA _eYpdApxbEeuGmLQ6wlnetA">

            <eAnnotations xmi:id="_eYo18JxbEeuGmLQ6wlnetA" source="org.eclipse.papyrus">

              <details xmi:id="_eYo18ZxbEeuGmLQ6wlnetA" key="nature" value="UML_Nature"/>

            </eAnnotations>

            <ownedEnd xmi:id="_eYpdApxbEeuGmLQ6wlnetA" name="simpledatatype" type="_YchMsAwZEeSyW5TlhCAZUA" association="_eYoO4JxbEeuGmLQ6wlnetA"/>

          </packagedElement>

          <packagedElement xmi:type="uml:Association" xmi:id="_YnjysJxcEeuGmLQ6wlnetA" memberEnd="_YnkZwpxcEeuGmLQ6wlnetA _YnlA0pxcEeuGmLQ6wlnetA">

            <eAnnotations xmi:id="_YnkZwJxcEeuGmLQ6wlnetA" source="org.eclipse.papyrus">

              <details xmi:id="_YnkZwZxcEeuGmLQ6wlnetA" key="nature" value="UML_Nature"/>

            </eAnnotations>

            <ownedEnd xmi:id="_YnlA0pxcEeuGmLQ6wlnetA" name="datatype" type="_DFaAoO4xEeKygtYz46QGBw" association="_YnjysJxcEeuGmLQ6wlnetA"/>

          </packagedElement>

          <packagedElement xmi:type="uml:Association" xmi:id="_4aG20J3nEeuoZ4mf2LxKWg" memberEnd="_4aUSMJ3nEeuoZ4mf2LxKWg _4aUSM53nEeuoZ4mf2LxKWg">

            <eAnnotations xmi:id="_4aQn0J3nEeuoZ4mf2LxKWg" source="org.eclipse.papyrus">

              <details xmi:id="_4aQn0Z3nEeuoZ4mf2LxKWg" key="nature" value="UML_Nature"/>

            </eAnnotations>

            <ownedEnd xmi:id="_4aUSM53nEeuoZ4mf2LxKWg" name="member" type="_2PvEMAwhEeSyW5TlhCAZUA" association="_4aG20J3nEeuoZ4mf2LxKWg"/>

          </packagedElement>

        </packagedElement>

        <packagedElement xmi:type="uml:Package" xmi:id="_u2zt4HlFEeSVko5r_SJ_NA" name="DataUse">

          <packagedElement xmi:type="uml:Class" xmi:id="_Er2MgFRwEeSK7t9cQ4MpAA" name="DynamicDataUse" isAbstract="true">
@@ -645,11 +716,22 @@ 
            <generalization xmi:id="_ySa5gUN-Eeq6JfofCdGheg" general="_WJp7wGjrEeSGaIFXgYnwew"/>

            <ownedAttribute xmi:id="_kmdqYEN_Eeq6JfofCdGheg" name="value" visibility="public" isUnique="false">

              <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>

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

            </ownedAttribute>

            <ownedAttribute xmi:id="_uKPl8EP8EeqBvYJaFSFI5A" name="dataType" type="_DFaAoO4xEeKygtYz46QGBw" association="_uKLUgEP8EeqBvYJaFSFI5A">

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

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

            </ownedAttribute>

            <ownedAttribute xmi:id="_05M30JxmEeuGmLQ6wlnetA" name="intValue" isUnique="false">

              <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

              <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_hrc8oJx-EeuGmLQ6wlnetA"/>

              <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_hp9u4Jx-EeuGmLQ6wlnetA" value="*"/>

            </ownedAttribute>

            <ownedAttribute xmi:id="_RP9ewJx3EeuGmLQ6wlnetA" name="boolValue" isUnique="false">

              <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>

              <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_hrWO8Jx-EeuGmLQ6wlnetA"/>

              <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_hpzW0Jx-EeuGmLQ6wlnetA" value="*"/>

            </ownedAttribute>

          </packagedElement>

          <packagedElement xmi:type="uml:Association" xmi:id="_uKLUgEP8EeqBvYJaFSFI5A" name="A_LiteralValueUse_DataType" memberEnd="_uKPl8EP8EeqBvYJaFSFI5A _uKQ0EUP8EeqBvYJaFSFI5A">

            <eAnnotations xmi:id="_uKOX0EP8EeqBvYJaFSFI5A" source="org.eclipse.papyrus">
@@ -658,12 +740,6 @@ 
            <ownedEnd xmi:id="_uKQ0EUP8EeqBvYJaFSFI5A" name="literalvalueuse" type="_ySa5gEN-Eeq6JfofCdGheg" association="_uKLUgEP8EeqBvYJaFSFI5A"/>

          </packagedElement>

        </packagedElement>

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

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

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

          </eAnnotations>

          <ownedEnd 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">
@@ -2188,4 +2264,7 @@ 
  <standard:Metaclass xmi:id="_FexvcJCIEeqtm5xS3r5AoA" base_Class="_mj-8wC_5EeeNhaZdcDdRHA"/>

  <standard:Metaclass xmi:id="_3JgdkJCIEeqtm5xS3r5AoA" base_Class="_fWtvoN_REeWUQZfFL-B5gw"/>

  <standard:Metaclass xmi:id="_4KnVQJCIEeqtm5xS3r5AoA" base_Class="_JZnmMN_REeWUQZfFL-B5gw"/>

  <standard:Metaclass xmi:id="_V5AzsJxaEeuGmLQ6wlnetA" base_Class="_V4hEcJxaEeuGmLQ6wlnetA"/>

  <standard:Metaclass xmi:id="__9pdsJxbEeuGmLQ6wlnetA" base_Class="__9maYJxbEeuGmLQ6wlnetA"/>

  <standard:Metaclass xmi:id="_0C_mmpx8EeuGmLQ6wlnetA" base_Class="_0C9xYJx8EeuGmLQ6wlnetA"/>

</xmi:XMI>