[522007] Test to check Hide/Reveal label behavior with invalid selection

In test data, a border node without label has been added. After this issue, even with this element selected, the action "Hide/Reveal label" must be available. The contextual menu of Outline tree view is not automatically tested (pb with SWTBot and multi-selection in tree). Bug: 522007 Change-Id: Ic0950d8fdc46bb8e452c6678e917d3ce1f4be79c Signed-off-by: Laurent Redor <laurent.redor@obeo.fr>
author: Laurent Redor 2017-09-08 09:00:25 +0000
committer: Laurent Redor 2017-09-11 15:02:38 +0000
commit: bd1d82c356db9ada41d4bbe29b128ce912149349 (patch)
tree: a2cd3b99c4c57786364fecad978f1f42a4c32b4a
parent: 8a3c059d1d732bfe51cd9d84d6bed266bcddb5f5 (diff)
download: org.eclipse.sirius-bd1d82c356db9ada41d4bbe29b128ce912149349.tar.gz
org.eclipse.sirius-bd1d82c356db9ada41d4bbe29b128ce912149349.tar.xz
org.eclipse.sirius-bd1d82c356db9ada41d4bbe29b128ce912149349.zip
3 files changed, 526 insertions, 426 deletions
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/tools/hide-reveal/tc-2330/tc2330.aird b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/tools/hide-reveal/tc-2330/tc2330.aird
index e3b332251f..fdd025a73e 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/tools/hide-reveal/tc-2330/tc2330.aird
+++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/tools/hide-reveal/tc-2330/tc2330.aird
@@ -1,449 +1,422 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<viewpoint:DAnalysis xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:diagram="http://www.eclipse.org/sirius/diagram/1.1.0" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:viewpoint="http://www.eclipse.org/sirius/1.1.0" xsi:schemaLocation="http://www.eclipse.org/sirius/description/1.1.0 http://www.eclipse.org/sirius/1.1.0#//description http://www.eclipse.org/sirius/diagram/description/1.1.0 http://www.eclipse.org/sirius/1.1.0#//diagram/description http://www.eclipse.org/sirius/diagram/1.1.0 http://www.eclipse.org/sirius/1.1.0#//diagram http://www.eclipse.org/sirius/diagram/description/style/1.1.0 http://www.eclipse.org/sirius/1.1.0#//diagram/description/style" xmi:id="_XVY-EOzQEd-T-fkKxdk2ZA" selectedViews="_hfrAwOzQEd-T-fkKxdk2ZA" version="8.0.0">
-  <models xmi:type="ecore:EPackage" href="tc2330.ecore#/"/>
-  <ownedViews xmi:type="viewpoint:DRepresentationContainer" xmi:id="_Zom94OzQEd-T-fkKxdk2ZA" initialized="true">
-    <viewpoint xmi:type="description:Viewpoint" href="tc2330.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231481%20domain%20based']"/>
-  </ownedViews>
-  <ownedViews xmi:type="viewpoint:DRepresentationContainer" xmi:id="_hfrAwOzQEd-T-fkKxdk2ZA" initialized="true">
-    <ownedRepresentations xmi:type="diagram:DSemanticDiagram" xmi:id="_iSyfwOzQEd-T-fkKxdk2ZA" name="new 2330 Diagram">
-      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_iT-ykOzQEd-T-fkKxdk2ZA" source="GMF_DIAGRAMS">
-        <data xmi:type="notation:Diagram" xmi:id="_iT-ykezQEd-T-fkKxdk2ZA" type="Sirius" element="_iSyfwOzQEd-T-fkKxdk2ZA" measurementUnit="Pixel">
-          <children xmi:type="notation:Node" xmi:id="_iXZ6AOzQEd-T-fkKxdk2ZA" type="2002" element="_7ayCwUg0EeCm95Tq9dtYWA">
-            <children xmi:type="notation:Node" xmi:id="_iYAW8OzQEd-T-fkKxdk2ZA" type="5006"/>
-            <children xmi:type="notation:Node" xmi:id="_iYTR4OzQEd-T-fkKxdk2ZA" type="7001">
-              <styles xmi:type="notation:SortingStyle" xmi:id="_iYTR4ezQEd-T-fkKxdk2ZA"/>
-              <styles xmi:type="notation:FilteringStyle" xmi:id="_iYTR4uzQEd-T-fkKxdk2ZA"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_icxiMOzQEd-T-fkKxdk2ZA" type="3012" element="_7a1tIEg0EeCm95Tq9dtYWA">
-              <children xmi:type="notation:Node" xmi:id="_idEdIOzQEd-T-fkKxdk2ZA" type="5010">
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_idEdIezQEd-T-fkKxdk2ZA" x="-3" y="-17"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_id91AOzQEd-T-fkKxdk2ZA" type="3003" element="_7a1tIUg0EeCm95Tq9dtYWA">
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_id91AezQEd-T-fkKxdk2ZA"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_id91AuzQEd-T-fkKxdk2ZA"/>
-              </children>
-              <styles xmi:type="notation:ShapeStyle" xmi:id="_icxiMezQEd-T-fkKxdk2ZA" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_icxiMuzQEd-T-fkKxdk2ZA" x="8" y="-12" width="20" height="20"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_idEdIuzQEd-T-fkKxdk2ZA" type="3012" element="_7a2UMEg0EeCm95Tq9dtYWA">
-              <children xmi:type="notation:Node" xmi:id="_idNnEuzQEd-T-fkKxdk2ZA" type="5010">
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_idNnE-zQEd-T-fkKxdk2ZA" x="-3" y="21"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_ieQv8OzQEd-T-fkKxdk2ZA" type="3003" element="_7a2UMUg0EeCm95Tq9dtYWA">
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_ieQv8ezQEd-T-fkKxdk2ZA"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ieQv8uzQEd-T-fkKxdk2ZA"/>
-              </children>
-              <styles xmi:type="notation:ShapeStyle" xmi:id="_idNnEOzQEd-T-fkKxdk2ZA" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_idNnEezQEd-T-fkKxdk2ZA" x="105" y="70" width="20" height="20"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_idNnFOzQEd-T-fkKxdk2ZA" type="3012" element="_7a27QEg0EeCm95Tq9dtYWA">
-              <children xmi:type="notation:Node" xmi:id="_idNnF-zQEd-T-fkKxdk2ZA" type="5010">
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_idNnGOzQEd-T-fkKxdk2ZA" x="-3" y="21"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_ieQv8-zQEd-T-fkKxdk2ZA" type="3003" element="_7a27QUg0EeCm95Tq9dtYWA">
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_ieQv9OzQEd-T-fkKxdk2ZA"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ieQv9ezQEd-T-fkKxdk2ZA"/>
-              </children>
-              <styles xmi:type="notation:ShapeStyle" xmi:id="_idNnFezQEd-T-fkKxdk2ZA" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_idNnFuzQEd-T-fkKxdk2ZA" x="45" y="80" width="20" height="20"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_idNnGezQEd-T-fkKxdk2ZA" type="3012" element="_7a3iUEg0EeCm95Tq9dtYWA">
-              <children xmi:type="notation:Node" xmi:id="_idNnHOzQEd-T-fkKxdk2ZA" type="5010">
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_idNnHezQEd-T-fkKxdk2ZA" x="-1" y="-17"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_ieZ54OzQEd-T-fkKxdk2ZA" type="3003" element="_7a3iUUg0EeCm95Tq9dtYWA">
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_ieZ54ezQEd-T-fkKxdk2ZA"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ieZ54uzQEd-T-fkKxdk2ZA"/>
-              </children>
-              <styles xmi:type="notation:ShapeStyle" xmi:id="_idNnGuzQEd-T-fkKxdk2ZA" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_idNnG-zQEd-T-fkKxdk2ZA" x="107" y="-12" width="20" height="20"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_iXZ6AezQEd-T-fkKxdk2ZA" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iXZ6AuzQEd-T-fkKxdk2ZA" x="315" y="130"/>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:diagram="http://www.eclipse.org/sirius/diagram/1.1.0" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:viewpoint="http://www.eclipse.org/sirius/1.1.0" xsi:schemaLocation="http://www.eclipse.org/sirius/description/1.1.0 http://www.eclipse.org/sirius/1.1.0#//description http://www.eclipse.org/sirius/diagram/description/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description http://www.eclipse.org/sirius/diagram/description/style/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description/style">
+  <viewpoint:DAnalysis xmi:id="_XVY-EOzQEd-T-fkKxdk2ZA" selectedViews="_hfrAwOzQEd-T-fkKxdk2ZA" version="12.1.0.201708031200">
+    <semanticResources>tc2330.ecore</semanticResources>
+    <ownedViews xmi:type="viewpoint:DView" xmi:id="_Zom94OzQEd-T-fkKxdk2ZA">
+      <viewpoint xmi:type="description:Viewpoint" href="tc2330.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231481%20domain%20based']"/>
+    </ownedViews>
+    <ownedViews xmi:type="viewpoint:DView" xmi:id="_hfrAwOzQEd-T-fkKxdk2ZA">
+      <viewpoint xmi:type="description:Viewpoint" href="tc2330.odesign#//@ownedViewpoints[name='2330']"/>
+      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" xmi:id="_o7XJkJRvEeeQtoUIhUY0Ow" name="new 2330 Diagram" repPath="#_o7DnkJRvEeeQtoUIhUY0Ow">
+        <description xmi:type="description_1:DiagramDescription" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']"/>
+        <target xmi:type="ecore:EPackage" href="tc2330.ecore#/"/>
+      </ownedRepresentationDescriptors>
+    </ownedViews>
+  </viewpoint:DAnalysis>
+  <diagram:DSemanticDiagram xmi:id="_iSyfwOzQEd-T-fkKxdk2ZA" name="new 2330 Diagram" uid="_o7DnkJRvEeeQtoUIhUY0Ow">
+    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_iT-ykOzQEd-T-fkKxdk2ZA" source="GMF_DIAGRAMS">
+      <data xmi:type="notation:Diagram" xmi:id="_iT-ykezQEd-T-fkKxdk2ZA" type="Sirius" element="_iSyfwOzQEd-T-fkKxdk2ZA" measurementUnit="Pixel">
+        <children xmi:type="notation:Node" xmi:id="_iXZ6AOzQEd-T-fkKxdk2ZA" type="2002" element="_7ayCwUg0EeCm95Tq9dtYWA">
+          <children xmi:type="notation:Node" xmi:id="_iYAW8OzQEd-T-fkKxdk2ZA" type="5006"/>
+          <children xmi:type="notation:Node" xmi:id="_iYTR4OzQEd-T-fkKxdk2ZA" type="7001">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_iYTR4ezQEd-T-fkKxdk2ZA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_iYTR4uzQEd-T-fkKxdk2ZA"/>
           </children>
-          <children xmi:type="notation:Node" xmi:id="_iYTR4-zQEd-T-fkKxdk2ZA" type="2002" element="_7azQ4Ug0EeCm95Tq9dtYWA">
-            <children xmi:type="notation:Node" xmi:id="_iYTR5uzQEd-T-fkKxdk2ZA" type="5006"/>
-            <children xmi:type="notation:Node" xmi:id="_iYTR5-zQEd-T-fkKxdk2ZA" type="7001">
-              <styles xmi:type="notation:SortingStyle" xmi:id="_iYTR6OzQEd-T-fkKxdk2ZA"/>
-              <styles xmi:type="notation:FilteringStyle" xmi:id="_iYTR6ezQEd-T-fkKxdk2ZA"/>
+          <children xmi:type="notation:Node" xmi:id="_icxiMOzQEd-T-fkKxdk2ZA" type="3012" element="_7a1tIEg0EeCm95Tq9dtYWA">
+            <children xmi:type="notation:Node" xmi:id="_idEdIOzQEd-T-fkKxdk2ZA" type="5010">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_idEdIezQEd-T-fkKxdk2ZA" x="-3" y="-17"/>
             </children>
-            <children xmi:type="notation:Node" xmi:id="_iejq4OzQEd-T-fkKxdk2ZA" type="3012" element="_7a4wcEg0EeCm95Tq9dtYWA">
-              <children xmi:type="notation:Node" xmi:id="_iejq4-zQEd-T-fkKxdk2ZA" type="5010">
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_iejq5OzQEd-T-fkKxdk2ZA" y="5"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_iejq5ezQEd-T-fkKxdk2ZA" type="3003" element="_7a5XgEg0EeCm95Tq9dtYWA">
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_iejq5uzQEd-T-fkKxdk2ZA"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iejq5-zQEd-T-fkKxdk2ZA"/>
-              </children>
-              <styles xmi:type="notation:ShapeStyle" xmi:id="_iejq4ezQEd-T-fkKxdk2ZA" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iejq4uzQEd-T-fkKxdk2ZA" x="150" y="8" width="20" height="20"/>
+            <children xmi:type="notation:Node" xmi:id="_id91AOzQEd-T-fkKxdk2ZA" type="3003" element="_7a1tIUg0EeCm95Tq9dtYWA">
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_id91AezQEd-T-fkKxdk2ZA"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_id91AuzQEd-T-fkKxdk2ZA"/>
             </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_iYTR5OzQEd-T-fkKxdk2ZA" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iYTR5ezQEd-T-fkKxdk2ZA" x="35" y="5"/>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_icxiMezQEd-T-fkKxdk2ZA" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_icxiMuzQEd-T-fkKxdk2ZA" x="8" y="-12" width="20" height="20"/>
           </children>
-          <children xmi:type="notation:Node" xmi:id="_iYTR6uzQEd-T-fkKxdk2ZA" type="2002" element="_7az38Eg0EeCm95Tq9dtYWA">
-            <children xmi:type="notation:Node" xmi:id="_iYTR7ezQEd-T-fkKxdk2ZA" type="5006"/>
-            <children xmi:type="notation:Node" xmi:id="_iYTR7uzQEd-T-fkKxdk2ZA" type="7001">
-              <styles xmi:type="notation:SortingStyle" xmi:id="_iYTR7-zQEd-T-fkKxdk2ZA"/>
-              <styles xmi:type="notation:FilteringStyle" xmi:id="_iYTR8OzQEd-T-fkKxdk2ZA"/>
+          <children xmi:type="notation:Node" xmi:id="_idEdIuzQEd-T-fkKxdk2ZA" type="3012" element="_7a2UMEg0EeCm95Tq9dtYWA">
+            <children xmi:type="notation:Node" xmi:id="_idNnEuzQEd-T-fkKxdk2ZA" type="5010">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_idNnE-zQEd-T-fkKxdk2ZA" x="-3" y="21"/>
             </children>
-            <children xmi:type="notation:Node" xmi:id="_iejq6OzQEd-T-fkKxdk2ZA" type="3012" element="_7a5-kEg0EeCm95Tq9dtYWA">
-              <children xmi:type="notation:Node" xmi:id="_iejq6-zQEd-T-fkKxdk2ZA" type="5010">
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_iejq7OzQEd-T-fkKxdk2ZA" y="5"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_ietb4OzQEd-T-fkKxdk2ZA" type="3003" element="_7a6loEg0EeCm95Tq9dtYWA">
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_ietb4ezQEd-T-fkKxdk2ZA"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ietb4uzQEd-T-fkKxdk2ZA"/>
-              </children>
-              <styles xmi:type="notation:ShapeStyle" xmi:id="_iejq6ezQEd-T-fkKxdk2ZA" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iejq6uzQEd-T-fkKxdk2ZA" x="8" y="70" width="20" height="20"/>
+            <children xmi:type="notation:Node" xmi:id="_ieQv8OzQEd-T-fkKxdk2ZA" type="3003" element="_7a2UMUg0EeCm95Tq9dtYWA">
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_ieQv8ezQEd-T-fkKxdk2ZA"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ieQv8uzQEd-T-fkKxdk2ZA"/>
             </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_iYTR6-zQEd-T-fkKxdk2ZA" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iYTR7OzQEd-T-fkKxdk2ZA" x="576" y="216"/>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_idNnEOzQEd-T-fkKxdk2ZA" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_idNnEezQEd-T-fkKxdk2ZA" x="105" y="70" width="20" height="20"/>
           </children>
-          <children xmi:type="notation:Node" xmi:id="_iYTR8ezQEd-T-fkKxdk2ZA" type="2002" element="_7a0fAEg0EeCm95Tq9dtYWA">
-            <children xmi:type="notation:Node" xmi:id="_iYTR9OzQEd-T-fkKxdk2ZA" type="5006"/>
-            <children xmi:type="notation:Node" xmi:id="_iYTR9ezQEd-T-fkKxdk2ZA" type="7001">
-              <styles xmi:type="notation:SortingStyle" xmi:id="_iYTR9uzQEd-T-fkKxdk2ZA"/>
-              <styles xmi:type="notation:FilteringStyle" xmi:id="_iYTR9-zQEd-T-fkKxdk2ZA"/>
+          <children xmi:type="notation:Node" xmi:id="_idNnFOzQEd-T-fkKxdk2ZA" type="3012" element="_7a27QEg0EeCm95Tq9dtYWA">
+            <children xmi:type="notation:Node" xmi:id="_idNnF-zQEd-T-fkKxdk2ZA" type="5010">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_idNnGOzQEd-T-fkKxdk2ZA" x="-3" y="21"/>
             </children>
-            <children xmi:type="notation:Node" xmi:id="_ietb4-zQEd-T-fkKxdk2ZA" type="3012" element="_7a7MsEg0EeCm95Tq9dtYWA">
-              <children xmi:type="notation:Node" xmi:id="_ietb5uzQEd-T-fkKxdk2ZA" type="5010">
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_ietb5-zQEd-T-fkKxdk2ZA" y="5"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_ie2l0OzQEd-T-fkKxdk2ZA" type="3003" element="_7a7zwEg0EeCm95Tq9dtYWA">
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_ie2l0ezQEd-T-fkKxdk2ZA"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ie2l0uzQEd-T-fkKxdk2ZA"/>
-              </children>
-              <styles xmi:type="notation:ShapeStyle" xmi:id="_ietb5OzQEd-T-fkKxdk2ZA" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ietb5ezQEd-T-fkKxdk2ZA" x="150" y="36" width="20" height="20"/>
+            <children xmi:type="notation:Node" xmi:id="_ieQv8-zQEd-T-fkKxdk2ZA" type="3003" element="_7a27QUg0EeCm95Tq9dtYWA">
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_ieQv9OzQEd-T-fkKxdk2ZA"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ieQv9ezQEd-T-fkKxdk2ZA"/>
             </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_iYTR8uzQEd-T-fkKxdk2ZA" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iYTR8-zQEd-T-fkKxdk2ZA" x="60" y="252"/>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_idNnFezQEd-T-fkKxdk2ZA" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_idNnFuzQEd-T-fkKxdk2ZA" x="45" y="80" width="20" height="20"/>
           </children>
-          <children xmi:type="notation:Node" xmi:id="_iYTR-OzQEd-T-fkKxdk2ZA" type="2002" element="_7a0fCkg0EeCm95Tq9dtYWA">
-            <children xmi:type="notation:Node" xmi:id="_iYTR--zQEd-T-fkKxdk2ZA" type="5006"/>
-            <children xmi:type="notation:Node" xmi:id="_iYTR_OzQEd-T-fkKxdk2ZA" type="7001">
-              <styles xmi:type="notation:SortingStyle" xmi:id="_iYTR_ezQEd-T-fkKxdk2ZA"/>
-              <styles xmi:type="notation:FilteringStyle" xmi:id="_iYTR_uzQEd-T-fkKxdk2ZA"/>
+          <children xmi:type="notation:Node" xmi:id="_idNnGezQEd-T-fkKxdk2ZA" type="3012" element="_7a3iUEg0EeCm95Tq9dtYWA">
+            <children xmi:type="notation:Node" xmi:id="_idNnHOzQEd-T-fkKxdk2ZA" type="5010">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_idNnHezQEd-T-fkKxdk2ZA" x="-1" y="-17"/>
             </children>
-            <children xmi:type="notation:Node" xmi:id="_ie2l0-zQEd-T-fkKxdk2ZA" type="3012" element="_7a8a0Eg0EeCm95Tq9dtYWA">
-              <children xmi:type="notation:Node" xmi:id="_ie2l1uzQEd-T-fkKxdk2ZA" type="5010">
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_ie2l1-zQEd-T-fkKxdk2ZA" y="5"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_ie2l2OzQEd-T-fkKxdk2ZA" type="3003" element="_7a9B4Eg0EeCm95Tq9dtYWA">
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_ie2l2ezQEd-T-fkKxdk2ZA"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ie2l2uzQEd-T-fkKxdk2ZA"/>
-              </children>
-              <styles xmi:type="notation:ShapeStyle" xmi:id="_ie2l1OzQEd-T-fkKxdk2ZA" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ie2l1ezQEd-T-fkKxdk2ZA" x="-12" y="8" width="20" height="20"/>
+            <children xmi:type="notation:Node" xmi:id="_ieZ54OzQEd-T-fkKxdk2ZA" type="3003" element="_7a3iUUg0EeCm95Tq9dtYWA">
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_ieZ54ezQEd-T-fkKxdk2ZA"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ieZ54uzQEd-T-fkKxdk2ZA"/>
             </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_iYTR-ezQEd-T-fkKxdk2ZA" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iYTR-uzQEd-T-fkKxdk2ZA" x="552" y="36"/>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_idNnGuzQEd-T-fkKxdk2ZA" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_idNnG-zQEd-T-fkKxdk2ZA" x="107" y="-12" width="20" height="20"/>
           </children>
-          <children xmi:type="notation:Node" xmi:id="_78JfkOzQEd-T-fkKxdk2ZA" type="2001" element="_7awNkEg0EeCm95Tq9dtYWA">
-            <children xmi:type="notation:Node" xmi:id="_78TQkOzQEd-T-fkKxdk2ZA" type="5002">
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_78TQkezQEd-T-fkKxdk2ZA" y="5"/>
+          <children xmi:type="notation:Node" xmi:id="_Ava0oJRwEeeQtoUIhUY0Ow" type="3012" element="_Au53QJRwEeeQtoUIhUY0Ow">
+            <children xmi:type="notation:Node" xmi:id="_AviwcJRwEeeQtoUIhUY0Ow" type="5010">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_AviwcZRwEeeQtoUIhUY0Ow" x="-1"/>
             </children>
-            <children xmi:type="notation:Node" xmi:id="__CydcGshEeC9B9Ea6MYhXQ" type="3016" element="_7aw0oEg0EeCm95Tq9dtYWA">
-              <styles xmi:type="notation:ShapeStyle" xmi:id="__CydcWshEeC9B9Ea6MYhXQ" fontName="Segoe UI" fillColor="8421440"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="__CydcmshEeC9B9Ea6MYhXQ"/>
+            <children xmi:type="notation:Node" xmi:id="_Avo3EJRwEeeQtoUIhUY0Ow" type="3003" element="_Au6eUJRwEeeQtoUIhUY0Ow">
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_Avo3EZRwEeeQtoUIhUY0Ow" fontName="Segoe UI"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Avo3EpRwEeeQtoUIhUY0Ow"/>
             </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_78JfkezQEd-T-fkKxdk2ZA" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_78JfkuzQEd-T-fkKxdk2ZA" x="180" y="144" width="30" height="30"/>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_Ava0oZRwEeeQtoUIhUY0Ow" fontName="Segoe UI" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ava0opRwEeeQtoUIhUY0Ow" x="140" y="20" width="20" height="20"/>
           </children>
-          <children xmi:type="notation:Node" xmi:id="_uqODwPk3Ed-olLe834UWAw" type="2001" element="_7axbsUg0EeCm95Tq9dtYWA">
-            <children xmi:type="notation:Node" xmi:id="_uqODw_k3Ed-olLe834UWAw" type="5002">
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_uqODxPk3Ed-olLe834UWAw" y="5"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="__C5LIGshEeC9B9Ea6MYhXQ" type="3016" element="_7axbskg0EeCm95Tq9dtYWA">
-              <styles xmi:type="notation:ShapeStyle" xmi:id="__C5LIWshEeC9B9Ea6MYhXQ" fontName="Segoe UI" fillColor="8421440"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="__C5LImshEeC9B9Ea6MYhXQ"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_uqODwfk3Ed-olLe834UWAw" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uqODwvk3Ed-olLe834UWAw" x="555" y="145" width="30" height="30"/>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_iXZ6AezQEd-T-fkKxdk2ZA" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iXZ6AuzQEd-T-fkKxdk2ZA" x="315" y="130"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_iYTR4-zQEd-T-fkKxdk2ZA" type="2002" element="_7azQ4Ug0EeCm95Tq9dtYWA">
+          <children xmi:type="notation:Node" xmi:id="_iYTR5uzQEd-T-fkKxdk2ZA" type="5006"/>
+          <children xmi:type="notation:Node" xmi:id="_iYTR5-zQEd-T-fkKxdk2ZA" type="7001">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_iYTR6OzQEd-T-fkKxdk2ZA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_iYTR6ezQEd-T-fkKxdk2ZA"/>
           </children>
-          <styles xmi:type="notation:DiagramStyle" xmi:id="_iT-ykuzQEd-T-fkKxdk2ZA"/>
-          <edges xmi:type="notation:Edge" xmi:id="_ifv9sOzQEd-T-fkKxdk2ZA" type="4001" element="_7a-3EEg0EeCm95Tq9dtYWA" source="_icxiMOzQEd-T-fkKxdk2ZA" target="_iejq4OzQEd-T-fkKxdk2ZA">
-            <children xmi:type="notation:Node" xmi:id="_if5usOzQEd-T-fkKxdk2ZA" type="6001">
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_if5usezQEd-T-fkKxdk2ZA" y="-10"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_8dFmgGshEeC9B9Ea6MYhXQ" type="6002">
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8dFmgWshEeC9B9Ea6MYhXQ" y="10"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_8dGNkGshEeC9B9Ea6MYhXQ" type="6003">
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8dGNkWshEeC9B9Ea6MYhXQ" y="10"/>
-            </children>
-            <styles xmi:type="notation:ConnectorStyle" xmi:id="_ifv9sezQEd-T-fkKxdk2ZA" routing="Rectilinear" jumpLinkStatus="Above"/>
-            <styles xmi:type="notation:FontStyle" xmi:id="_ifv9suzQEd-T-fkKxdk2ZA" fontHeight="8"/>
-            <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ifv9s-zQEd-T-fkKxdk2ZA" points="[0, 35, -315, -95]$[315, 95, 0, -35]"/>
-          </edges>
-          <edges xmi:type="notation:Edge" xmi:id="_if5usuzQEd-T-fkKxdk2ZA" type="4001" element="_7a_eIEg0EeCm95Tq9dtYWA" source="_idEdIuzQEd-T-fkKxdk2ZA" target="_iejq6OzQEd-T-fkKxdk2ZA">
-            <children xmi:type="notation:Node" xmi:id="_if5utuzQEd-T-fkKxdk2ZA" type="6001">
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_if5ut-zQEd-T-fkKxdk2ZA" y="-10"/>
+          <children xmi:type="notation:Node" xmi:id="_iejq4OzQEd-T-fkKxdk2ZA" type="3012" element="_7a4wcEg0EeCm95Tq9dtYWA">
+            <children xmi:type="notation:Node" xmi:id="_iejq4-zQEd-T-fkKxdk2ZA" type="5010">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_iejq5OzQEd-T-fkKxdk2ZA" y="5"/>
             </children>
-            <children xmi:type="notation:Node" xmi:id="_8dGNkmshEeC9B9Ea6MYhXQ" type="6002">
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8dGNk2shEeC9B9Ea6MYhXQ" y="10"/>
+            <children xmi:type="notation:Node" xmi:id="_iejq5ezQEd-T-fkKxdk2ZA" type="3003" element="_7a5XgEg0EeCm95Tq9dtYWA">
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_iejq5uzQEd-T-fkKxdk2ZA"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iejq5-zQEd-T-fkKxdk2ZA"/>
             </children>
-            <children xmi:type="notation:Node" xmi:id="_8dICwGshEeC9B9Ea6MYhXQ" type="6003">
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8dICwWshEeC9B9Ea6MYhXQ" y="10"/>
-            </children>
-            <styles xmi:type="notation:ConnectorStyle" xmi:id="_if5us-zQEd-T-fkKxdk2ZA" routing="Rectilinear" jumpLinkStatus="Above"/>
-            <styles xmi:type="notation:FontStyle" xmi:id="_if5utOzQEd-T-fkKxdk2ZA" fontHeight="8"/>
-            <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_if5utezQEd-T-fkKxdk2ZA" points="[0, 35, 105, -95]$[-105, 95, 0, -35]"/>
-          </edges>
-          <edges xmi:type="notation:Edge" xmi:id="_igC4oOzQEd-T-fkKxdk2ZA" type="4001" element="_7bAFMEg0EeCm95Tq9dtYWA" source="_idNnFOzQEd-T-fkKxdk2ZA" target="_ietb4-zQEd-T-fkKxdk2ZA">
-            <children xmi:type="notation:Node" xmi:id="_igC4pOzQEd-T-fkKxdk2ZA" type="6001">
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_igC4pezQEd-T-fkKxdk2ZA" y="-10"/>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_iejq4ezQEd-T-fkKxdk2ZA" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iejq4uzQEd-T-fkKxdk2ZA" x="150" y="8" width="20" height="20"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_iYTR5OzQEd-T-fkKxdk2ZA" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iYTR5ezQEd-T-fkKxdk2ZA" x="35" y="5"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_iYTR6uzQEd-T-fkKxdk2ZA" type="2002" element="_7az38Eg0EeCm95Tq9dtYWA">
+          <children xmi:type="notation:Node" xmi:id="_iYTR7ezQEd-T-fkKxdk2ZA" type="5006"/>
+          <children xmi:type="notation:Node" xmi:id="_iYTR7uzQEd-T-fkKxdk2ZA" type="7001">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_iYTR7-zQEd-T-fkKxdk2ZA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_iYTR8OzQEd-T-fkKxdk2ZA"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_iejq6OzQEd-T-fkKxdk2ZA" type="3012" element="_7a5-kEg0EeCm95Tq9dtYWA">
+            <children xmi:type="notation:Node" xmi:id="_iejq6-zQEd-T-fkKxdk2ZA" type="5010">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_iejq7OzQEd-T-fkKxdk2ZA" y="5"/>
             </children>
-            <children xmi:type="notation:Node" xmi:id="_8dIp0GshEeC9B9Ea6MYhXQ" type="6002">
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8dIp0WshEeC9B9Ea6MYhXQ" y="10"/>
+            <children xmi:type="notation:Node" xmi:id="_ietb4OzQEd-T-fkKxdk2ZA" type="3003" element="_7a6loEg0EeCm95Tq9dtYWA">
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_ietb4ezQEd-T-fkKxdk2ZA"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ietb4uzQEd-T-fkKxdk2ZA"/>
             </children>
-            <children xmi:type="notation:Node" xmi:id="_8dIp0mshEeC9B9Ea6MYhXQ" type="6003">
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8dIp02shEeC9B9Ea6MYhXQ" y="10"/>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_iejq6ezQEd-T-fkKxdk2ZA" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iejq6uzQEd-T-fkKxdk2ZA" x="8" y="70" width="20" height="20"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_iYTR6-zQEd-T-fkKxdk2ZA" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iYTR7OzQEd-T-fkKxdk2ZA" x="576" y="216"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_iYTR8ezQEd-T-fkKxdk2ZA" type="2002" element="_7a0fAEg0EeCm95Tq9dtYWA">
+          <children xmi:type="notation:Node" xmi:id="_iYTR9OzQEd-T-fkKxdk2ZA" type="5006"/>
+          <children xmi:type="notation:Node" xmi:id="_iYTR9ezQEd-T-fkKxdk2ZA" type="7001">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_iYTR9uzQEd-T-fkKxdk2ZA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_iYTR9-zQEd-T-fkKxdk2ZA"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_ietb4-zQEd-T-fkKxdk2ZA" type="3012" element="_7a7MsEg0EeCm95Tq9dtYWA">
+            <children xmi:type="notation:Node" xmi:id="_ietb5uzQEd-T-fkKxdk2ZA" type="5010">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_ietb5-zQEd-T-fkKxdk2ZA" y="5"/>
             </children>
-            <styles xmi:type="notation:ConnectorStyle" xmi:id="_igC4oezQEd-T-fkKxdk2ZA" routing="Rectilinear" jumpLinkStatus="Above"/>
-            <styles xmi:type="notation:FontStyle" xmi:id="_igC4ouzQEd-T-fkKxdk2ZA" fontHeight="8"/>
-            <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_igC4o-zQEd-T-fkKxdk2ZA" points="[0, 35, -105, -95]$[105, 95, 0, -35]"/>
-          </edges>
-          <edges xmi:type="notation:Edge" xmi:id="_igC4puzQEd-T-fkKxdk2ZA" type="4001" element="_7bAsQEg0EeCm95Tq9dtYWA" source="_idNnGezQEd-T-fkKxdk2ZA" target="_ie2l0-zQEd-T-fkKxdk2ZA">
-            <children xmi:type="notation:Node" xmi:id="_igC4quzQEd-T-fkKxdk2ZA" type="6001">
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_igC4q-zQEd-T-fkKxdk2ZA" y="-10"/>
+            <children xmi:type="notation:Node" xmi:id="_ie2l0OzQEd-T-fkKxdk2ZA" type="3003" element="_7a7zwEg0EeCm95Tq9dtYWA">
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_ie2l0ezQEd-T-fkKxdk2ZA"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ie2l0uzQEd-T-fkKxdk2ZA"/>
             </children>
-            <children xmi:type="notation:Node" xmi:id="_8dJ38GshEeC9B9Ea6MYhXQ" type="6002">
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8dLGEGshEeC9B9Ea6MYhXQ" y="10"/>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_ietb5OzQEd-T-fkKxdk2ZA" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ietb5ezQEd-T-fkKxdk2ZA" x="150" y="36" width="20" height="20"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_iYTR8uzQEd-T-fkKxdk2ZA" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iYTR8-zQEd-T-fkKxdk2ZA" x="60" y="252"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_iYTR-OzQEd-T-fkKxdk2ZA" type="2002" element="_7a0fCkg0EeCm95Tq9dtYWA">
+          <children xmi:type="notation:Node" xmi:id="_iYTR--zQEd-T-fkKxdk2ZA" type="5006"/>
+          <children xmi:type="notation:Node" xmi:id="_iYTR_OzQEd-T-fkKxdk2ZA" type="7001">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_iYTR_ezQEd-T-fkKxdk2ZA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_iYTR_uzQEd-T-fkKxdk2ZA"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_ie2l0-zQEd-T-fkKxdk2ZA" type="3012" element="_7a8a0Eg0EeCm95Tq9dtYWA">
+            <children xmi:type="notation:Node" xmi:id="_ie2l1uzQEd-T-fkKxdk2ZA" type="5010">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_ie2l1-zQEd-T-fkKxdk2ZA" y="5"/>
             </children>
-            <children xmi:type="notation:Node" xmi:id="_8dLtIGshEeC9B9Ea6MYhXQ" type="6003">
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8dLtIWshEeC9B9Ea6MYhXQ" y="10"/>
+            <children xmi:type="notation:Node" xmi:id="_ie2l2OzQEd-T-fkKxdk2ZA" type="3003" element="_7a9B4Eg0EeCm95Tq9dtYWA">
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_ie2l2ezQEd-T-fkKxdk2ZA"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ie2l2uzQEd-T-fkKxdk2ZA"/>
             </children>
-            <styles xmi:type="notation:ConnectorStyle" xmi:id="_igC4p-zQEd-T-fkKxdk2ZA" routing="Rectilinear" jumpLinkStatus="Above"/>
-            <styles xmi:type="notation:FontStyle" xmi:id="_igC4qOzQEd-T-fkKxdk2ZA" fontHeight="8"/>
-            <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_igC4qezQEd-T-fkKxdk2ZA" points="[0, 35, 315, -95]$[-315, 95, 0, -35]"/>
-          </edges>
-        </data>
-      </ownedAnnotationEntries>
-      <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_7awNkEg0EeCm95Tq9dtYWA" name="myEnum" width="3" height="3">
-        <target xmi:type="ecore:EEnum" href="tc2330.ecore#//myEnum"/>
-        <semanticElements xmi:type="ecore:EEnum" href="tc2330.ecore#//myEnum"/>
-        <ownedStyle xmi:type="diagram:Ellipse" xmi:id="_7aw0oEg0EeCm95Tq9dtYWA">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7aw0pEg0EeCm95Tq9dtYWA"/>
-          <description xmi:type="style:EllipseNodeDescription" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@nodeMappings[name='NM_EEnum']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_7aw0pUg0EeCm95Tq9dtYWA"/>
-          <color xmi:type="viewpoint:RGBValues" xmi:id="_7axbsEg0EeCm95Tq9dtYWA" red="194" green="239" blue="255"/>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_ie2l1OzQEd-T-fkKxdk2ZA" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ie2l1ezQEd-T-fkKxdk2ZA" x="-12" y="8" width="20" height="20"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_iYTR-ezQEd-T-fkKxdk2ZA" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iYTR-uzQEd-T-fkKxdk2ZA" x="552" y="36"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_78JfkOzQEd-T-fkKxdk2ZA" type="2001" element="_7awNkEg0EeCm95Tq9dtYWA">
+          <children xmi:type="notation:Node" xmi:id="_78TQkOzQEd-T-fkKxdk2ZA" type="5002">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_78TQkezQEd-T-fkKxdk2ZA" y="5"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="__CydcGshEeC9B9Ea6MYhXQ" type="3016" element="_7aw0oEg0EeCm95Tq9dtYWA">
+            <styles xmi:type="notation:ShapeStyle" xmi:id="__CydcWshEeC9B9Ea6MYhXQ" fontName="Segoe UI" fillColor="8421440"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="__CydcmshEeC9B9Ea6MYhXQ"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_78JfkezQEd-T-fkKxdk2ZA" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_78JfkuzQEd-T-fkKxdk2ZA" x="180" y="144" width="30" height="30"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_uqODwPk3Ed-olLe834UWAw" type="2001" element="_7axbsUg0EeCm95Tq9dtYWA">
+          <children xmi:type="notation:Node" xmi:id="_uqODw_k3Ed-olLe834UWAw" type="5002">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_uqODxPk3Ed-olLe834UWAw" y="5"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="__C5LIGshEeC9B9Ea6MYhXQ" type="3016" element="_7axbskg0EeCm95Tq9dtYWA">
+            <styles xmi:type="notation:ShapeStyle" xmi:id="__C5LIWshEeC9B9Ea6MYhXQ" fontName="Segoe UI" fillColor="8421440"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="__C5LImshEeC9B9Ea6MYhXQ"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_uqODwfk3Ed-olLe834UWAw" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uqODwvk3Ed-olLe834UWAw" x="555" y="145" width="30" height="30"/>
+        </children>
+        <styles xmi:type="notation:DiagramStyle" xmi:id="_iT-ykuzQEd-T-fkKxdk2ZA"/>
+        <edges xmi:type="notation:Edge" xmi:id="_ifv9sOzQEd-T-fkKxdk2ZA" type="4001" element="_7a-3EEg0EeCm95Tq9dtYWA" source="_icxiMOzQEd-T-fkKxdk2ZA" target="_iejq4OzQEd-T-fkKxdk2ZA">
+          <children xmi:type="notation:Node" xmi:id="_if5usOzQEd-T-fkKxdk2ZA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_if5usezQEd-T-fkKxdk2ZA" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_8dFmgGshEeC9B9Ea6MYhXQ" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8dFmgWshEeC9B9Ea6MYhXQ" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_8dGNkGshEeC9B9Ea6MYhXQ" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8dGNkWshEeC9B9Ea6MYhXQ" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_ifv9sezQEd-T-fkKxdk2ZA" routing="Rectilinear" jumpLinkStatus="Above"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_ifv9suzQEd-T-fkKxdk2ZA" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ifv9s-zQEd-T-fkKxdk2ZA" points="[0, 35, -315, -95]$[315, 95, 0, -35]"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_if5usuzQEd-T-fkKxdk2ZA" type="4001" element="_7a_eIEg0EeCm95Tq9dtYWA" source="_idEdIuzQEd-T-fkKxdk2ZA" target="_iejq6OzQEd-T-fkKxdk2ZA">
+          <children xmi:type="notation:Node" xmi:id="_if5utuzQEd-T-fkKxdk2ZA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_if5ut-zQEd-T-fkKxdk2ZA" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_8dGNkmshEeC9B9Ea6MYhXQ" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8dGNk2shEeC9B9Ea6MYhXQ" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_8dICwGshEeC9B9Ea6MYhXQ" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8dICwWshEeC9B9Ea6MYhXQ" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_if5us-zQEd-T-fkKxdk2ZA" routing="Rectilinear" jumpLinkStatus="Above"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_if5utOzQEd-T-fkKxdk2ZA" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_if5utezQEd-T-fkKxdk2ZA" points="[0, 35, 105, -95]$[-105, 95, 0, -35]"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_igC4oOzQEd-T-fkKxdk2ZA" type="4001" element="_7bAFMEg0EeCm95Tq9dtYWA" source="_idNnFOzQEd-T-fkKxdk2ZA" target="_ietb4-zQEd-T-fkKxdk2ZA">
+          <children xmi:type="notation:Node" xmi:id="_igC4pOzQEd-T-fkKxdk2ZA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_igC4pezQEd-T-fkKxdk2ZA" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_8dIp0GshEeC9B9Ea6MYhXQ" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8dIp0WshEeC9B9Ea6MYhXQ" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_8dIp0mshEeC9B9Ea6MYhXQ" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8dIp02shEeC9B9Ea6MYhXQ" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_igC4oezQEd-T-fkKxdk2ZA" routing="Rectilinear" jumpLinkStatus="Above"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_igC4ouzQEd-T-fkKxdk2ZA" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_igC4o-zQEd-T-fkKxdk2ZA" points="[0, 35, -105, -95]$[105, 95, 0, -35]"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_igC4puzQEd-T-fkKxdk2ZA" type="4001" element="_7bAsQEg0EeCm95Tq9dtYWA" source="_idNnGezQEd-T-fkKxdk2ZA" target="_ie2l0-zQEd-T-fkKxdk2ZA">
+          <children xmi:type="notation:Node" xmi:id="_igC4quzQEd-T-fkKxdk2ZA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_igC4q-zQEd-T-fkKxdk2ZA" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_8dJ38GshEeC9B9Ea6MYhXQ" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8dLGEGshEeC9B9Ea6MYhXQ" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_8dLtIGshEeC9B9Ea6MYhXQ" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8dLtIWshEeC9B9Ea6MYhXQ" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_igC4p-zQEd-T-fkKxdk2ZA" routing="Rectilinear" jumpLinkStatus="Above"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_igC4qOzQEd-T-fkKxdk2ZA" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_igC4qezQEd-T-fkKxdk2ZA" points="[0, 35, 315, -95]$[-315, 95, 0, -35]"/>
+        </edges>
+      </data>
+    </ownedAnnotationEntries>
+    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_o7XJkZRvEeeQtoUIhUY0Ow" source="DANNOTATION_CUSTOMIZATION_KEY">
+      <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_o7XJkpRvEeeQtoUIhUY0Ow"/>
+    </ownedAnnotationEntries>
+    <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_7awNkEg0EeCm95Tq9dtYWA" name="myEnum" width="3" height="3">
+      <target xmi:type="ecore:EEnum" href="tc2330.ecore#//myEnum"/>
+      <semanticElements xmi:type="ecore:EEnum" href="tc2330.ecore#//myEnum"/>
+      <ownedStyle xmi:type="diagram:Ellipse" xmi:id="_7aw0oEg0EeCm95Tq9dtYWA" color="194,239,255">
+        <description xmi:type="style:EllipseNodeDescription" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@nodeMappings[name='NM_EEnum']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:NodeMapping" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@nodeMappings[name='NM_EEnum']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_7axbsUg0EeCm95Tq9dtYWA" name="mySecondEnum" width="3" height="3">
+      <target xmi:type="ecore:EEnum" href="tc2330.ecore#//mySecondEnum"/>
+      <semanticElements xmi:type="ecore:EEnum" href="tc2330.ecore#//mySecondEnum"/>
+      <ownedStyle xmi:type="diagram:Ellipse" xmi:id="_7axbskg0EeCm95Tq9dtYWA" color="194,239,255">
+        <description xmi:type="style:EllipseNodeDescription" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@nodeMappings[name='NM_EEnum']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:NodeMapping" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@nodeMappings[name='NM_EEnum']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_7ayCwUg0EeCm95Tq9dtYWA" name="p1">
+      <target xmi:type="ecore:EPackage" href="tc2330.ecore#//p1"/>
+      <semanticElements xmi:type="ecore:EPackage" href="tc2330.ecore#//p1"/>
+      <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_7a1tIEg0EeCm95Tq9dtYWA" name="A" outgoingEdges="_7a-3EEg0EeCm95Tq9dtYWA" width="2" height="2">
+        <target xmi:type="ecore:EClass" href="tc2330.ecore#//p1/A"/>
+        <semanticElements xmi:type="ecore:EClass" href="tc2330.ecore#//p1/A"/>
+        <ownedStyle xmi:type="diagram:Square" xmi:id="_7a1tIUg0EeCm95Tq9dtYWA" borderColor="173,127,168" width="2" height="2" color="239,41,41">
+          <description xmi:type="style:SquareDescription" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']"/>
+      </ownedBorderedNodes>
+      <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_7a2UMEg0EeCm95Tq9dtYWA" name="G" outgoingEdges="_7a_eIEg0EeCm95Tq9dtYWA" width="2" height="2">
+        <target xmi:type="ecore:EClass" href="tc2330.ecore#//p1/G"/>
+        <semanticElements xmi:type="ecore:EClass" href="tc2330.ecore#//p1/G"/>
+        <ownedStyle xmi:type="diagram:Square" xmi:id="_7a2UMUg0EeCm95Tq9dtYWA" borderColor="173,127,168" width="2" height="2" color="239,41,41">
+          <description xmi:type="style:SquareDescription" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']/@style"/>
         </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@nodeMappings[name='NM_EEnum']"/>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_7axbsUg0EeCm95Tq9dtYWA" name="mySecondEnum" width="3" height="3">
-        <target xmi:type="ecore:EEnum" href="tc2330.ecore#//mySecondEnum"/>
-        <semanticElements xmi:type="ecore:EEnum" href="tc2330.ecore#//mySecondEnum"/>
-        <ownedStyle xmi:type="diagram:Ellipse" xmi:id="_7axbskg0EeCm95Tq9dtYWA">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7axbtkg0EeCm95Tq9dtYWA"/>
-          <description xmi:type="style:EllipseNodeDescription" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@nodeMappings[name='NM_EEnum']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_7axbt0g0EeCm95Tq9dtYWA"/>
-          <color xmi:type="viewpoint:RGBValues" xmi:id="_7ayCwEg0EeCm95Tq9dtYWA" red="194" green="239" blue="255"/>
+        <actualMapping xmi:type="description_1:NodeMapping" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']"/>
+      </ownedBorderedNodes>
+      <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_7a27QEg0EeCm95Tq9dtYWA" name="H" outgoingEdges="_7bAFMEg0EeCm95Tq9dtYWA" width="2" height="2">
+        <target xmi:type="ecore:EClass" href="tc2330.ecore#//p1/H"/>
+        <semanticElements xmi:type="ecore:EClass" href="tc2330.ecore#//p1/H"/>
+        <ownedStyle xmi:type="diagram:Square" xmi:id="_7a27QUg0EeCm95Tq9dtYWA" borderColor="173,127,168" width="2" height="2" color="239,41,41">
+          <description xmi:type="style:SquareDescription" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']/@style"/>
         </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@nodeMappings[name='NM_EEnum']"/>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_7ayCwUg0EeCm95Tq9dtYWA" name="p1">
+        <actualMapping xmi:type="description_1:NodeMapping" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']"/>
+      </ownedBorderedNodes>
+      <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_7a3iUEg0EeCm95Tq9dtYWA" name="I" outgoingEdges="_7bAsQEg0EeCm95Tq9dtYWA" width="2" height="2">
+        <target xmi:type="ecore:EClass" href="tc2330.ecore#//p1/I"/>
+        <semanticElements xmi:type="ecore:EClass" href="tc2330.ecore#//p1/I"/>
+        <ownedStyle xmi:type="diagram:Square" xmi:id="_7a3iUUg0EeCm95Tq9dtYWA" borderColor="173,127,168" width="2" height="2" color="239,41,41">
+          <description xmi:type="style:SquareDescription" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']"/>
+      </ownedBorderedNodes>
+      <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_Au53QJRwEeeQtoUIhUY0Ow" width="2" height="2">
         <target xmi:type="ecore:EPackage" href="tc2330.ecore#//p1"/>
         <semanticElements xmi:type="ecore:EPackage" href="tc2330.ecore#//p1"/>
-        <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_7a1tIEg0EeCm95Tq9dtYWA" name="A" outgoingEdges="_7a-3EEg0EeCm95Tq9dtYWA" width="2" height="2">
-          <target xmi:type="ecore:EClass" href="tc2330.ecore#//p1/A"/>
-          <semanticElements xmi:type="ecore:EClass" href="tc2330.ecore#//p1/A"/>
-          <ownedStyle xmi:type="diagram:Square" xmi:id="_7a1tIUg0EeCm95Tq9dtYWA" width="2" height="2">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7a1tJUg0EeCm95Tq9dtYWA"/>
-            <description xmi:type="style:SquareDescription" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_7a1tJkg0EeCm95Tq9dtYWA" red="173" green="127" blue="168"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_7a1tJ0g0EeCm95Tq9dtYWA" red="239" green="41" blue="41"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']"/>
-        </ownedBorderedNodes>
-        <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_7a2UMEg0EeCm95Tq9dtYWA" name="G" outgoingEdges="_7a_eIEg0EeCm95Tq9dtYWA" width="2" height="2">
-          <target xmi:type="ecore:EClass" href="tc2330.ecore#//p1/G"/>
-          <semanticElements xmi:type="ecore:EClass" href="tc2330.ecore#//p1/G"/>
-          <ownedStyle xmi:type="diagram:Square" xmi:id="_7a2UMUg0EeCm95Tq9dtYWA" width="2" height="2">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7a2UNUg0EeCm95Tq9dtYWA"/>
-            <description xmi:type="style:SquareDescription" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_7a2UNkg0EeCm95Tq9dtYWA" red="173" green="127" blue="168"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_7a2UN0g0EeCm95Tq9dtYWA" red="239" green="41" blue="41"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']"/>
-        </ownedBorderedNodes>
-        <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_7a27QEg0EeCm95Tq9dtYWA" name="H" outgoingEdges="_7bAFMEg0EeCm95Tq9dtYWA" width="2" height="2">
-          <target xmi:type="ecore:EClass" href="tc2330.ecore#//p1/H"/>
-          <semanticElements xmi:type="ecore:EClass" href="tc2330.ecore#//p1/H"/>
-          <ownedStyle xmi:type="diagram:Square" xmi:id="_7a27QUg0EeCm95Tq9dtYWA" width="2" height="2">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7a27RUg0EeCm95Tq9dtYWA"/>
-            <description xmi:type="style:SquareDescription" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_7a27Rkg0EeCm95Tq9dtYWA" red="173" green="127" blue="168"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_7a27R0g0EeCm95Tq9dtYWA" red="239" green="41" blue="41"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']"/>
-        </ownedBorderedNodes>
-        <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_7a3iUEg0EeCm95Tq9dtYWA" name="I" outgoingEdges="_7bAsQEg0EeCm95Tq9dtYWA" width="2" height="2">
-          <target xmi:type="ecore:EClass" href="tc2330.ecore#//p1/I"/>
-          <semanticElements xmi:type="ecore:EClass" href="tc2330.ecore#//p1/I"/>
-          <ownedStyle xmi:type="diagram:Square" xmi:id="_7a3iUUg0EeCm95Tq9dtYWA" width="2" height="2">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7a3iVUg0EeCm95Tq9dtYWA"/>
-            <description xmi:type="style:SquareDescription" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_7a3iVkg0EeCm95Tq9dtYWA" red="173" green="127" blue="168"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_7a3iV0g0EeCm95Tq9dtYWA" red="239" green="41" blue="41"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']"/>
-        </ownedBorderedNodes>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_7ayp0Eg0EeCm95Tq9dtYWA">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7ayp1Ug0EeCm95Tq9dtYWA"/>
-          <description xmi:type="style:FlatContainerStyleDescription" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@containerMappings[name='CM_EPackage']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_7ayp1kg0EeCm95Tq9dtYWA" red="39" green="76" blue="114"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_7ayp10g0EeCm95Tq9dtYWA" red="114" green="159" blue="207"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_7azQ4Eg0EeCm95Tq9dtYWA" red="204" green="242" blue="166"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:ContainerMapping" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@containerMappings[name='CM_EPackage']"/>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_7azQ4Ug0EeCm95Tq9dtYWA" name="p2">
-        <target xmi:type="ecore:EPackage" href="tc2330.ecore#//p2"/>
-        <semanticElements xmi:type="ecore:EPackage" href="tc2330.ecore#//p2"/>
-        <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_7a4wcEg0EeCm95Tq9dtYWA" name="B" incomingEdges="_7a-3EEg0EeCm95Tq9dtYWA" width="2" height="2">
-          <target xmi:type="ecore:EClass" href="tc2330.ecore#//p2/B"/>
-          <semanticElements xmi:type="ecore:EClass" href="tc2330.ecore#//p2/B"/>
-          <ownedStyle xmi:type="diagram:Square" xmi:id="_7a5XgEg0EeCm95Tq9dtYWA" width="2" height="2">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7a5XhEg0EeCm95Tq9dtYWA"/>
-            <description xmi:type="style:SquareDescription" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_7a5XhUg0EeCm95Tq9dtYWA" red="173" green="127" blue="168"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_7a5Xhkg0EeCm95Tq9dtYWA" red="239" green="41" blue="41"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']"/>
-        </ownedBorderedNodes>
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_7azQ4kg0EeCm95Tq9dtYWA">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7azQ50g0EeCm95Tq9dtYWA"/>
-          <description xmi:type="style:FlatContainerStyleDescription" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@containerMappings[name='CM_EPackage']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_7azQ6Eg0EeCm95Tq9dtYWA" red="39" green="76" blue="114"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_7azQ6Ug0EeCm95Tq9dtYWA" red="114" green="159" blue="207"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_7azQ6kg0EeCm95Tq9dtYWA" red="204" green="242" blue="166"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:ContainerMapping" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@containerMappings[name='CM_EPackage']"/>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_7az38Eg0EeCm95Tq9dtYWA" name="p3">
-        <target xmi:type="ecore:EPackage" href="tc2330.ecore#//p3"/>
-        <semanticElements xmi:type="ecore:EPackage" href="tc2330.ecore#//p3"/>
-        <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_7a5-kEg0EeCm95Tq9dtYWA" name="E" incomingEdges="_7a_eIEg0EeCm95Tq9dtYWA" width="2" height="2">
-          <target xmi:type="ecore:EClass" href="tc2330.ecore#//p3/E"/>
-          <semanticElements xmi:type="ecore:EClass" href="tc2330.ecore#//p3/E"/>
-          <ownedStyle xmi:type="diagram:Square" xmi:id="_7a6loEg0EeCm95Tq9dtYWA" width="2" height="2">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7a6lpEg0EeCm95Tq9dtYWA"/>
-            <description xmi:type="style:SquareDescription" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_7a6lpUg0EeCm95Tq9dtYWA" red="173" green="127" blue="168"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_7a6lpkg0EeCm95Tq9dtYWA" red="239" green="41" blue="41"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']"/>
-        </ownedBorderedNodes>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_7az38Ug0EeCm95Tq9dtYWA">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7az39kg0EeCm95Tq9dtYWA"/>
-          <description xmi:type="style:FlatContainerStyleDescription" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@containerMappings[name='CM_EPackage']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_7az390g0EeCm95Tq9dtYWA" red="39" green="76" blue="114"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_7az3-Eg0EeCm95Tq9dtYWA" red="114" green="159" blue="207"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_7az3-Ug0EeCm95Tq9dtYWA" red="204" green="242" blue="166"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:ContainerMapping" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@containerMappings[name='CM_EPackage']"/>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_7a0fAEg0EeCm95Tq9dtYWA" name="p4">
-        <target xmi:type="ecore:EPackage" href="tc2330.ecore#//p4"/>
-        <semanticElements xmi:type="ecore:EPackage" href="tc2330.ecore#//p4"/>
-        <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_7a7MsEg0EeCm95Tq9dtYWA" name="F" incomingEdges="_7bAFMEg0EeCm95Tq9dtYWA" width="2" height="2">
-          <target xmi:type="ecore:EClass" href="tc2330.ecore#//p4/F"/>
-          <semanticElements xmi:type="ecore:EClass" href="tc2330.ecore#//p4/F"/>
-          <ownedStyle xmi:type="diagram:Square" xmi:id="_7a7zwEg0EeCm95Tq9dtYWA" width="2" height="2">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7a7zxEg0EeCm95Tq9dtYWA"/>
-            <description xmi:type="style:SquareDescription" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_7a7zxUg0EeCm95Tq9dtYWA" red="173" green="127" blue="168"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_7a7zxkg0EeCm95Tq9dtYWA" red="239" green="41" blue="41"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']"/>
-        </ownedBorderedNodes>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_7a0fAUg0EeCm95Tq9dtYWA">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7a0fBkg0EeCm95Tq9dtYWA"/>
-          <description xmi:type="style:FlatContainerStyleDescription" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@containerMappings[name='CM_EPackage']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_7a0fB0g0EeCm95Tq9dtYWA" red="39" green="76" blue="114"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_7a0fCEg0EeCm95Tq9dtYWA" red="114" green="159" blue="207"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_7a0fCUg0EeCm95Tq9dtYWA" red="204" green="242" blue="166"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:ContainerMapping" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@containerMappings[name='CM_EPackage']"/>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_7a0fCkg0EeCm95Tq9dtYWA" name="p5">
-        <target xmi:type="ecore:EPackage" href="tc2330.ecore#//p5"/>
-        <semanticElements xmi:type="ecore:EPackage" href="tc2330.ecore#//p5"/>
-        <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_7a8a0Eg0EeCm95Tq9dtYWA" name="J" incomingEdges="_7bAsQEg0EeCm95Tq9dtYWA" width="2" height="2">
-          <target xmi:type="ecore:EClass" href="tc2330.ecore#//p5/J"/>
-          <semanticElements xmi:type="ecore:EClass" href="tc2330.ecore#//p5/J"/>
-          <ownedStyle xmi:type="diagram:Square" xmi:id="_7a9B4Eg0EeCm95Tq9dtYWA" width="2" height="2">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7a9B5Eg0EeCm95Tq9dtYWA"/>
-            <description xmi:type="style:SquareDescription" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_7a9B5Ug0EeCm95Tq9dtYWA" red="173" green="127" blue="168"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_7a9B5kg0EeCm95Tq9dtYWA" red="239" green="41" blue="41"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']"/>
-        </ownedBorderedNodes>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_7a0fC0g0EeCm95Tq9dtYWA">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7a1GEEg0EeCm95Tq9dtYWA"/>
-          <description xmi:type="style:FlatContainerStyleDescription" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@containerMappings[name='CM_EPackage']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_7a1GEUg0EeCm95Tq9dtYWA" red="39" green="76" blue="114"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_7a1GEkg0EeCm95Tq9dtYWA" red="114" green="159" blue="207"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_7a1GE0g0EeCm95Tq9dtYWA" red="204" green="242" blue="166"/>
+        <ownedStyle xmi:type="diagram:Square" xmi:id="_Au6eUJRwEeeQtoUIhUY0Ow" showIcon="false" borderColor="173,127,168" width="2" height="2" color="204,242,166">
+          <description xmi:type="style:SquareDescription" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='selfP1BorderNode']/@style"/>
         </ownedStyle>
-        <actualMapping xmi:type="description_1:ContainerMapping" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@containerMappings[name='CM_EPackage']"/>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_7a-3EEg0EeCm95Tq9dtYWA" name="toB" sourceNode="_7a1tIEg0EeCm95Tq9dtYWA" targetNode="_7a4wcEg0EeCm95Tq9dtYWA">
-        <target xmi:type="ecore:EReference" href="tc2330.ecore#//p1/A/toB"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_iV6sQezQEd-T-fkKxdk2ZA" routingStyle="manhattan">
-          <description xmi:type="style:EdgeStyleDescription" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@edgeMappings[name='EM_Ref']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_iV6sQ-zQEd-T-fkKxdk2ZA" red="136" green="136" blue="136"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_7XWUQEg0EeCm95Tq9dtYWA">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7XWUQkg0EeCm95Tq9dtYWA"/>
-          </centerLabelStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='selfP1BorderNode']"/>
+      </ownedBorderedNodes>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_7ayp0Eg0EeCm95Tq9dtYWA" borderSize="1" borderSizeComputationExpression="1" borderColor="39,76,114" backgroundColor="114,159,207" foregroundColor="204,242,166">
+        <description xmi:type="style:FlatContainerStyleDescription" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@containerMappings[name='CM_EPackage']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@containerMappings[name='CM_EPackage']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_7azQ4Ug0EeCm95Tq9dtYWA" name="p2">
+      <target xmi:type="ecore:EPackage" href="tc2330.ecore#//p2"/>
+      <semanticElements xmi:type="ecore:EPackage" href="tc2330.ecore#//p2"/>
+      <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_7a4wcEg0EeCm95Tq9dtYWA" name="B" incomingEdges="_7a-3EEg0EeCm95Tq9dtYWA" width="2" height="2">
+        <target xmi:type="ecore:EClass" href="tc2330.ecore#//p2/B"/>
+        <semanticElements xmi:type="ecore:EClass" href="tc2330.ecore#//p2/B"/>
+        <ownedStyle xmi:type="diagram:Square" xmi:id="_7a5XgEg0EeCm95Tq9dtYWA" borderColor="173,127,168" width="2" height="2" color="239,41,41">
+          <description xmi:type="style:SquareDescription" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']/@style"/>
         </ownedStyle>
-        <actualMapping xmi:type="description_1:EdgeMapping" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@edgeMappings[name='EM_Ref']"/>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_7a_eIEg0EeCm95Tq9dtYWA" name="toE" sourceNode="_7a2UMEg0EeCm95Tq9dtYWA" targetNode="_7a5-kEg0EeCm95Tq9dtYWA">
-        <target xmi:type="ecore:EReference" href="tc2330.ecore#//p1/G/toE"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_iV6sRezQEd-T-fkKxdk2ZA" routingStyle="manhattan">
-          <description xmi:type="style:EdgeStyleDescription" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@edgeMappings[name='EM_Ref']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_iV6sR-zQEd-T-fkKxdk2ZA" red="136" green="136" blue="136"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_7XWUSUg0EeCm95Tq9dtYWA">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7XWUS0g0EeCm95Tq9dtYWA"/>
-          </centerLabelStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']"/>
+      </ownedBorderedNodes>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_7azQ4kg0EeCm95Tq9dtYWA" borderSize="1" borderSizeComputationExpression="1" borderColor="39,76,114" backgroundColor="114,159,207" foregroundColor="204,242,166">
+        <description xmi:type="style:FlatContainerStyleDescription" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@containerMappings[name='CM_EPackage']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@containerMappings[name='CM_EPackage']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_7az38Eg0EeCm95Tq9dtYWA" name="p3">
+      <target xmi:type="ecore:EPackage" href="tc2330.ecore#//p3"/>
+      <semanticElements xmi:type="ecore:EPackage" href="tc2330.ecore#//p3"/>
+      <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_7a5-kEg0EeCm95Tq9dtYWA" name="E" incomingEdges="_7a_eIEg0EeCm95Tq9dtYWA" width="2" height="2">
+        <target xmi:type="ecore:EClass" href="tc2330.ecore#//p3/E"/>
+        <semanticElements xmi:type="ecore:EClass" href="tc2330.ecore#//p3/E"/>
+        <ownedStyle xmi:type="diagram:Square" xmi:id="_7a6loEg0EeCm95Tq9dtYWA" borderColor="173,127,168" width="2" height="2" color="239,41,41">
+          <description xmi:type="style:SquareDescription" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']/@style"/>
         </ownedStyle>
-        <actualMapping xmi:type="description_1:EdgeMapping" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@edgeMappings[name='EM_Ref']"/>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_7bAFMEg0EeCm95Tq9dtYWA" name="toF" sourceNode="_7a27QEg0EeCm95Tq9dtYWA" targetNode="_7a7MsEg0EeCm95Tq9dtYWA">
-        <target xmi:type="ecore:EReference" href="tc2330.ecore#//p1/H/toF"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_iV6sSezQEd-T-fkKxdk2ZA" routingStyle="manhattan">
-          <description xmi:type="style:EdgeStyleDescription" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@edgeMappings[name='EM_Ref']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_iV6sS-zQEd-T-fkKxdk2ZA" red="136" green="136" blue="136"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_7XWUQ0g0EeCm95Tq9dtYWA">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7XWURUg0EeCm95Tq9dtYWA"/>
-          </centerLabelStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']"/>
+      </ownedBorderedNodes>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_7az38Ug0EeCm95Tq9dtYWA" borderSize="1" borderSizeComputationExpression="1" borderColor="39,76,114" backgroundColor="114,159,207" foregroundColor="204,242,166">
+        <description xmi:type="style:FlatContainerStyleDescription" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@containerMappings[name='CM_EPackage']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@containerMappings[name='CM_EPackage']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_7a0fAEg0EeCm95Tq9dtYWA" name="p4">
+      <target xmi:type="ecore:EPackage" href="tc2330.ecore#//p4"/>
+      <semanticElements xmi:type="ecore:EPackage" href="tc2330.ecore#//p4"/>
+      <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_7a7MsEg0EeCm95Tq9dtYWA" name="F" incomingEdges="_7bAFMEg0EeCm95Tq9dtYWA" width="2" height="2">
+        <target xmi:type="ecore:EClass" href="tc2330.ecore#//p4/F"/>
+        <semanticElements xmi:type="ecore:EClass" href="tc2330.ecore#//p4/F"/>
+        <ownedStyle xmi:type="diagram:Square" xmi:id="_7a7zwEg0EeCm95Tq9dtYWA" borderColor="173,127,168" width="2" height="2" color="239,41,41">
+          <description xmi:type="style:SquareDescription" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']/@style"/>
         </ownedStyle>
-        <actualMapping xmi:type="description_1:EdgeMapping" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@edgeMappings[name='EM_Ref']"/>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_7bAsQEg0EeCm95Tq9dtYWA" name="toJ" sourceNode="_7a3iUEg0EeCm95Tq9dtYWA" targetNode="_7a8a0Eg0EeCm95Tq9dtYWA">
-        <target xmi:type="ecore:EReference" href="tc2330.ecore#//p1/I/toJ"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_iV6sTezQEd-T-fkKxdk2ZA" routingStyle="manhattan">
-          <description xmi:type="style:EdgeStyleDescription" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@edgeMappings[name='EM_Ref']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_iV6sT-zQEd-T-fkKxdk2ZA" red="136" green="136" blue="136"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_7XWURkg0EeCm95Tq9dtYWA">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_7XWUSEg0EeCm95Tq9dtYWA"/>
-          </centerLabelStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']"/>
+      </ownedBorderedNodes>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_7a0fAUg0EeCm95Tq9dtYWA" borderSize="1" borderSizeComputationExpression="1" borderColor="39,76,114" backgroundColor="114,159,207" foregroundColor="204,242,166">
+        <description xmi:type="style:FlatContainerStyleDescription" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@containerMappings[name='CM_EPackage']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@containerMappings[name='CM_EPackage']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_7a0fCkg0EeCm95Tq9dtYWA" name="p5">
+      <target xmi:type="ecore:EPackage" href="tc2330.ecore#//p5"/>
+      <semanticElements xmi:type="ecore:EPackage" href="tc2330.ecore#//p5"/>
+      <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_7a8a0Eg0EeCm95Tq9dtYWA" name="J" incomingEdges="_7bAsQEg0EeCm95Tq9dtYWA" width="2" height="2">
+        <target xmi:type="ecore:EClass" href="tc2330.ecore#//p5/J"/>
+        <semanticElements xmi:type="ecore:EClass" href="tc2330.ecore#//p5/J"/>
+        <ownedStyle xmi:type="diagram:Square" xmi:id="_7a9B4Eg0EeCm95Tq9dtYWA" borderColor="173,127,168" width="2" height="2" color="239,41,41">
+          <description xmi:type="style:SquareDescription" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']/@style"/>
         </ownedStyle>
-        <actualMapping xmi:type="description_1:EdgeMapping" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@edgeMappings[name='EM_Ref']"/>
-      </ownedDiagramElements>
-      <description xmi:type="description_1:DiagramDescription" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']"/>
-      <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_iSyfwezQEd-T-fkKxdk2ZA"/>
-      <activatedLayers xmi:type="description_1:Layer" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer"/>
-      <target xmi:type="ecore:EPackage" href="tc2330.ecore#/"/>
-    </ownedRepresentations>
-    <viewpoint xmi:type="description:Viewpoint" href="tc2330.odesign#//@ownedViewpoints[name='2330']"/>
-  </ownedViews>
-</viewpoint:DAnalysis>
+        <actualMapping xmi:type="description_1:NodeMapping" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']"/>
+      </ownedBorderedNodes>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_7a0fC0g0EeCm95Tq9dtYWA" borderSize="1" borderSizeComputationExpression="1" borderColor="39,76,114" backgroundColor="114,159,207" foregroundColor="204,242,166">
+        <description xmi:type="style:FlatContainerStyleDescription" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@containerMappings[name='CM_EPackage']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@containerMappings[name='CM_EPackage']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_7a-3EEg0EeCm95Tq9dtYWA" name="toB" sourceNode="_7a1tIEg0EeCm95Tq9dtYWA" targetNode="_7a4wcEg0EeCm95Tq9dtYWA">
+      <target xmi:type="ecore:EReference" href="tc2330.ecore#//p1/A/toB"/>
+      <semanticElements xmi:type="ecore:EReference" href="tc2330.ecore#//p1/A/toB"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_iV6sQezQEd-T-fkKxdk2ZA" routingStyle="manhattan">
+        <description xmi:type="style:EdgeStyleDescription" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@edgeMappings[name='EM_Ref']/@style"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_7XWUQEg0EeCm95Tq9dtYWA"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@edgeMappings[name='EM_Ref']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_7a_eIEg0EeCm95Tq9dtYWA" name="toE" sourceNode="_7a2UMEg0EeCm95Tq9dtYWA" targetNode="_7a5-kEg0EeCm95Tq9dtYWA">
+      <target xmi:type="ecore:EReference" href="tc2330.ecore#//p1/G/toE"/>
+      <semanticElements xmi:type="ecore:EReference" href="tc2330.ecore#//p1/G/toE"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_iV6sRezQEd-T-fkKxdk2ZA" routingStyle="manhattan">
+        <description xmi:type="style:EdgeStyleDescription" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@edgeMappings[name='EM_Ref']/@style"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_7XWUSUg0EeCm95Tq9dtYWA"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@edgeMappings[name='EM_Ref']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_7bAFMEg0EeCm95Tq9dtYWA" name="toF" sourceNode="_7a27QEg0EeCm95Tq9dtYWA" targetNode="_7a7MsEg0EeCm95Tq9dtYWA">
+      <target xmi:type="ecore:EReference" href="tc2330.ecore#//p1/H/toF"/>
+      <semanticElements xmi:type="ecore:EReference" href="tc2330.ecore#//p1/H/toF"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_iV6sSezQEd-T-fkKxdk2ZA" routingStyle="manhattan">
+        <description xmi:type="style:EdgeStyleDescription" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@edgeMappings[name='EM_Ref']/@style"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_7XWUQ0g0EeCm95Tq9dtYWA"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@edgeMappings[name='EM_Ref']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_7bAsQEg0EeCm95Tq9dtYWA" name="toJ" sourceNode="_7a3iUEg0EeCm95Tq9dtYWA" targetNode="_7a8a0Eg0EeCm95Tq9dtYWA">
+      <target xmi:type="ecore:EReference" href="tc2330.ecore#//p1/I/toJ"/>
+      <semanticElements xmi:type="ecore:EReference" href="tc2330.ecore#//p1/I/toJ"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_iV6sTezQEd-T-fkKxdk2ZA" routingStyle="manhattan">
+        <description xmi:type="style:EdgeStyleDescription" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@edgeMappings[name='EM_Ref']/@style"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_7XWURkg0EeCm95Tq9dtYWA"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@edgeMappings[name='EM_Ref']"/>
+    </ownedDiagramElements>
+    <description xmi:type="description_1:DiagramDescription" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']"/>
+    <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_iSyfwezQEd-T-fkKxdk2ZA"/>
+    <activatedLayers xmi:type="description_1:Layer" href="tc2330.odesign#//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer"/>
+    <target xmi:type="ecore:EPackage" href="tc2330.ecore#/"/>
+  </diagram:DSemanticDiagram>
+</xmi:XMI>
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/tools/hide-reveal/tc-2330/tc2330.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/tools/hide-reveal/tc-2330/tc2330.odesign
index d8c6610e52..e83eaa54c6 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/tools/hide-reveal/tc-2330/tc2330.odesign
+++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/tools/hide-reveal/tc-2330/tc2330.odesign
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ASCII"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:filter="http://www.eclipse.org/sirius/diagram/description/filter/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" name="2330" version="10.1.3.201511131800">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:filter="http://www.eclipse.org/sirius/diagram/description/filter/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" name="2330" version="12.0.0.2017041100">
   <ownedViewpoints name="2330" modelFileExtension="ecore">
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="2330 Diagram" domainClass="EPackage">
       <filters xsi:type="filter:CompositeFilterDescription" name="port collapse">
@@ -29,6 +29,13 @@
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='red']"/>
             </style>
           </borderedNodeMappings>
+          <borderedNodeMappings name="selfP1BorderNode" preconditionExpression="aql:self.name = 'p1'" semanticCandidatesExpression="var:self" domainClass="EPackage">
+            <style xsi:type="style:SquareDescription" showIcon="false" labelExpression="" width="2" height="2">
+              <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='purple']"/>
+              <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+              <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/>
+            </style>
+          </borderedNodeMappings>
           <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/HideRevealDiagramElementsLabelsTest.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/HideRevealDiagramElementsLabelsTest.java
index be3bd1b224..b38fbe0e6d 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/HideRevealDiagramElementsLabelsTest.java
+++ b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/HideRevealDiagramElementsLabelsTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2014 THALES GLOBAL SERVICES.
+ * Copyright (c) 2010, 2017 THALES GLOBAL SERVICES.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,8 +11,10 @@
 package org.eclipse.sirius.tests.swtbot;
 
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
 
+import org.eclipse.sirius.diagram.ui.edit.api.part.AbstractDiagramContainerEditPart;
 import org.eclipse.sirius.diagram.ui.edit.api.part.AbstractDiagramEdgeEditPart;
 import org.eclipse.sirius.tests.support.api.TestsUtil;
 import org.eclipse.sirius.tests.swtbot.sequence.condition.CheckTreeItemFontFormat;
@@ -87,15 +89,20 @@ public class HideRevealDiagramElementsLabelsTest extends AbstractHideRevealDiagr
 
     /**
      * Ensures that the Hide and Reveal Actions works correctly when called from
-     * tabbar (right-click on edge).
+     * tabbar (button in tabbar with edge and optional invalid element
+     * selected).
      */
-    public void testHideLabelWithTabbarOnEdge() {
+    private void testHideLabelWithTabbarOnEdge(boolean selectInvalidElement) {
 
         // Step 1 : hide the label and check that it is correctly hidden
         SWTBotGefEditPart editPart = editor.getEditPart(EDGE_WITH_LABEL_NAME).parent();
 
         checkEdgeLabelIsVisible(EDGE_WITH_LABEL_NAME);
-        editor.select(Sets.newHashSet(editPart));
+        if (selectInvalidElement) {
+            editor.select(Sets.newHashSet(editPart, getInvalidElement()));
+        } else {
+            editor.select(Sets.newHashSet(editPart));
+        }
         editor.bot().toolbarButtonWithTooltip(HIDE_LABEL_TOOLTIP).click();
 
         checkEdgeLabelIsHidden(EDGE_WITH_LABEL_NAME);
@@ -122,6 +129,22 @@ public class HideRevealDiagramElementsLabelsTest extends AbstractHideRevealDiagr
 
     /**
      * Ensures that the Hide and Reveal Actions works correctly when called from
+     * tabbar (button in tabbar with edge).
+     */
+    public void testHideLabelWithTabbarOnEdge() {
+        testHideLabelWithTabbarOnEdge(false);
+    }
+
+    /**
+     * Ensures that the Hide and Reveal Actions works correctly when called from
+     * tabbar (button in tabbar with edge and an invalid element selected).
+     */
+    public void testHideLabelWithTabbarOnEdgeWithInvalidSelection() {
+        testHideLabelWithTabbarOnEdge(true);
+    }
+
+    /**
+     * Ensures that the Hide and Reveal Actions works correctly when called from
      * tabbar (right-click on a bordered node).
      */
     public void testHideLabelWithTabbarOnBorderedNode() {
@@ -191,11 +214,15 @@ public class HideRevealDiagramElementsLabelsTest extends AbstractHideRevealDiagr
      * Ensures that the Hide and Reveal Actions works correctly when called from
      * context menu (right-click on the Node).
      */
-    public void testHideLabelWithContextMenuOnNode() {
+    private void testHideLabelWithContextMenuOnNode(boolean selectInvalidElement) {
         // Step 1 : hide the label and check that it is correctly hidden
         SWTBotGefEditPart editPart = editor.getEditPart(NODE_WITH_LABEL_NAME).parent();
         checkLabelIsVisible(NODE_WITH_LABEL_NAME);
-        editor.select(Sets.newHashSet(editPart));
+        if (selectInvalidElement) {
+            editor.select(Sets.newHashSet(editPart, getInvalidElement()));
+        } else {
+            editor.select(Sets.newHashSet(editPart));
+        }
         editor.clickContextMenu(HIDE_LABEL_TOOLTIP);
 
         checkLabelIsHidden(NODE_WITH_LABEL_NAME);
@@ -218,13 +245,36 @@ public class HideRevealDiagramElementsLabelsTest extends AbstractHideRevealDiagr
 
     /**
      * Ensures that the Hide and Reveal Actions works correctly when called from
+     * context menu (right-click on the Node).
+     */
+    public void testHideLabelWithContextMenuOnNode() {
+        testHideLabelWithContextMenuOnNode(false);
+    }
+
+    /**
+     * Ensures that the Hide and Reveal Actions works correctly when called from
+     * context menu (right-click on the Node and an invalid element).
+     */
+    public void testHideLabelWithContextMenuOnNodeWithInvalidSelection() {
+        testHideLabelWithContextMenuOnNode(true);
+    }
+
+    /**
+     * Ensures that the Hide and Reveal Actions works correctly when called from
      * context menu (right-click on the Edge).
      */
-    public void testHideLabelWithContextMenuOnEdge() {
-        // Step 1 : hide the label and check that it is correctly hidden
+    private void testHideLabelWithContextMenuOnEdge(boolean selectInvalidElement) {
+        // Step 0 : Create list of elements to select
         SWTBotGefEditPart editPart = editor.getEditPart(EDGE_WITH_LABEL_NAME).parent();
+        HashSet<SWTBotGefEditPart> elementsToSelect;
+        if (selectInvalidElement) {
+            elementsToSelect = Sets.newHashSet(editPart, getInvalidElement());
+        } else {
+            elementsToSelect = Sets.newHashSet(editPart);
+        }
+        // Step 1 : hide the label and check that it is correctly hidden
         checkEdgeLabelIsVisible(EDGE_WITH_LABEL_NAME);
-        editor.select(Sets.newHashSet(editPart));
+        editor.select(elementsToSelect);
         editor.clickContextMenu(HIDE_LABEL_TOOLTIP);
 
         checkEdgeLabelIsHidden(EDGE_WITH_LABEL_NAME);
@@ -232,7 +282,7 @@ public class HideRevealDiagramElementsLabelsTest extends AbstractHideRevealDiagr
         // Step 2 : ensure that the context menu doesn't propose user to hide
         // label anymore
         boolean hideLabelContextMenuActionFound = true;
-        editor.select(editPart);
+        editor.select(elementsToSelect);
         try {
             editor.clickContextMenu(HIDE_LABEL_TOOLTIP);
         } catch (WidgetNotFoundException e) {
@@ -240,17 +290,42 @@ public class HideRevealDiagramElementsLabelsTest extends AbstractHideRevealDiagr
         } finally {
             Assert.assertFalse("The context menu shouldn't allow user to hide label of " + EDGE_WITH_LABEL_NAME + " (as it is already hidden)", hideLabelContextMenuActionFound);
         }
+
+        // Step 3 : reveal the label and check that it is correctly reveal
+        editor.clickContextMenu(REVEAL_LABEL_TOOLTIP);
+
+        checkEdgeLabelIsVisible(EDGE_WITH_LABEL_NAME);
+    }
+
+    /**
+     * Ensures that the Hide and Reveal Actions works correctly when called from
+     * context menu (right-click on the Edge).
+     */
+    public void testHideLabelWithContextMenuOnEdge() {
+        testHideLabelWithContextMenuOnEdge(false);
+    }
+
+    /**
+     * Ensures that the Hide and Reveal Actions works correctly when called from
+     * context menu (right-click on the Edge and an invalid element).
+     */
+    public void testHideLabelWithContextMenuOnEdgeWithInvalidSelection() {
+        testHideLabelWithContextMenuOnEdge(true);
     }
 
     /**
      * Ensures that the Hide and Reveal Actions works correctly when called from
      * context menu (right-click on the Bordered Node).
      */
-    public void testHideLabelWithContextMenuOnBorderedNode() {
+    private void testHideLabelWithContextMenuOnBorderedNode(boolean selectInvalidElement) {
         // Step 1 : hide the label and check that it is correctly hidden
         SWTBotGefEditPart editPart = editor.getEditPart(BORDERED_NODE_WITH_LABEL_NAME).parent();
         checkLabelIsVisible(BORDERED_NODE_WITH_LABEL_NAME);
-        editor.select(Sets.newHashSet(editPart));
+        if (selectInvalidElement) {
+            editor.select(Sets.newHashSet(editPart, getInvalidElement()));
+        } else {
+            editor.select(Sets.newHashSet(editPart));
+        }
         editor.clickContextMenu(HIDE_LABEL_TOOLTIP);
 
         checkLabelIsHidden(BORDERED_NODE_WITH_LABEL_NAME);
@@ -270,14 +345,34 @@ public class HideRevealDiagramElementsLabelsTest extends AbstractHideRevealDiagr
 
     /**
      * Ensures that the Hide and Reveal Actions works correctly when called from
+     * context menu (right-click on the Bordered Node).
+     */
+    public void testHideLabelWithContextMenuOnBorderedNode() {
+        testHideLabelWithContextMenuOnBorderedNode(false);
+    }
+
+    /**
+     * Ensures that the Hide and Reveal Actions works correctly when called from
+     * context menu (right-click on the Bordered Node and an invalid element).
+     */
+    public void testHideLabelWithContextMenuOnBorderedNodeWithInvalidSelection() {
+        testHideLabelWithContextMenuOnBorderedNode(true);
+    }
+
+    /**
+     * Ensures that the Hide and Reveal Actions works correctly when called from
      * context menu (right-click on the label).
      */
-    public void testHideLabelWithContextMenuOnLabel() {
+    private void testHideLabelWithContextMenuOnLabel(boolean selectInvalidElement) {
         // Step 1 : hide the label and check that it is correctly hidden
         SWTBotGefEditPart editPart = editor.getEditPart(NODE_WITH_LABEL_NAME);
         SWTBotGefEditPart parentEditPart = editPart.parent();
         checkLabelIsVisible(NODE_WITH_LABEL_NAME);
-        editor.select(Sets.newHashSet(editPart));
+        if (selectInvalidElement) {
+            editor.select(Sets.newHashSet(editPart, getInvalidElement()));
+        } else {
+            editor.select(Sets.newHashSet(editPart));
+        }
         editor.clickContextMenu(HIDE_LABEL_TOOLTIP);
 
         checkLabelIsHidden(NODE_WITH_LABEL_NAME);
@@ -297,6 +392,22 @@ public class HideRevealDiagramElementsLabelsTest extends AbstractHideRevealDiagr
 
     /**
      * Ensures that the Hide and Reveal Actions works correctly when called from
+     * context menu (right-click on the label).
+     */
+    public void testHideLabelWithContextMenuOnLabel() {
+        testHideLabelWithContextMenuOnLabel(false);
+    }
+
+    /**
+     * Ensures that the Hide and Reveal Actions works correctly when called from
+     * context menu (right-click on the label and an invalid element).
+     */
+    public void testHideLabelWithContextMenuOnLabelWithInvalidSelection() {
+        testHideLabelWithContextMenuOnLabel(true);
+    }
+
+    /**
+     * Ensures that the Hide and Reveal Actions works correctly when called from
      * the outline on Node.
      * 
      * @throws Exception
@@ -325,6 +436,7 @@ public class HideRevealDiagramElementsLabelsTest extends AbstractHideRevealDiagr
         view.bot().tree().getTreeItem("p").getNode(NODE_WITH_LABEL_NAME).select();
         SWTBotUtils.waitAllUiEvents();
         bot.waitUntil(new TreeItemSelected(nodeItem));
+
         checkOutlineIsCorrectlyDecorated(labelItem, false);
         nodeItem.contextMenu(HIDE_LABEL_TOOLTIP).click();
 
@@ -760,4 +872,12 @@ public class HideRevealDiagramElementsLabelsTest extends AbstractHideRevealDiagr
         item.contextMenu(REVEAL_ELEMENT_TOOLTIP).click();
         checkEdgeLabelIsVisible(EDGE_WITH_LABEL_NAME);
     }
+
+    private SWTBotGefEditPart getInvalidElement() {
+        // Get the p1 package
+        SWTBotGefEditPart p1EditPart = editor.getEditPart("p1", AbstractDiagramContainerEditPart.class);
+        // Get the last border node (that is the one without label).
+        SWTBotGefEditPart borderNodeWithoutLabel = p1EditPart.children().get(p1EditPart.children().size() - 1);
+        return borderNodeWithoutLabel;
+    }
 }
author	Laurent Redor	2017-09-08 09:00:25 +0000
committer	Laurent Redor	2017-09-11 15:02:38 +0000
commit	bd1d82c356db9ada41d4bbe29b128ce912149349 (patch)
tree	a2cd3b99c4c57786364fecad978f1f42a4c32b4a
parent	8a3c059d1d732bfe51cd9d84d6bed266bcddb5f5 (diff)
download	org.eclipse.sirius-bd1d82c356db9ada41d4bbe29b128ce912149349.tar.gz org.eclipse.sirius-bd1d82c356db9ada41d4bbe29b128ce912149349.tar.xz org.eclipse.sirius-bd1d82c356db9ada41d4bbe29b128ce912149349.zip