diff options
Diffstat (limited to 'plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/data/conflict/a4')
3 files changed, 42 insertions, 0 deletions
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/data/conflict/a4/left.uml b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/data/conflict/a4/left.uml new file mode 100644 index 000000000..c15a0e099 --- /dev/null +++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/data/conflict/a4/left.uml @@ -0,0 +1,15 @@ +<?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"/> + <packagedElement xmi:type="uml:Class" xmi:id="_bv63ALmSEee3h-90p9bUpQ" name="Bar"/> + <packagedElement xmi:type="uml:Class" xmi:id="_b4ngALmSEee3h-90p9bUpQ" name="Baz"/> + <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" manyValuedReference="_bv63ALmSEee3h-90p9bUpQ _b4ngALmSEee3h-90p9bUpQ" base_Class="_MNDVkPr8EeCcXd0vrIzyPg"/> +</xmi:XMI> diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/data/conflict/a4/origin.uml b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/data/conflict/a4/origin.uml new file mode 100644 index 000000000..64fde5208 --- /dev/null +++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/data/conflict/a4/origin.uml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_GfO3Ifr8EeCcXd0vrIzyPg" name="model"> + <packagedElement xmi:type="uml:Class" xmi:id="_MNDVkPr8EeCcXd0vrIzyPg" name="Foo"/> + <packagedElement xmi:type="uml:Class" xmi:id="_bv63ALmSEee3h-90p9bUpQ" name="Bar"/> + <packagedElement xmi:type="uml:Class" xmi:id="_b4ngALmSEee3h-90p9bUpQ" name="Baz"/> + <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> diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/data/conflict/a4/right.uml b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/data/conflict/a4/right.uml new file mode 100644 index 000000000..337652f5c --- /dev/null +++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/data/conflict/a4/right.uml @@ -0,0 +1,15 @@ +<?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"/> + <packagedElement xmi:type="uml:Class" xmi:id="_bv63ALmSEee3h-90p9bUpQ" name="Bar"/> + <packagedElement xmi:type="uml:Class" xmi:id="_b4ngALmSEee3h-90p9bUpQ" name="Baz"/> + <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="_DgvBULjxEeeVg_HuOthLOA" manyValuedReference="_bv63ALmSEee3h-90p9bUpQ _b4ngALmSEee3h-90p9bUpQ" base_Class="_MNDVkPr8EeCcXd0vrIzyPg"/> +</xmi:XMI> |