[453917] Fixes sub-node moving when resizing a container within a

container. * Add new tests to check that issue. Bug: 453917 Change-Id: If7d5938247d77d0369d31f521a9ee96996dbd9eb Signed-off-by: Florian Barbin <florian.barbin@obeo.fr>
author: Florian Barbin 2014-12-02 16:43:54 +0000
committer: Florian Barbin 2014-12-03 12:05:54 +0000
commit: b665757fe7d8d4650a355ebe5ad66b71b156a9b7 (patch)
tree: 8c0522f4b34c03d910a39b6c5fdebaafdf130b6e
parent: f7f046a4f255565b9af1954bf8f9d02955262b3d (diff)
download: org.eclipse.sirius-b665757fe7d8d4650a355ebe5ad66b71b156a9b7.tar.gz
org.eclipse.sirius-b665757fe7d8d4650a355ebe5ad66b71b156a9b7.tar.xz
org.eclipse.sirius-b665757fe7d8d4650a355ebe5ad66b71b156a9b7.zip
4 files changed, 559 insertions, 635 deletions
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/edit/commands/ChildrenAdjustmentCommand.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/edit/commands/ChildrenAdjustmentCommand.java
index edacccdc74..d238da4af4 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/edit/commands/ChildrenAdjustmentCommand.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/edit/commands/ChildrenAdjustmentCommand.java
@@ -36,6 +36,7 @@ import org.eclipse.sirius.diagram.ui.business.internal.operation.MoveViewOperati
 import org.eclipse.sirius.diagram.ui.business.internal.operation.ShiftDirectBorderedNodesOperation;
 import org.eclipse.sirius.diagram.ui.business.internal.query.RequestQuery;
 import org.eclipse.sirius.diagram.ui.graphical.edit.policies.SiriusResizeTracker;
+import org.eclipse.sirius.diagram.ui.internal.edit.parts.AbstractDNodeContainerCompartmentEditPart;
 import org.eclipse.sirius.diagram.ui.internal.edit.parts.DNodeContainerViewNodeContainerCompartmentEditPart;
 import org.eclipse.sirius.diagram.ui.tools.internal.edit.command.CommandFactory;
 import org.eclipse.sirius.diagram.ui.tools.internal.util.EditPartQuery;
@@ -150,8 +151,7 @@ public class ChildrenAdjustmentCommand extends AbstractTransactionalCommand {
     private void addChildrenAdjustmentCommands(IGraphicalEditPart resizedPart, CompositeTransactionalCommand cc, ChangeBoundsRequest cbr) {
         PrecisionPoint delta = new PrecisionPoint(cbr.getMoveDelta().getNegated());
         GraphicalHelper.applyInverseZoomOnPoint(resizedPart, delta);
-        DNodeContainerViewNodeContainerCompartmentEditPart compartment = Iterables
-                .getFirst(Iterables.filter(resizedPart.getChildren(), DNodeContainerViewNodeContainerCompartmentEditPart.class), null);
+        AbstractDNodeContainerCompartmentEditPart compartment = Iterables.getFirst(Iterables.filter(resizedPart.getChildren(), AbstractDNodeContainerCompartmentEditPart.class), null);
         if (compartment != null) {
             Iterable<EditPart> childrenExceptBorderItemPart = Iterables.filter(compartment.getChildren(), EditPart.class);
             for (EditPart editPart : childrenExceptBorderItemPart) {
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/portPositionStability/tc-1479/description/tc1479.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/portPositionStability/tc-1479/description/tc1479.odesign
index 68df8ddf8b..f0898eead4 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/portPositionStability/tc-1479/description/tc1479.odesign
+++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/portPositionStability/tc-1479/description/tc1479.odesign
@@ -1,10 +1,10 @@
 <?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:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" name="Ticket #1479" version="8.1.0">
+<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:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" name="Ticket #1479" version="10.0.0.201411061000">
   <ownedViewpoints name="Test case for ticket #1479" modelFileExtension="ecore">
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="TC1479" domainClass="EPackage">
       <defaultLayer name="Default">
         <edgeMappings name="EM_Ref" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='TC1479']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']" targetMapping="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='TC1479']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']" targetFinderExpression="&lt;%eAllStructuralFeatures.filter(&quot;EReference&quot;).eReferenceType%>">
-          <style>
+          <style sizeComputationExpression="[eContents()->size()/]">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
           </style>
         </edgeMappings>
@@ -23,6 +23,21 @@
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/>
             </style>
           </subNodeMappings>
+          <subContainerMappings name="subContainer" semanticCandidatesExpression="feature:eSubpackages" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer/@containerMappings[name='ContainerPackage']">
+            <subNodeMappings name="subN_EClass" semanticCandidatesExpression="feature:eClassifiers" domainClass="EClass">
+              <style xsi:type="style:SquareDescription" showIcon="false" labelExpression="['D' + name/]" labelPosition="node" resizeKind="NSEW">
+                <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+                <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+                <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_purple']"/>
+              </style>
+            </subNodeMappings>
+            <style xsi:type="style:FlatContainerStyleDescription">
+              <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+              <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+              <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
+              <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
+            </style>
+          </subContainerMappings>
           <style xsi:type="style:FlatContainerStyleDescription">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/portPositionStability/tc-1479/models/tc1479.aird b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/portPositionStability/tc-1479/models/tc1479.aird
index 4631dd3af1..4d39be996b 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/portPositionStability/tc-1479/models/tc1479.aird
+++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/portPositionStability/tc-1479/models/tc1479.aird
@@ -114,11 +114,179 @@
           <children xmi:type="notation:Node" xmi:id="_OqCVoCnLEeSkw5jQFTzPHw" type="2002" element="_Odg8kSnLEeSkw5jQFTzPHw">
             <children xmi:type="notation:Node" xmi:id="_OqJDUCnLEeSkw5jQFTzPHw" type="5006"/>
             <children xmi:type="notation:Node" xmi:id="_OqN70CnLEeSkw5jQFTzPHw" type="7001">
+              <children xmi:type="notation:Node" xmi:id="_E_Iz4HorEeScG9lRPRjvxQ" type="3008" element="_E--b0HorEeScG9lRPRjvxQ">
+                <children xmi:type="notation:Node" xmi:id="_E_Ja8HorEeScG9lRPRjvxQ" type="5005"/>
+                <children xmi:type="notation:Node" xmi:id="_E_Ja8XorEeScG9lRPRjvxQ" type="7002">
+                  <children xmi:type="notation:Node" xmi:id="_rivi8HozEeScG9lRPRjvxQ" type="3007" element="_riYWkHozEeScG9lRPRjvxQ">
+                    <children xmi:type="notation:Node" xmi:id="_riwxEHozEeScG9lRPRjvxQ" type="5003">
+                      <layoutConstraint xmi:type="notation:Location" xmi:id="_riwxEXozEeScG9lRPRjvxQ" x="31"/>
+                    </children>
+                    <children xmi:type="notation:Node" xmi:id="_riymQHozEeScG9lRPRjvxQ" type="3003" element="_rig5cHozEeScG9lRPRjvxQ">
+                      <styles xmi:type="notation:ShapeStyle" xmi:id="_riymQXozEeScG9lRPRjvxQ" fontName="Cantarell"/>
+                      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_riymQnozEeScG9lRPRjvxQ"/>
+                    </children>
+                    <styles xmi:type="notation:ShapeStyle" xmi:id="_rivi8XozEeScG9lRPRjvxQ" fontName="Cantarell" fontHeight="8"/>
+                    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rivi8nozEeScG9lRPRjvxQ" x="19" y="66" width="30" height="30"/>
+                  </children>
+                  <children xmi:type="notation:Node" xmi:id="_rixYIHozEeScG9lRPRjvxQ" type="3007" element="_rihggHozEeScG9lRPRjvxQ">
+                    <children xmi:type="notation:Node" xmi:id="_rix_MHozEeScG9lRPRjvxQ" type="5003">
+                      <layoutConstraint xmi:type="notation:Location" xmi:id="_rix_MXozEeScG9lRPRjvxQ" x="31"/>
+                    </children>
+                    <children xmi:type="notation:Node" xmi:id="_riymQ3ozEeScG9lRPRjvxQ" type="3003" element="_rihggXozEeScG9lRPRjvxQ">
+                      <styles xmi:type="notation:ShapeStyle" xmi:id="_riymRHozEeScG9lRPRjvxQ" fontName="Cantarell"/>
+                      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_riymRXozEeScG9lRPRjvxQ"/>
+                    </children>
+                    <styles xmi:type="notation:ShapeStyle" xmi:id="_rixYIXozEeScG9lRPRjvxQ" fontName="Cantarell" fontHeight="8"/>
+                    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rixYInozEeScG9lRPRjvxQ" x="103" y="66" width="30" height="30"/>
+                  </children>
+                  <styles xmi:type="notation:SortingStyle" xmi:id="_E_Ja8norEeScG9lRPRjvxQ"/>
+                  <styles xmi:type="notation:FilteringStyle" xmi:id="_E_Ja83orEeScG9lRPRjvxQ"/>
+                </children>
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_E_Iz4XorEeScG9lRPRjvxQ" fontName="Cantarell"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_E_Iz4norEeScG9lRPRjvxQ" x="31" y="54"/>
+              </children>
+              <children xmi:type="notation:Node" xmi:id="_E_KCAHorEeScG9lRPRjvxQ" type="3008" element="_E-_C4HorEeScG9lRPRjvxQ">
+                <children xmi:type="notation:Node" xmi:id="_E_KCA3orEeScG9lRPRjvxQ" type="5005"/>
+                <children xmi:type="notation:Node" xmi:id="_E_KCBHorEeScG9lRPRjvxQ" type="7002">
+                  <children xmi:type="notation:Node" xmi:id="_rizNUHozEeScG9lRPRjvxQ" type="3007" element="_riiuoHozEeScG9lRPRjvxQ">
+                    <children xmi:type="notation:Node" xmi:id="_riz0YHozEeScG9lRPRjvxQ" type="5003">
+                      <layoutConstraint xmi:type="notation:Location" xmi:id="_riz0YXozEeScG9lRPRjvxQ" x="31"/>
+                    </children>
+                    <children xmi:type="notation:Node" xmi:id="_ri1pkHozEeScG9lRPRjvxQ" type="3003" element="_rijVsHozEeScG9lRPRjvxQ">
+                      <styles xmi:type="notation:ShapeStyle" xmi:id="_ri1pkXozEeScG9lRPRjvxQ" fontName="Cantarell"/>
+                      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ri1pknozEeScG9lRPRjvxQ"/>
+                    </children>
+                    <styles xmi:type="notation:ShapeStyle" xmi:id="_rizNUXozEeScG9lRPRjvxQ" fontName="Cantarell" fontHeight="8"/>
+                    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rizNUnozEeScG9lRPRjvxQ" x="19" y="66" width="30" height="30"/>
+                  </children>
+                  <children xmi:type="notation:Node" xmi:id="_ri0bcHozEeScG9lRPRjvxQ" type="3007" element="_rij8wHozEeScG9lRPRjvxQ">
+                    <children xmi:type="notation:Node" xmi:id="_ri1CgHozEeScG9lRPRjvxQ" type="5003">
+                      <layoutConstraint xmi:type="notation:Location" xmi:id="_ri1CgXozEeScG9lRPRjvxQ" x="31"/>
+                    </children>
+                    <children xmi:type="notation:Node" xmi:id="_ri23sHozEeScG9lRPRjvxQ" type="3003" element="_rikj0HozEeScG9lRPRjvxQ">
+                      <styles xmi:type="notation:ShapeStyle" xmi:id="_ri23sXozEeScG9lRPRjvxQ" fontName="Cantarell"/>
+                      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ri23snozEeScG9lRPRjvxQ"/>
+                    </children>
+                    <styles xmi:type="notation:ShapeStyle" xmi:id="_ri0bcXozEeScG9lRPRjvxQ" fontName="Cantarell" fontHeight="8"/>
+                    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ri0bcnozEeScG9lRPRjvxQ" x="103" y="66" width="30" height="30"/>
+                  </children>
+                  <styles xmi:type="notation:SortingStyle" xmi:id="_E_KCBXorEeScG9lRPRjvxQ"/>
+                  <styles xmi:type="notation:FilteringStyle" xmi:id="_E_KCBnorEeScG9lRPRjvxQ"/>
+                </children>
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_E_KCAXorEeScG9lRPRjvxQ" fontName="Cantarell"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_E_KCAnorEeScG9lRPRjvxQ" x="199" y="54"/>
+              </children>
+              <children xmi:type="notation:Node" xmi:id="_Iv36kHorEeScG9lRPRjvxQ" visible="false" type="3008" element="_IvUg8HorEeScG9lRPRjvxQ">
+                <children xmi:type="notation:Node" xmi:id="_Iv4hoHorEeScG9lRPRjvxQ" type="5005"/>
+                <children xmi:type="notation:Node" xmi:id="_Iv4hoXorEeScG9lRPRjvxQ" type="7002">
+                  <children xmi:type="notation:Node" xmi:id="_IwDgwHorEeScG9lRPRjvxQ" visible="false" type="3007" element="_IvZZcHorEeScG9lRPRjvxQ">
+                    <children xmi:type="notation:Node" xmi:id="_IwEH0HorEeScG9lRPRjvxQ" type="5003">
+                      <layoutConstraint xmi:type="notation:Location" xmi:id="_IwEH0XorEeScG9lRPRjvxQ" y="5"/>
+                    </children>
+                    <children xmi:type="notation:Node" xmi:id="_IwF9AHorEeScG9lRPRjvxQ" type="3003" element="_IvaAgHorEeScG9lRPRjvxQ">
+                      <styles xmi:type="notation:ShapeStyle" xmi:id="_IwF9AXorEeScG9lRPRjvxQ" fontName="Cantarell"/>
+                      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IwF9AnorEeScG9lRPRjvxQ"/>
+                    </children>
+                    <styles xmi:type="notation:ShapeStyle" xmi:id="_IwDgwXorEeScG9lRPRjvxQ" fontName="Cantarell" fontHeight="8"/>
+                    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IwDgwnorEeScG9lRPRjvxQ" x="27" y="30" width="30" height="30"/>
+                  </children>
+                  <children xmi:type="notation:Node" xmi:id="_IwEH0norEeScG9lRPRjvxQ" visible="false" type="3007" element="_IvankHorEeScG9lRPRjvxQ">
+                    <children xmi:type="notation:Node" xmi:id="_IwEu4HorEeScG9lRPRjvxQ" type="5003">
+                      <layoutConstraint xmi:type="notation:Location" xmi:id="_IwEu4XorEeScG9lRPRjvxQ" y="5"/>
+                    </children>
+                    <children xmi:type="notation:Node" xmi:id="_IwF9A3orEeScG9lRPRjvxQ" type="3003" element="_IvbOoHorEeScG9lRPRjvxQ">
+                      <styles xmi:type="notation:ShapeStyle" xmi:id="_IwF9BHorEeScG9lRPRjvxQ" fontName="Cantarell"/>
+                      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IwF9BXorEeScG9lRPRjvxQ"/>
+                    </children>
+                    <styles xmi:type="notation:ShapeStyle" xmi:id="_IwEH03orEeScG9lRPRjvxQ" fontName="Cantarell" fontHeight="8"/>
+                    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IwEH1HorEeScG9lRPRjvxQ" x="87" y="30" width="30" height="30"/>
+                  </children>
+                  <styles xmi:type="notation:SortingStyle" xmi:id="_Iv4honorEeScG9lRPRjvxQ"/>
+                  <styles xmi:type="notation:FilteringStyle" xmi:id="_Iv4ho3orEeScG9lRPRjvxQ"/>
+                </children>
+                <children xmi:type="notation:Node" xmi:id="_Iv8zEHorEeScG9lRPRjvxQ" visible="false" type="3012" element="_IvW9MHorEeScG9lRPRjvxQ">
+                  <children xmi:type="notation:Node" xmi:id="_Iv-oQHorEeScG9lRPRjvxQ" type="5010">
+                    <layoutConstraint xmi:type="notation:Location" xmi:id="_Iv-oQXorEeScG9lRPRjvxQ" y="5"/>
+                  </children>
+                  <children xmi:type="notation:Node" xmi:id="_IwGkEHorEeScG9lRPRjvxQ" type="3003" element="_IvW9MXorEeScG9lRPRjvxQ">
+                    <styles xmi:type="notation:ShapeStyle" xmi:id="_IwGkEXorEeScG9lRPRjvxQ" fontName="Cantarell"/>
+                    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IwGkEnorEeScG9lRPRjvxQ"/>
+                  </children>
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_Iv8zEXorEeScG9lRPRjvxQ" fontName="Cantarell" fontHeight="8"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Iv8zEnorEeScG9lRPRjvxQ" x="-22" width="30" height="30"/>
+                </children>
+                <children xmi:type="notation:Node" xmi:id="_IwCSoHorEeScG9lRPRjvxQ" visible="false" type="3012" element="_IvYLUHorEeScG9lRPRjvxQ">
+                  <children xmi:type="notation:Node" xmi:id="_IwC5sHorEeScG9lRPRjvxQ" type="5010">
+                    <layoutConstraint xmi:type="notation:Location" xmi:id="_IwC5sXorEeScG9lRPRjvxQ" y="5"/>
+                  </children>
+                  <children xmi:type="notation:Node" xmi:id="_IwHLIHorEeScG9lRPRjvxQ" type="3003" element="_IvYLUXorEeScG9lRPRjvxQ">
+                    <styles xmi:type="notation:ShapeStyle" xmi:id="_IwHLIXorEeScG9lRPRjvxQ" fontName="Cantarell"/>
+                    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IwHLInorEeScG9lRPRjvxQ"/>
+                  </children>
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_IwCSoXorEeScG9lRPRjvxQ" fontName="Cantarell" fontHeight="8"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IwCSonorEeScG9lRPRjvxQ" x="-22" y="31" width="30" height="30"/>
+                </children>
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_Iv36kXorEeScG9lRPRjvxQ" fontName="Cantarell" fontHeight="8"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Iv36knorEeScG9lRPRjvxQ" x="32" y="34"/>
+              </children>
+              <children xmi:type="notation:Node" xmi:id="_Iv5IsHorEeScG9lRPRjvxQ" visible="false" type="3008" element="_IvVIAHorEeScG9lRPRjvxQ">
+                <children xmi:type="notation:Node" xmi:id="_Iv5Is3orEeScG9lRPRjvxQ" type="5005"/>
+                <children xmi:type="notation:Node" xmi:id="_Iv5ItHorEeScG9lRPRjvxQ" type="7002">
+                  <children xmi:type="notation:Node" xmi:id="_IwK1gHorEeScG9lRPRjvxQ" visible="false" type="3007" element="_IvfgEHorEeScG9lRPRjvxQ">
+                    <children xmi:type="notation:Node" xmi:id="_IwMDoHorEeScG9lRPRjvxQ" type="5003">
+                      <layoutConstraint xmi:type="notation:Location" xmi:id="_IwMDoXorEeScG9lRPRjvxQ" y="5"/>
+                    </children>
+                    <children xmi:type="notation:Node" xmi:id="_IwOf4HorEeScG9lRPRjvxQ" type="3003" element="_IvfgEXorEeScG9lRPRjvxQ">
+                      <styles xmi:type="notation:ShapeStyle" xmi:id="_IwOf4XorEeScG9lRPRjvxQ" fontName="Cantarell"/>
+                      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IwOf4norEeScG9lRPRjvxQ"/>
+                    </children>
+                    <styles xmi:type="notation:ShapeStyle" xmi:id="_IwK1gXorEeScG9lRPRjvxQ" fontName="Cantarell" fontHeight="8"/>
+                    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IwK1gnorEeScG9lRPRjvxQ" x="27" y="30" width="30" height="30"/>
+                  </children>
+                  <children xmi:type="notation:Node" xmi:id="_IwNRwHorEeScG9lRPRjvxQ" visible="false" type="3007" element="_IvgHIHorEeScG9lRPRjvxQ">
+                    <children xmi:type="notation:Node" xmi:id="_IwN40HorEeScG9lRPRjvxQ" type="5003">
+                      <layoutConstraint xmi:type="notation:Location" xmi:id="_IwN40XorEeScG9lRPRjvxQ" y="5"/>
+                    </children>
+                    <children xmi:type="notation:Node" xmi:id="_IwPuAHorEeScG9lRPRjvxQ" type="3003" element="_IvgHIXorEeScG9lRPRjvxQ">
+                      <styles xmi:type="notation:ShapeStyle" xmi:id="_IwPuAXorEeScG9lRPRjvxQ" fontName="Cantarell"/>
+                      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IwPuAnorEeScG9lRPRjvxQ"/>
+                    </children>
+                    <styles xmi:type="notation:ShapeStyle" xmi:id="_IwNRwXorEeScG9lRPRjvxQ" fontName="Cantarell" fontHeight="8"/>
+                    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IwNRwnorEeScG9lRPRjvxQ" x="87" y="30" width="30" height="30"/>
+                  </children>
+                  <styles xmi:type="notation:SortingStyle" xmi:id="_Iv5ItXorEeScG9lRPRjvxQ"/>
+                  <styles xmi:type="notation:FilteringStyle" xmi:id="_Iv5ItnorEeScG9lRPRjvxQ"/>
+                </children>
+                <children xmi:type="notation:Node" xmi:id="_IwHLI3orEeScG9lRPRjvxQ" visible="false" type="3012" element="_IvccwHorEeScG9lRPRjvxQ">
+                  <children xmi:type="notation:Node" xmi:id="_IwHyMHorEeScG9lRPRjvxQ" type="5010">
+                    <layoutConstraint xmi:type="notation:Location" xmi:id="_IwHyMXorEeScG9lRPRjvxQ" y="5"/>
+                  </children>
+                  <children xmi:type="notation:Node" xmi:id="_IwPuA3orEeScG9lRPRjvxQ" type="3003" element="_IvccwXorEeScG9lRPRjvxQ">
+                    <styles xmi:type="notation:ShapeStyle" xmi:id="_IwPuBHorEeScG9lRPRjvxQ" fontName="Cantarell"/>
+                    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IwPuBXorEeScG9lRPRjvxQ"/>
+                  </children>
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_IwHLJHorEeScG9lRPRjvxQ" fontName="Cantarell" fontHeight="8"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IwHLJXorEeScG9lRPRjvxQ" x="-22" width="30" height="30"/>
+                </children>
+                <children xmi:type="notation:Node" xmi:id="_IwJAUHorEeScG9lRPRjvxQ" visible="false" type="3012" element="_Ivdq4HorEeScG9lRPRjvxQ">
+                  <children xmi:type="notation:Node" xmi:id="_IwJnYHorEeScG9lRPRjvxQ" type="5010">
+                    <layoutConstraint xmi:type="notation:Location" xmi:id="_IwJnYXorEeScG9lRPRjvxQ" y="5"/>
+                  </children>
+                  <children xmi:type="notation:Node" xmi:id="_IwRjMHorEeScG9lRPRjvxQ" type="3003" element="_IveR8HorEeScG9lRPRjvxQ">
+                    <styles xmi:type="notation:ShapeStyle" xmi:id="_IwRjMXorEeScG9lRPRjvxQ" fontName="Cantarell"/>
+                    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IwRjMnorEeScG9lRPRjvxQ"/>
+                  </children>
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_IwJAUXorEeScG9lRPRjvxQ" fontName="Cantarell" fontHeight="8"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IwJAUnorEeScG9lRPRjvxQ" x="-22" y="31" width="30" height="30"/>
+                </children>
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_Iv5IsXorEeScG9lRPRjvxQ" fontName="Cantarell" fontHeight="8"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Iv5IsnorEeScG9lRPRjvxQ" x="212" y="34"/>
+              </children>
               <styles xmi:type="notation:SortingStyle" xmi:id="_OqN70SnLEeSkw5jQFTzPHw"/>
               <styles xmi:type="notation:FilteringStyle" xmi:id="_OqN70inLEeSkw5jQFTzPHw"/>
             </children>
             <styles xmi:type="notation:ShapeStyle" xmi:id="_OqCVoSnLEeSkw5jQFTzPHw" fontName="Comic Sans MS" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OqCVoinLEeSkw5jQFTzPHw" x="275" y="20"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OqCVoinLEeSkw5jQFTzPHw" x="24" y="312" width="387" height="214"/>
           </children>
           <styles xmi:type="notation:DiagramStyle" xmi:id="_euGskeu9Ed6huvz2q8dLQg"/>
           <edges xmi:type="notation:Edge" xmi:id="_oJIckOu9Ed6huvz2q8dLQg" type="4001" element="_aBDEoJjKEeCGbO5oLE72PQ" source="_ewYkgOu9Ed6huvz2q8dLQg" target="_ew3ssOu9Ed6huvz2q8dLQg">
@@ -319,6 +487,204 @@
           <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_OdhjpCnLEeSkw5jQFTzPHw" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='TC1479']/@defaultLayer/@containerMappings[name='CM_EPackage']"/>
+        <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_E--b0HorEeScG9lRPRjvxQ" name="p31">
+          <target xmi:type="ecore:EPackage" href="tc1479.ecore#//p3/p31"/>
+          <semanticElements xmi:type="ecore:EPackage" href="tc1479.ecore#//p3/p31"/>
+          <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+          <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+          <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_OrXooHorEeScG9lRPRjvxQ">
+            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_OrXooXorEeScG9lRPRjvxQ"/>
+            <description xmi:type="style:FlatContainerStyleDescription" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='TC1479']/@defaultLayer/@containerMappings[name='CM_EPackage']/@subContainerMappings[name='subContainer']/@style"/>
+            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_OrXoonorEeScG9lRPRjvxQ"/>
+            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_OrXoo3orEeScG9lRPRjvxQ" red="255" green="255" blue="255"/>
+            <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_OrXopHorEeScG9lRPRjvxQ" red="209" green="209" blue="209"/>
+          </ownedStyle>
+          <actualMapping xmi:type="description_1:ContainerMapping" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='TC1479']/@defaultLayer/@containerMappings[name='CM_EPackage']/@subContainerMappings[name='subContainer']"/>
+          <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_riYWkHozEeScG9lRPRjvxQ" name="DA" width="3" height="3" resizeKind="NSEW">
+            <target xmi:type="ecore:EClass" href="tc1479.ecore#//p3/p31/A"/>
+            <semanticElements xmi:type="ecore:EClass" href="tc1479.ecore#//p3/p31/A"/>
+            <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+            <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+            <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+            <ownedStyle xmi:type="diagram:Square" xmi:id="_rig5cHozEeScG9lRPRjvxQ" showIcon="false" labelPosition="node">
+              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_rig5cXozEeScG9lRPRjvxQ"/>
+              <description xmi:type="style:SquareDescription" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='TC1479']/@defaultLayer/@containerMappings[name='CM_EPackage']/@subContainerMappings[name='subContainer']/@subNodeMappings[name='subN_EClass']/@style"/>
+              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_rig5cnozEeScG9lRPRjvxQ"/>
+              <color xmi:type="viewpoint:RGBValues" xmi:id="_rig5c3ozEeScG9lRPRjvxQ" red="217" green="196" blue="215"/>
+            </ownedStyle>
+            <actualMapping xmi:type="description_1:NodeMapping" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='TC1479']/@defaultLayer/@containerMappings[name='CM_EPackage']/@subContainerMappings[name='subContainer']/@subNodeMappings[name='subN_EClass']"/>
+          </ownedDiagramElements>
+          <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_rihggHozEeScG9lRPRjvxQ" name="DB" width="3" height="3" resizeKind="NSEW">
+            <target xmi:type="ecore:EClass" href="tc1479.ecore#//p3/p31/B"/>
+            <semanticElements xmi:type="ecore:EClass" href="tc1479.ecore#//p3/p31/B"/>
+            <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+            <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+            <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+            <ownedStyle xmi:type="diagram:Square" xmi:id="_rihggXozEeScG9lRPRjvxQ" showIcon="false" labelPosition="node">
+              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_rihggnozEeScG9lRPRjvxQ"/>
+              <description xmi:type="style:SquareDescription" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='TC1479']/@defaultLayer/@containerMappings[name='CM_EPackage']/@subContainerMappings[name='subContainer']/@subNodeMappings[name='subN_EClass']/@style"/>
+              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_rihgg3ozEeScG9lRPRjvxQ"/>
+              <color xmi:type="viewpoint:RGBValues" xmi:id="_rihghHozEeScG9lRPRjvxQ" red="217" green="196" blue="215"/>
+            </ownedStyle>
+            <actualMapping xmi:type="description_1:NodeMapping" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='TC1479']/@defaultLayer/@containerMappings[name='CM_EPackage']/@subContainerMappings[name='subContainer']/@subNodeMappings[name='subN_EClass']"/>
+          </ownedDiagramElements>
+        </ownedDiagramElements>
+        <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_E-_C4HorEeScG9lRPRjvxQ" name="p32">
+          <target xmi:type="ecore:EPackage" href="tc1479.ecore#//p3/p32"/>
+          <semanticElements xmi:type="ecore:EPackage" href="tc1479.ecore#//p3/p32"/>
+          <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+          <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+          <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_OrXopXorEeScG9lRPRjvxQ">
+            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_OrXopnorEeScG9lRPRjvxQ"/>
+            <description xmi:type="style:FlatContainerStyleDescription" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='TC1479']/@defaultLayer/@containerMappings[name='CM_EPackage']/@subContainerMappings[name='subContainer']/@style"/>
+            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_OrXop3orEeScG9lRPRjvxQ"/>
+            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_OrXoqHorEeScG9lRPRjvxQ" red="255" green="255" blue="255"/>
+            <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_OrXoqXorEeScG9lRPRjvxQ" red="209" green="209" blue="209"/>
+          </ownedStyle>
+          <actualMapping xmi:type="description_1:ContainerMapping" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='TC1479']/@defaultLayer/@containerMappings[name='CM_EPackage']/@subContainerMappings[name='subContainer']"/>
+          <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_riiuoHozEeScG9lRPRjvxQ" name="DC" width="3" height="3" resizeKind="NSEW">
+            <target xmi:type="ecore:EClass" href="tc1479.ecore#//p3/p32/C"/>
+            <semanticElements xmi:type="ecore:EClass" href="tc1479.ecore#//p3/p32/C"/>
+            <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+            <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+            <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+            <ownedStyle xmi:type="diagram:Square" xmi:id="_rijVsHozEeScG9lRPRjvxQ" showIcon="false" labelPosition="node">
+              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_rijVsXozEeScG9lRPRjvxQ"/>
+              <description xmi:type="style:SquareDescription" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='TC1479']/@defaultLayer/@containerMappings[name='CM_EPackage']/@subContainerMappings[name='subContainer']/@subNodeMappings[name='subN_EClass']/@style"/>
+              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_rijVsnozEeScG9lRPRjvxQ"/>
+              <color xmi:type="viewpoint:RGBValues" xmi:id="_rijVs3ozEeScG9lRPRjvxQ" red="217" green="196" blue="215"/>
+            </ownedStyle>
+            <actualMapping xmi:type="description_1:NodeMapping" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='TC1479']/@defaultLayer/@containerMappings[name='CM_EPackage']/@subContainerMappings[name='subContainer']/@subNodeMappings[name='subN_EClass']"/>
+          </ownedDiagramElements>
+          <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_rij8wHozEeScG9lRPRjvxQ" name="DD" width="3" height="3" resizeKind="NSEW">
+            <target xmi:type="ecore:EClass" href="tc1479.ecore#//p3/p32/D"/>
+            <semanticElements xmi:type="ecore:EClass" href="tc1479.ecore#//p3/p32/D"/>
+            <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+            <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+            <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+            <ownedStyle xmi:type="diagram:Square" xmi:id="_rikj0HozEeScG9lRPRjvxQ" showIcon="false" labelPosition="node">
+              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_rikj0XozEeScG9lRPRjvxQ"/>
+              <description xmi:type="style:SquareDescription" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='TC1479']/@defaultLayer/@containerMappings[name='CM_EPackage']/@subContainerMappings[name='subContainer']/@subNodeMappings[name='subN_EClass']/@style"/>
+              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_rikj0nozEeScG9lRPRjvxQ"/>
+              <color xmi:type="viewpoint:RGBValues" xmi:id="_rikj03ozEeScG9lRPRjvxQ" red="217" green="196" blue="215"/>
+            </ownedStyle>
+            <actualMapping xmi:type="description_1:NodeMapping" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='TC1479']/@defaultLayer/@containerMappings[name='CM_EPackage']/@subContainerMappings[name='subContainer']/@subNodeMappings[name='subN_EClass']"/>
+          </ownedDiagramElements>
+        </ownedDiagramElements>
+        <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_IvUg8HorEeScG9lRPRjvxQ" name="p31" visible="false">
+          <target xmi:type="ecore:EPackage" href="tc1479.ecore#//p3/p31"/>
+          <semanticElements xmi:type="ecore:EPackage" href="tc1479.ecore#//p3/p31"/>
+          <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_IvW9MHorEeScG9lRPRjvxQ" name="A" visible="false" width="3" height="3">
+            <target xmi:type="ecore:EClass" href="tc1479.ecore#//p3/p31/A"/>
+            <semanticElements xmi:type="ecore:EClass" href="tc1479.ecore#//p3/p31/A"/>
+            <ownedStyle xmi:type="diagram:Square" xmi:id="_IvW9MXorEeScG9lRPRjvxQ" labelPosition="node">
+              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_IvW9MnorEeScG9lRPRjvxQ"/>
+              <description xmi:type="style:SquareDescription" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer/@containerMappings[name='ContainerPackage']/@borderedNodeMappings[name='BNonPackage']/@style"/>
+              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_IvW9M3orEeScG9lRPRjvxQ" red="138" green="226" blue="52"/>
+              <color xmi:type="viewpoint:RGBValues" xmi:id="_IvW9NHorEeScG9lRPRjvxQ" red="138" green="226" blue="52"/>
+            </ownedStyle>
+            <actualMapping xmi:type="description_1:NodeMapping" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer/@containerMappings[name='ContainerPackage']/@borderedNodeMappings[name='BNonPackage']"/>
+          </ownedBorderedNodes>
+          <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_IvYLUHorEeScG9lRPRjvxQ" name="B" visible="false" width="3" height="3">
+            <target xmi:type="ecore:EClass" href="tc1479.ecore#//p3/p31/B"/>
+            <semanticElements xmi:type="ecore:EClass" href="tc1479.ecore#//p3/p31/B"/>
+            <ownedStyle xmi:type="diagram:Square" xmi:id="_IvYLUXorEeScG9lRPRjvxQ" labelPosition="node">
+              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_IvYLUnorEeScG9lRPRjvxQ"/>
+              <description xmi:type="style:SquareDescription" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer/@containerMappings[name='ContainerPackage']/@borderedNodeMappings[name='BNonPackage']/@style"/>
+              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_IvYLU3orEeScG9lRPRjvxQ" red="138" green="226" blue="52"/>
+              <color xmi:type="viewpoint:RGBValues" xmi:id="_IvYLVHorEeScG9lRPRjvxQ" red="138" green="226" blue="52"/>
+            </ownedStyle>
+            <actualMapping xmi:type="description_1:NodeMapping" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer/@containerMappings[name='ContainerPackage']/@borderedNodeMappings[name='BNonPackage']"/>
+          </ownedBorderedNodes>
+          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_IvUg8XorEeScG9lRPRjvxQ">
+            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_IvUg8norEeScG9lRPRjvxQ"/>
+            <description xmi:type="style:FlatContainerStyleDescription" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer/@containerMappings[name='ContainerPackage']/@style"/>
+            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_IvUg83orEeScG9lRPRjvxQ"/>
+            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_IvUg9HorEeScG9lRPRjvxQ" red="255" green="255" blue="255"/>
+            <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_IvUg9XorEeScG9lRPRjvxQ" red="209" green="209" blue="209"/>
+          </ownedStyle>
+          <actualMapping xmi:type="description_1:ContainerMapping" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer/@containerMappings[name='ContainerPackage']"/>
+          <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_IvZZcHorEeScG9lRPRjvxQ" name="A" visible="false" width="3" height="3">
+            <target xmi:type="ecore:EClass" href="tc1479.ecore#//p3/p31/A"/>
+            <semanticElements xmi:type="ecore:EClass" href="tc1479.ecore#//p3/p31/A"/>
+            <ownedStyle xmi:type="diagram:Square" xmi:id="_IvaAgHorEeScG9lRPRjvxQ" labelPosition="node">
+              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_IvaAgXorEeScG9lRPRjvxQ"/>
+              <description xmi:type="style:SquareDescription" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer/@containerMappings[name='ContainerPackage']/@subNodeMappings[name='NodeClassInContainer']/@style"/>
+              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_IvaAgnorEeScG9lRPRjvxQ" red="138" green="226" blue="52"/>
+              <color xmi:type="viewpoint:RGBValues" xmi:id="_IvaAg3orEeScG9lRPRjvxQ" red="114" green="159" blue="207"/>
+            </ownedStyle>
+            <actualMapping xmi:type="description_1:NodeMapping" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer/@containerMappings[name='ContainerPackage']/@subNodeMappings[name='NodeClassInContainer']"/>
+          </ownedDiagramElements>
+          <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_IvankHorEeScG9lRPRjvxQ" name="B" visible="false" width="3" height="3">
+            <target xmi:type="ecore:EClass" href="tc1479.ecore#//p3/p31/B"/>
+            <semanticElements xmi:type="ecore:EClass" href="tc1479.ecore#//p3/p31/B"/>
+            <ownedStyle xmi:type="diagram:Square" xmi:id="_IvbOoHorEeScG9lRPRjvxQ" labelPosition="node">
+              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_IvbOoXorEeScG9lRPRjvxQ"/>
+              <description xmi:type="style:SquareDescription" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer/@containerMappings[name='ContainerPackage']/@subNodeMappings[name='NodeClassInContainer']/@style"/>
+              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_IvbOonorEeScG9lRPRjvxQ" red="138" green="226" blue="52"/>
+              <color xmi:type="viewpoint:RGBValues" xmi:id="_IvbOo3orEeScG9lRPRjvxQ" red="114" green="159" blue="207"/>
+            </ownedStyle>
+            <actualMapping xmi:type="description_1:NodeMapping" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer/@containerMappings[name='ContainerPackage']/@subNodeMappings[name='NodeClassInContainer']"/>
+          </ownedDiagramElements>
+        </ownedDiagramElements>
+        <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_IvVIAHorEeScG9lRPRjvxQ" name="p32" visible="false">
+          <target xmi:type="ecore:EPackage" href="tc1479.ecore#//p3/p32"/>
+          <semanticElements xmi:type="ecore:EPackage" href="tc1479.ecore#//p3/p32"/>
+          <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_IvccwHorEeScG9lRPRjvxQ" name="C" visible="false" width="3" height="3">
+            <target xmi:type="ecore:EClass" href="tc1479.ecore#//p3/p32/C"/>
+            <semanticElements xmi:type="ecore:EClass" href="tc1479.ecore#//p3/p32/C"/>
+            <ownedStyle xmi:type="diagram:Square" xmi:id="_IvccwXorEeScG9lRPRjvxQ" labelPosition="node">
+              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_IvccwnorEeScG9lRPRjvxQ"/>
+              <description xmi:type="style:SquareDescription" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer/@containerMappings[name='ContainerPackage']/@borderedNodeMappings[name='BNonPackage']/@style"/>
+              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Ivccw3orEeScG9lRPRjvxQ" red="138" green="226" blue="52"/>
+              <color xmi:type="viewpoint:RGBValues" xmi:id="_IvccxHorEeScG9lRPRjvxQ" red="138" green="226" blue="52"/>
+            </ownedStyle>
+            <actualMapping xmi:type="description_1:NodeMapping" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer/@containerMappings[name='ContainerPackage']/@borderedNodeMappings[name='BNonPackage']"/>
+          </ownedBorderedNodes>
+          <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_Ivdq4HorEeScG9lRPRjvxQ" name="D" visible="false" width="3" height="3">
+            <target xmi:type="ecore:EClass" href="tc1479.ecore#//p3/p32/D"/>
+            <semanticElements xmi:type="ecore:EClass" href="tc1479.ecore#//p3/p32/D"/>
+            <ownedStyle xmi:type="diagram:Square" xmi:id="_IveR8HorEeScG9lRPRjvxQ" labelPosition="node">
+              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_IveR8XorEeScG9lRPRjvxQ"/>
+              <description xmi:type="style:SquareDescription" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer/@containerMappings[name='ContainerPackage']/@borderedNodeMappings[name='BNonPackage']/@style"/>
+              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_IveR8norEeScG9lRPRjvxQ" red="138" green="226" blue="52"/>
+              <color xmi:type="viewpoint:RGBValues" xmi:id="_IveR83orEeScG9lRPRjvxQ" red="138" green="226" blue="52"/>
+            </ownedStyle>
+            <actualMapping xmi:type="description_1:NodeMapping" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer/@containerMappings[name='ContainerPackage']/@borderedNodeMappings[name='BNonPackage']"/>
+          </ownedBorderedNodes>
+          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_IvVvEHorEeScG9lRPRjvxQ">
+            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_IvVvEXorEeScG9lRPRjvxQ"/>
+            <description xmi:type="style:FlatContainerStyleDescription" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer/@containerMappings[name='ContainerPackage']/@style"/>
+            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_IvVvEnorEeScG9lRPRjvxQ"/>
+            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_IvVvE3orEeScG9lRPRjvxQ" red="255" green="255" blue="255"/>
+            <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_IvVvFHorEeScG9lRPRjvxQ" red="209" green="209" blue="209"/>
+          </ownedStyle>
+          <actualMapping xmi:type="description_1:ContainerMapping" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer/@containerMappings[name='ContainerPackage']"/>
+          <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_IvfgEHorEeScG9lRPRjvxQ" name="C" visible="false" width="3" height="3">
+            <target xmi:type="ecore:EClass" href="tc1479.ecore#//p3/p32/C"/>
+            <semanticElements xmi:type="ecore:EClass" href="tc1479.ecore#//p3/p32/C"/>
+            <ownedStyle xmi:type="diagram:Square" xmi:id="_IvfgEXorEeScG9lRPRjvxQ" labelPosition="node">
+              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_IvfgEnorEeScG9lRPRjvxQ"/>
+              <description xmi:type="style:SquareDescription" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer/@containerMappings[name='ContainerPackage']/@subNodeMappings[name='NodeClassInContainer']/@style"/>
+              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_IvfgE3orEeScG9lRPRjvxQ" red="138" green="226" blue="52"/>
+              <color xmi:type="viewpoint:RGBValues" xmi:id="_IvfgFHorEeScG9lRPRjvxQ" red="114" green="159" blue="207"/>
+            </ownedStyle>
+            <actualMapping xmi:type="description_1:NodeMapping" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer/@containerMappings[name='ContainerPackage']/@subNodeMappings[name='NodeClassInContainer']"/>
+          </ownedDiagramElements>
+          <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_IvgHIHorEeScG9lRPRjvxQ" name="D" visible="false" width="3" height="3">
+            <target xmi:type="ecore:EClass" href="tc1479.ecore#//p3/p32/D"/>
+            <semanticElements xmi:type="ecore:EClass" href="tc1479.ecore#//p3/p32/D"/>
+            <ownedStyle xmi:type="diagram:Square" xmi:id="_IvgHIXorEeScG9lRPRjvxQ" labelPosition="node">
+              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_IvgHInorEeScG9lRPRjvxQ"/>
+              <description xmi:type="style:SquareDescription" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer/@containerMappings[name='ContainerPackage']/@subNodeMappings[name='NodeClassInContainer']/@style"/>
+              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_IvgHI3orEeScG9lRPRjvxQ" red="138" green="226" blue="52"/>
+              <color xmi:type="viewpoint:RGBValues" xmi:id="_IvgHJHorEeScG9lRPRjvxQ" red="114" green="159" blue="207"/>
+            </ownedStyle>
+            <actualMapping xmi:type="description_1:NodeMapping" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer/@containerMappings[name='ContainerPackage']/@subNodeMappings[name='NodeClassInContainer']"/>
+          </ownedDiagramElements>
+        </ownedDiagramElements>
       </ownedDiagramElements>
       <description xmi:type="description_1:DiagramDescription" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='TC1479']"/>
       <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_et_-4uu9Ed6huvz2q8dLQg"/>
@@ -328,229 +694,9 @@
     <ownedRepresentations xmi:type="diagram:DSemanticDiagram" xmi:id="_cmBvYCnLEeSkw5jQFTzPHw" name="diagWithBorderNodeOnNode">
       <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_cmFZwCnLEeSkw5jQFTzPHw" source="GMF_DIAGRAMS">
         <data xmi:type="notation:Diagram" xmi:id="_cmFZwSnLEeSkw5jQFTzPHw" type="Sirius" element="_cmBvYCnLEeSkw5jQFTzPHw" measurementUnit="Pixel">
-          <children xmi:type="notation:Node" xmi:id="_cmGA0CnLEeSkw5jQFTzPHw" visible="false" type="2001" element="_cmBvYSnLEeSkw5jQFTzPHw">
-            <children xmi:type="notation:Node" xmi:id="_cmGn4CnLEeSkw5jQFTzPHw" type="5002">
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_cmGn4SnLEeSkw5jQFTzPHw" y="5"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_cmLgYCnLEeSkw5jQFTzPHw" visible="false" type="3001" element="_cmBvYinLEeSkw5jQFTzPHw">
-              <children xmi:type="notation:Node" xmi:id="_cmMHcCnLEeSkw5jQFTzPHw" type="5001">
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_cmMHcSnLEeSkw5jQFTzPHw" x="-10" y="-4"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_cmPKwCnLEeSkw5jQFTzPHw" type="3003" element="_cmBvYynLEeSkw5jQFTzPHw">
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_cmPKwSnLEeSkw5jQFTzPHw" fontName="Comic Sans MS" fontHeight="12"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cmPKwinLEeSkw5jQFTzPHw"/>
-              </children>
-              <styles xmi:type="notation:ShapeStyle" xmi:id="_cmLgYSnLEeSkw5jQFTzPHw" fontName="Comic Sans MS" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cmLgYinLEeSkw5jQFTzPHw" x="30" y="-22" width="30" height="30"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_cmNVkCnLEeSkw5jQFTzPHw" visible="false" type="3001" element="_cmBvZynLEeSkw5jQFTzPHw">
-              <children xmi:type="notation:Node" xmi:id="_cmN8oCnLEeSkw5jQFTzPHw" type="5001">
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_cmN8oSnLEeSkw5jQFTzPHw" x="31"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_cmPx0CnLEeSkw5jQFTzPHw" type="3003" element="_cmBvaCnLEeSkw5jQFTzPHw">
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_cmPx0SnLEeSkw5jQFTzPHw" fontName="Comic Sans MS" fontHeight="12"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cmPx0inLEeSkw5jQFTzPHw"/>
-              </children>
-              <styles xmi:type="notation:ShapeStyle" xmi:id="_cmNVkSnLEeSkw5jQFTzPHw" fontName="Comic Sans MS" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cmNVkinLEeSkw5jQFTzPHw" x="193" y="35" width="30" height="30"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_cmOjsCnLEeSkw5jQFTzPHw" type="3003" element="_cmBvbCnLEeSkw5jQFTzPHw">
-              <styles xmi:type="notation:ShapeStyle" xmi:id="_cmOjsSnLEeSkw5jQFTzPHw" fontName="Comic Sans MS" fontHeight="12"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cmOjsinLEeSkw5jQFTzPHw"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_cmGA0SnLEeSkw5jQFTzPHw" fontName="Comic Sans MS" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cmGA0inLEeSkw5jQFTzPHw" x="155" y="40" width="201" height="100"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_cmHO8CnLEeSkw5jQFTzPHw" visible="false" type="2001" element="_cmBvcCnLEeSkw5jQFTzPHw">
-            <children xmi:type="notation:Node" xmi:id="_cmH2ACnLEeSkw5jQFTzPHw" type="5002">
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_cmH2ASnLEeSkw5jQFTzPHw" y="5"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_cmQY4CnLEeSkw5jQFTzPHw" visible="false" type="3001" element="_cmBvcSnLEeSkw5jQFTzPHw">
-              <children xmi:type="notation:Node" xmi:id="_cmRnACnLEeSkw5jQFTzPHw" type="5001">
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_cmRnASnLEeSkw5jQFTzPHw" x="-10" y="-4"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_cmUqUCnLEeSkw5jQFTzPHw" type="3003" element="_cmBvcinLEeSkw5jQFTzPHw">
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_cmUqUSnLEeSkw5jQFTzPHw" fontName="Comic Sans MS" fontHeight="12"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cmUqUinLEeSkw5jQFTzPHw"/>
-              </children>
-              <styles xmi:type="notation:ShapeStyle" xmi:id="_cmQY4SnLEeSkw5jQFTzPHw" fontName="Comic Sans MS" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cmQ_8CnLEeSkw5jQFTzPHw" x="-22" y="25" width="30" height="30"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_cmSOECnLEeSkw5jQFTzPHw" visible="false" type="3001" element="_cmCWcCnLEeSkw5jQFTzPHw">
-              <children xmi:type="notation:Node" xmi:id="_cmS1ICnLEeSkw5jQFTzPHw" type="5001">
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_cmS1ISnLEeSkw5jQFTzPHw" x="31"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_cmVRYCnLEeSkw5jQFTzPHw" type="3003" element="_cmCWcSnLEeSkw5jQFTzPHw">
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_cmVRYSnLEeSkw5jQFTzPHw" fontName="Comic Sans MS" fontHeight="12"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cmVRYinLEeSkw5jQFTzPHw"/>
-              </children>
-              <styles xmi:type="notation:ShapeStyle" xmi:id="_cmSOESnLEeSkw5jQFTzPHw" fontName="Comic Sans MS" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cmSOEinLEeSkw5jQFTzPHw" x="60" y="92" width="30" height="30"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_cmTcMCnLEeSkw5jQFTzPHw" type="3003" element="_cmCWdSnLEeSkw5jQFTzPHw">
-              <styles xmi:type="notation:ShapeStyle" xmi:id="_cmTcMSnLEeSkw5jQFTzPHw" fontName="Comic Sans MS" fontHeight="12"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cmTcMinLEeSkw5jQFTzPHw"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_cmHO8SnLEeSkw5jQFTzPHw" fontName="Comic Sans MS" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cmHO8inLEeSkw5jQFTzPHw" x="155" y="225" width="201" height="100"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_cmIdECnLEeSkw5jQFTzPHw" visible="false" type="2001" element="_cmCWeSnLEeSkw5jQFTzPHw">
-            <children xmi:type="notation:Node" xmi:id="_cmJEICnLEeSkw5jQFTzPHw" type="5002">
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_cmJEISnLEeSkw5jQFTzPHw" y="5"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_cmV4cCnLEeSkw5jQFTzPHw" visible="false" type="3001" element="_cmCWeinLEeSkw5jQFTzPHw">
-              <children xmi:type="notation:Node" xmi:id="_cmWfgCnLEeSkw5jQFTzPHw" type="5001">
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_cmWfgSnLEeSkw5jQFTzPHw" x="-10" y="-4"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_cmZi0CnLEeSkw5jQFTzPHw" type="3003" element="_cmCWeynLEeSkw5jQFTzPHw">
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_cmZi0SnLEeSkw5jQFTzPHw" fontName="Comic Sans MS" fontHeight="12"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cmZi0inLEeSkw5jQFTzPHw"/>
-              </children>
-              <styles xmi:type="notation:ShapeStyle" xmi:id="_cmV4cSnLEeSkw5jQFTzPHw" fontName="Comic Sans MS" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cmV4cinLEeSkw5jQFTzPHw" x="25" y="-22" width="30" height="30"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_cmXtoCnLEeSkw5jQFTzPHw" visible="false" type="3001" element="_cmCWfynLEeSkw5jQFTzPHw">
-              <children xmi:type="notation:Node" xmi:id="_cmYUsCnLEeSkw5jQFTzPHw" type="5001">
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_cmYUsSnLEeSkw5jQFTzPHw" x="31"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_cmaJ4CnLEeSkw5jQFTzPHw" type="3003" element="_cmCWgCnLEeSkw5jQFTzPHw">
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_cmaw8CnLEeSkw5jQFTzPHw" fontName="Comic Sans MS" fontHeight="12"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cmaw8SnLEeSkw5jQFTzPHw"/>
-              </children>
-              <styles xmi:type="notation:ShapeStyle" xmi:id="_cmXtoSnLEeSkw5jQFTzPHw" fontName="Comic Sans MS" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cmXtoinLEeSkw5jQFTzPHw" x="193" y="45" width="30" height="30"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_cmY7wCnLEeSkw5jQFTzPHw" type="3003" element="_cmCWhCnLEeSkw5jQFTzPHw">
-              <styles xmi:type="notation:ShapeStyle" xmi:id="_cmY7wSnLEeSkw5jQFTzPHw" fontName="Comic Sans MS" fontHeight="12"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cmY7winLEeSkw5jQFTzPHw"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_cmIdESnLEeSkw5jQFTzPHw" fontName="Comic Sans MS" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cmIdEinLEeSkw5jQFTzPHw" x="595" y="40" width="201" height="100"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_cmJrMCnLEeSkw5jQFTzPHw" visible="false" type="2001" element="_cmCWiCnLEeSkw5jQFTzPHw">
-            <children xmi:type="notation:Node" xmi:id="_cmK5UCnLEeSkw5jQFTzPHw" type="5002">
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_cmK5USnLEeSkw5jQFTzPHw" y="5"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_cmbYACnLEeSkw5jQFTzPHw" visible="false" type="3001" element="_cmCWiSnLEeSkw5jQFTzPHw">
-              <children xmi:type="notation:Node" xmi:id="_cmb_ECnLEeSkw5jQFTzPHw" type="5001">
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_cmb_ESnLEeSkw5jQFTzPHw" x="-10" y="-4"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_cmfCYCnLEeSkw5jQFTzPHw" type="3003" element="_cmCWiinLEeSkw5jQFTzPHw">
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_cmfCYSnLEeSkw5jQFTzPHw" fontName="Comic Sans MS" fontHeight="12"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cmfCYinLEeSkw5jQFTzPHw"/>
-              </children>
-              <styles xmi:type="notation:ShapeStyle" xmi:id="_cmbYASnLEeSkw5jQFTzPHw" fontName="Comic Sans MS" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cmbYAinLEeSkw5jQFTzPHw" x="-22" y="25" width="30" height="30"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_cmcmICnLEeSkw5jQFTzPHw" visible="false" type="3001" element="_cmCWjinLEeSkw5jQFTzPHw">
-              <children xmi:type="notation:Node" xmi:id="_cmdNMCnLEeSkw5jQFTzPHw" type="5001">
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_cmdNMSnLEeSkw5jQFTzPHw" x="31"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_cmfpcCnLEeSkw5jQFTzPHw" type="3003" element="_cmCWjynLEeSkw5jQFTzPHw">
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_cmfpcSnLEeSkw5jQFTzPHw" fontName="Comic Sans MS" fontHeight="12"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cmfpcinLEeSkw5jQFTzPHw"/>
-              </children>
-              <styles xmi:type="notation:ShapeStyle" xmi:id="_cmcmISnLEeSkw5jQFTzPHw" fontName="Comic Sans MS" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cmcmIinLEeSkw5jQFTzPHw" x="70" y="92" width="30" height="30"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_cmebUCnLEeSkw5jQFTzPHw" type="3003" element="_cmCWkynLEeSkw5jQFTzPHw">
-              <styles xmi:type="notation:ShapeStyle" xmi:id="_cmebUSnLEeSkw5jQFTzPHw" fontName="Comic Sans MS" fontHeight="12"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cmebUinLEeSkw5jQFTzPHw"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_cmJrMSnLEeSkw5jQFTzPHw" fontName="Comic Sans MS" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cmJrMinLEeSkw5jQFTzPHw" x="595" y="225" width="201" height="100"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_Qvph0CnMEeSkw5jQFTzPHw" visible="false" type="2001" element="_QvS8gCnMEeSkw5jQFTzPHw">
-            <children xmi:type="notation:Node" xmi:id="_QvqI4CnMEeSkw5jQFTzPHw" type="5002">
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_QvqI4SnMEeSkw5jQFTzPHw" y="5"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_QvtzQCnMEeSkw5jQFTzPHw" type="3003" element="_QvTjkCnMEeSkw5jQFTzPHw">
-              <styles xmi:type="notation:ShapeStyle" xmi:id="_QvtzQSnMEeSkw5jQFTzPHw" fontName="Comic Sans MS" fontHeight="12"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QvtzQinMEeSkw5jQFTzPHw"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_Qvph0SnMEeSkw5jQFTzPHw" fontName="Comic Sans MS" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Qvph0inMEeSkw5jQFTzPHw" width="100" height="100"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_QvqI4inMEeSkw5jQFTzPHw" visible="false" type="2001" element="_QvUKoCnMEeSkw5jQFTzPHw">
-            <children xmi:type="notation:Node" xmi:id="_Qvqv8CnMEeSkw5jQFTzPHw" type="5002">
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_Qvqv8SnMEeSkw5jQFTzPHw" y="5"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_QvuaUCnMEeSkw5jQFTzPHw" type="3003" element="_QvUKoSnMEeSkw5jQFTzPHw">
-              <styles xmi:type="notation:ShapeStyle" xmi:id="_QvuaUSnMEeSkw5jQFTzPHw" fontName="Comic Sans MS" fontHeight="12"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QvuaUinMEeSkw5jQFTzPHw"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_QvqI4ynMEeSkw5jQFTzPHw" fontName="Comic Sans MS" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QvqI5CnMEeSkw5jQFTzPHw" width="100" height="100"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_Qvqv8inMEeSkw5jQFTzPHw" visible="false" type="2001" element="_QvUxsCnMEeSkw5jQFTzPHw">
-            <children xmi:type="notation:Node" xmi:id="_QvrXACnMEeSkw5jQFTzPHw" type="5002">
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_QvrXASnMEeSkw5jQFTzPHw" y="5"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_QvuaUynMEeSkw5jQFTzPHw" type="3003" element="_QvVYwCnMEeSkw5jQFTzPHw">
-              <styles xmi:type="notation:ShapeStyle" xmi:id="_QvuaVCnMEeSkw5jQFTzPHw" fontName="Comic Sans MS" fontHeight="12"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QvuaVSnMEeSkw5jQFTzPHw"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_Qvqv8ynMEeSkw5jQFTzPHw" fontName="Comic Sans MS" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Qvqv9CnMEeSkw5jQFTzPHw" width="100" height="100"/>
-          </children>
           <children xmi:type="notation:Node" xmi:id="_Qvr-ECnMEeSkw5jQFTzPHw" type="2002" element="_QvXN8CnMEeSkw5jQFTzPHw">
             <children xmi:type="notation:Node" xmi:id="_Qvr-EynMEeSkw5jQFTzPHw" type="5006"/>
             <children xmi:type="notation:Node" xmi:id="_Qvr-FCnMEeSkw5jQFTzPHw" type="7001">
-              <children xmi:type="notation:Node" xmi:id="_QvvocCnMEeSkw5jQFTzPHw" visible="false" type="3007" element="_QvYcECnMEeSkw5jQFTzPHw">
-                <children xmi:type="notation:Node" xmi:id="_QvwPgCnMEeSkw5jQFTzPHw" type="5003">
-                  <layoutConstraint xmi:type="notation:Location" xmi:id="_QvwPgSnMEeSkw5jQFTzPHw" y="5"/>
-                </children>
-                <children xmi:type="notation:Node" xmi:id="_QvzS0inMEeSkw5jQFTzPHw" type="3003" element="_QvYcESnMEeSkw5jQFTzPHw">
-                  <styles xmi:type="notation:ShapeStyle" xmi:id="_QvzS0ynMEeSkw5jQFTzPHw" fontName="Comic Sans MS" fontHeight="12"/>
-                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QvzS1CnMEeSkw5jQFTzPHw"/>
-                </children>
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_QvvocSnMEeSkw5jQFTzPHw" fontName="Comic Sans MS" fontHeight="8"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QvvocinMEeSkw5jQFTzPHw" x="30" y="29" width="100" height="100"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_QvwPginMEeSkw5jQFTzPHw" visible="false" type="3007" element="_QvZDICnMEeSkw5jQFTzPHw">
-                <children xmi:type="notation:Node" xmi:id="_Qvw2kCnMEeSkw5jQFTzPHw" type="5003">
-                  <layoutConstraint xmi:type="notation:Location" xmi:id="_Qvw2kSnMEeSkw5jQFTzPHw" y="5"/>
-                </children>
-                <children xmi:type="notation:Node" xmi:id="_Qvz54CnMEeSkw5jQFTzPHw" type="3003" element="_QvZDISnMEeSkw5jQFTzPHw">
-                  <styles xmi:type="notation:ShapeStyle" xmi:id="_Qvz54SnMEeSkw5jQFTzPHw" fontName="Comic Sans MS" fontHeight="12"/>
-                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Qvz54inMEeSkw5jQFTzPHw"/>
-                </children>
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_QvwPgynMEeSkw5jQFTzPHw" fontName="Comic Sans MS" fontHeight="8"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QvwPhCnMEeSkw5jQFTzPHw" x="160" y="29" width="100" height="100"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_Qvw2kinMEeSkw5jQFTzPHw" visible="false" type="3007" element="_QvZqMCnMEeSkw5jQFTzPHw">
-                <children xmi:type="notation:Node" xmi:id="_QvxdoCnMEeSkw5jQFTzPHw" type="5003">
-                  <layoutConstraint xmi:type="notation:Location" xmi:id="_QvxdoSnMEeSkw5jQFTzPHw" y="5"/>
-                </children>
-                <children xmi:type="notation:Node" xmi:id="_Qv0g8CnMEeSkw5jQFTzPHw" type="3003" element="_QvZqMSnMEeSkw5jQFTzPHw">
-                  <styles xmi:type="notation:ShapeStyle" xmi:id="_Qv0g8SnMEeSkw5jQFTzPHw" fontName="Comic Sans MS" fontHeight="12"/>
-                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Qv0g8inMEeSkw5jQFTzPHw"/>
-                </children>
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_Qvw2kynMEeSkw5jQFTzPHw" fontName="Comic Sans MS" fontHeight="8"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Qvw2lCnMEeSkw5jQFTzPHw" x="320" y="29" width="100" height="100"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_QvyEsCnMEeSkw5jQFTzPHw" visible="false" type="3007" element="_QvaRQCnMEeSkw5jQFTzPHw">
-                <children xmi:type="notation:Node" xmi:id="_QvyEsynMEeSkw5jQFTzPHw" type="5003">
-                  <layoutConstraint xmi:type="notation:Location" xmi:id="_QvyEtCnMEeSkw5jQFTzPHw" y="5"/>
-                </children>
-                <children xmi:type="notation:Node" xmi:id="_Qv0g8ynMEeSkw5jQFTzPHw" type="3003" element="_QvaRQSnMEeSkw5jQFTzPHw">
-                  <styles xmi:type="notation:ShapeStyle" xmi:id="_Qv0g9CnMEeSkw5jQFTzPHw" fontName="Comic Sans MS" fontHeight="12"/>
-                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Qv0g9SnMEeSkw5jQFTzPHw"/>
-                </children>
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_QvyEsSnMEeSkw5jQFTzPHw" fontName="Comic Sans MS" fontHeight="8"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QvyEsinMEeSkw5jQFTzPHw" x="480" y="29" width="100" height="100"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_QvyrwCnMEeSkw5jQFTzPHw" visible="false" type="3007" element="_Qva4UCnMEeSkw5jQFTzPHw">
-                <children xmi:type="notation:Node" xmi:id="_QvzS0CnMEeSkw5jQFTzPHw" type="5003">
-                  <layoutConstraint xmi:type="notation:Location" xmi:id="_QvzS0SnMEeSkw5jQFTzPHw" y="5"/>
-                </children>
-                <children xmi:type="notation:Node" xmi:id="_Qv1IACnMEeSkw5jQFTzPHw" type="3003" element="_Qva4USnMEeSkw5jQFTzPHw">
-                  <styles xmi:type="notation:ShapeStyle" xmi:id="_Qv1IASnMEeSkw5jQFTzPHw" fontName="Comic Sans MS" fontHeight="12"/>
-                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Qv1IAinMEeSkw5jQFTzPHw"/>
-                </children>
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_QvyrwSnMEeSkw5jQFTzPHw" fontName="Comic Sans MS" fontHeight="8"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QvyrwinMEeSkw5jQFTzPHw" x="640" y="29" width="100" height="100"/>
-              </children>
               <children xmi:type="notation:Node" xmi:id="_wp0YYCnMEeSkw5jQFTzPHw" type="3007" element="_wpr1gCnMEeSkw5jQFTzPHw">
                 <children xmi:type="notation:Node" xmi:id="_wp0YYynMEeSkw5jQFTzPHw" type="5003">
                   <layoutConstraint xmi:type="notation:Location" xmi:id="_wp0YZCnMEeSkw5jQFTzPHw" y="5"/>
@@ -604,61 +750,6 @@
           <children xmi:type="notation:Node" xmi:id="_QvslICnMEeSkw5jQFTzPHw" type="2002" element="_QvX1ACnMEeSkw5jQFTzPHw">
             <children xmi:type="notation:Node" xmi:id="_QvtMMCnMEeSkw5jQFTzPHw" type="5006"/>
             <children xmi:type="notation:Node" xmi:id="_QvtMMSnMEeSkw5jQFTzPHw" type="7001">
-              <children xmi:type="notation:Node" xmi:id="_Qv1vECnMEeSkw5jQFTzPHw" visible="false" type="3007" element="_QvcGcCnMEeSkw5jQFTzPHw">
-                <children xmi:type="notation:Node" xmi:id="_Qv1vEynMEeSkw5jQFTzPHw" type="5003">
-                  <layoutConstraint xmi:type="notation:Location" xmi:id="_Qv1vFCnMEeSkw5jQFTzPHw" y="5"/>
-                </children>
-                <children xmi:type="notation:Node" xmi:id="_Qv5ZcinMEeSkw5jQFTzPHw" type="3003" element="_QvcGcSnMEeSkw5jQFTzPHw">
-                  <styles xmi:type="notation:ShapeStyle" xmi:id="_Qv5ZcynMEeSkw5jQFTzPHw" fontName="Comic Sans MS" fontHeight="12"/>
-                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Qv5ZdCnMEeSkw5jQFTzPHw"/>
-                </children>
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_Qv1vESnMEeSkw5jQFTzPHw" fontName="Comic Sans MS" fontHeight="8"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Qv1vEinMEeSkw5jQFTzPHw" x="30" y="29" width="100" height="100"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_Qv2WICnMEeSkw5jQFTzPHw" visible="false" type="3007" element="_QvctgCnMEeSkw5jQFTzPHw">
-                <children xmi:type="notation:Node" xmi:id="_Qv29MCnMEeSkw5jQFTzPHw" type="5003">
-                  <layoutConstraint xmi:type="notation:Location" xmi:id="_Qv29MSnMEeSkw5jQFTzPHw" y="5"/>
-                </children>
-                <children xmi:type="notation:Node" xmi:id="_Qv6AgCnMEeSkw5jQFTzPHw" type="3003" element="_QvdUkCnMEeSkw5jQFTzPHw">
-                  <styles xmi:type="notation:ShapeStyle" xmi:id="_Qv6AgSnMEeSkw5jQFTzPHw" fontName="Comic Sans MS" fontHeight="12"/>
-                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Qv6AginMEeSkw5jQFTzPHw"/>
-                </children>
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_Qv2WISnMEeSkw5jQFTzPHw" fontName="Comic Sans MS" fontHeight="8"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Qv2WIinMEeSkw5jQFTzPHw" x="160" y="29" width="100" height="100"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_Qv29MinMEeSkw5jQFTzPHw" visible="false" type="3007" element="_Qvd7oCnMEeSkw5jQFTzPHw">
-                <children xmi:type="notation:Node" xmi:id="_Qv3kQCnMEeSkw5jQFTzPHw" type="5003">
-                  <layoutConstraint xmi:type="notation:Location" xmi:id="_Qv3kQSnMEeSkw5jQFTzPHw" y="5"/>
-                </children>
-                <children xmi:type="notation:Node" xmi:id="_Qv6nkCnMEeSkw5jQFTzPHw" type="3003" element="_Qvd7oSnMEeSkw5jQFTzPHw">
-                  <styles xmi:type="notation:ShapeStyle" xmi:id="_Qv6nkSnMEeSkw5jQFTzPHw" fontName="Comic Sans MS" fontHeight="12"/>
-                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Qv6nkinMEeSkw5jQFTzPHw"/>
-                </children>
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_Qv29MynMEeSkw5jQFTzPHw" fontName="Comic Sans MS" fontHeight="8"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Qv29NCnMEeSkw5jQFTzPHw" x="320" y="29" width="100" height="100"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_Qv3kQinMEeSkw5jQFTzPHw" visible="false" type="3007" element="_QveisCnMEeSkw5jQFTzPHw">
-                <children xmi:type="notation:Node" xmi:id="_Qv4LUinMEeSkw5jQFTzPHw" type="5003">
-                  <layoutConstraint xmi:type="notation:Location" xmi:id="_Qv4LUynMEeSkw5jQFTzPHw" y="5"/>
-                </children>
-                <children xmi:type="notation:Node" xmi:id="_Qv6nkynMEeSkw5jQFTzPHw" type="3003" element="_QveisSnMEeSkw5jQFTzPHw">
-                  <styles xmi:type="notation:ShapeStyle" xmi:id="_Qv6nlCnMEeSkw5jQFTzPHw" fontName="Comic Sans MS" fontHeight="12"/>
-                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Qv6nlSnMEeSkw5jQFTzPHw"/>
-                </children>
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_Qv4LUCnMEeSkw5jQFTzPHw" fontName="Comic Sans MS" fontHeight="8"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Qv4LUSnMEeSkw5jQFTzPHw" x="480" y="29" width="100" height="100"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_Qv4yYCnMEeSkw5jQFTzPHw" visible="false" type="3007" element="_QvfJwCnMEeSkw5jQFTzPHw">
-                <children xmi:type="notation:Node" xmi:id="_Qv5ZcCnMEeSkw5jQFTzPHw" type="5003">
-                  <layoutConstraint xmi:type="notation:Location" xmi:id="_Qv5ZcSnMEeSkw5jQFTzPHw" y="5"/>
-                </children>
-                <children xmi:type="notation:Node" xmi:id="_Qv7OoCnMEeSkw5jQFTzPHw" type="3003" element="_QvfJwSnMEeSkw5jQFTzPHw">
-                  <styles xmi:type="notation:ShapeStyle" xmi:id="_Qv7OoSnMEeSkw5jQFTzPHw" fontName="Comic Sans MS" fontHeight="12"/>
-                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Qv7OoinMEeSkw5jQFTzPHw"/>
-                </children>
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_Qv4yYSnMEeSkw5jQFTzPHw" fontName="Comic Sans MS" fontHeight="8"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Qv4yYinMEeSkw5jQFTzPHw" x="640" y="29" width="100" height="100"/>
-              </children>
               <children xmi:type="notation:Node" xmi:id="_wp3bsCnMEeSkw5jQFTzPHw" type="3007" element="_wptqsCnMEeSkw5jQFTzPHw">
                 <children xmi:type="notation:Node" xmi:id="_wp4CwCnMEeSkw5jQFTzPHw" type="5003">
                   <layoutConstraint xmi:type="notation:Location" xmi:id="_wp4CwSnMEeSkw5jQFTzPHw" y="5"/>
@@ -709,28 +800,6 @@
             <styles xmi:type="notation:ShapeStyle" xmi:id="_QvslISnMEeSkw5jQFTzPHw" fontName="Comic Sans MS" fontHeight="8"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QvslIinMEeSkw5jQFTzPHw" x="435" y="250" width="178" height="108"/>
           </children>
-          <children xmi:type="notation:Node" xmi:id="_d9jGgCnMEeSkw5jQFTzPHw" visible="false" type="2001" element="_d9ZVgCnMEeSkw5jQFTzPHw">
-            <children xmi:type="notation:Node" xmi:id="_d9jtkCnMEeSkw5jQFTzPHw" type="5002">
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_d9jtkSnMEeSkw5jQFTzPHw" y="5"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_d9mw4CnMEeSkw5jQFTzPHw" type="3003" element="_d9ZVgSnMEeSkw5jQFTzPHw">
-              <styles xmi:type="notation:ShapeStyle" xmi:id="_d9mw4SnMEeSkw5jQFTzPHw" fontName="Comic Sans MS" fontHeight="12"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_d9mw4inMEeSkw5jQFTzPHw"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_d9jGgSnMEeSkw5jQFTzPHw" fontName="Comic Sans MS" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_d9jGginMEeSkw5jQFTzPHw" width="100" height="100"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_d9kUoCnMEeSkw5jQFTzPHw" visible="false" type="2001" element="_d9Z8kCnMEeSkw5jQFTzPHw">
-            <children xmi:type="notation:Node" xmi:id="_d9k7sCnMEeSkw5jQFTzPHw" type="5002">
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_d9k7sSnMEeSkw5jQFTzPHw" y="5"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_d9nX8CnMEeSkw5jQFTzPHw" type="3003" element="_d9Z8kSnMEeSkw5jQFTzPHw">
-              <styles xmi:type="notation:ShapeStyle" xmi:id="_d9nX8SnMEeSkw5jQFTzPHw" fontName="Comic Sans MS" fontHeight="12"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_d9nX8inMEeSkw5jQFTzPHw"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_d9kUoSnMEeSkw5jQFTzPHw" fontName="Comic Sans MS" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_d9kUoinMEeSkw5jQFTzPHw" width="100" height="100"/>
-          </children>
           <children xmi:type="notation:Node" xmi:id="_pT4soCnMEeSkw5jQFTzPHw" type="2001" element="_pTuUkCnMEeSkw5jQFTzPHw">
             <children xmi:type="notation:Node" xmi:id="_pT5TsCnMEeSkw5jQFTzPHw" type="5002">
               <layoutConstraint xmi:type="notation:Location" xmi:id="_pT5TsSnMEeSkw5jQFTzPHw" y="5"/>
@@ -800,207 +869,6 @@
           <styles xmi:type="notation:DiagramStyle" xmi:id="_cmFZwinLEeSkw5jQFTzPHw"/>
         </data>
       </ownedAnnotationEntries>
-      <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_cmBvYSnLEeSkw5jQFTzPHw" name="p31WithDirectEdit" visible="false" width="10" height="10" resizeKind="NSEW">
-        <target xmi:type="ecore:EPackage" href="tc1479.ecore#//p3/p31"/>
-        <semanticElements xmi:type="ecore:EPackage" href="tc1479.ecore#//p3/p31"/>
-        <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_cmBvYinLEeSkw5jQFTzPHw" name="A" visible="false" width="3" height="3">
-          <target xmi:type="ecore:EClass" href="tc1479.ecore#//p3/p31/A"/>
-          <semanticElements xmi:type="ecore:EClass" href="tc1479.ecore#//p3/p31/A"/>
-          <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
-          <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
-          <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-          <ownedStyle xmi:type="diagram:Square" xmi:id="_cmBvYynLEeSkw5jQFTzPHw" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_cmBvZCnLEeSkw5jQFTzPHw"/>
-            <description xmi:type="style:SquareDescription" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer/@nodeMappings[name='NodePackageWithDirectEdit']/@borderedNodeMappings[name='BNonNode']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_cmBvZSnLEeSkw5jQFTzPHw" red="138" green="226" blue="52"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_cmBvZinLEeSkw5jQFTzPHw" red="138" green="226" blue="52"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer/@nodeMappings[name='NodePackageWithDirectEdit']/@borderedNodeMappings[name='BNonNode']"/>
-        </ownedBorderedNodes>
-        <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_cmBvZynLEeSkw5jQFTzPHw" name="B" visible="false" width="3" height="3">
-          <target xmi:type="ecore:EClass" href="tc1479.ecore#//p3/p31/B"/>
-          <semanticElements xmi:type="ecore:EClass" href="tc1479.ecore#//p3/p31/B"/>
-          <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
-          <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
-          <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-          <ownedStyle xmi:type="diagram:Square" xmi:id="_cmBvaCnLEeSkw5jQFTzPHw" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_cmBvaSnLEeSkw5jQFTzPHw"/>
-            <description xmi:type="style:SquareDescription" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer/@nodeMappings[name='NodePackageWithDirectEdit']/@borderedNodeMappings[name='BNonNode']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_cmBvainLEeSkw5jQFTzPHw" red="138" green="226" blue="52"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_cmBvaynLEeSkw5jQFTzPHw" red="138" green="226" blue="52"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer/@nodeMappings[name='NodePackageWithDirectEdit']/@borderedNodeMappings[name='BNonNode']"/>
-        </ownedBorderedNodes>
-        <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
-        <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
-        <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:Square" xmi:id="_cmBvbCnLEeSkw5jQFTzPHw" labelPosition="node">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_cmBvbSnLEeSkw5jQFTzPHw"/>
-          <description xmi:type="style:SquareDescription" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer/@nodeMappings[name='NodePackageWithDirectEdit']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_cmBvbinLEeSkw5jQFTzPHw"/>
-          <color xmi:type="viewpoint:RGBValues" xmi:id="_cmBvbynLEeSkw5jQFTzPHw" red="194" green="239" blue="255"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer/@nodeMappings[name='NodePackageWithDirectEdit']"/>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_cmBvcCnLEeSkw5jQFTzPHw" name="p32WithDirectEdit" visible="false" width="10" height="10" resizeKind="NSEW">
-        <target xmi:type="ecore:EPackage" href="tc1479.ecore#//p3/p32"/>
-        <semanticElements xmi:type="ecore:EPackage" href="tc1479.ecore#//p3/p32"/>
-        <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_cmBvcSnLEeSkw5jQFTzPHw" name="C" visible="false" width="3" height="3">
-          <target xmi:type="ecore:EClass" href="tc1479.ecore#//p3/p32/C"/>
-          <semanticElements xmi:type="ecore:EClass" href="tc1479.ecore#//p3/p32/C"/>
-          <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
-          <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
-          <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-          <ownedStyle xmi:type="diagram:Square" xmi:id="_cmBvcinLEeSkw5jQFTzPHw" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_cmBvcynLEeSkw5jQFTzPHw"/>
-            <description xmi:type="style:SquareDescription" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer/@nodeMappings[name='NodePackageWithDirectEdit']/@borderedNodeMappings[name='BNonNode']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_cmBvdCnLEeSkw5jQFTzPHw" red="138" green="226" blue="52"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_cmBvdSnLEeSkw5jQFTzPHw" red="138" green="226" blue="52"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer/@nodeMappings[name='NodePackageWithDirectEdit']/@borderedNodeMappings[name='BNonNode']"/>
-        </ownedBorderedNodes>
-        <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_cmCWcCnLEeSkw5jQFTzPHw" name="D" visible="false" width="3" height="3">
-          <target xmi:type="ecore:EClass" href="tc1479.ecore#//p3/p32/D"/>
-          <semanticElements xmi:type="ecore:EClass" href="tc1479.ecore#//p3/p32/D"/>
-          <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
-          <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
-          <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-          <ownedStyle xmi:type="diagram:Square" xmi:id="_cmCWcSnLEeSkw5jQFTzPHw" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_cmCWcinLEeSkw5jQFTzPHw"/>
-            <description xmi:type="style:SquareDescription" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer/@nodeMappings[name='NodePackageWithDirectEdit']/@borderedNodeMappings[name='BNonNode']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_cmCWcynLEeSkw5jQFTzPHw" red="138" green="226" blue="52"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_cmCWdCnLEeSkw5jQFTzPHw" red="138" green="226" blue="52"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer/@nodeMappings[name='NodePackageWithDirectEdit']/@borderedNodeMappings[name='BNonNode']"/>
-        </ownedBorderedNodes>
-        <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
-        <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
-        <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:Square" xmi:id="_cmCWdSnLEeSkw5jQFTzPHw" labelPosition="node">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_cmCWdinLEeSkw5jQFTzPHw"/>
-          <description xmi:type="style:SquareDescription" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer/@nodeMappings[name='NodePackageWithDirectEdit']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_cmCWdynLEeSkw5jQFTzPHw"/>
-          <color xmi:type="viewpoint:RGBValues" xmi:id="_cmCWeCnLEeSkw5jQFTzPHw" red="194" green="239" blue="255"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer/@nodeMappings[name='NodePackageWithDirectEdit']"/>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_QvS8gCnMEeSkw5jQFTzPHw" name="p1" visible="false" width="10" height="10" resizeKind="NSEW">
-        <target xmi:type="ecore:EPackage" href="tc1479.ecore#//p1"/>
-        <semanticElements xmi:type="ecore:EPackage" href="tc1479.ecore#//p1"/>
-        <ownedStyle xmi:type="diagram:Square" xmi:id="_QvTjkCnMEeSkw5jQFTzPHw" labelPosition="node">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_QvTjkSnMEeSkw5jQFTzPHw"/>
-          <description xmi:type="style:SquareDescription" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer/@nodeMappings[name='NodePackage']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_QvTjkinMEeSkw5jQFTzPHw"/>
-          <color xmi:type="viewpoint:RGBValues" xmi:id="_QvTjkynMEeSkw5jQFTzPHw" red="194" green="239" blue="255"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMappingImport" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer/@containerMappings[name='ContainerPackage']/@subNodeMappings[name='']"/>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_QvUKoCnMEeSkw5jQFTzPHw" name="p2" visible="false" width="10" height="10" resizeKind="NSEW">
-        <target xmi:type="ecore:EPackage" href="tc1479.ecore#//p2"/>
-        <semanticElements xmi:type="ecore:EPackage" href="tc1479.ecore#//p2"/>
-        <ownedStyle xmi:type="diagram:Square" xmi:id="_QvUKoSnMEeSkw5jQFTzPHw" labelPosition="node">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_QvUKoinMEeSkw5jQFTzPHw"/>
-          <description xmi:type="style:SquareDescription" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer/@nodeMappings[name='NodePackage']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_QvUKoynMEeSkw5jQFTzPHw"/>
-          <color xmi:type="viewpoint:RGBValues" xmi:id="_QvUKpCnMEeSkw5jQFTzPHw" red="194" green="239" blue="255"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMappingImport" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer/@containerMappings[name='ContainerPackage']/@subNodeMappings[name='']"/>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_QvUxsCnMEeSkw5jQFTzPHw" name="p3" visible="false" width="10" height="10" resizeKind="NSEW">
-        <target xmi:type="ecore:EPackage" href="tc1479.ecore#//p3"/>
-        <semanticElements xmi:type="ecore:EPackage" href="tc1479.ecore#//p3"/>
-        <ownedStyle xmi:type="diagram:Square" xmi:id="_QvVYwCnMEeSkw5jQFTzPHw" labelPosition="node">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_QvVYwSnMEeSkw5jQFTzPHw"/>
-          <description xmi:type="style:SquareDescription" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer/@nodeMappings[name='NodePackage']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_QvVYwinMEeSkw5jQFTzPHw"/>
-          <color xmi:type="viewpoint:RGBValues" xmi:id="_QvVYwynMEeSkw5jQFTzPHw" red="194" green="239" blue="255"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMappingImport" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer/@containerMappings[name='ContainerPackage']/@subNodeMappings[name='']"/>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_cmCWeSnLEeSkw5jQFTzPHw" name="p31" visible="false" width="10" height="10" resizeKind="NSEW">
-        <target xmi:type="ecore:EPackage" href="tc1479.ecore#//p3/p31"/>
-        <semanticElements xmi:type="ecore:EPackage" href="tc1479.ecore#//p3/p31"/>
-        <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_cmCWeinLEeSkw5jQFTzPHw" name="A" visible="false" width="3" height="3">
-          <target xmi:type="ecore:EClass" href="tc1479.ecore#//p3/p31/A"/>
-          <semanticElements xmi:type="ecore:EClass" href="tc1479.ecore#//p3/p31/A"/>
-          <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
-          <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
-          <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-          <ownedStyle xmi:type="diagram:Square" xmi:id="_cmCWeynLEeSkw5jQFTzPHw" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_cmCWfCnLEeSkw5jQFTzPHw"/>
-            <description xmi:type="style:SquareDescription" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer/@nodeMappings[name='NodePackage']/@borderedNodeMappings[name='BNonNode']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_cmCWfSnLEeSkw5jQFTzPHw" red="138" green="226" blue="52"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_cmCWfinLEeSkw5jQFTzPHw" red="138" green="226" blue="52"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer/@nodeMappings[name='NodePackage']/@borderedNodeMappings[name='BNonNode']"/>
-        </ownedBorderedNodes>
-        <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_cmCWfynLEeSkw5jQFTzPHw" name="B" visible="false" width="3" height="3">
-          <target xmi:type="ecore:EClass" href="tc1479.ecore#//p3/p31/B"/>
-          <semanticElements xmi:type="ecore:EClass" href="tc1479.ecore#//p3/p31/B"/>
-          <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
-          <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
-          <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-          <ownedStyle xmi:type="diagram:Square" xmi:id="_cmCWgCnLEeSkw5jQFTzPHw" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_cmCWgSnLEeSkw5jQFTzPHw"/>
-            <description xmi:type="style:SquareDescription" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer/@nodeMappings[name='NodePackage']/@borderedNodeMappings[name='BNonNode']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_cmCWginLEeSkw5jQFTzPHw" red="138" green="226" blue="52"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_cmCWgynLEeSkw5jQFTzPHw" red="138" green="226" blue="52"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer/@nodeMappings[name='NodePackage']/@borderedNodeMappings[name='BNonNode']"/>
-        </ownedBorderedNodes>
-        <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
-        <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
-        <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:Square" xmi:id="_cmCWhCnLEeSkw5jQFTzPHw" labelPosition="node">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_cmCWhSnLEeSkw5jQFTzPHw"/>
-          <description xmi:type="style:SquareDescription" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer/@nodeMappings[name='NodePackage']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_cmCWhinLEeSkw5jQFTzPHw"/>
-          <color xmi:type="viewpoint:RGBValues" xmi:id="_Dg_vMCnMEeSkw5jQFTzPHw" red="194" green="239" blue="255"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMappingImport" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer/@containerMappings[name='ContainerPackage']/@subNodeMappings[name='']"/>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_cmCWiCnLEeSkw5jQFTzPHw" name="p32" visible="false" width="10" height="10" resizeKind="NSEW">
-        <target xmi:type="ecore:EPackage" href="tc1479.ecore#//p3/p32"/>
-        <semanticElements xmi:type="ecore:EPackage" href="tc1479.ecore#//p3/p32"/>
-        <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_cmCWiSnLEeSkw5jQFTzPHw" name="C" visible="false" width="3" height="3">
-          <target xmi:type="ecore:EClass" href="tc1479.ecore#//p3/p32/C"/>
-          <semanticElements xmi:type="ecore:EClass" href="tc1479.ecore#//p3/p32/C"/>
-          <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
-          <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
-          <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-          <ownedStyle xmi:type="diagram:Square" xmi:id="_cmCWiinLEeSkw5jQFTzPHw" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_cmCWiynLEeSkw5jQFTzPHw"/>
-            <description xmi:type="style:SquareDescription" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer/@nodeMappings[name='NodePackage']/@borderedNodeMappings[name='BNonNode']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_cmCWjCnLEeSkw5jQFTzPHw" red="138" green="226" blue="52"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_cmCWjSnLEeSkw5jQFTzPHw" red="138" green="226" blue="52"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer/@nodeMappings[name='NodePackage']/@borderedNodeMappings[name='BNonNode']"/>
-        </ownedBorderedNodes>
-        <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_cmCWjinLEeSkw5jQFTzPHw" name="D" visible="false" width="3" height="3">
-          <target xmi:type="ecore:EClass" href="tc1479.ecore#//p3/p32/D"/>
-          <semanticElements xmi:type="ecore:EClass" href="tc1479.ecore#//p3/p32/D"/>
-          <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
-          <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
-          <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-          <ownedStyle xmi:type="diagram:Square" xmi:id="_cmCWjynLEeSkw5jQFTzPHw" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_cmCWkCnLEeSkw5jQFTzPHw"/>
-            <description xmi:type="style:SquareDescription" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer/@nodeMappings[name='NodePackage']/@borderedNodeMappings[name='BNonNode']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_cmCWkSnLEeSkw5jQFTzPHw" red="138" green="226" blue="52"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_cmCWkinLEeSkw5jQFTzPHw" red="138" green="226" blue="52"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer/@nodeMappings[name='NodePackage']/@borderedNodeMappings[name='BNonNode']"/>
-        </ownedBorderedNodes>
-        <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
-        <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
-        <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:Square" xmi:id="_cmCWkynLEeSkw5jQFTzPHw" labelPosition="node">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_cmCWlCnLEeSkw5jQFTzPHw"/>
-          <description xmi:type="style:SquareDescription" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer/@nodeMappings[name='NodePackage']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_cmCWlSnLEeSkw5jQFTzPHw"/>
-          <color xmi:type="viewpoint:RGBValues" xmi:id="_DhA9UCnMEeSkw5jQFTzPHw" red="194" green="239" blue="255"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMappingImport" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer/@containerMappings[name='ContainerPackage']/@subNodeMappings[name='']"/>
-      </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_QvXN8CnMEeSkw5jQFTzPHw" name="p31">
         <target xmi:type="ecore:EPackage" href="tc1479.ecore#//p3/p31"/>
         <semanticElements xmi:type="ecore:EPackage" href="tc1479.ecore#//p3/p31"/>
@@ -1043,61 +911,6 @@
           <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_QvXN9SnMEeSkw5jQFTzPHw" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer/@containerMappings[name='ContainerPackage']"/>
-        <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_QvYcECnMEeSkw5jQFTzPHw" name="p1" visible="false" width="10" height="10" resizeKind="NSEW">
-          <target xmi:type="ecore:EPackage" href="tc1479.ecore#//p1"/>
-          <semanticElements xmi:type="ecore:EPackage" href="tc1479.ecore#//p1"/>
-          <ownedStyle xmi:type="diagram:Square" xmi:id="_QvYcESnMEeSkw5jQFTzPHw" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_QvYcEinMEeSkw5jQFTzPHw"/>
-            <description xmi:type="style:SquareDescription" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer/@nodeMappings[name='NodePackage']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_QvYcEynMEeSkw5jQFTzPHw"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_QvYcFCnMEeSkw5jQFTzPHw" red="194" green="239" blue="255"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMappingImport" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer/@containerMappings[name='ContainerPackage']/@subNodeMappings[name='']"/>
-        </ownedDiagramElements>
-        <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_QvZDICnMEeSkw5jQFTzPHw" name="p2" visible="false" width="10" height="10" resizeKind="NSEW">
-          <target xmi:type="ecore:EPackage" href="tc1479.ecore#//p2"/>
-          <semanticElements xmi:type="ecore:EPackage" href="tc1479.ecore#//p2"/>
-          <ownedStyle xmi:type="diagram:Square" xmi:id="_QvZDISnMEeSkw5jQFTzPHw" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_QvZDIinMEeSkw5jQFTzPHw"/>
-            <description xmi:type="style:SquareDescription" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer/@nodeMappings[name='NodePackage']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_QvZDIynMEeSkw5jQFTzPHw"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_QvZDJCnMEeSkw5jQFTzPHw" red="194" green="239" blue="255"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMappingImport" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer/@containerMappings[name='ContainerPackage']/@subNodeMappings[name='']"/>
-        </ownedDiagramElements>
-        <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_QvZqMCnMEeSkw5jQFTzPHw" name="p3" visible="false" width="10" height="10" resizeKind="NSEW">
-          <target xmi:type="ecore:EPackage" href="tc1479.ecore#//p3"/>
-          <semanticElements xmi:type="ecore:EPackage" href="tc1479.ecore#//p3"/>
-          <ownedStyle xmi:type="diagram:Square" xmi:id="_QvZqMSnMEeSkw5jQFTzPHw" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_QvZqMinMEeSkw5jQFTzPHw"/>
-            <description xmi:type="style:SquareDescription" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer/@nodeMappings[name='NodePackage']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_QvZqMynMEeSkw5jQFTzPHw"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_QvZqNCnMEeSkw5jQFTzPHw" red="194" green="239" blue="255"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMappingImport" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer/@containerMappings[name='ContainerPackage']/@subNodeMappings[name='']"/>
-        </ownedDiagramElements>
-        <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_QvaRQCnMEeSkw5jQFTzPHw" name="p31" visible="false" width="10" height="10" resizeKind="NSEW">
-          <target xmi:type="ecore:EPackage" href="tc1479.ecore#//p3/p31"/>
-          <semanticElements xmi:type="ecore:EPackage" href="tc1479.ecore#//p3/p31"/>
-          <ownedStyle xmi:type="diagram:Square" xmi:id="_QvaRQSnMEeSkw5jQFTzPHw" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_QvaRQinMEeSkw5jQFTzPHw"/>
-            <description xmi:type="style:SquareDescription" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer/@nodeMappings[name='NodePackage']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_QvaRQynMEeSkw5jQFTzPHw"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_QvaRRCnMEeSkw5jQFTzPHw" red="194" green="239" blue="255"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMappingImport" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer/@containerMappings[name='ContainerPackage']/@subNodeMappings[name='']"/>
-        </ownedDiagramElements>
-        <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_Qva4UCnMEeSkw5jQFTzPHw" name="p32" visible="false" width="10" height="10" resizeKind="NSEW">
-          <target xmi:type="ecore:EPackage" href="tc1479.ecore#//p3/p32"/>
-          <semanticElements xmi:type="ecore:EPackage" href="tc1479.ecore#//p3/p32"/>
-          <ownedStyle xmi:type="diagram:Square" xmi:id="_Qva4USnMEeSkw5jQFTzPHw" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Qva4UinMEeSkw5jQFTzPHw"/>
-            <description xmi:type="style:SquareDescription" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer/@nodeMappings[name='NodePackage']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Qva4UynMEeSkw5jQFTzPHw"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_Qva4VCnMEeSkw5jQFTzPHw" red="194" green="239" blue="255"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMappingImport" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer/@containerMappings[name='ContainerPackage']/@subNodeMappings[name='']"/>
-        </ownedDiagramElements>
         <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_wpr1gCnMEeSkw5jQFTzPHw" name="A" width="3" height="3">
           <target xmi:type="ecore:EClass" href="tc1479.ecore#//p3/p31/A"/>
           <semanticElements xmi:type="ecore:EClass" href="tc1479.ecore#//p3/p31/A"/>
@@ -1169,61 +982,6 @@
           <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_QvX1BSnMEeSkw5jQFTzPHw" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer/@containerMappings[name='ContainerPackage']"/>
-        <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_QvcGcCnMEeSkw5jQFTzPHw" name="p1" visible="false" width="10" height="10" resizeKind="NSEW">
-          <target xmi:type="ecore:EPackage" href="tc1479.ecore#//p1"/>
-          <semanticElements xmi:type="ecore:EPackage" href="tc1479.ecore#//p1"/>
-          <ownedStyle xmi:type="diagram:Square" xmi:id="_QvcGcSnMEeSkw5jQFTzPHw" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_QvcGcinMEeSkw5jQFTzPHw"/>
-            <description xmi:type="style:SquareDescription" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer/@nodeMappings[name='NodePackage']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_QvcGcynMEeSkw5jQFTzPHw"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_QvcGdCnMEeSkw5jQFTzPHw" red="194" green="239" blue="255"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMappingImport" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer/@containerMappings[name='ContainerPackage']/@subNodeMappings[name='']"/>
-        </ownedDiagramElements>
-        <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_QvctgCnMEeSkw5jQFTzPHw" name="p2" visible="false" width="10" height="10" resizeKind="NSEW">
-          <target xmi:type="ecore:EPackage" href="tc1479.ecore#//p2"/>
-          <semanticElements xmi:type="ecore:EPackage" href="tc1479.ecore#//p2"/>
-          <ownedStyle xmi:type="diagram:Square" xmi:id="_QvdUkCnMEeSkw5jQFTzPHw" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_QvdUkSnMEeSkw5jQFTzPHw"/>
-            <description xmi:type="style:SquareDescription" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer/@nodeMappings[name='NodePackage']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_QvdUkinMEeSkw5jQFTzPHw"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_QvdUkynMEeSkw5jQFTzPHw" red="194" green="239" blue="255"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMappingImport" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer/@containerMappings[name='ContainerPackage']/@subNodeMappings[name='']"/>
-        </ownedDiagramElements>
-        <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_Qvd7oCnMEeSkw5jQFTzPHw" name="p3" visible="false" width="10" height="10" resizeKind="NSEW">
-          <target xmi:type="ecore:EPackage" href="tc1479.ecore#//p3"/>
-          <semanticElements xmi:type="ecore:EPackage" href="tc1479.ecore#//p3"/>
-          <ownedStyle xmi:type="diagram:Square" xmi:id="_Qvd7oSnMEeSkw5jQFTzPHw" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Qvd7oinMEeSkw5jQFTzPHw"/>
-            <description xmi:type="style:SquareDescription" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer/@nodeMappings[name='NodePackage']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Qvd7oynMEeSkw5jQFTzPHw"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_Qvd7pCnMEeSkw5jQFTzPHw" red="194" green="239" blue="255"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMappingImport" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer/@containerMappings[name='ContainerPackage']/@subNodeMappings[name='']"/>
-        </ownedDiagramElements>
-        <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_QveisCnMEeSkw5jQFTzPHw" name="p31" visible="false" width="10" height="10" resizeKind="NSEW">
-          <target xmi:type="ecore:EPackage" href="tc1479.ecore#//p3/p31"/>
-          <semanticElements xmi:type="ecore:EPackage" href="tc1479.ecore#//p3/p31"/>
-          <ownedStyle xmi:type="diagram:Square" xmi:id="_QveisSnMEeSkw5jQFTzPHw" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_QveisinMEeSkw5jQFTzPHw"/>
-            <description xmi:type="style:SquareDescription" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer/@nodeMappings[name='NodePackage']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_QveisynMEeSkw5jQFTzPHw"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_QveitCnMEeSkw5jQFTzPHw" red="194" green="239" blue="255"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMappingImport" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer/@containerMappings[name='ContainerPackage']/@subNodeMappings[name='']"/>
-        </ownedDiagramElements>
-        <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_QvfJwCnMEeSkw5jQFTzPHw" name="p32" visible="false" width="10" height="10" resizeKind="NSEW">
-          <target xmi:type="ecore:EPackage" href="tc1479.ecore#//p3/p32"/>
-          <semanticElements xmi:type="ecore:EPackage" href="tc1479.ecore#//p3/p32"/>
-          <ownedStyle xmi:type="diagram:Square" xmi:id="_QvfJwSnMEeSkw5jQFTzPHw" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_QvfJwinMEeSkw5jQFTzPHw"/>
-            <description xmi:type="style:SquareDescription" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer/@nodeMappings[name='NodePackage']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Qvfw0CnMEeSkw5jQFTzPHw"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_Qvfw0SnMEeSkw5jQFTzPHw" red="194" green="239" blue="255"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMappingImport" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer/@containerMappings[name='ContainerPackage']/@subNodeMappings[name='']"/>
-        </ownedDiagramElements>
         <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_wptqsCnMEeSkw5jQFTzPHw" name="C" width="3" height="3">
           <target xmi:type="ecore:EClass" href="tc1479.ecore#//p3/p32/C"/>
           <semanticElements xmi:type="ecore:EClass" href="tc1479.ecore#//p3/p32/C"/>
@@ -1247,28 +1005,6 @@
           <actualMapping xmi:type="description_1:NodeMapping" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer/@containerMappings[name='ContainerPackage']/@subNodeMappings[name='NodeClassInContainer']"/>
         </ownedDiagramElements>
       </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_d9ZVgCnMEeSkw5jQFTzPHw" name="p31" visible="false" width="10" height="10" resizeKind="NSEW">
-        <target xmi:type="ecore:EPackage" href="tc1479.ecore#//p3/p31"/>
-        <semanticElements xmi:type="ecore:EPackage" href="tc1479.ecore#//p3/p31"/>
-        <ownedStyle xmi:type="diagram:Square" xmi:id="_d9ZVgSnMEeSkw5jQFTzPHw" labelPosition="node">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_d9ZVginMEeSkw5jQFTzPHw"/>
-          <description xmi:type="style:SquareDescription" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer/@nodeMappings[name='NodePackage']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_d9ZVgynMEeSkw5jQFTzPHw"/>
-          <color xmi:type="viewpoint:RGBValues" xmi:id="_d9ZVhCnMEeSkw5jQFTzPHw" red="194" green="239" blue="255"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMappingImport" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer/@containerMappings[name='ContainerPackage']/@subNodeMappings[name='Import']"/>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_d9Z8kCnMEeSkw5jQFTzPHw" name="p32" visible="false" width="10" height="10" resizeKind="NSEW">
-        <target xmi:type="ecore:EPackage" href="tc1479.ecore#//p3/p32"/>
-        <semanticElements xmi:type="ecore:EPackage" href="tc1479.ecore#//p3/p32"/>
-        <ownedStyle xmi:type="diagram:Square" xmi:id="_d9Z8kSnMEeSkw5jQFTzPHw" labelPosition="node">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_d9Z8kinMEeSkw5jQFTzPHw"/>
-          <description xmi:type="style:SquareDescription" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer/@nodeMappings[name='NodePackage']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_d9Z8kynMEeSkw5jQFTzPHw"/>
-          <color xmi:type="viewpoint:RGBValues" xmi:id="_d9ajoCnMEeSkw5jQFTzPHw" red="194" green="239" blue="255"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMappingImport" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer/@containerMappings[name='ContainerPackage']/@subNodeMappings[name='Import']"/>
-      </ownedDiagramElements>
       <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_pTuUkCnMEeSkw5jQFTzPHw" name="p31" width="10" height="10" resizeKind="NSEW">
         <target xmi:type="ecore:EPackage" href="tc1479.ecore#//p3/p31"/>
         <semanticElements xmi:type="ecore:EPackage" href="tc1479.ecore#//p3/p31"/>
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/ChildrenPositionStabilityAfterParentResizeTest.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/ChildrenPositionStabilityAfterParentResizeTest.java
index 93b4cf1954..718578baed 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/ChildrenPositionStabilityAfterParentResizeTest.java
+++ b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/ChildrenPositionStabilityAfterParentResizeTest.java
@@ -45,10 +45,14 @@ public class ChildrenPositionStabilityAfterParentResizeTest extends AbstractSiri
 
     private static final Point EXPECTED_INITIAL_POSITION_NODE_A = new Point(28, 31);
 
+    private static final Point EXPECTED_INITIAL_POSITION_NODE_DA = new Point(19, 66);
+
     private static final Point EXPECTED_INITIAL_POSITION_B = new Point(444, 182);
 
     private static final Point EXPECTED_INITIAL_POSITION_NODE_B = new Point(29, 30);
 
+    private static final Point EXPECTED_INITIAL_POSITION_NODE_DB = new Point(103, 66);
+
     private static final Point EXPECTED_INITIAL_POSITION_C = new Point(96, 155);
 
     private static final Point EXPECTED_INITIAL_POSITION_NODE_C = new Point(28, 81);
@@ -99,6 +103,10 @@ public class ChildrenPositionStabilityAfterParentResizeTest extends AbstractSiri
 
     private Rectangle nodeDBefore;
 
+    private Rectangle nodeDABefore;
+
+    private Rectangle nodeDBBefore;
+
     /**
      * {@inheritDoc}
      */
@@ -131,6 +139,10 @@ public class ChildrenPositionStabilityAfterParentResizeTest extends AbstractSiri
         assertThat("Unexpected initial position for node 'CC'.", nodeCBefore.getLocation(), equalTo(EXPECTED_INITIAL_POSITION_NODE_C));
         nodeDBefore = getBounds("CD");
         assertThat("Unexpected initial position for node 'CD'.", nodeDBefore.getLocation(), equalTo(EXPECTED_INITIAL_POSITION_NODE_D));
+        nodeDABefore = getBounds("DA");
+        assertThat("Unexpected initial position for node 'DA'.", nodeDABefore.getLocation(), equalTo(EXPECTED_INITIAL_POSITION_NODE_DA));
+        nodeDBBefore = getBounds("DB");
+        assertThat("Unexpected initial position for node 'DB'.", nodeDBBefore.getLocation(), equalTo(EXPECTED_INITIAL_POSITION_NODE_DB));
     }
 
     /**
@@ -274,6 +286,167 @@ public class ChildrenPositionStabilityAfterParentResizeTest extends AbstractSiri
      * @throws Exception
      *             if an error occurs
      */
+    public void test_D_after_expand_P31_to_the_right() throws Exception {
+        test_D_after_expand_P31_to_the_right(ZoomLevel.ZOOM_100);
+    }
+
+    /**
+     * @throws Exception
+     *             if an error occurs
+     */
+    public void test_D_after_expand_P31_to_the_right_zoom125() throws Exception {
+        test_D_after_expand_P31_to_the_right(ZoomLevel.ZOOM_125);
+    }
+
+    /**
+     * @param zoomLevel
+     *            The zoomLevel to apply to editor.
+     * @throws Exception
+     *             if an error occurs
+     */
+    protected void test_D_after_expand_P31_to_the_right(ZoomLevel zoomLevel) throws Exception {
+        editor.maximize();
+        editor.zoom(zoomLevel);
+        try {
+            CheckSelectedCondition cS = new CheckSelectedCondition(editor, "p31");
+            Rectangle bounds = editor.clickCentered("p31");
+            bot.waitUntil(cS);
+            editor.drag(bounds.getRight(), bounds.getRight().getTranslated(TRANSLATION_PLUS_180X));
+
+            checkBoundsAfterDrag("DA", equalTo(nodeDABefore));
+            checkBoundsAfterDrag("DB", equalTo(nodeDBBefore));
+        } finally {
+            if (!zoomLevel.equals(ZoomLevel.ZOOM_100)) {
+                editor.zoom(ZoomLevel.ZOOM_100);
+            }
+            editor.restore();
+        }
+    }
+
+    /**
+     * @throws Exception
+     *             if an error occurs
+     */
+    public void test_D_after_expand_P31_to_the_left() throws Exception {
+        test_D_after_expand_P31_to_the_left(ZoomLevel.ZOOM_100);
+    }
+
+    /**
+     * @throws Exception
+     *             if an error occurs
+     */
+    public void test_D_after_expand_P31_to_the_left_zoom125() throws Exception {
+        test_D_after_expand_P31_to_the_left(ZoomLevel.ZOOM_125);
+    }
+
+    /**
+     * @param zoomLevel
+     *            The zoomLevel to apply to editor.
+     * @throws Exception
+     *             if an error occurs
+     */
+    protected void test_D_after_expand_P31_to_the_left(ZoomLevel zoomLevel) throws Exception {
+        editor.maximize();
+        editor.zoom(zoomLevel);
+        try {
+            CheckSelectedCondition cS = new CheckSelectedCondition(editor, "p31");
+            Rectangle bounds = editor.clickCentered("p31");
+            bot.waitUntil(cS);
+            editor.drag(bounds.getLeft(), bounds.getLeft().getTranslated(TRANSLATION_MINUS_100X));
+            checkBoundsAfterDrag("DA", equalTo(nodeDABefore.getTranslated(TRANSLATION_MINUS_100X.getScaled(1 / zoomLevel.getAmount()).getNegated())));
+            checkBoundsAfterDrag("DB", equalTo(nodeDBBefore.getTranslated(TRANSLATION_MINUS_100X.getScaled(1 / zoomLevel.getAmount()).getNegated())));
+        } finally {
+            if (!zoomLevel.equals(ZoomLevel.ZOOM_100)) {
+                editor.zoom(ZoomLevel.ZOOM_100);
+            }
+            editor.restore();
+        }
+    }
+
+    /**
+     * @throws Exception
+     *             if an error occurs
+     */
+    public void test_D_after_expand_P31_to_the_top() throws Exception {
+        test_D_after_expand_P31_to_the_top(ZoomLevel.ZOOM_100);
+    }
+
+    /**
+     * @throws Exception
+     *             if an error occurs
+     */
+    public void test_D_after_expand_P31_to_the_top_zoom125() throws Exception {
+        test_D_after_expand_P31_to_the_top(ZoomLevel.ZOOM_125);
+    }
+
+    /**
+     * @param zoomLevel
+     *            The zoomLevel to apply to editor.
+     * @throws Exception
+     *             if an error occurs
+     */
+    protected void test_D_after_expand_P31_to_the_top(ZoomLevel zoomLevel) throws Exception {
+        editor.maximize();
+        editor.zoom(zoomLevel);
+        try {
+            CheckSelectedCondition cS = new CheckSelectedCondition(editor, "p31");
+            Rectangle bounds = editor.clickCentered("p31");
+            bot.waitUntil(cS);
+            editor.drag(bounds.getTop(), bounds.getTop().getTranslated(TRANSLATION_MINUS_80Y));
+            checkBoundsAfterDrag("DA", equalTo(nodeDABefore.getTranslated(TRANSLATION_MINUS_80Y.getScaled(1 / zoomLevel.getAmount()).getNegated())));
+            checkBoundsAfterDrag("DB", equalTo(nodeDBBefore.getTranslated(TRANSLATION_MINUS_80Y.getScaled(1 / zoomLevel.getAmount()).getNegated())));
+        } finally {
+            if (!zoomLevel.equals(ZoomLevel.ZOOM_100)) {
+                editor.zoom(ZoomLevel.ZOOM_100);
+            }
+            editor.restore();
+        }
+    }
+
+    /**
+     * @throws Exception
+     *             if an error occurs
+     */
+    public void test_D_after_expand_P31_to_the_bottom() throws Exception {
+        test_D_after_expand_P31_to_the_bottom(ZoomLevel.ZOOM_100);
+    }
+
+    /**
+     * @throws Exception
+     *             if an error occurs
+     */
+    public void test_D_after_expand_P31_to_the_bottom_zoom125() throws Exception {
+        test_D_after_expand_P31_to_the_bottom(ZoomLevel.ZOOM_125);
+    }
+
+    /**
+     * @param zoomLevel
+     *            The zoomLevel to apply to editor.
+     * @throws Exception
+     *             if an error occurs
+     */
+    protected void test_D_after_expand_P31_to_the_bottom(ZoomLevel zoomLevel) throws Exception {
+        editor.maximize();
+        editor.zoom(zoomLevel);
+        try {
+            CheckSelectedCondition cS = new CheckSelectedCondition(editor, "p31");
+            Rectangle bounds = editor.clickCentered("p31");
+            bot.waitUntil(cS);
+            editor.drag(bounds.getBottom(), bounds.getBottom().getTranslated(TRANSLATION_PLUS_80Y));
+            checkBoundsAfterDrag("DA", equalTo(nodeDABefore));
+            checkBoundsAfterDrag("DB", equalTo(nodeDBBefore));
+        } finally {
+            if (!zoomLevel.equals(ZoomLevel.ZOOM_100)) {
+                editor.zoom(ZoomLevel.ZOOM_100);
+            }
+            editor.restore();
+        }
+    }
+
+    /**
+     * @throws Exception
+     *             if an error occurs
+     */
     public void test_D_after_expand_P2_to_the_right() throws Exception {
         test_D_after_expand_P2_to_the_right(ZoomLevel.ZOOM_100);
     }
author	Florian Barbin	2014-12-02 16:43:54 +0000
committer	Florian Barbin	2014-12-03 12:05:54 +0000
commit	b665757fe7d8d4650a355ebe5ad66b71b156a9b7 (patch)
tree	8c0522f4b34c03d910a39b6c5fdebaafdf130b6e
parent	f7f046a4f255565b9af1954bf8f9d02955262b3d (diff)
download	org.eclipse.sirius-b665757fe7d8d4650a355ebe5ad66b71b156a9b7.tar.gz org.eclipse.sirius-b665757fe7d8d4650a355ebe5ad66b71b156a9b7.tar.xz org.eclipse.sirius-b665757fe7d8d4650a355ebe5ad66b71b156a9b7.zip