383880: [UML Compare] Profile and stereotyped element management

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

Commit the example for StereotypeApplication in the case of the nested comparison

12 files changed, 456 insertions, 0 deletions

diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/resources/uml_nested/stereotypeApplicationAddition_1/model.di b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/resources/uml_nested/stereotypeApplicationAddition_1/model.di
new file mode 100644
index 00000000000..16a83eb8b8e
--- /dev/null
+++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/resources/uml_nested/stereotypeApplicationAddition_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#_9QsewNVnEeGesbOtChNcvA"/>

+    </availablePage>

+  </pageList>

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

+    <windows>

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

+        <children>

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

+        </children>

+      </children>

+    </windows>

+  </sashModel>

+</di:SashWindowsMngr>

diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/resources/uml_nested/stereotypeApplicationAddition_1/model.notation b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/resources/uml_nested/stereotypeApplicationAddition_1/model.notation
new file mode 100644
index 00000000000..b5053d16952
--- /dev/null
+++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/resources/uml_nested/stereotypeApplicationAddition_1/model.notation
@@ -0,0 +1,76 @@
+<?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="_9QsewNVnEeGesbOtChNcvA" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">

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

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

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

+    </eAnnotations>

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

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

+    </eAnnotations>

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

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

+    </eAnnotations>

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EKluwNVoEeGesbOtChNcvA" source="Stereotype_Annotation">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EKluwdVoEeGesbOtChNcvA" key="StereotypeWithQualifiedNameList" value=""/>

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EKluwtVoEeGesbOtChNcvA" key="StereotypeList" value="SysML::Blocks::Block"/>

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EKluw9VoEeGesbOtChNcvA" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EKluxNVoEeGesbOtChNcvA" key="PropStereoDisplay" value=""/>

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EKluxdVoEeGesbOtChNcvA" key="StereotypePropertyLocation" value="Compartment"/>

+    </eAnnotations>

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

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

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

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

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

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

+    </children>

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

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

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

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

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

+    </children>

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

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

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

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

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

+    </children>

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

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BORuodVoEeGesbOtChNcvA" x="236" y="244"/>

+  </children>

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

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Br--UtVoEeGesbOtChNcvA" source="ShadowFigure">

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

+    </eAnnotations>

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Br--VNVoEeGesbOtChNcvA" source="displayNameLabelIcon">

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

+    </eAnnotations>

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Br--VtVoEeGesbOtChNcvA" source="QualifiedName">

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

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_Br--WNVoEeGesbOtChNcvA" type="5029"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_Br--WdVoEeGesbOtChNcvA" type="7017">

+      <styles xmi:type="notation:TitleStyle" xmi:id="_Br--WtVoEeGesbOtChNcvA"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_Br--W9VoEeGesbOtChNcvA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Br--XNVoEeGesbOtChNcvA"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Br--XdVoEeGesbOtChNcvA"/>

+    </children>

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

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

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

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

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

+    </children>

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

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

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

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

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

+    </children>

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

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Br--UdVoEeGesbOtChNcvA" x="605" y="257"/>

+  </children>

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

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

+</notation:Diagram>

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

+<xmi:XMI xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Blocks="http://www.eclipse.org/papyrus/0.7.0/SysML/Blocks" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysML/Blocks http://www.eclipse.org/papyrus/0.7.0/SysML#//blocks">

+  <uml:Model xmi:id="_9QiGsNVnEeGesbOtChNcvA" name="Model">

+    <packageImport xmi:id="_9QiGsdVnEeGesbOtChNcvA">

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

+    </packageImport>

+    <packagedElement xmi:type="uml:Class" xmi:id="_BOLA8NVoEeGesbOtChNcvA" name="Class1"/>

+    <packagedElement xmi:type="uml:Class" xmi:id="_Br9wMNVoEeGesbOtChNcvA" name="Class1"/>

+    <profileApplication xmi:id="_AxzOANVoEeGesbOtChNcvA">

+      <eAnnotations xmi:id="_AyDssNVoEeGesbOtChNcvA" source="http://www.eclipse.org/uml2/2.0.0/UML">

+        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/0.7.0/SysML#//blocks"/>

+      </eAnnotations>

+      <appliedProfile href="pathmap://SysML_PROFILES/SysML.profile.uml#_fSw28LX7EduFmqQsrNB9lw"/>

+    </profileApplication>

+  </uml:Model>

+  <Blocks:Block xmi:id="_EKaIkNVoEeGesbOtChNcvA" base_Class="_BOLA8NVoEeGesbOtChNcvA"/>

+</xmi:XMI>

diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/resources/uml_nested/stereotypeApplicationAddition_2/model.di b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/resources/uml_nested/stereotypeApplicationAddition_2/model.di
new file mode 100644
index 00000000000..16a83eb8b8e
--- /dev/null
+++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/resources/uml_nested/stereotypeApplicationAddition_2/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#_9QsewNVnEeGesbOtChNcvA"/>

+    </availablePage>

+  </pageList>

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

+    <windows>

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

+        <children>

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

+        </children>

+      </children>

+    </windows>

+  </sashModel>

+</di:SashWindowsMngr>

diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/resources/uml_nested/stereotypeApplicationAddition_2/model.notation b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/resources/uml_nested/stereotypeApplicationAddition_2/model.notation
new file mode 100644
index 00000000000..ff292c5c477
--- /dev/null
+++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/resources/uml_nested/stereotypeApplicationAddition_2/model.notation
@@ -0,0 +1,83 @@
+<?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="_9QsewNVnEeGesbOtChNcvA" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">

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

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

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

+    </eAnnotations>

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

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

+    </eAnnotations>

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

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

+    </eAnnotations>

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EKluwNVoEeGesbOtChNcvA" source="Stereotype_Annotation">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EKluwdVoEeGesbOtChNcvA" key="StereotypeWithQualifiedNameList" value=""/>

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EKluwtVoEeGesbOtChNcvA" key="StereotypeList" value="SysML::Blocks::Block"/>

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EKluw9VoEeGesbOtChNcvA" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EKluxNVoEeGesbOtChNcvA" key="PropStereoDisplay" value=""/>

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EKluxdVoEeGesbOtChNcvA" key="StereotypePropertyLocation" value="Compartment"/>

+    </eAnnotations>

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

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

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

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

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

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

+    </children>

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

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

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

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

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

+    </children>

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

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

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

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

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

+    </children>

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

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BORuodVoEeGesbOtChNcvA" x="236" y="244"/>

+  </children>

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

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Br--UtVoEeGesbOtChNcvA" source="ShadowFigure">

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

+    </eAnnotations>

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Br--VNVoEeGesbOtChNcvA" source="displayNameLabelIcon">

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

+    </eAnnotations>

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Br--VtVoEeGesbOtChNcvA" source="QualifiedName">

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

+    </eAnnotations>

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_aXpm0NVoEeGesbOtChNcvA" source="Stereotype_Annotation">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_aXpm0dVoEeGesbOtChNcvA" key="StereotypeWithQualifiedNameList" value=""/>

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_aXpm0tVoEeGesbOtChNcvA" key="StereotypeList" value="SysML::Blocks::Block"/>

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_aXpm09VoEeGesbOtChNcvA" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_aXpm1NVoEeGesbOtChNcvA" key="PropStereoDisplay" value=""/>

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_aXpm1dVoEeGesbOtChNcvA" key="StereotypePropertyLocation" value="Compartment"/>

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_Br--WNVoEeGesbOtChNcvA" type="5029"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_Br--WdVoEeGesbOtChNcvA" type="7017">

+      <styles xmi:type="notation:TitleStyle" xmi:id="_Br--WtVoEeGesbOtChNcvA"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_Br--W9VoEeGesbOtChNcvA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Br--XNVoEeGesbOtChNcvA"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Br--XdVoEeGesbOtChNcvA"/>

+    </children>

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

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

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

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

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

+    </children>

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

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

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

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

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

+    </children>

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

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Br--UdVoEeGesbOtChNcvA" x="605" y="257"/>

+  </children>

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

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

+</notation:Diagram>

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

+<xmi:XMI xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Blocks="http://www.eclipse.org/papyrus/0.7.0/SysML/Blocks" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysML/Blocks http://www.eclipse.org/papyrus/0.7.0/SysML#//blocks">

+  <uml:Model xmi:id="_9QiGsNVnEeGesbOtChNcvA" name="Model">

+    <packageImport xmi:id="_9QiGsdVnEeGesbOtChNcvA">

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

+    </packageImport>

+    <packagedElement xmi:type="uml:Class" xmi:id="_BOLA8NVoEeGesbOtChNcvA" name="Class1"/>

+    <packagedElement xmi:type="uml:Class" xmi:id="_Br9wMNVoEeGesbOtChNcvA" name="Class1"/>

+    <profileApplication xmi:id="_AxzOANVoEeGesbOtChNcvA">

+      <eAnnotations xmi:id="_AyDssNVoEeGesbOtChNcvA" source="http://www.eclipse.org/uml2/2.0.0/UML">

+        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/0.7.0/SysML#//blocks"/>

+      </eAnnotations>

+      <appliedProfile href="pathmap://SysML_PROFILES/SysML.profile.uml#_fSw28LX7EduFmqQsrNB9lw"/>

+    </profileApplication>

+  </uml:Model>

+  <Blocks:Block xmi:id="_EKaIkNVoEeGesbOtChNcvA" base_Class="_BOLA8NVoEeGesbOtChNcvA"/>

+  <Blocks:Block xmi:id="_aXi5INVoEeGesbOtChNcvA" base_Class="_Br9wMNVoEeGesbOtChNcvA"/>

+</xmi:XMI>

diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/resources/uml_nested/stereotypeApplicationRemoval_1/model.di b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/resources/uml_nested/stereotypeApplicationRemoval_1/model.di
new file mode 100644
index 00000000000..16a83eb8b8e
--- /dev/null
+++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/resources/uml_nested/stereotypeApplicationRemoval_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#_9QsewNVnEeGesbOtChNcvA"/>

+    </availablePage>

+  </pageList>

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

+    <windows>

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

+        <children>

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

+        </children>

+      </children>

+    </windows>

+  </sashModel>

+</di:SashWindowsMngr>

diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/resources/uml_nested/stereotypeApplicationRemoval_1/model.notation b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/resources/uml_nested/stereotypeApplicationRemoval_1/model.notation
new file mode 100644
index 00000000000..b5053d16952
--- /dev/null
+++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/resources/uml_nested/stereotypeApplicationRemoval_1/model.notation
@@ -0,0 +1,76 @@
+<?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="_9QsewNVnEeGesbOtChNcvA" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">

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

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

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

+    </eAnnotations>

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

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

+    </eAnnotations>

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

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

+    </eAnnotations>

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EKluwNVoEeGesbOtChNcvA" source="Stereotype_Annotation">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EKluwdVoEeGesbOtChNcvA" key="StereotypeWithQualifiedNameList" value=""/>

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EKluwtVoEeGesbOtChNcvA" key="StereotypeList" value="SysML::Blocks::Block"/>

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EKluw9VoEeGesbOtChNcvA" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EKluxNVoEeGesbOtChNcvA" key="PropStereoDisplay" value=""/>

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EKluxdVoEeGesbOtChNcvA" key="StereotypePropertyLocation" value="Compartment"/>

+    </eAnnotations>

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

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

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

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

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

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

+    </children>

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

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

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

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

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

+    </children>

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

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

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

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

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

+    </children>

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

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BORuodVoEeGesbOtChNcvA" x="236" y="244"/>

+  </children>

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

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Br--UtVoEeGesbOtChNcvA" source="ShadowFigure">

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

+    </eAnnotations>

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Br--VNVoEeGesbOtChNcvA" source="displayNameLabelIcon">

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

+    </eAnnotations>

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Br--VtVoEeGesbOtChNcvA" source="QualifiedName">

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

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_Br--WNVoEeGesbOtChNcvA" type="5029"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_Br--WdVoEeGesbOtChNcvA" type="7017">

+      <styles xmi:type="notation:TitleStyle" xmi:id="_Br--WtVoEeGesbOtChNcvA"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_Br--W9VoEeGesbOtChNcvA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Br--XNVoEeGesbOtChNcvA"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Br--XdVoEeGesbOtChNcvA"/>

+    </children>

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

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

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

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

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

+    </children>

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

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

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

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

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

+    </children>

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

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Br--UdVoEeGesbOtChNcvA" x="605" y="257"/>

+  </children>

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

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

+</notation:Diagram>

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

+<xmi:XMI xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Blocks="http://www.eclipse.org/papyrus/0.7.0/SysML/Blocks" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysML/Blocks http://www.eclipse.org/papyrus/0.7.0/SysML#//blocks">

+  <uml:Model xmi:id="_9QiGsNVnEeGesbOtChNcvA" name="Model">

+    <packageImport xmi:id="_9QiGsdVnEeGesbOtChNcvA">

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

+    </packageImport>

+    <packagedElement xmi:type="uml:Class" xmi:id="_BOLA8NVoEeGesbOtChNcvA" name="Class1"/>

+    <packagedElement xmi:type="uml:Class" xmi:id="_Br9wMNVoEeGesbOtChNcvA" name="Class1"/>

+    <profileApplication xmi:id="_AxzOANVoEeGesbOtChNcvA">

+      <eAnnotations xmi:id="_AyDssNVoEeGesbOtChNcvA" source="http://www.eclipse.org/uml2/2.0.0/UML">

+        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/0.7.0/SysML#//blocks"/>

+      </eAnnotations>

+      <appliedProfile href="pathmap://SysML_PROFILES/SysML.profile.uml#_fSw28LX7EduFmqQsrNB9lw"/>

+    </profileApplication>

+  </uml:Model>

+  <Blocks:Block xmi:id="_EKaIkNVoEeGesbOtChNcvA" base_Class="_BOLA8NVoEeGesbOtChNcvA"/>

+</xmi:XMI>

diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/resources/uml_nested/stereotypeApplicationRemoval_2/model.di b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/resources/uml_nested/stereotypeApplicationRemoval_2/model.di
new file mode 100644
index 00000000000..16a83eb8b8e
--- /dev/null
+++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/resources/uml_nested/stereotypeApplicationRemoval_2/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#_9QsewNVnEeGesbOtChNcvA"/>

+    </availablePage>

+  </pageList>

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

+    <windows>

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

+        <children>

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

+        </children>

+      </children>

+    </windows>

+  </sashModel>

+</di:SashWindowsMngr>

diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/resources/uml_nested/stereotypeApplicationRemoval_2/model.notation b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/resources/uml_nested/stereotypeApplicationRemoval_2/model.notation
new file mode 100644
index 00000000000..ff292c5c477
--- /dev/null
+++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/resources/uml_nested/stereotypeApplicationRemoval_2/model.notation
@@ -0,0 +1,83 @@
+<?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="_9QsewNVnEeGesbOtChNcvA" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">

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

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

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

+    </eAnnotations>

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

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

+    </eAnnotations>

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

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

+    </eAnnotations>

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EKluwNVoEeGesbOtChNcvA" source="Stereotype_Annotation">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EKluwdVoEeGesbOtChNcvA" key="StereotypeWithQualifiedNameList" value=""/>

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EKluwtVoEeGesbOtChNcvA" key="StereotypeList" value="SysML::Blocks::Block"/>

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EKluw9VoEeGesbOtChNcvA" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EKluxNVoEeGesbOtChNcvA" key="PropStereoDisplay" value=""/>

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EKluxdVoEeGesbOtChNcvA" key="StereotypePropertyLocation" value="Compartment"/>

+    </eAnnotations>

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

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

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

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

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

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

+    </children>

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

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

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

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

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

+    </children>

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

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

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

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

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

+    </children>

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

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BORuodVoEeGesbOtChNcvA" x="236" y="244"/>

+  </children>

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

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Br--UtVoEeGesbOtChNcvA" source="ShadowFigure">

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

+    </eAnnotations>

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Br--VNVoEeGesbOtChNcvA" source="displayNameLabelIcon">

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

+    </eAnnotations>

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Br--VtVoEeGesbOtChNcvA" source="QualifiedName">

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

+    </eAnnotations>

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_aXpm0NVoEeGesbOtChNcvA" source="Stereotype_Annotation">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_aXpm0dVoEeGesbOtChNcvA" key="StereotypeWithQualifiedNameList" value=""/>

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_aXpm0tVoEeGesbOtChNcvA" key="StereotypeList" value="SysML::Blocks::Block"/>

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_aXpm09VoEeGesbOtChNcvA" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_aXpm1NVoEeGesbOtChNcvA" key="PropStereoDisplay" value=""/>

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_aXpm1dVoEeGesbOtChNcvA" key="StereotypePropertyLocation" value="Compartment"/>

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_Br--WNVoEeGesbOtChNcvA" type="5029"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_Br--WdVoEeGesbOtChNcvA" type="7017">

+      <styles xmi:type="notation:TitleStyle" xmi:id="_Br--WtVoEeGesbOtChNcvA"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_Br--W9VoEeGesbOtChNcvA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Br--XNVoEeGesbOtChNcvA"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Br--XdVoEeGesbOtChNcvA"/>

+    </children>

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

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

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

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

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

+    </children>

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

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

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

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

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

+    </children>

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

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Br--UdVoEeGesbOtChNcvA" x="605" y="257"/>

+  </children>

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

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

+</notation:Diagram>

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

+<xmi:XMI xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Blocks="http://www.eclipse.org/papyrus/0.7.0/SysML/Blocks" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysML/Blocks http://www.eclipse.org/papyrus/0.7.0/SysML#//blocks">

+  <uml:Model xmi:id="_9QiGsNVnEeGesbOtChNcvA" name="Model">

+    <packageImport xmi:id="_9QiGsdVnEeGesbOtChNcvA">

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

+    </packageImport>

+    <packagedElement xmi:type="uml:Class" xmi:id="_BOLA8NVoEeGesbOtChNcvA" name="Class1"/>

+    <packagedElement xmi:type="uml:Class" xmi:id="_Br9wMNVoEeGesbOtChNcvA" name="Class1"/>

+    <profileApplication xmi:id="_AxzOANVoEeGesbOtChNcvA">

+      <eAnnotations xmi:id="_AyDssNVoEeGesbOtChNcvA" source="http://www.eclipse.org/uml2/2.0.0/UML">

+        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/0.7.0/SysML#//blocks"/>

+      </eAnnotations>

+      <appliedProfile href="pathmap://SysML_PROFILES/SysML.profile.uml#_fSw28LX7EduFmqQsrNB9lw"/>

+    </profileApplication>

+  </uml:Model>

+  <Blocks:Block xmi:id="_EKaIkNVoEeGesbOtChNcvA" base_Class="_BOLA8NVoEeGesbOtChNcvA"/>

+  <Blocks:Block xmi:id="_aXi5INVoEeGesbOtChNcvA" base_Class="_Br9wMNVoEeGesbOtChNcvA"/>

+</xmi:XMI>