Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian W. Damus2017-09-11 07:43:59 -0400
committerlgoubet2019-07-17 11:03:15 -0400
commit22c21612be43f38771b64e81a328ec215d470864 (patch)
treea3dbbc478b4252c99af017535a17bedd5617d061 /plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/data/conflict/a2/left.uml
parent1998e64ba331e977271a01a57e1e12dbb5a99148 (diff)
downloadorg.eclipse.emf.compare-22c21612be43f38771b64e81a328ec215d470864.tar.gz
org.eclipse.emf.compare-22c21612be43f38771b64e81a328ec215d470864.tar.xz
org.eclipse.emf.compare-22c21612be43f38771b64e81a328ec215d470864.zip
[522080] [UML] Add-add conflicts in stereotype application not detected
Two changes in the UML post-processor to handle apply-apply and unapply-unapply conflicts for stereotype applications on the same element in both sides of the comparison: * re-match left- and right-side additions/removals of stereotype applications to match the same stereotype applied to the same element even though the XMI IDs are different * generate the attribute diffs in added stereotype applications that the default diff engine refuses to do, so that we may find conflicts in differing attribute values in the conflict phase (references are handled by the core) Bug: 522080 Change-Id: I4daac02414abc3f275ac9ff19d6a460b43a0fe84 Signed-off-by: Christian W. Damus <give.a.damus@gmail.com>
Diffstat (limited to 'plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/data/conflict/a2/left.uml')
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/data/conflict/a2/left.uml13
1 files changed, 13 insertions, 0 deletions
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/data/conflict/a2/left.uml b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/data/conflict/a2/left.uml
new file mode 100644
index 000000000..36db0c8e7
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/data/conflict/a2/left.uml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:testProfile="http://www.eclipse.org/emf/compare/uml2/1.0.0/testprofile" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">
+ <uml:Model xmi:id="_GfO3Ifr8EeCcXd0vrIzyPg" name="model">
+ <packagedElement xmi:type="uml:Class" xmi:id="_MNDVkPr8EeCcXd0vrIzyPg" name="Foo"/>
+ <profileApplication xmi:id="_jAMnAPzmEeGvprorRl_paQ">
+ <eAnnotations xmi:id="_jAMnAfzmEeGvprorRl_paQ" source="http://www.eclipse.org/uml2/2.0.0/UML">
+ <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/emf/compare/uml2/1.0.0/testprofile#/"/>
+ </eAnnotations>
+ <appliedProfile href="platform:/plugin/org.eclipse.emf.compare.uml2.tests/model/uml2.compare.testprofile.profile.uml#_hZFTgIwkEeC_FYHMbTTxXw"/>
+ </profileApplication>
+ </uml:Model>
+ <testProfile:ACliche xmi:id="_lLJboPzmEeGvprorRl_paQ" singleValuedAttribute="bar" base_Class="_MNDVkPr8EeCcXd0vrIzyPg"/>
+</xmi:XMI>

Back to the top