Bug 541044: [Tests] The test

'PageManagerTests.testContainedDiagramDeletion' is in failure

Re-create the diagram for the deletion of the diagrams because the
version of this model was out-dated.

Change-Id: I4571cd46118e3dc9359d1a9ea2e5606344e43b2c
Signed-off-by: Nicolas FAUVERGUE <nicolas.fauvergue@cea.fr>

3 files changed, 174 insertions, 340 deletions

diff --git a/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_contained_diagram.di b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_contained_diagram.di
index 8ae13a19f1e..8c549eecdc6 100644
--- a/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_contained_diagram.di
+++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_contained_diagram.di
@@ -1,35 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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="delete_contained_diagram.notation#_7KiAcHxQEeKD0tnoPLkh-A"/>
-    </availablePage>
-    <availablePage>
-      <emfPageIdentifier href="delete_contained_diagram.notation#_45GUoH9WEeKg8Ob6i-v52w"/>
-    </availablePage>
-    <availablePage>
-      <emfPageIdentifier href="delete_contained_diagram.notation#_GeJbwH9cEeKUSOg4DHoPwA"/>
-    </availablePage>
-    <availablePage>
-      <emfPageIdentifier href="delete_contained_diagram.notation#_HGUPAH9cEeKUSOg4DHoPwA"/>
-    </availablePage>
-    <availablePage>
-      <emfPageIdentifier href="delete_contained_diagram.notation#_a0DxsH9sEeKFzdr7iEywzg"/>
-    </availablePage>
-  </pageList>
-  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
-    <windows>
-      <children xsi:type="di:TabFolder">
-        <children>
-          <emfPageIdentifier href="delete_contained_diagram.notation#_45GUoH9WEeKg8Ob6i-v52w"/>
-        </children>
-        <children>
-          <emfPageIdentifier href="delete_contained_diagram.notation#_GeJbwH9cEeKUSOg4DHoPwA"/>
-        </children>
-        <children>
-          <emfPageIdentifier href="delete_contained_diagram.notation#_7KiAcHxQEeKD0tnoPLkh-A"/>
-        </children>
-      </children>
-    </windows>
-  </sashModel>
-</di:SashWindowsMngr>
+<architecture:ArchitectureDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:architecture="http://www.eclipse.org/papyrus/infra/core/architecture" contextId="org.eclipse.papyrus.infra.services.edit.TypeContext"/>
diff --git a/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_contained_diagram.notation b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_contained_diagram.notation
index 660b276d194..657a2f4eefc 100644
--- a/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_contained_diagram.notation
+++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_contained_diagram.notation
@@ -1,282 +1,156 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI 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">
-  <notation:Diagram xmi:id="_7KiAcHxQEeKD0tnoPLkh-A" type="PapyrusUMLActivityDiagram" name="ActivityDiagram" measurementUnit="Pixel">
-    <children xmi:type="notation:Shape" xmi:id="_7KiAcXxQEeKD0tnoPLkh-A" type="2001" fontName="Segoe UI" lineColor="0">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_7KiAcnxQEeKD0tnoPLkh-A" source="ShadowFigure">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_7KiAc3xQEeKD0tnoPLkh-A" key="ShadowFigure_Value" value="false"/>
-      </eAnnotations>
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_7KiAdHxQEeKD0tnoPLkh-A" source="displayNameLabelIcon">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_7KiAdXxQEeKD0tnoPLkh-A" key="displayNameLabelIcon_value" value="false"/>
-      </eAnnotations>
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_7KiAdnxQEeKD0tnoPLkh-A" source="QualifiedName">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_7KiAd3xQEeKD0tnoPLkh-A" key="QualifiedNameDepth" value="1000"/>
-      </eAnnotations>
-      <children xmi:type="notation:DecorationNode" xmi:id="_7KiAeHxQEeKD0tnoPLkh-A" type="5001"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_7KiAenxQEeKD0tnoPLkh-A" type="7001">
-        <styles xmi:type="notation:SortingStyle" xmi:id="_7KiAe3xQEeKD0tnoPLkh-A"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_7KiAfHxQEeKD0tnoPLkh-A"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7KiAfXxQEeKD0tnoPLkh-A"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_7KiAfnxQEeKD0tnoPLkh-A" type="7002">
-        <styles xmi:type="notation:SortingStyle" xmi:id="_7KiAf3xQEeKD0tnoPLkh-A"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_7KiAgHxQEeKD0tnoPLkh-A"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7KiAgXxQEeKD0tnoPLkh-A"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_7KiAgnxQEeKD0tnoPLkh-A" type="7003">
-        <styles xmi:type="notation:SortingStyle" xmi:id="_7KiAg3xQEeKD0tnoPLkh-A"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_7KiAhHxQEeKD0tnoPLkh-A"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7KiAhXxQEeKD0tnoPLkh-A"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_7KiAhnxQEeKD0tnoPLkh-A" type="7004">
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7KiAh3xQEeKD0tnoPLkh-A"/>
-      </children>
-      <element xmi:type="uml:Activity" href="delete_contained_diagram.uml#_7Hjk8HxQEeKD0tnoPLkh-A"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7KiAiHxQEeKD0tnoPLkh-A"/>
-    </children>
-    <styles xmi:type="notation:DiagramStyle" xmi:id="_7KiAiXxQEeKD0tnoPLkh-A"/>
-    <element xmi:type="uml:Activity" href="delete_contained_diagram.uml#_7Hjk8HxQEeKD0tnoPLkh-A"/>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">
+  <notation:Diagram xmi:id="_1tn0QOaPEeiCTbLkJ0LILg" type="PapyrusUMLClassDiagram" name="ClassDiagram1" measurementUnit="Pixel">
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_1tn0QeaPEeiCTbLkJ0LILg" name="diagram_compatibility_version" stringValue="1.4.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_1tn0QuaPEeiCTbLkJ0LILg"/>
+    <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_1tn0Q-aPEeiCTbLkJ0LILg" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
+      <owner xmi:type="uml:Package" href="delete_contained_diagram.uml#_tiQVUOaPEeiCTbLkJ0LILg"/>
+    </styles>
+    <element xmi:type="uml:Package" href="delete_contained_diagram.uml#_tiQVUOaPEeiCTbLkJ0LILg"/>
   </notation:Diagram>
-  <notation:Diagram xmi:id="_45GUoH9WEeKg8Ob6i-v52w" type="PapyrusUMLClassDiagram" name="ClassDiagram3" measurementUnit="Pixel">
-    <children xmi:type="notation:Shape" xmi:id="_Itj5oH9cEeKUSOg4DHoPwA" type="2008">
-      <children xmi:type="notation:DecorationNode" xmi:id="_IttqoH9cEeKUSOg4DHoPwA" type="5029"/>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_IttqoX9cEeKUSOg4DHoPwA" type="7017">
-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IttqsH9cEeKUSOg4DHoPwA" source="PapyrusCSSForceValue">
-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IttqsX9cEeKUSOg4DHoPwA" key="showTitle" value="true"/>
-        </eAnnotations>
-        <children xmi:type="notation:Shape" xmi:id="_nL9LIIAfEeKTe7ZOi8nJaA" type="3012">
-          <element xmi:type="uml:Property" href="delete_contained_diagram.uml#_nDxfgIAfEeKTe7ZOi8nJaA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_nL9LIYAfEeKTe7ZOi8nJaA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_nWEwcIAfEeKTe7ZOi8nJaA" type="3012">
-          <element xmi:type="uml:Property" href="delete_contained_diagram.uml#_nVx1gIAfEeKTe7ZOi8nJaA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_nWEwcYAfEeKTe7ZOi8nJaA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_ondf0IAfEeKTe7ZOi8nJaA" type="3012">
-          <element xmi:type="uml:Property" href="delete_contained_diagram.uml#_onKk4IAfEeKTe7ZOi8nJaA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_ondf0YAfEeKTe7ZOi8nJaA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_pUtAUIAfEeKTe7ZOi8nJaA" type="3012">
-          <element xmi:type="uml:Property" href="delete_contained_diagram.uml#_pUQUYIAfEeKTe7ZOi8nJaA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_pUtAUYAfEeKTe7ZOi8nJaA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_pcviAIAfEeKTe7ZOi8nJaA" type="3012">
-          <element xmi:type="uml:Property" href="delete_contained_diagram.uml#_pcmYEIAfEeKTe7ZOi8nJaA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_pcviAYAfEeKTe7ZOi8nJaA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_pozBAIAfEeKTe7ZOi8nJaA" type="3012">
-          <element xmi:type="uml:Property" href="delete_contained_diagram.uml#_poWVEIAfEeKTe7ZOi8nJaA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_pozBAYAfEeKTe7ZOi8nJaA"/>
-        </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_Ittqon9cEeKUSOg4DHoPwA"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_Ittqo39cEeKUSOg4DHoPwA"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_IttqpH9cEeKUSOg4DHoPwA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IttqpX9cEeKUSOg4DHoPwA"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_Ittqpn9cEeKUSOg4DHoPwA" type="7018">
-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Ittqsn9cEeKUSOg4DHoPwA" source="PapyrusCSSForceValue">
-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Ittqs39cEeKUSOg4DHoPwA" key="showTitle" value="true"/>
-        </eAnnotations>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_Ittqp39cEeKUSOg4DHoPwA"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_IttqqH9cEeKUSOg4DHoPwA"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_IttqqX9cEeKUSOg4DHoPwA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ittqqn9cEeKUSOg4DHoPwA"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_Ittqq39cEeKUSOg4DHoPwA" type="7019">
-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_It3boH9cEeKUSOg4DHoPwA" source="PapyrusCSSForceValue">
-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_It3boX9cEeKUSOg4DHoPwA" key="showTitle" value="true"/>
-        </eAnnotations>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_IttqrH9cEeKUSOg4DHoPwA"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_IttqrX9cEeKUSOg4DHoPwA"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_Ittqrn9cEeKUSOg4DHoPwA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ittqr39cEeKUSOg4DHoPwA"/>
-      </children>
-      <element xmi:type="uml:Class" href="delete_contained_diagram.uml#_8UYvwH9WEeKg8Ob6i-v52w"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Itj5oX9cEeKUSOg4DHoPwA" x="150" y="205"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_IuwMcH9cEeKUSOg4DHoPwA" type="2008">
-      <children xmi:type="notation:DecorationNode" xmi:id="_IuwMcn9cEeKUSOg4DHoPwA" type="5029"/>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_IuwMc39cEeKUSOg4DHoPwA" type="7017">
-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IuwMgn9cEeKUSOg4DHoPwA" source="PapyrusCSSForceValue">
-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IuwMg39cEeKUSOg4DHoPwA" key="showTitle" value="true"/>
-        </eAnnotations>
-        <children xmi:type="notation:Shape" xmi:id="_AfaMYIAgEeKTe7ZOi8nJaA" type="3012">
-          <element xmi:type="uml:Property" href="delete_contained_diagram.uml#_nDxfgIAfEeKTe7ZOi8nJaA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_AfaMYYAgEeKTe7ZOi8nJaA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_AfaMYoAgEeKTe7ZOi8nJaA" type="3012">
-          <element xmi:type="uml:Property" href="delete_contained_diagram.uml#_nVx1gIAfEeKTe7ZOi8nJaA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_AfaMY4AgEeKTe7ZOi8nJaA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_AfaMZIAgEeKTe7ZOi8nJaA" type="3012">
-          <element xmi:type="uml:Property" href="delete_contained_diagram.uml#_pcmYEIAfEeKTe7ZOi8nJaA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_AfaMZYAgEeKTe7ZOi8nJaA"/>
-        </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_IuwMdH9cEeKUSOg4DHoPwA"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_IuwMdX9cEeKUSOg4DHoPwA"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_IuwMdn9cEeKUSOg4DHoPwA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IuwMd39cEeKUSOg4DHoPwA"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_IuwMeH9cEeKUSOg4DHoPwA" type="7018">
-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IuwMhH9cEeKUSOg4DHoPwA" source="PapyrusCSSForceValue">
-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IuwMhX9cEeKUSOg4DHoPwA" key="showTitle" value="true"/>
-        </eAnnotations>
-        <children xmi:type="notation:Shape" xmi:id="_raBuEIAfEeKTe7ZOi8nJaA" type="3013">
-          <element xmi:type="uml:Operation" href="delete_contained_diagram.uml#_rZlCIIAfEeKTe7ZOi8nJaA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_raBuEYAfEeKTe7ZOi8nJaA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_reL1UIAfEeKTe7ZOi8nJaA" type="3013">
-          <element xmi:type="uml:Operation" href="delete_contained_diagram.uml#_rd46YIAfEeKTe7ZOi8nJaA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_reL1UYAfEeKTe7ZOi8nJaA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_rizPkIAfEeKTe7ZOi8nJaA" type="3013">
-          <element xmi:type="uml:Operation" href="delete_contained_diagram.uml#_rigUoIAfEeKTe7ZOi8nJaA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_rizPkYAfEeKTe7ZOi8nJaA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_roTaoIAfEeKTe7ZOi8nJaA" type="3013">
-          <element xmi:type="uml:Operation" href="delete_contained_diagram.uml#_roAfsIAfEeKTe7ZOi8nJaA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_roTaoYAfEeKTe7ZOi8nJaA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_rtNv0IAfEeKTe7ZOi8nJaA" type="3013">
-          <element xmi:type="uml:Operation" href="delete_contained_diagram.uml#_rs604IAfEeKTe7ZOi8nJaA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_rtNv0YAfEeKTe7ZOi8nJaA"/>
-        </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_IuwMeX9cEeKUSOg4DHoPwA"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_IuwMen9cEeKUSOg4DHoPwA"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_IuwMe39cEeKUSOg4DHoPwA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IuwMfH9cEeKUSOg4DHoPwA"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_IuwMfX9cEeKUSOg4DHoPwA" type="7019">
-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Iu59cH9cEeKUSOg4DHoPwA" source="PapyrusCSSForceValue">
-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Iu59cX9cEeKUSOg4DHoPwA" key="showTitle" value="true"/>
-        </eAnnotations>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_IuwMfn9cEeKUSOg4DHoPwA"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_IuwMf39cEeKUSOg4DHoPwA"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_IuwMgH9cEeKUSOg4DHoPwA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IuwMgX9cEeKUSOg4DHoPwA"/>
-      </children>
-      <element xmi:type="uml:Class" href="delete_contained_diagram.uml#_9c2MoH9WEeKg8Ob6i-v52w"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IuwMcX9cEeKUSOg4DHoPwA" x="490" y="530" width="336"/>
+  <notation:Diagram xmi:id="_20f8wOaPEeiCTbLkJ0LILg" type="PapyrusUMLDeploymentDiagram" name="NewDeploymentDiagram" measurementUnit="Pixel">
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_20f8weaPEeiCTbLkJ0LILg" name="diagram_compatibility_version" stringValue="1.4.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_20f8wuaPEeiCTbLkJ0LILg"/>
+    <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_20f8w-aPEeiCTbLkJ0LILg" diagramKindId="org.eclipse.papyrus.uml.diagram.deployment">
+      <owner xmi:type="uml:Package" href="delete_contained_diagram.uml#_tiQVUOaPEeiCTbLkJ0LILg"/>
+    </styles>
+    <element xmi:type="uml:Package" href="delete_contained_diagram.uml#_tiQVUOaPEeiCTbLkJ0LILg"/>
+  </notation:Diagram>
+  <notation:Diagram xmi:id="_5lZ-IOaPEeiCTbLkJ0LILg" type="PapyrusUMLClassDiagram" name="ClassDiagram2" measurementUnit="Pixel">
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_5lZ-IeaPEeiCTbLkJ0LILg" name="diagram_compatibility_version" stringValue="1.4.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_5lZ-IuaPEeiCTbLkJ0LILg"/>
+    <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_5lZ-I-aPEeiCTbLkJ0LILg" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
+      <owner xmi:type="uml:Package" href="delete_contained_diagram.uml#_3pd14OaPEeiCTbLkJ0LILg"/>
+    </styles>
+    <element xmi:type="uml:Package" href="delete_contained_diagram.uml#_3pd14OaPEeiCTbLkJ0LILg"/>
+  </notation:Diagram>
+  <notation:Diagram xmi:id="_8HcdEOaPEeiCTbLkJ0LILg" type="PapyrusUMLClassDiagram" name="ClassDiagram3" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_Uc8oUOaQEeiCTbLkJ0LILg" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_Uc92cOaQEeiCTbLkJ0LILg" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Uc92ceaQEeiCTbLkJ0LILg" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Uc92cuaQEeiCTbLkJ0LILg" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Uc-dgOaQEeiCTbLkJ0LILg" type="Class_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Uc-dgeaQEeiCTbLkJ0LILg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Uc-dguaQEeiCTbLkJ0LILg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Uc-dg-aQEeiCTbLkJ0LILg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Uc-dhOaQEeiCTbLkJ0LILg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Uc-dheaQEeiCTbLkJ0LILg" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Uc-dhuaQEeiCTbLkJ0LILg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Uc-dh-aQEeiCTbLkJ0LILg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Uc-diOaQEeiCTbLkJ0LILg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Uc-dieaQEeiCTbLkJ0LILg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Uc-diuaQEeiCTbLkJ0LILg" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Uc-di-aQEeiCTbLkJ0LILg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Uc-djOaQEeiCTbLkJ0LILg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Uc-djeaQEeiCTbLkJ0LILg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Uc-djuaQEeiCTbLkJ0LILg"/>
+      </children>
+      <element xmi:type="uml:Class" href="delete_contained_diagram.uml#_8iuD0OaPEeiCTbLkJ0LILg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Uc8oUeaQEeiCTbLkJ0LILg" x="366" y="217"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_IvWpYH9cEeKUSOg4DHoPwA" type="2008">
-      <children xmi:type="notation:DecorationNode" xmi:id="_IvWpYn9cEeKUSOg4DHoPwA" type="5029"/>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_IvWpY39cEeKUSOg4DHoPwA" type="7017">
-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IvWpcn9cEeKUSOg4DHoPwA" source="PapyrusCSSForceValue">
-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IvWpc39cEeKUSOg4DHoPwA" key="showTitle" value="true"/>
-        </eAnnotations>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_IvWpZH9cEeKUSOg4DHoPwA"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_IvWpZX9cEeKUSOg4DHoPwA"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_IvWpZn9cEeKUSOg4DHoPwA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IvWpZ39cEeKUSOg4DHoPwA"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_IvWpaH9cEeKUSOg4DHoPwA" type="7018">
-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IvWpdH9cEeKUSOg4DHoPwA" source="PapyrusCSSForceValue">
-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IvWpdX9cEeKUSOg4DHoPwA" key="showTitle" value="true"/>
-        </eAnnotations>
-        <children xmi:type="notation:Shape" xmi:id="_qycwsIAfEeKTe7ZOi8nJaA" type="3013">
-          <element xmi:type="uml:Operation" href="delete_contained_diagram.uml#_qyAEwIAfEeKTe7ZOi8nJaA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_qycwsYAfEeKTe7ZOi8nJaA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_rDHC4IAfEeKTe7ZOi8nJaA" type="3013">
-          <element xmi:type="uml:Operation" href="delete_contained_diagram.uml#_rC0H8IAfEeKTe7ZOi8nJaA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_rDHC4YAfEeKTe7ZOi8nJaA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_rILJEIAfEeKTe7ZOi8nJaA" type="3013">
-          <element xmi:type="uml:Operation" href="delete_contained_diagram.uml#_rHudIIAfEeKTe7ZOi8nJaA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_rILJEYAfEeKTe7ZOi8nJaA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_rNE3MIAfEeKTe7ZOi8nJaA" type="3013">
-          <element xmi:type="uml:Operation" href="delete_contained_diagram.uml#_rMx8QIAfEeKTe7ZOi8nJaA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_rNE3MYAfEeKTe7ZOi8nJaA"/>
-        </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_IvWpaX9cEeKUSOg4DHoPwA"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_IvWpan9cEeKUSOg4DHoPwA"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_IvWpa39cEeKUSOg4DHoPwA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IvWpbH9cEeKUSOg4DHoPwA"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_IvWpbX9cEeKUSOg4DHoPwA" type="7019">
-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IvWpdn9cEeKUSOg4DHoPwA" source="PapyrusCSSForceValue">
-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IvWpd39cEeKUSOg4DHoPwA" key="showTitle" value="true"/>
-        </eAnnotations>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_IvWpbn9cEeKUSOg4DHoPwA"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_IvWpb39cEeKUSOg4DHoPwA"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_IvWpcH9cEeKUSOg4DHoPwA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IvWpcX9cEeKUSOg4DHoPwA"/>
-      </children>
-      <element xmi:type="uml:Class" href="delete_contained_diagram.uml#_9q0-QH9WEeKg8Ob6i-v52w"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IvWpYX9cEeKUSOg4DHoPwA" x="905" y="220"/>
+    <children xmi:type="notation:Shape" xmi:id="_Uw9wgOaQEeiCTbLkJ0LILg" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_Uw9wguaQEeiCTbLkJ0LILg" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Uw-XkOaQEeiCTbLkJ0LILg" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Uw-XkeaQEeiCTbLkJ0LILg" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Uw-XkuaQEeiCTbLkJ0LILg" type="Class_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Uw-Xk-aQEeiCTbLkJ0LILg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Uw-XlOaQEeiCTbLkJ0LILg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Uw-XleaQEeiCTbLkJ0LILg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Uw-XluaQEeiCTbLkJ0LILg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Uw-Xl-aQEeiCTbLkJ0LILg" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Uw-XmOaQEeiCTbLkJ0LILg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Uw-XmeaQEeiCTbLkJ0LILg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Uw-XmuaQEeiCTbLkJ0LILg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Uw-Xm-aQEeiCTbLkJ0LILg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Uw--oOaQEeiCTbLkJ0LILg" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Uw--oeaQEeiCTbLkJ0LILg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Uw--ouaQEeiCTbLkJ0LILg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Uw--o-aQEeiCTbLkJ0LILg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Uw--pOaQEeiCTbLkJ0LILg"/>
+      </children>
+      <element xmi:type="uml:Class" href="delete_contained_diagram.uml#__wBtUOaPEeiCTbLkJ0LILg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Uw9wgeaQEeiCTbLkJ0LILg" x="731" y="222"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_njLtcIAhEeKTe7ZOi8nJaA" type="2015">
-      <styles xmi:type="notation:DescriptionStyle" xmi:id="_njLtcYAhEeKTe7ZOi8nJaA"/>
-      <styles xmi:type="notation:FontStyle" xmi:id="_njLtcoAhEeKTe7ZOi8nJaA"/>
-      <element xmi:type="uml:Association" href="delete_contained_diagram.uml#_mxWA04AhEeKTe7ZOi8nJaA"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_njLtdIAhEeKTe7ZOi8nJaA" x="645" y="285"/>
+    <children xmi:type="notation:Shape" xmi:id="_VbO1gOaQEeiCTbLkJ0LILg" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_VbPckOaQEeiCTbLkJ0LILg" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_VbQDoOaQEeiCTbLkJ0LILg" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_VbQDoeaQEeiCTbLkJ0LILg" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_VbQDouaQEeiCTbLkJ0LILg" type="Class_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_VbQDo-aQEeiCTbLkJ0LILg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_VbQDpOaQEeiCTbLkJ0LILg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_VbQDpeaQEeiCTbLkJ0LILg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VbQDpuaQEeiCTbLkJ0LILg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_VbQqsOaQEeiCTbLkJ0LILg" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_VbQqseaQEeiCTbLkJ0LILg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_VbQqsuaQEeiCTbLkJ0LILg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_VbQqs-aQEeiCTbLkJ0LILg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VbQqtOaQEeiCTbLkJ0LILg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_VbQqteaQEeiCTbLkJ0LILg" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_VbQqtuaQEeiCTbLkJ0LILg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_VbQqt-aQEeiCTbLkJ0LILg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_VbQquOaQEeiCTbLkJ0LILg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VbQqueaQEeiCTbLkJ0LILg"/>
+      </children>
+      <element xmi:type="uml:Class" href="delete_contained_diagram.uml#_-ZCFMOaPEeiCTbLkJ0LILg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VbO1geaQEeiCTbLkJ0LILg" x="413" y="420"/>
     </children>
-    <styles xmi:type="notation:DiagramStyle" xmi:id="_45GUoX9WEeKg8Ob6i-v52w"/>
-    <element xmi:type="uml:Package" href="delete_contained_diagram.uml#_4gjRwH9WEeKg8Ob6i-v52w"/>
-    <edges xmi:type="notation:Connector" xmi:id="_6tQAgIAfEeKTe7ZOi8nJaA" type="4002" source="_IuwMcH9cEeKUSOg4DHoPwA" target="_Itj5oH9cEeKUSOg4DHoPwA">
-      <children xmi:type="notation:DecorationNode" xmi:id="_6tQAg4AfEeKTe7ZOi8nJaA" type="6007">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_6tQAhIAfEeKTe7ZOi8nJaA" y="40"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_6tQAgYAfEeKTe7ZOi8nJaA"/>
-      <element xmi:type="uml:Generalization" href="delete_contained_diagram.uml#_6sgZoIAfEeKTe7ZOi8nJaA"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_6tQAgoAfEeKTe7ZOi8nJaA" points="[-131, 0, 271, 215]$[-402, 0, 0, 215]$[-402, -192, 0, 23]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6wYNAIAfEeKTe7ZOi8nJaA" id="(0.3898809523809524,0.21875)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6wYNAYAfEeKTe7ZOi8nJaA" id="(0.3894736842105263,0.8693181818181818)"/>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_8HcdEeaPEeiCTbLkJ0LILg" name="diagram_compatibility_version" stringValue="1.4.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_8HcdEuaPEeiCTbLkJ0LILg"/>
+    <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_8HcdE-aPEeiCTbLkJ0LILg" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
+      <owner xmi:type="uml:Package" href="delete_contained_diagram.uml#_6TxgAOaPEeiCTbLkJ0LILg"/>
+    </styles>
+    <element xmi:type="uml:Package" href="delete_contained_diagram.uml#_6TxgAOaPEeiCTbLkJ0LILg"/>
+    <edges xmi:type="notation:Connector" xmi:id="_WdfjwOaQEeiCTbLkJ0LILg" type="Generalization_Edge" source="_VbO1gOaQEeiCTbLkJ0LILg" target="_Uc8oUOaQEeiCTbLkJ0LILg">
+      <children xmi:type="notation:DecorationNode" xmi:id="_WdgK0OaQEeiCTbLkJ0LILg" type="Generalization_StereotypeLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_WdgK0eaQEeiCTbLkJ0LILg" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_WdfjweaQEeiCTbLkJ0LILg"/>
+      <element xmi:type="uml:Generalization" href="delete_contained_diagram.uml#_WdF7IOaQEeiCTbLkJ0LILg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_WdfjwuaQEeiCTbLkJ0LILg" points="[460, 420, -643984, -643984]$[420, 317, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_WegQYOaQEeiCTbLkJ0LILg" id="(0.47,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Weg3cOaQEeiCTbLkJ0LILg" id="(0.54,1.0)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_nlQxEIAhEeKTe7ZOi8nJaA" type="4019" source="_njLtcIAhEeKTe7ZOi8nJaA" target="_Itj5oH9cEeKUSOg4DHoPwA">
-      <children xmi:type="notation:DecorationNode" xmi:id="_nlQxE4AhEeKTe7ZOi8nJaA" type="6024">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_nlQxFIAhEeKTe7ZOi8nJaA" y="-20"/>
+    <edges xmi:type="notation:Connector" xmi:id="_Xu9LoOaQEeiCTbLkJ0LILg" type="Association_Edge" source="_Uc8oUOaQEeiCTbLkJ0LILg" target="_Uw9wgOaQEeiCTbLkJ0LILg">
+      <children xmi:type="notation:DecorationNode" xmi:id="_Xu9Lo-aQEeiCTbLkJ0LILg" type="Association_StereotypeLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Xu9LpOaQEeiCTbLkJ0LILg" y="-20"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_nlQxFYAhEeKTe7ZOi8nJaA" type="6035">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_nlQxFoAhEeKTe7ZOi8nJaA" y="20"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Xu9LpeaQEeiCTbLkJ0LILg" type="Association_NameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Xu9LpuaQEeiCTbLkJ0LILg" y="20"/>
       </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_nlQxEYAhEeKTe7ZOi8nJaA"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_nmv-0IAhEeKTe7ZOi8nJaA" name="Semantic_Branch_Style">
-        <eObjectValue xmi:type="uml:Property" href="delete_contained_diagram.uml#_mxWA1IAhEeKTe7ZOi8nJaA"/>
-      </styles>
-      <element xmi:type="uml:Association" href="delete_contained_diagram.uml#_mxWA04AhEeKTe7ZOi8nJaA"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_nlQxEoAhEeKTe7ZOi8nJaA" points="[0, 0, -245, -293]$[171, 205, -74, -88]"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_noY9kIAhEeKTe7ZOi8nJaA" type="4019" source="_njLtcIAhEeKTe7ZOi8nJaA" target="_IvWpYH9cEeKUSOg4DHoPwA">
-      <children xmi:type="notation:DecorationNode" xmi:id="_noY9k4AhEeKTe7ZOi8nJaA" type="6024">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_noY9lIAhEeKTe7ZOi8nJaA" y="-20"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Xu9Lp-aQEeiCTbLkJ0LILg" type="Association_TargetRoleLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Xu9LqOaQEeiCTbLkJ0LILg" y="-20"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_noY9lYAhEeKTe7ZOi8nJaA" type="6035">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_noY9loAhEeKTe7ZOi8nJaA" y="20"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Xu9LqeaQEeiCTbLkJ0LILg" type="Association_SourceRoleLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Xu9LquaQEeiCTbLkJ0LILg" y="20"/>
       </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_noY9kYAhEeKTe7ZOi8nJaA"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_noY9l4AhEeKTe7ZOi8nJaA" name="Semantic_Branch_Style">
-        <eObjectValue xmi:type="uml:Property" href="delete_contained_diagram.uml#_mxWA0IAhEeKTe7ZOi8nJaA"/>
-      </styles>
-      <element xmi:type="uml:Association" href="delete_contained_diagram.uml#_mxWA04AhEeKTe7ZOi8nJaA"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_noY9koAhEeKTe7ZOi8nJaA" points="[7, -3, -258, 85]$[210, -70, -55, 18]"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_nor4gIAhEeKTe7ZOi8nJaA" type="4019" source="_njLtcIAhEeKTe7ZOi8nJaA" target="_IuwMcH9cEeKUSOg4DHoPwA">
-      <children xmi:type="notation:DecorationNode" xmi:id="_nor4g4AhEeKTe7ZOi8nJaA" type="6024">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_nor4hIAhEeKTe7ZOi8nJaA" x="-19" y="29"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Xu9Lq-aQEeiCTbLkJ0LILg" type="Association_SourceMultiplicityLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Xu9LrOaQEeiCTbLkJ0LILg" y="20"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_nor4hYAhEeKTe7ZOi8nJaA" type="6035">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_nor4hoAhEeKTe7ZOi8nJaA" x="-4" y="22"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Xu9LreaQEeiCTbLkJ0LILg" type="Association_TargetMultiplicityLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Xu9LruaQEeiCTbLkJ0LILg" y="-20"/>
       </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_nor4gYAhEeKTe7ZOi8nJaA"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_nor4h4AhEeKTe7ZOi8nJaA" name="Semantic_Branch_Style">
-        <eObjectValue xmi:type="uml:Property" href="delete_contained_diagram.uml#_nicGkIAhEeKTe7ZOi8nJaA"/>
-      </styles>
-      <element xmi:type="uml:Association" href="delete_contained_diagram.uml#_mxWA04AhEeKTe7ZOi8nJaA"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_nor4goAhEeKTe7ZOi8nJaA" points="[0, 0, -663, -629]$[558, 530, -105, -99]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4osc4IAhEeKTe7ZOi8nJaA" id="(0.35,0.8)"/>
+      <styles xmi:type="notation:FontStyle" xmi:id="_Xu9LoeaQEeiCTbLkJ0LILg"/>
+      <element xmi:type="uml:Association" href="delete_contained_diagram.uml#_Xun0cOaQEeiCTbLkJ0LILg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Xu9LouaQEeiCTbLkJ0LILg" points="[466, 260, -643984, -643984]$[731, 260, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XwCwwOaQEeiCTbLkJ0LILg" id="(1.0,0.43)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XwCwweaQEeiCTbLkJ0LILg" id="(0.0,0.38)"/>
     </edges>
   </notation:Diagram>
-  <notation:Diagram xmi:id="_GeJbwH9cEeKUSOg4DHoPwA" type="PapyrusUMLClassDiagram" name="ClassDiagram2" measurementUnit="Pixel">
-    <styles xmi:type="notation:DiagramStyle" xmi:id="_GeJbwX9cEeKUSOg4DHoPwA"/>
-    <element xmi:type="uml:Package" href="delete_contained_diagram.uml#_3wyowH9WEeKg8Ob6i-v52w"/>
-  </notation:Diagram>
-  <notation:Diagram xmi:id="_HGUPAH9cEeKUSOg4DHoPwA" type="PapyrusUMLClassDiagram" name="ClassDiagram1" measurementUnit="Pixel">
-    <styles xmi:type="notation:DiagramStyle" xmi:id="_HGUPAX9cEeKUSOg4DHoPwA"/>
-    <element xmi:type="uml:Package" href="delete_contained_diagram.uml#_3AS_8H9WEeKg8Ob6i-v52w"/>
-  </notation:Diagram>
-  <notation:Diagram xmi:id="_a0DxsH9sEeKFzdr7iEywzg" type="PapyrusUMLDeploymentDiagram" name="NewDeploymentDiagram" measurementUnit="Pixel">
-    <styles xmi:type="notation:DiagramStyle" xmi:id="_a0DxsX9sEeKFzdr7iEywzg"/>
-    <element xmi:type="uml:Package" href="delete_contained_diagram.uml#_3AS_8H9WEeKg8Ob6i-v52w"/>
+  <notation:Diagram xmi:id="_tb2rAOaSEeiUrJYPpJSlpg" type="PapyrusUMLComponentDiagram" name="NewComponentDiagram" measurementUnit="Pixel">
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_tb2rAeaSEeiUrJYPpJSlpg" name="diagram_compatibility_version" stringValue="1.4.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_tb2rAuaSEeiUrJYPpJSlpg"/>
+    <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_tb2rA-aSEeiUrJYPpJSlpg" diagramKindId="org.eclipse.papyrus.uml.diagram.component.root.package">
+      <owner xmi:type="uml:Package" href="delete_contained_diagram.uml#_rLDtEOaSEeiUrJYPpJSlpg"/>
+    </styles>
+    <element xmi:type="uml:Package" href="delete_contained_diagram.uml#_rLDtEOaSEeiUrJYPpJSlpg"/>
   </notation:Diagram>
 </xmi:XMI>
diff --git a/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_contained_diagram.uml b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_contained_diagram.uml
index 41d2a331cba..d39277cbe21 100644
--- a/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_contained_diagram.uml
+++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_contained_diagram.uml
@@ -1,47 +1,40 @@
 <?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="_0VtdsHxQEeKD0tnoPLkh-A" name="model">
-  <packagedElement xmi:type="uml:Activity" xmi:id="_7Hjk8HxQEeKD0tnoPLkh-A" name="Activity1"/>
-  <packagedElement xmi:type="uml:Package" xmi:id="_3AS_8H9WEeKg8Ob6i-v52w" name="Package1">
-    <packagedElement xmi:type="uml:Package" xmi:id="_3wyowH9WEeKg8Ob6i-v52w" name="Package2">
-      <packagedElement xmi:type="uml:Package" xmi:id="_4gjRwH9WEeKg8Ob6i-v52w" name="Package3">
-        <packagedElement xmi:type="uml:Class" xmi:id="_8UYvwH9WEeKg8Ob6i-v52w" name="Class1">
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_nDxfgIAfEeKTe7ZOi8nJaA" name="Attribute1"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_nVx1gIAfEeKTe7ZOi8nJaA" name="Attribute2"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_onKk4IAfEeKTe7ZOi8nJaA" name="Attribute3"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_pUQUYIAfEeKTe7ZOi8nJaA" name="Attribute4"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_pcmYEIAfEeKTe7ZOi8nJaA" name="Attribute5"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_poWVEIAfEeKTe7ZOi8nJaA" name="Attribute6"/>
+<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="_sjMsEOaPEeiCTbLkJ0LILg" name="model">
+  <packagedElement xmi:type="uml:Package" xmi:id="_rLDtEOaSEeiUrJYPpJSlpg" name="Package0"/>
+  <packagedElement xmi:type="uml:Package" xmi:id="_tiQVUOaPEeiCTbLkJ0LILg" name="Package1">
+    <packagedElement xmi:type="uml:Package" xmi:id="_3pd14OaPEeiCTbLkJ0LILg" name="Package2">
+      <packagedElement xmi:type="uml:Package" xmi:id="_6TxgAOaPEeiCTbLkJ0LILg" name="Package3">
+        <packagedElement xmi:type="uml:Class" xmi:id="_8iuD0OaPEeiCTbLkJ0LILg" name="Class1">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_CtqjIOaQEeiCTbLkJ0LILg" name="Attribute1" visibility="public"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_D7bWwOaQEeiCTbLkJ0LILg" name="Attribute2" visibility="public"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_EkLY0OaQEeiCTbLkJ0LILg" name="Attribute3" visibility="public"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_FCjW4OaQEeiCTbLkJ0LILg" name="Attribute4" visibility="public"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_FtyFMOaQEeiCTbLkJ0LILg" name="Attribute5" visibility="public"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_GKJ4IOaQEeiCTbLkJ0LILg" name="Attribute6" visibility="public"/>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_8cIWgH9WEeKg8Ob6i-v52w" name="Class2"/>
-        <packagedElement xmi:type="uml:Class" xmi:id="_9c2MoH9WEeKg8Ob6i-v52w" name="Class3">
-          <generalization xmi:type="uml:Generalization" xmi:id="_6sgZoIAfEeKTe7ZOi8nJaA" general="_8UYvwH9WEeKg8Ob6i-v52w"/>
-          <ownedOperation xmi:type="uml:Operation" xmi:id="_rZlCIIAfEeKTe7ZOi8nJaA" name="Operation1"/>
-          <ownedOperation xmi:type="uml:Operation" xmi:id="_rd46YIAfEeKTe7ZOi8nJaA" name="Operation2"/>
-          <ownedOperation xmi:type="uml:Operation" xmi:id="_rigUoIAfEeKTe7ZOi8nJaA" name="Operation3"/>
-          <ownedOperation xmi:type="uml:Operation" xmi:id="_roAfsIAfEeKTe7ZOi8nJaA" name="Operation4"/>
-          <ownedOperation xmi:type="uml:Operation" xmi:id="_rs604IAfEeKTe7ZOi8nJaA" name="Operation5"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_-CAsUOaPEeiCTbLkJ0LILg" name="Class2"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_-ZCFMOaPEeiCTbLkJ0LILg" name="Class3">
+          <generalization xmi:type="uml:Generalization" xmi:id="_WdF7IOaQEeiCTbLkJ0LILg" general="_8iuD0OaPEeiCTbLkJ0LILg"/>
+          <ownedOperation xmi:type="uml:Operation" xmi:id="_PhjsYOaQEeiCTbLkJ0LILg" name="Operation1"/>
+          <ownedOperation xmi:type="uml:Operation" xmi:id="_P6tMMOaQEeiCTbLkJ0LILg" name="Operation2"/>
+          <ownedOperation xmi:type="uml:Operation" xmi:id="_QYab4OaQEeiCTbLkJ0LILg" name="Operation3"/>
+          <ownedOperation xmi:type="uml:Operation" xmi:id="_Qz9IYOaQEeiCTbLkJ0LILg" name="Operation4"/>
+          <ownedOperation xmi:type="uml:Operation" xmi:id="_RsbBcOaQEeiCTbLkJ0LILg" name="Operation5"/>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_9d4ucH9WEeKg8Ob6i-v52w" name="Class4"/>
-        <packagedElement xmi:type="uml:Class" xmi:id="_9exfQH9WEeKg8Ob6i-v52w" name="Class5"/>
-        <packagedElement xmi:type="uml:Class" xmi:id="_9q0-QH9WEeKg8Ob6i-v52w" name="Class6">
-          <ownedOperation xmi:type="uml:Operation" xmi:id="_qyAEwIAfEeKTe7ZOi8nJaA" name="Operation1"/>
-          <ownedOperation xmi:type="uml:Operation" xmi:id="_rC0H8IAfEeKTe7ZOi8nJaA" name="Operation2"/>
-          <ownedOperation xmi:type="uml:Operation" xmi:id="_rHudIIAfEeKTe7ZOi8nJaA" name="Operation3"/>
-          <ownedOperation xmi:type="uml:Operation" xmi:id="_rMx8QIAfEeKTe7ZOi8nJaA" name="Operation4"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_-yEQQOaPEeiCTbLkJ0LILg" name="Class4"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="__XQA8OaPEeiCTbLkJ0LILg" name="Class5"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="__wBtUOaPEeiCTbLkJ0LILg" name="Class6">
+          <ownedOperation xmi:type="uml:Operation" xmi:id="_SV5cQOaQEeiCTbLkJ0LILg" name="Operation1"/>
+          <ownedOperation xmi:type="uml:Operation" xmi:id="_Sx6C0OaQEeiCTbLkJ0LILg" name="Operation2"/>
+          <ownedOperation xmi:type="uml:Operation" xmi:id="_TSCUYOaQEeiCTbLkJ0LILg" name="Operation3"/>
+          <ownedOperation xmi:type="uml:Operation" xmi:id="_TuPIMOaQEeiCTbLkJ0LILg" name="Operation4"/>
         </packagedElement>
-        <packagedElement xmi:type="uml:Association" xmi:id="_mxWA04AhEeKTe7ZOi8nJaA" name="class1_class6_1" memberEnd="_mxWA1IAhEeKTe7ZOi8nJaA _mxWA0IAhEeKTe7ZOi8nJaA _nicGkIAhEeKTe7ZOi8nJaA">
-          <ownedEnd xmi:type="uml:Property" xmi:id="_mxWA1IAhEeKTe7ZOi8nJaA" name="class1" type="_8UYvwH9WEeKg8Ob6i-v52w" association="_mxWA04AhEeKTe7ZOi8nJaA">
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_mxWA1YAhEeKTe7ZOi8nJaA" value="1"/>
-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_mxWA1oAhEeKTe7ZOi8nJaA" value="1"/>
-          </ownedEnd>
-          <ownedEnd xmi:type="uml:Property" xmi:id="_mxWA0IAhEeKTe7ZOi8nJaA" name="class6" type="_9q0-QH9WEeKg8Ob6i-v52w" association="_mxWA04AhEeKTe7ZOi8nJaA">
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_mxWA0YAhEeKTe7ZOi8nJaA" value="1"/>
-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_mxWA0oAhEeKTe7ZOi8nJaA" value="1"/>
-          </ownedEnd>
-          <ownedEnd xmi:type="uml:Property" xmi:id="_nicGkIAhEeKTe7ZOi8nJaA" name="Class3" type="_9c2MoH9WEeKg8Ob6i-v52w" association="_mxWA04AhEeKTe7ZOi8nJaA">
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_nilQgIAhEeKTe7ZOi8nJaA"/>
-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_nivBgIAhEeKTe7ZOi8nJaA" value="1"/>
-          </ownedEnd>
+        <packagedElement xmi:type="uml:Association" xmi:id="_Xun0cOaQEeiCTbLkJ0LILg" memberEnd="_XuvJMOaQEeiCTbLkJ0LILg _XuwXUOaQEeiCTbLkJ0LILg">
+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_XusF4OaQEeiCTbLkJ0LILg" source="org.eclipse.papyrus">
+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Xuss8OaQEeiCTbLkJ0LILg" key="nature" value="UML_Nature"/>
+          </eAnnotations>
+          <ownedEnd xmi:type="uml:Property" xmi:id="_XuvJMOaQEeiCTbLkJ0LILg" name="class6" type="__wBtUOaPEeiCTbLkJ0LILg" association="_Xun0cOaQEeiCTbLkJ0LILg"/>
+          <ownedEnd xmi:type="uml:Property" xmi:id="_XuwXUOaQEeiCTbLkJ0LILg" name="class1" type="_8iuD0OaPEeiCTbLkJ0LILg" association="_Xun0cOaQEeiCTbLkJ0LILg"/>
         </packagedElement>
       </packagedElement>
     </packagedElement>