383868: [UML Compare] Retarget for Generalization link should be done using a ReorientRelationShipRequest

https://bugs.eclipse.org/bugs/show_bug.cgi?id=383868

Example for the merge of a Generalization in a nested editor

6 files changed, 297 insertions, 0 deletions

diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/resources/uml_nested/generalizationSourceChanged_1/model.di b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/resources/uml_nested/generalizationSourceChanged_1/model.di
new file mode 100644
index 00000000000..25abb0486ef
--- /dev/null
+++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/resources/uml_nested/generalizationSourceChanged_1/model.di
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="ASCII"?>

+<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">

+  <pageList>

+    <availablePage>

+      <emfPageIdentifier href="model.notation#_S0BnMNGgEeGGSdtlCGVoZA"/>

+    </availablePage>

+  </pageList>

+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

+    <windows>

+      <children xsi:type="di:TabFolder">

+        <children>

+          <emfPageIdentifier href="model.notation#_S0BnMNGgEeGGSdtlCGVoZA"/>

+        </children>

+      </children>

+    </windows>

+  </sashModel>

+</di:SashWindowsMngr>

diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/resources/uml_nested/generalizationSourceChanged_1/model.notation b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/resources/uml_nested/generalizationSourceChanged_1/model.notation
new file mode 100644
index 00000000000..f243c39eb2f
--- /dev/null
+++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/resources/uml_nested/generalizationSourceChanged_1/model.notation
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_S0BnMNGgEeGGSdtlCGVoZA" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">

+  <children xmi:type="notation:Shape" xmi:id="_TfSxwNGgEeGGSdtlCGVoZA" type="2008" fontName="Segoe UI" lineColor="0">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_TfUm8NGgEeGGSdtlCGVoZA" source="ShadowFigure">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TfUm8dGgEeGGSdtlCGVoZA" key="ShadowFigure_Value" value="false"/>

+    </eAnnotations>

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_TfUm8tGgEeGGSdtlCGVoZA" source="displayNameLabelIcon">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TfVOANGgEeGGSdtlCGVoZA" key="displayNameLabelIcon_value" value="false"/>

+    </eAnnotations>

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_TfVOAdGgEeGGSdtlCGVoZA" source="QualifiedName">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TfVOAtGgEeGGSdtlCGVoZA" key="QualifiedNameDepth" value="1000"/>

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_TfVOA9GgEeGGSdtlCGVoZA" type="5029"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_TfVOBNGgEeGGSdtlCGVoZA" type="7017">

+      <children xmi:type="notation:Shape" xmi:id="_ZS8ycNGgEeGGSdtlCGVoZA" type="3012" fontName="Segoe UI" lineColor="0">

+        <element xmi:type="uml:Property" href="model.uml#_ZS69QNGgEeGGSdtlCGVoZA"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ZS8ycdGgEeGGSdtlCGVoZA"/>

+      </children>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_TfVOBdGgEeGGSdtlCGVoZA"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_TfVOBtGgEeGGSdtlCGVoZA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_TfVOB9GgEeGGSdtlCGVoZA"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TfVOCNGgEeGGSdtlCGVoZA"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_TfVOCdGgEeGGSdtlCGVoZA" type="7018">

+      <styles xmi:type="notation:TitleStyle" xmi:id="_TfVOCtGgEeGGSdtlCGVoZA"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_TfVOC9GgEeGGSdtlCGVoZA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_TfVODNGgEeGGSdtlCGVoZA"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TfVODdGgEeGGSdtlCGVoZA"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_TfVODtGgEeGGSdtlCGVoZA" type="7019">

+      <styles xmi:type="notation:TitleStyle" xmi:id="_TfVOD9GgEeGGSdtlCGVoZA"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_TfVOENGgEeGGSdtlCGVoZA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_TfVOEdGgEeGGSdtlCGVoZA"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TfVOEtGgEeGGSdtlCGVoZA"/>

+    </children>

+    <element xmi:type="uml:Class" href="model.uml#_TfNSMNGgEeGGSdtlCGVoZA"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TfSxwdGgEeGGSdtlCGVoZA" x="396" y="137"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_UEX0wNGgEeGGSdtlCGVoZA" type="2008" fontName="Segoe UI" lineColor="0">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UEYb0NGgEeGGSdtlCGVoZA" source="ShadowFigure">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UEYb0dGgEeGGSdtlCGVoZA" key="ShadowFigure_Value" value="false"/>

+    </eAnnotations>

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UEYb0tGgEeGGSdtlCGVoZA" source="displayNameLabelIcon">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UEYb09GgEeGGSdtlCGVoZA" key="displayNameLabelIcon_value" value="false"/>

+    </eAnnotations>

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UEYb1NGgEeGGSdtlCGVoZA" source="QualifiedName">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UEYb1dGgEeGGSdtlCGVoZA" key="QualifiedNameDepth" value="1000"/>

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_UEYb1tGgEeGGSdtlCGVoZA" type="5029"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_UEYb19GgEeGGSdtlCGVoZA" type="7017">

+      <children xmi:type="notation:Shape" xmi:id="_bTlNcNGgEeGGSdtlCGVoZA" type="3012" fontName="Segoe UI" lineColor="0">

+        <element xmi:type="uml:Property" href="model.uml#_bTjYQNGgEeGGSdtlCGVoZA"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_bTlNcdGgEeGGSdtlCGVoZA"/>

+      </children>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_UEYb2NGgEeGGSdtlCGVoZA"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_UEYb2dGgEeGGSdtlCGVoZA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_UEYb2tGgEeGGSdtlCGVoZA"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UEYb29GgEeGGSdtlCGVoZA"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_UEYb3NGgEeGGSdtlCGVoZA" type="7018">

+      <styles xmi:type="notation:TitleStyle" xmi:id="_UEYb3dGgEeGGSdtlCGVoZA"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_UEYb3tGgEeGGSdtlCGVoZA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_UEYb39GgEeGGSdtlCGVoZA"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UEYb4NGgEeGGSdtlCGVoZA"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_UEYb4dGgEeGGSdtlCGVoZA" type="7019">

+      <styles xmi:type="notation:TitleStyle" xmi:id="_UEYb4tGgEeGGSdtlCGVoZA"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_UEYb49GgEeGGSdtlCGVoZA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_UEYb5NGgEeGGSdtlCGVoZA"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UEYb5dGgEeGGSdtlCGVoZA"/>

+    </children>

+    <element xmi:type="uml:Class" href="model.uml#_UEWmoNGgEeGGSdtlCGVoZA"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UEX0wdGgEeGGSdtlCGVoZA" x="163" y="512"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_UanxkNGgEeGGSdtlCGVoZA" type="2008" fontName="Segoe UI" lineColor="0">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UaoYoNGgEeGGSdtlCGVoZA" source="ShadowFigure">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UaoYodGgEeGGSdtlCGVoZA" key="ShadowFigure_Value" value="false"/>

+    </eAnnotations>

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UaoYotGgEeGGSdtlCGVoZA" source="displayNameLabelIcon">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UaoYo9GgEeGGSdtlCGVoZA" key="displayNameLabelIcon_value" value="false"/>

+    </eAnnotations>

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UaoYpNGgEeGGSdtlCGVoZA" source="QualifiedName">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UaoYpdGgEeGGSdtlCGVoZA" key="QualifiedNameDepth" value="1000"/>

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_UaoYptGgEeGGSdtlCGVoZA" type="5029"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_UaoYp9GgEeGGSdtlCGVoZA" type="7017">

+      <styles xmi:type="notation:TitleStyle" xmi:id="_UaoYqNGgEeGGSdtlCGVoZA"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_UaoYqdGgEeGGSdtlCGVoZA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_UaoYqtGgEeGGSdtlCGVoZA"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UaoYq9GgEeGGSdtlCGVoZA"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_UaoYrNGgEeGGSdtlCGVoZA" type="7018">

+      <styles xmi:type="notation:TitleStyle" xmi:id="_UaoYrdGgEeGGSdtlCGVoZA"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_UaoYrtGgEeGGSdtlCGVoZA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_UaoYr9GgEeGGSdtlCGVoZA"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UaoYsNGgEeGGSdtlCGVoZA"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_UaoYsdGgEeGGSdtlCGVoZA" type="7019">

+      <styles xmi:type="notation:TitleStyle" xmi:id="_UaoYstGgEeGGSdtlCGVoZA"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_UaoYs9GgEeGGSdtlCGVoZA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_UaoYtNGgEeGGSdtlCGVoZA"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UaoYtdGgEeGGSdtlCGVoZA"/>

+    </children>

+    <element xmi:type="uml:Class" href="model.uml#_UamjcNGgEeGGSdtlCGVoZA"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UanxkdGgEeGGSdtlCGVoZA" x="684" y="497"/>

+  </children>

+  <styles xmi:type="notation:DiagramStyle" xmi:id="_S0BnMdGgEeGGSdtlCGVoZA"/>

+  <element xmi:type="uml:Model" href="model.uml#_Sz-j4NGgEeGGSdtlCGVoZA"/>

+  <edges xmi:type="notation:Connector" xmi:id="_aFLgoNGgEeGGSdtlCGVoZA" type="4002" source="_UEX0wNGgEeGGSdtlCGVoZA" target="_TfSxwNGgEeGGSdtlCGVoZA" lineColor="0">

+    <children xmi:type="notation:DecorationNode" xmi:id="_aFMHsNGgEeGGSdtlCGVoZA" type="6007">

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_aFMHsdGgEeGGSdtlCGVoZA" y="40"/>

+    </children>

+    <styles xmi:type="notation:FontStyle" xmi:id="_aFLgodGgEeGGSdtlCGVoZA" fontName="Segoe UI"/>

+    <element xmi:type="uml:Generalization" href="model.uml#_aFAhgNGgEeGGSdtlCGVoZA"/>

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_aFLgotGgEeGGSdtlCGVoZA" points="[32, -50, -227, 325]$[183, -329, -76, 46]"/>

+  </edges>

+</notation:Diagram>

diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/resources/uml_nested/generalizationSourceChanged_1/model.uml b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/resources/uml_nested/generalizationSourceChanged_1/model.uml
new file mode 100644
index 00000000000..8fd55937099
--- /dev/null
+++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/resources/uml_nested/generalizationSourceChanged_1/model.uml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_Sz-j4NGgEeGGSdtlCGVoZA" name="Model">

+  <packageImport xmi:id="_Sz-j4dGgEeGGSdtlCGVoZA">

+    <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>

+  </packageImport>

+  <packagedElement xmi:type="uml:Class" xmi:id="_TfNSMNGgEeGGSdtlCGVoZA" name="target">

+    <ownedAttribute xmi:id="_ZS69QNGgEeGGSdtlCGVoZA" name="Property1" visibility="public">

+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ZmYr0NGgEeGGSdtlCGVoZA" value="1"/>

+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ZmZS4NGgEeGGSdtlCGVoZA" value="1"/>

+      <defaultValue xmi:type="uml:LiteralString" xmi:id="_ZmahANGgEeGGSdtlCGVoZA">

+        <value xsi:nil="true"/>

+      </defaultValue>

+    </ownedAttribute>

+  </packagedElement>

+  <packagedElement xmi:type="uml:Class" xmi:id="_UEWmoNGgEeGGSdtlCGVoZA" name="oldSource">

+    <generalization xmi:id="_aFAhgNGgEeGGSdtlCGVoZA" general="_TfNSMNGgEeGGSdtlCGVoZA"/>

+    <ownedAttribute xmi:id="_bTjYQNGgEeGGSdtlCGVoZA" name="Property1" visibility="public">

+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_bep1ANGgEeGGSdtlCGVoZA" value="1"/>

+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_bep1AdGgEeGGSdtlCGVoZA" value="1"/>

+      <defaultValue xmi:type="uml:LiteralString" xmi:id="_beqcENGgEeGGSdtlCGVoZA">

+        <value xsi:nil="true"/>

+      </defaultValue>

+    </ownedAttribute>

+  </packagedElement>

+  <packagedElement xmi:type="uml:Class" xmi:id="_UamjcNGgEeGGSdtlCGVoZA" name="newSource"/>

+</uml:Model>

diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/resources/uml_nested/generalizationTargetChanged_1/model.di b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/resources/uml_nested/generalizationTargetChanged_1/model.di
new file mode 100644
index 00000000000..049c21e71ae
--- /dev/null
+++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/resources/uml_nested/generalizationTargetChanged_1/model.di
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="ASCII"?>

+<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">

+  <pageList>

+    <availablePage>

+      <emfPageIdentifier href="model.notation#_mC6d8NGgEeGGSdtlCGVoZA"/>

+    </availablePage>

+  </pageList>

+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

+    <windows>

+      <children xsi:type="di:TabFolder">

+        <children>

+          <emfPageIdentifier href="model.notation#_mC6d8NGgEeGGSdtlCGVoZA"/>

+        </children>

+      </children>

+    </windows>

+  </sashModel>

+</di:SashWindowsMngr>

diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/resources/uml_nested/generalizationTargetChanged_1/model.notation b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/resources/uml_nested/generalizationTargetChanged_1/model.notation
new file mode 100644
index 00000000000..7265141f667
--- /dev/null
+++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/resources/uml_nested/generalizationTargetChanged_1/model.notation
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_mC6d8NGgEeGGSdtlCGVoZA" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">

+  <children xmi:type="notation:Shape" xmi:id="_nknhQNGgEeGGSdtlCGVoZA" type="2008" fontName="Segoe UI" lineColor="0">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_nkoIUNGgEeGGSdtlCGVoZA" source="ShadowFigure">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nkoIUdGgEeGGSdtlCGVoZA" key="ShadowFigure_Value" value="false"/>

+    </eAnnotations>

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_nkoIUtGgEeGGSdtlCGVoZA" source="displayNameLabelIcon">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nkoIU9GgEeGGSdtlCGVoZA" key="displayNameLabelIcon_value" value="false"/>

+    </eAnnotations>

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_nkoIVNGgEeGGSdtlCGVoZA" source="QualifiedName">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nkoIVdGgEeGGSdtlCGVoZA" key="QualifiedNameDepth" value="1000"/>

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_nkoIVtGgEeGGSdtlCGVoZA" type="5029"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_nkoIV9GgEeGGSdtlCGVoZA" type="7017">

+      <styles xmi:type="notation:TitleStyle" xmi:id="_nkoIWNGgEeGGSdtlCGVoZA"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_nkoIWdGgEeGGSdtlCGVoZA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_nkoIWtGgEeGGSdtlCGVoZA"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nkoIW9GgEeGGSdtlCGVoZA"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_nkoIXNGgEeGGSdtlCGVoZA" type="7018">

+      <styles xmi:type="notation:TitleStyle" xmi:id="_nkoIXdGgEeGGSdtlCGVoZA"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_nkoIXtGgEeGGSdtlCGVoZA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_nkoIX9GgEeGGSdtlCGVoZA"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nkoIYNGgEeGGSdtlCGVoZA"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_nkovYNGgEeGGSdtlCGVoZA" type="7019">

+      <styles xmi:type="notation:TitleStyle" xmi:id="_nkovYdGgEeGGSdtlCGVoZA"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_nkovYtGgEeGGSdtlCGVoZA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_nkovY9GgEeGGSdtlCGVoZA"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nkovZNGgEeGGSdtlCGVoZA"/>

+    </children>

+    <element xmi:type="uml:Class" href="model.uml#_nkm6MNGgEeGGSdtlCGVoZA"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nknhQdGgEeGGSdtlCGVoZA" x="377" y="177"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_oadkINGgEeGGSdtlCGVoZA" type="2008" fontName="Segoe UI" lineColor="0">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_oaeLMNGgEeGGSdtlCGVoZA" source="ShadowFigure">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_oaeLMdGgEeGGSdtlCGVoZA" key="ShadowFigure_Value" value="false"/>

+    </eAnnotations>

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_oaeLMtGgEeGGSdtlCGVoZA" source="displayNameLabelIcon">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_oaeLM9GgEeGGSdtlCGVoZA" key="displayNameLabelIcon_value" value="false"/>

+    </eAnnotations>

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_oaeLNNGgEeGGSdtlCGVoZA" source="QualifiedName">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_oaeLNdGgEeGGSdtlCGVoZA" key="QualifiedNameDepth" value="1000"/>

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_oaeLNtGgEeGGSdtlCGVoZA" type="5029"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_oaeLN9GgEeGGSdtlCGVoZA" type="7017">

+      <styles xmi:type="notation:TitleStyle" xmi:id="_oaeLONGgEeGGSdtlCGVoZA"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_oaeLOdGgEeGGSdtlCGVoZA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_oaeLOtGgEeGGSdtlCGVoZA"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oaeLO9GgEeGGSdtlCGVoZA"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_oaeLPNGgEeGGSdtlCGVoZA" type="7018">

+      <styles xmi:type="notation:TitleStyle" xmi:id="_oaeLPdGgEeGGSdtlCGVoZA"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_oaeLPtGgEeGGSdtlCGVoZA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_oaeLP9GgEeGGSdtlCGVoZA"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oaeLQNGgEeGGSdtlCGVoZA"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_oaeLQdGgEeGGSdtlCGVoZA" type="7019">

+      <styles xmi:type="notation:TitleStyle" xmi:id="_oaeLQtGgEeGGSdtlCGVoZA"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_oaeLQ9GgEeGGSdtlCGVoZA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_oaeLRNGgEeGGSdtlCGVoZA"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oaeLRdGgEeGGSdtlCGVoZA"/>

+    </children>

+    <element xmi:type="uml:Class" href="model.uml#_oacWANGgEeGGSdtlCGVoZA"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oadkIdGgEeGGSdtlCGVoZA" x="664" y="187"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_pN4lINGgEeGGSdtlCGVoZA" type="2008" fontName="Segoe UI" lineColor="0">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pN5MMNGgEeGGSdtlCGVoZA" source="ShadowFigure">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pN5MMdGgEeGGSdtlCGVoZA" key="ShadowFigure_Value" value="false"/>

+    </eAnnotations>

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pN5MMtGgEeGGSdtlCGVoZA" source="displayNameLabelIcon">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pN5MM9GgEeGGSdtlCGVoZA" key="displayNameLabelIcon_value" value="false"/>

+    </eAnnotations>

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pN5MNNGgEeGGSdtlCGVoZA" source="QualifiedName">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pN5MNdGgEeGGSdtlCGVoZA" key="QualifiedNameDepth" value="1000"/>

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_pN5MNtGgEeGGSdtlCGVoZA" type="5029"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_pN5MN9GgEeGGSdtlCGVoZA" type="7017">

+      <styles xmi:type="notation:TitleStyle" xmi:id="_pN5MONGgEeGGSdtlCGVoZA"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_pN5MOdGgEeGGSdtlCGVoZA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_pN5MOtGgEeGGSdtlCGVoZA"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pN5MO9GgEeGGSdtlCGVoZA"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_pN5MPNGgEeGGSdtlCGVoZA" type="7018">

+      <styles xmi:type="notation:TitleStyle" xmi:id="_pN5MPdGgEeGGSdtlCGVoZA"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_pN5MPtGgEeGGSdtlCGVoZA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_pN5MP9GgEeGGSdtlCGVoZA"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pN5MQNGgEeGGSdtlCGVoZA"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_pN5MQdGgEeGGSdtlCGVoZA" type="7019">

+      <styles xmi:type="notation:TitleStyle" xmi:id="_pN5MQtGgEeGGSdtlCGVoZA"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_pN5MQ9GgEeGGSdtlCGVoZA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_pN5MRNGgEeGGSdtlCGVoZA"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pN5MRdGgEeGGSdtlCGVoZA"/>

+    </children>

+    <element xmi:type="uml:Class" href="model.uml#_pN3XANGgEeGGSdtlCGVoZA"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pN4lIdGgEeGGSdtlCGVoZA" x="465" y="527"/>

+  </children>

+  <styles xmi:type="notation:DiagramStyle" xmi:id="_mC6d8dGgEeGGSdtlCGVoZA"/>

+  <element xmi:type="uml:Model" href="model.uml#_mC524NGgEeGGSdtlCGVoZA"/>

+  <edges xmi:type="notation:Connector" xmi:id="_qJ3sQNGgEeGGSdtlCGVoZA" type="4002" source="_pN4lINGgEeGGSdtlCGVoZA" target="_nknhQNGgEeGGSdtlCGVoZA" lineColor="0">

+    <children xmi:type="notation:DecorationNode" xmi:id="_qJ3sQ9GgEeGGSdtlCGVoZA" type="6007">

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_qJ3sRNGgEeGGSdtlCGVoZA" y="40"/>

+    </children>

+    <styles xmi:type="notation:FontStyle" xmi:id="_qJ3sQdGgEeGGSdtlCGVoZA" fontName="Segoe UI"/>

+    <element xmi:type="uml:Generalization" href="model.uml#_qJ2eINGgEeGGSdtlCGVoZA"/>

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_qJ3sQtGgEeGGSdtlCGVoZA" points="[-14, -50, 74, 300]$[-94, -400, -6, -50]"/>

+  </edges>

+</notation:Diagram>

diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/resources/uml_nested/generalizationTargetChanged_1/model.uml b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/resources/uml_nested/generalizationTargetChanged_1/model.uml
new file mode 100644
index 00000000000..b9b9e3616dd
--- /dev/null
+++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/resources/uml_nested/generalizationTargetChanged_1/model.uml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_mC524NGgEeGGSdtlCGVoZA" name="Model">

+  <packageImport xmi:id="_mC524dGgEeGGSdtlCGVoZA">

+    <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>

+  </packageImport>

+  <packagedElement xmi:type="uml:Class" xmi:id="_nkm6MNGgEeGGSdtlCGVoZA" name="target1"/>

+  <packagedElement xmi:type="uml:Class" xmi:id="_oacWANGgEeGGSdtlCGVoZA" name="target2"/>

+  <packagedElement xmi:type="uml:Class" xmi:id="_pN3XANGgEeGGSdtlCGVoZA" name="source">

+    <generalization xmi:id="_qJ2eINGgEeGGSdtlCGVoZA" general="_nkm6MNGgEeGGSdtlCGVoZA"/>

+  </packagedElement>

+</uml:Model>