Commit 7a8061de authored by Philip Makedonski's avatar Philip Makedonski
Browse files

+ added CollectionDataInstance.unassignedMember

parent 144e74a1

TestDescriptionLanguage/tdl.notation

+12 −7
Original line number Original line Diff line number Diff line
@@ -19320,6 +19320,10 @@ 
        <layoutConstraint xmi:type="notation:Location" xmi:id="_j75RpDAkEeerxdvNBlW7Qw" y="5"/>

        <layoutConstraint xmi:type="notation:Location" xmi:id="_j75RpDAkEeerxdvNBlW7Qw" y="5"/>

      </children>

      </children>

      <children xmi:type="notation:BasicCompartment" xmi:id="_j75RpTAkEeerxdvNBlW7Qw" type="Class_AttributeCompartment">

      <children xmi:type="notation:BasicCompartment" xmi:id="_j75RpTAkEeerxdvNBlW7Qw" type="Class_AttributeCompartment">

        <children xmi:type="notation:Shape" xmi:id="_Wu-FsFjjEeyDQfQJnzjHjg" type="Property_ClassAttributeLabel">

          <element xmi:type="uml:Property" href="tdl.uml#_WuPF4FjjEeyDQfQJnzjHjg"/>

          <layoutConstraint xmi:type="notation:Location" xmi:id="_Wu-FsVjjEeyDQfQJnzjHjg"/>

        </children>

        <styles xmi:type="notation:TitleStyle" xmi:id="_j75RpjAkEeerxdvNBlW7Qw"/>

        <styles xmi:type="notation:TitleStyle" xmi:id="_j75RpjAkEeerxdvNBlW7Qw"/>

        <styles xmi:type="notation:SortingStyle" xmi:id="_j75RpzAkEeerxdvNBlW7Qw"/>

        <styles xmi:type="notation:SortingStyle" xmi:id="_j75RpzAkEeerxdvNBlW7Qw"/>

        <styles xmi:type="notation:FilteringStyle" xmi:id="_j75RqDAkEeerxdvNBlW7Qw"/>

        <styles xmi:type="notation:FilteringStyle" xmi:id="_j75RqDAkEeerxdvNBlW7Qw"/>
@@ -19338,7 +19342,7 @@ 
        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j75RszAkEeerxdvNBlW7Qw"/>

        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j75RszAkEeerxdvNBlW7Qw"/>

      </children>

      </children>

      <element xmi:type="uml:Class" href="tdl.uml#_j7zLADAkEeerxdvNBlW7Qw"/>

      <element xmi:type="uml:Class" href="tdl.uml#_j7zLADAkEeerxdvNBlW7Qw"/>

      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j75RoTAkEeerxdvNBlW7Qw" x="360" y="280" width="131" height="61"/>

      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j75RoTAkEeerxdvNBlW7Qw" x="360" y="280" width="291" height="61"/>

    </children>

    </children>

    <children xmi:type="notation:Shape" xmi:id="_pHxgoDAkEeerxdvNBlW7Qw" type="Class_Shape">

    <children xmi:type="notation:Shape" xmi:id="_pHxgoDAkEeerxdvNBlW7Qw" type="Class_Shape">

      <children xmi:type="notation:DecorationNode" xmi:id="_pHxgojAkEeerxdvNBlW7Qw" type="Class_NameLabel"/>

      <children xmi:type="notation:DecorationNode" xmi:id="_pHxgojAkEeerxdvNBlW7Qw" type="Class_NameLabel"/>
@@ -19538,7 +19542,7 @@ 
        <stringListValue>referenced</stringListValue>

        <stringListValue>referenced</stringListValue>

      </styles>

      </styles>

      <element xmi:type="uml:Class" href="tdl.uml#_DFaAoO4xEeKygtYz46QGBw"/>

      <element xmi:type="uml:Class" href="tdl.uml#_DFaAoO4xEeKygtYz46QGBw"/>

      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rg2a4ZMLEeevTcyijWh1sA" x="580" y="176" width="141" height="63"/>

      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rg2a4ZMLEeevTcyijWh1sA" x="670" y="176" width="141" height="63"/>

    </children>

    </children>

    <children xmi:type="notation:Shape" xmi:id="_81JNNZMLEeevTcyijWh1sA" type="Class_Shape">

    <children xmi:type="notation:Shape" xmi:id="_81JNNZMLEeevTcyijWh1sA" type="Class_Shape">

      <children xmi:type="notation:DecorationNode" xmi:id="_81JNOZMLEeevTcyijWh1sA" type="Class_NameLabel"/>

      <children xmi:type="notation:DecorationNode" xmi:id="_81JNOZMLEeevTcyijWh1sA" type="Class_NameLabel"/>
@@ -19564,12 +19568,12 @@ 
        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_81PT35MLEeevTcyijWh1sA"/>

        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_81PT35MLEeevTcyijWh1sA"/>

      </children>

      </children>

      <element xmi:type="uml:Class" href="tdl.uml#_81JNMJMLEeevTcyijWh1sA"/>

      <element xmi:type="uml:Class" href="tdl.uml#_81JNMJMLEeevTcyijWh1sA"/>

      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_81PT7pMLEeevTcyijWh1sA" x="580" y="280" width="141" height="61"/>

      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_81PT7pMLEeevTcyijWh1sA" x="670" y="280" width="141" height="61"/>

    </children>

    </children>

    <children xmi:type="notation:Shape" xmi:id="_HGDIQFINEeytR_qPigAF5g" type="Comment_Shape" fillColor="8905185">

    <children xmi:type="notation:Shape" xmi:id="_HGDIQFINEeytR_qPigAF5g" type="Comment_Shape" fillColor="8905185">

      <children xmi:type="notation:DecorationNode" xmi:id="_HGJ18FINEeytR_qPigAF5g" type="Comment_BodyLabel"/>

      <children xmi:type="notation:DecorationNode" xmi:id="_HGJ18FINEeytR_qPigAF5g" type="Comment_BodyLabel"/>

      <element xmi:type="uml:Comment" href="tdl.uml#_HFr74FINEeytR_qPigAF5g"/>

      <element xmi:type="uml:Comment" href="tdl.uml#_HFr74FINEeytR_qPigAF5g"/>

      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HGDvUFINEeytR_qPigAF5g" x="160" y="360" width="249"/>

      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HGDvUFINEeytR_qPigAF5g" x="160" y="360" width="261"/>

    </children>

    </children>

    <children xmi:type="notation:Shape" xmi:id="_AZJAUFgsEeyjNoYeZICQvw" type="Class_Shape">

    <children xmi:type="notation:Shape" xmi:id="_AZJAUFgsEeyjNoYeZICQvw" type="Class_Shape">

      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_AZJnYFgsEeyjNoYeZICQvw" source="PapyrusCSSForceValue">

      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_AZJnYFgsEeyjNoYeZICQvw" source="PapyrusCSSForceValue">
@@ -19666,7 +19670,7 @@ 
      <styles xmi:type="notation:FontStyle" xmi:id="_sN2gwTAkEeerxdvNBlW7Qw"/>

      <styles xmi:type="notation:FontStyle" xmi:id="_sN2gwTAkEeerxdvNBlW7Qw"/>

      <element xmi:type="uml:Generalization" href="tdl.uml#_sNwaIDAkEeerxdvNBlW7Qw"/>

      <element xmi:type="uml:Generalization" href="tdl.uml#_sNwaIDAkEeerxdvNBlW7Qw"/>

      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sN2gwjAkEeerxdvNBlW7Qw" points="[446, 280, -643984, -643984]$[446, 241, -643984, -643984]"/>

      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sN2gwjAkEeerxdvNBlW7Qw" points="[446, 280, -643984, -643984]$[446, 241, -643984, -643984]"/>

      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sOI0oDAkEeerxdvNBlW7Qw" id="(0.6106870229007634,0.0)"/>

      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sOI0oDAkEeerxdvNBlW7Qw" id="(0.27491408934707906,0.0)"/>

      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sOI0oTAkEeerxdvNBlW7Qw" id="(0.6106870229007634,1.0)"/>

      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sOI0oTAkEeerxdvNBlW7Qw" id="(0.6106870229007634,1.0)"/>

    </edges>

    </edges>

    <edges xmi:type="notation:Connector" xmi:id="_hW59xIaGEeel4O4Esmz2Bg" type="StereotypeCommentLink" target="_hW59wIaGEeel4O4Esmz2Bg">

    <edges xmi:type="notation:Connector" xmi:id="_hW59xIaGEeel4O4Esmz2Bg" type="StereotypeCommentLink" target="_hW59wIaGEeel4O4Esmz2Bg">
@@ -19849,11 +19853,12 @@ 
    </edges>

    </edges>

    <edges xmi:type="notation:Connector" xmi:id="_jPTwkJMNEeevTcyijWh1sA" type="Generalization_Edge" source="_81JNNZMLEeevTcyijWh1sA" target="_rg2a4JMLEeevTcyijWh1sA">

    <edges xmi:type="notation:Connector" xmi:id="_jPTwkJMNEeevTcyijWh1sA" type="Generalization_Edge" source="_81JNNZMLEeevTcyijWh1sA" target="_rg2a4JMLEeevTcyijWh1sA">

      <children xmi:type="notation:DecorationNode" xmi:id="_jPTwk5MNEeevTcyijWh1sA" type="Generalization_StereotypeLabel">

      <children xmi:type="notation:DecorationNode" xmi:id="_jPTwk5MNEeevTcyijWh1sA" type="Generalization_StereotypeLabel">

        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Z7z1IFjjEeyDQfQJnzjHjg" name="IS_UPDATED_POSITION" booleanValue="true"/>

        <layoutConstraint xmi:type="notation:Location" xmi:id="_jPTwlJMNEeevTcyijWh1sA" y="40"/>

        <layoutConstraint xmi:type="notation:Location" xmi:id="_jPTwlJMNEeevTcyijWh1sA" y="40"/>

      </children>

      </children>

      <styles xmi:type="notation:FontStyle" xmi:id="_jPTwkZMNEeevTcyijWh1sA"/>

      <styles xmi:type="notation:FontStyle" xmi:id="_jPTwkZMNEeevTcyijWh1sA"/>

      <element xmi:type="uml:Generalization" href="tdl.uml#_jPHjUJMNEeevTcyijWh1sA"/>

      <element xmi:type="uml:Generalization" href="tdl.uml#_jPHjUJMNEeevTcyijWh1sA"/>

      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jPTwkpMNEeevTcyijWh1sA" points="[677, 280, -643984, -643984]$[677, 239, -643984, -643984]"/>

      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jPTwkpMNEeevTcyijWh1sA" points="[767, 280, -643984, -643984]$[767, 239, -643984, -643984]"/>

      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jPsLEJMNEeevTcyijWh1sA" id="(0.5673758865248227,0.0)"/>

      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jPsLEJMNEeevTcyijWh1sA" id="(0.5673758865248227,0.0)"/>

      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jPsLEZMNEeevTcyijWh1sA" id="(0.5673758865248227,1.0)"/>

      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jPsLEZMNEeevTcyijWh1sA" id="(0.5673758865248227,1.0)"/>

    </edges>

    </edges>
@@ -19921,7 +19926,7 @@ 
      </children>

      </children>

      <styles xmi:type="notation:FontStyle" xmi:id="_CaKL4ZBcEeqtm5xS3r5AoA"/>

      <styles xmi:type="notation:FontStyle" xmi:id="_CaKL4ZBcEeqtm5xS3r5AoA"/>

      <element xmi:type="uml:Association" href="tdl.uml#_qim_EJMNEeevTcyijWh1sA"/>

      <element xmi:type="uml:Association" href="tdl.uml#_qim_EJMNEeevTcyijWh1sA"/>

      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_CaKL4pBcEeqtm5xS3r5AoA" points="[746, 310, -643984, -643984]$[810, 310, -643984, -643984]$[810, 207, -643984, -643984]$[724, 207, -643984, -643984]"/>

      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_CaKL4pBcEeqtm5xS3r5AoA" points="[836, 310, -643984, -643984]$[900, 310, -643984, -643984]$[900, 207, -643984, -643984]$[814, 207, -643984, -643984]"/>

      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_DGtv4JBcEeqtm5xS3r5AoA" id="(1.0,0.4918032786885246)"/>

      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_DGtv4JBcEeqtm5xS3r5AoA" id="(1.0,0.4918032786885246)"/>

      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_DGtv4ZBcEeqtm5xS3r5AoA" id="(1.0,0.49206349206349204)"/>

      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_DGtv4ZBcEeqtm5xS3r5AoA" id="(1.0,0.49206349206349204)"/>

    </edges>

    </edges>

TestDescriptionLanguage/tdl.uml

+7 −1
Original line number Original line Diff line number Diff line
@@ -242,7 +242,8 @@ covers most cases 
        <packagedElement xmi:type="uml:Package" xmi:id="_R1-b8HlFEeSVko5r_SJ_NA" name="DataDefinition">

        <packagedElement xmi:type="uml:Package" xmi:id="_R1-b8HlFEeSVko5r_SJ_NA" name="DataDefinition">

          <ownedComment xmi:type="uml:Comment" xmi:id="_HFr74FINEeytR_qPigAF5g">

          <ownedComment xmi:type="uml:Comment" xmi:id="_HFr74FINEeytR_qPigAF5g">

            <body>Change Log:

            <body>Change Log:

- CollectionDataInstance.item changed to DataUse</body>

- CollectionDataInstance.item changed to DataUse

- Added CollectionDataInstance.unassignedMember</body>

          </ownedComment>

          </ownedComment>

          <packagedElement xmi:type="uml:Class" xmi:id="_--G8wOy_EeKqo4Ny4D-vKA" name="DataInstance" isAbstract="true">

          <packagedElement xmi:type="uml:Class" xmi:id="_--G8wOy_EeKqo4Ny4D-vKA" name="DataInstance" isAbstract="true">

            <generalization xmi:type="uml:Generalization" xmi:id="_qegJcDM_EeSy59ljSot60w" general="_HSF58FwCEeOpPZNGJe-gDQ"/>

            <generalization xmi:type="uml:Generalization" xmi:id="_qegJcDM_EeSy59ljSot60w" general="_HSF58FwCEeOpPZNGJe-gDQ"/>
@@ -479,6 +480,11 @@ covers most cases 
              <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_727HYDAkEeerxdvNBlW7Qw"/>

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

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

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

            </ownedAttribute>

            </ownedAttribute>

            <ownedAttribute xmi:type="uml:Property" xmi:id="_WuPF4FjjEeyDQfQJnzjHjg" name="unassignedMember" visibility="public" type="_mEj6wOR-EeWMb9h0hGvbqQ" isUnique="false">

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

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

              <defaultValue xmi:type="uml:LiteralString" xmi:id="_WuQ7EFjjEeyDQfQJnzjHjg"/>

            </ownedAttribute>

          </packagedElement>

          </packagedElement>

          <packagedElement xmi:type="uml:Association" xmi:id="_376qYDAkEeerxdvNBlW7Qw" name="A_collectionDatatInstance_member" memberEnd="_38AxAjAkEeerxdvNBlW7Qw _38AxAzAkEeerxdvNBlW7Qw">

          <packagedElement xmi:type="uml:Association" xmi:id="_376qYDAkEeerxdvNBlW7Qw" name="A_collectionDatatInstance_member" memberEnd="_38AxAjAkEeerxdvNBlW7Qw _38AxAzAkEeerxdvNBlW7Qw">

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

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