Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilip Langer2014-11-13 16:00:50 +0000
committerAxel RICHARD2014-12-07 15:17:23 +0000
commit01ae0763a8e0156dabc6bcdd1bcef170f1782099 (patch)
tree2f6a268534f4f781b88b300ba9d8d0035112b570 /plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/opaque/data/a5/left.uml
parent4ae5ea7b3b5c828d6a88421fd396ad042a01967f (diff)
downloadorg.eclipse.emf.compare-01ae0763a8e0156dabc6bcdd1bcef170f1782099.tar.gz
org.eclipse.emf.compare-01ae0763a8e0156dabc6bcdd1bcef170f1782099.tar.xz
org.eclipse.emf.compare-01ae0763a8e0156dabc6bcdd1bcef170f1782099.zip
[451365] Adds specific handling of opaque action, behavior & expression
Opaque actions, behaviors, and expressions all have a multi-valued language and multi-valued body attribute. Their indices have to be kept in sync, because the language value at the index n denotes the language of the body value at the index n. Moreover, if concurrent changes to the same body value are applied, they should be merged using a line-based three-way merge algorithm. If they are not mergeable with such an algorithm, a specific conflict should be raised. This commit contributes support for the aforementioned requirements by introducing a new UML-specific change type, specific conflict detection, and a specific merger. Bug: 451365 Change-Id: I6bf5c786e72a10c56eff7f0faaedd67b77528b4b Signed-off-by: Philip Langer <planger@eclipsesource.com>
Diffstat (limited to 'plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/opaque/data/a5/left.uml')
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/opaque/data/a5/left.uml22
1 files changed, 22 insertions, 0 deletions
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/opaque/data/a5/left.uml b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/opaque/data/a5/left.uml
new file mode 100644
index 000000000..d1c6a7222
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/opaque/data/a5/left.uml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_mhydQGQIEeS_8IneN_JFUg" name="Model">
+ <packageImport xmi:id="_mhydQWQIEeS_8IneN_JFUg">
+ <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
+ </packageImport>
+ <packagedElement xmi:type="uml:Activity" xmi:id="_mlTEQGQIEeS_8IneN_JFUg" name="Activity1" node="_opaqueAction1">
+ <node xmi:type="uml:OpaqueAction" xmi:id="_opaqueAction1" name="OpaqueAction1">
+ <language>JAVA</language>
+ <language>OCL</language>
+ <body>This is a JAVA&#xD;
+test with multi-line&#xD;
+String attribute&#xD;
+and concurrent changes&#xD;
+of them.</body>
+ <body>This is an OCL&#xD;
+test with multi-line&#xD;
+String attribute&#xD;
+and concurrent changes&#xD;
+of them.</body>
+ </node>
+ </packagedElement>
+</uml:Model>

Back to the top