diff options
| author | Alexandra Buzila | 2016-01-22 09:40:18 +0000 |
|---|---|---|
| committer | Laurent Delaigue | 2016-06-10 08:34:40 +0000 |
| commit | 6dfd995b7164e7a69aee10eaaf9858c5fb7c485e (patch) | |
| tree | 6fde210d867b7c4bef4f6e1ee54a2daa7280baaf /plugins/org.eclipse.emf.compare.uml2/model/uml2compare.ecore | |
| parent | 814919e9de93aacc099b18fd76dac201e115b465 (diff) | |
| download | org.eclipse.emf.compare-6dfd995b7164e7a69aee10eaaf9858c5fb7c485e.tar.gz org.eclipse.emf.compare-6dfd995b7164e7a69aee10eaaf9858c5fb7c485e.tar.xz org.eclipse.emf.compare-6dfd995b7164e7a69aee10eaaf9858c5fb7c485e.zip | |
[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>
Diffstat (limited to 'plugins/org.eclipse.emf.compare.uml2/model/uml2compare.ecore')
| -rw-r--r-- | plugins/org.eclipse.emf.compare.uml2/model/uml2compare.ecore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/plugins/org.eclipse.emf.compare.uml2/model/uml2compare.ecore b/plugins/org.eclipse.emf.compare.uml2/model/uml2compare.ecore index c739777ee..b73dfd26c 100644 --- a/plugins/org.eclipse.emf.compare.uml2/model/uml2compare.ecore +++ b/plugins/org.eclipse.emf.compare.uml2/model/uml2compare.ecore @@ -25,4 +25,5 @@ <eStructuralFeatures xsi:type="ecore:EAttribute" name="language" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="DanglingStereotypeApplication" eSuperTypes="platform:/plugin/org.eclipse.emf.compare/model/compare.ecore#//ResourceAttachmentChange #//UMLDiff"/> + <eClassifiers xsi:type="ecore:EClass" name="MultiplicityElementChange" eSuperTypes="#//UMLDiff"/> </ecore:EPackage> |