commit | 6dfd995b7164e7a69aee10eaaf9858c5fb7c485e | [log] [tgz] |
---|---|---|
author | Alexandra Buzila <abuzila@eclipsesource.com> | Fri Jan 22 10:40:18 2016 +0100 |
committer | Laurent Delaigue <laurent.delaigue@obeo.fr> | Fri Jun 10 10:34:40 2016 +0200 |
tree | 6fde210d867b7c4bef4f6e1ee54a2daa7280baaf | |
parent | 814919e9de93aacc099b18fd76dac201e115b465 [diff] |
[479449] Introduce MultiplicityElementChanges Created new UMLDiff type for changes of MultiplicityElements. Contribution also contains PostProcessor that ensures that the conflicts between MultiplicityElements are correct with respect to their type. Includes tests. Bug: 479449 CQ: 11548 Change-Id: I9faefd2dc948b1d2ea8e45ef232e9c82a9285f74 Also-by: Laurent Delaigue <laurent.delaigue@obeo.fr> Signed-off-by: Alexandra Buzila <abuzila@eclipsesource.com> Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>