Commit 00d5182f authored by Philip Makedonski's avatar Philip Makedonski
Browse files

* Meta-model refinements

* StaticDataUse -> DataUse in different contexts
parent ef0c6d7c
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -240,7 +240,8 @@ covers most cases
</ownedComment>
<packagedElement xmi:type="uml:Package" xmi:id="_R1-b8HlFEeSVko5r_SJ_NA" name="DataDefinition">
<ownedComment xmi:type="uml:Comment" xmi:id="_HFr74FINEeytR_qPigAF5g">
<body>This shall point to DataUse</body>
<body>Change Log:
- CollectionDataInstance.item changed to DataUse</body>
</ownedComment>
<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"/>
......@@ -473,7 +474,7 @@ covers most cases
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="_j7zLADAkEeerxdvNBlW7Qw" name="CollectionDataInstance">
<generalization xmi:type="uml:Generalization" xmi:id="_sNwaIDAkEeerxdvNBlW7Qw" general="_--G8wOy_EeKqo4Ny4D-vKA"/>
<ownedAttribute xmi:type="uml:Property" xmi:id="_38AxAjAkEeerxdvNBlW7Qw" name="item" type="_WJp7wGjrEeSGaIFXgYnwew" isOrdered="true" aggregation="composite" association="_376qYDAkEeerxdvNBlW7Qw">
<ownedAttribute xmi:type="uml:Property" xmi:id="_38AxAjAkEeerxdvNBlW7Qw" name="item" type="_WJp72GjrEeSGaIFXgYnwew" isOrdered="true" aggregation="composite" association="_376qYDAkEeerxdvNBlW7Qw">
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_727HYDAkEeerxdvNBlW7Qw"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_73NbQDAkEeerxdvNBlW7Qw" value="*"/>
</ownedAttribute>
......@@ -1203,6 +1204,11 @@ covers most cases
</packagedElement>
</packagedElement>
<packagedElement xmi:type="uml:Package" xmi:id="_UI9FUO7uEeKEI7DGGPzGog" name="CombinedBehaviour">
<ownedComment xmi:type="uml:Comment" xmi:id="_Oo_zQFgWEeyjNoYeZICQvw">
<body>Change Log:
- Changed VerdictAssignment.verdict to DataUse
</body>
</ownedComment>
<packagedElement xmi:type="uml:Class" xmi:id="_ZGOQkO7uEeKEI7DGGPzGog" name="Behaviour" isAbstract="true">
<generalization xmi:type="uml:Generalization" xmi:id="_3YCKoEhxEeOIBu03wL3k1g" general="_oFvnIM5xEeKBmZvNr53Zng"/>
<ownedAttribute xmi:type="uml:Property" xmi:id="_n0tbYFRqEeSGV_4El4z6Og" name="testObjective" type="_wZOBAAr9EeOfdc1Ie2nqvA" association="_n0tbY1RqEeSGV_4El4z6Og">
......@@ -1419,6 +1425,11 @@ covers most cases
</packagedElement>
</packagedElement>
<packagedElement xmi:type="uml:Package" xmi:id="_u99A8FOkEeSBn4xehKK8og" name="AtomicBehaviour">
<ownedComment xmi:type="uml:Comment" xmi:id="_hj2t0FL_EeytR_qPigAF5g">
<body>ChangeLog:
- Switched superclass of Assignment to AtomicBehaviour
- Note that Assertion.otherwise is already DataUse (vs StaticDataUse in Part 1)</body>
</ownedComment>
<packagedElement xmi:type="uml:Class" xmi:id="_KEb28O7vEeKEI7DGGPzGog" name="AtomicBehaviour" isAbstract="true">
<generalization xmi:type="uml:Generalization" xmi:id="_NDx88O7vEeKEI7DGGPzGog" general="_ZGOQkO7uEeKEI7DGGPzGog"/>
<ownedAttribute xmi:type="uml:Property" xmi:id="_Nzuj4DqOEeSb8urlu7a6kg" name="timeConstraint" type="_VOxK4O-_EeKh3utQwSgWiA" aggregation="composite" association="_Q27RFFOmEeSBn4xehKK8og">
......@@ -1432,7 +1443,7 @@ covers most cases
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="_Q2xgEFOmEeSBn4xehKK8og" name="VerdictAssignment">
<generalization xmi:type="uml:Generalization" xmi:id="_7FMYMFOnEeSBn4xehKK8og" general="_KEb28O7vEeKEI7DGGPzGog"/>
<ownedAttribute xmi:type="uml:Property" xmi:id="__aFfYFOoEeSBn4xehKK8og" name="verdict" type="_WJp7wGjrEeSGaIFXgYnwew" aggregation="composite" association="__aHUkFOoEeSBn4xehKK8og">
<ownedAttribute xmi:type="uml:Property" xmi:id="__aFfYFOoEeSBn4xehKK8og" name="verdict" type="_WJp72GjrEeSGaIFXgYnwew" aggregation="composite" association="__aHUkFOoEeSBn4xehKK8og">
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="__aFfYVOoEeSBn4xehKK8og" value="1"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="__aFfYlOoEeSBn4xehKK8og" value="1"/>
</ownedAttribute>
......@@ -1455,7 +1466,7 @@ covers most cases
<generalization xmi:type="uml:Generalization" xmi:id="_Q21KdVOmEeSBn4xehKK8og" general="_KEb28O7vEeKEI7DGGPzGog"/>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="_Q24NwFOmEeSBn4xehKK8og" name="Assignment">
<generalization xmi:type="uml:Generalization" xmi:id="_IKFQ8GpIEeSDq-zbplWUsQ" general="_wlN3oFR-EeSGV_4El4z6Og"/>
<generalization xmi:type="uml:Generalization" xmi:id="_IKFQ8GpIEeSDq-zbplWUsQ" general="_KEb28O7vEeKEI7DGGPzGog"/>
<ownedAttribute xmi:type="uml:Property" xmi:id="_Q24NwlOmEeSBn4xehKK8og" name="variable" type="_wpPAcFU4EeSayvSxECItWQ" aggregation="composite" association="_Q2400FOmEeSBn4xehKK8og">
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Q24Nw1OmEeSBn4xehKK8og" value="1"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Q24NxFOmEeSBn4xehKK8og" value="1"/>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment