Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCedric Notot2013-06-07 09:40:20 +0000
committerLaurent Goubet2013-06-21 11:04:50 +0000
commit4a8ef93f5473bca8faa7dadd6dc6a123542ce0c6 (patch)
tree6c8b7d46ef18389ed5041652b7b39ec6cbae72b5 /plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/implications/data/a3/left.uml
parent099f3f702c577f1ee81b66680a2f81c548e5f031 (diff)
downloadorg.eclipse.emf.compare-4a8ef93f5473bca8faa7dadd6dc6a123542ce0c6.tar.gz
org.eclipse.emf.compare-4a8ef93f5473bca8faa7dadd6dc6a123542ce0c6.tar.xz
org.eclipse.emf.compare-4a8ef93f5473bca8faa7dadd6dc6a123542ce0c6.zip
Filling of the implication link with UML subsets.
Like equivalences, the merge of a difference may imply the merge of other ones. But, contrary to equivalences, this implication link is unidirectional. So, if A implies B, B does not imply A. In the context of UML, references can be defined as subset of other ones. So, the merge of the add of a reference which is subset of another one implies the add of this last one. In the same way, the delete of a reference which is superset of other ones implies the delete of these last ones. Note that some superset references can be defined as 'union' (that is to say that each superset reference is in one of the subsets). Union supersets are derived, so they are not managed by EMF Compare. The implications are set in Diff#implies and Diff#impliedBy. The reference merger of EMF Compare scans these links to mark as merged the impacted differences without merging them (because the merge itself will be managed by the 'meta-model'). Change-Id: If3a62076c3569b1ba0aa4628c657765cd8ad7711
Diffstat (limited to 'plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/implications/data/a3/left.uml')
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/implications/data/a3/left.uml8
1 files changed, 8 insertions, 0 deletions
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/implications/data/a3/left.uml b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/implications/data/a3/left.uml
new file mode 100644
index 000000000..f93c9a32b
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/implications/data/a3/left.uml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_SSnEIIYEEeC_LdOTKS1r7g" name="model">
+ <packagedElement xmi:type="uml:Class" xmi:id="_WNoqEYYWEeCV1bmJqi-tSQ" clientDependency="_epYHUIYWEeCV1bmJqi-tSQ _I1OzkNgfEeKUpal9fab9XA" name="Class0">
+ <substitution xmi:id="_I1OzkNgfEeKUpal9fab9XA" name="substitution1" client="_WNoqEYYWEeCV1bmJqi-tSQ" supplier="_XMJgwIYWEeCV1bmJqi-tSQ"/>
+ <interfaceRealization xmi:id="_epYHUIYWEeCV1bmJqi-tSQ" name="InterfaceRealization0" client="_WNoqEYYWEeCV1bmJqi-tSQ" supplier="_XMJgwIYWEeCV1bmJqi-tSQ" contract="_XMJgwIYWEeCV1bmJqi-tSQ"/>
+ </packagedElement>
+ <packagedElement xmi:type="uml:Interface" xmi:id="_XMJgwIYWEeCV1bmJqi-tSQ" name="Interface0"/>
+</uml:Model>

Back to the top