[466605] Pb when border nodes "came out" of the container

There were several cases not well handled when border nodes "came out"
of the container after the resizing:
* border node near top and container is reduced from top to bottom
* border node near bottom and container is reduced from bottom to top
* border node near left and container is reduced from left to right
* border node near right and container is reduced from right to left

Moreover, when several border nodes are concerned during the same
resizing, they are now correctly handled.

This commit also fix problem when border node are :
* on the left or on the right side, near the bottom side and the
container is reduce from top to bottom
* on the top or on the bottom side, near the right side and the
container is reduce from left to right.

Test class ChildrenPositionStabilityAfterParentResizeTest has been
completed for this new cases.

Bug: 466605
Change-Id: I929c7070688e73897c4023de7fa0112c458a1eb5
Signed-off-by: Laurent Redor <laurent.redor@obeo.fr>

7 files changed, 2909 insertions, 284 deletions

diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/operation/ShiftDirectBorderedNodesOperation.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/operation/ShiftDirectBorderedNodesOperation.java
index e8e2fdd08d..9a3353c8d3 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/operation/ShiftDirectBorderedNodesOperation.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/operation/ShiftDirectBorderedNodesOperation.java
@@ -12,29 +12,24 @@ package org.eclipse.sirius.diagram.ui.business.internal.operation;
 
 import java.util.List;
 
-import org.eclipse.draw2d.PositionConstants;
+import org.eclipse.draw2d.geometry.Dimension;
 import org.eclipse.gmf.runtime.notation.LayoutConstraint;
 import org.eclipse.gmf.runtime.notation.Location;
 import org.eclipse.gmf.runtime.notation.Node;
 
 /**
  * This command moves the specified bordered nodes of a given EditPart
- * vertically or horizontally. It is used when an AbstractDNode is resized to
- * ensure the bordered nodes stay at the same side.
+ * vertically or horizontally. The GMF location constraint is updated according
+ * to the passed delta. It is used when an AbstractDNode is resized to ensure
+ * the bordered nodes stay at the same side.
  * 
  * @author lredor
  */
 public class ShiftDirectBorderedNodesOperation extends AbstractModelChangeOperation<Void> {
     /**
-     * The direction is one of {@link PositionConstants#HORIZONTAL} or
-     * {@link PositionConstants#VERTICAL}
-     */
-    private final int direction;
-
-    /**
      * The delta
      */
-    private final int delta;
+    private Dimension delta;
 
     /**
      * The Node to move
@@ -47,18 +42,13 @@ public class ShiftDirectBorderedNodesOperation extends AbstractModelChangeOperat
      * @param children
      *            the bordered nodes that must be shifted.
      * @param delta
-     *            the vertical or horizontal amount to shift the bordered nodes
+     *            the vertical and horizontal amount to shift the bordered nodes
      *            (in logical space).
-     * @param direction
-     *            the direction, vertical or horizontal to shift the bordered
-     *            nodes (one of {@link PositionConstants#HORIZONTAL} or
-     *            {@link PositionConstants#VERTICAL})
      */
-    public ShiftDirectBorderedNodesOperation(List<Node> children, int delta, int direction) {
+    public ShiftDirectBorderedNodesOperation(List<Node> children, Dimension delta) {
         super("Shift bordered nodes' positions by " + delta);
         this.children = children;
         this.delta = delta;
-        this.direction = direction;
     }
 
     /**
@@ -68,13 +58,10 @@ public class ShiftDirectBorderedNodesOperation extends AbstractModelChangeOperat
     public Void execute() {
         for (Node child : children) {
             LayoutConstraint layoutConstraint = child.getLayoutConstraint();
-            if (layoutConstraint instanceof Location && delta != 0) {
+            if (layoutConstraint instanceof Location && delta != null && (delta.width != 0 || delta.height != 0)) {
                 Location location = (Location) layoutConstraint;
-                if (PositionConstants.HORIZONTAL == direction) {
-                    location.setX(location.getX() + delta);
-                } else {
-                    location.setY(location.getY() + delta);
-                }
+                location.setX(location.getX() + delta.width);
+                location.setY(location.getY() + delta.height);
             }
         }
         return null;
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 d238da4af4..f630d9e08a 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
@@ -19,6 +19,7 @@ import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.draw2d.PositionConstants;
+import org.eclipse.draw2d.geometry.Dimension;
 import org.eclipse.draw2d.geometry.PrecisionPoint;
 import org.eclipse.draw2d.geometry.Rectangle;
 import org.eclipse.gef.EditPart;
@@ -218,16 +219,21 @@ public class ChildrenAdjustmentCommand extends AbstractTransactionalCommand {
             // the bottom side.
             List<Node> childrenToMove = resizedPartQuery.getBorderedNodes(PositionConstants.SOUTH);
             if (!childrenToMove.isEmpty()) {
-                cc.compose(CommandFactory.createICommand(cc.getEditingDomain(), new ShiftDirectBorderedNodesOperation(childrenToMove, verticalSizeDelta, PositionConstants.VERTICAL)));
+                cc.compose(CommandFactory.createICommand(cc.getEditingDomain(), new ShiftDirectBorderedNodesOperation(childrenToMove, new Dimension(0, verticalSizeDelta))));
             }
 
             // The border nodes of the east and west side must eventually be
             // shift to stay in the parent bounds.
-            Map<Node, Integer> childrenToMoveWithDelta = resizedPartQuery.getBorderedNodesToMoveWithDelta(PositionConstants.EAST, verticalSizeDelta);
-            childrenToMoveWithDelta.putAll(resizedPartQuery.getBorderedNodesToMoveWithDelta(PositionConstants.WEST, verticalSizeDelta));
-            for (Entry<Node, Integer> entry : childrenToMoveWithDelta.entrySet()) {
-                cc.compose(CommandFactory.createICommand(cc.getEditingDomain(), new ShiftDirectBorderedNodesOperation(Lists.newArrayList(entry.getKey()), entry.getValue().intValue(),
-                        PositionConstants.VERTICAL)));
+            Map<Node, Dimension> childrenToMoveWithDelta;
+            if (rq.isResizeFromTop()) {
+                childrenToMoveWithDelta = resizedPartQuery.getBorderedNodesToMoveWithDelta(PositionConstants.EAST, PositionConstants.NORTH, verticalSizeDelta);
+                childrenToMoveWithDelta.putAll(resizedPartQuery.getBorderedNodesToMoveWithDelta(PositionConstants.WEST, PositionConstants.NORTH, verticalSizeDelta));
+            } else {
+                childrenToMoveWithDelta = resizedPartQuery.getBorderedNodesToMoveWithDelta(PositionConstants.EAST, PositionConstants.SOUTH, verticalSizeDelta);
+                childrenToMoveWithDelta.putAll(resizedPartQuery.getBorderedNodesToMoveWithDelta(PositionConstants.WEST, PositionConstants.SOUTH, verticalSizeDelta));
+            }
+            for (Entry<Node, Dimension> entry : childrenToMoveWithDelta.entrySet()) {
+                cc.compose(CommandFactory.createICommand(cc.getEditingDomain(), new ShiftDirectBorderedNodesOperation(Lists.newArrayList(entry.getKey()), entry.getValue())));
             }
 
             if (rq.isResizeFromTop() || cbr.isCenteredResize()) {
@@ -254,7 +260,7 @@ public class ChildrenAdjustmentCommand extends AbstractTransactionalCommand {
                     List<Node> borderNodes = resizedPartQuery.getBorderedNodes(PositionConstants.WEST);
                     borderNodes.addAll(resizedPartQuery.getBorderedNodes(PositionConstants.EAST));
                     borderNodes.removeAll(childrenToMoveWithDelta.keySet());
-                    cc.compose(CommandFactory.createICommand(cc.getEditingDomain(), new ShiftDirectBorderedNodesOperation(borderNodes, verticalSizeDelta, PositionConstants.VERTICAL)));
+                    cc.compose(CommandFactory.createICommand(cc.getEditingDomain(), new ShiftDirectBorderedNodesOperation(borderNodes, new Dimension(0, verticalSizeDelta))));
                 } else {
                     // The edges linked to border nodes of the west and east
                     // sides must be adapted to only move the last segment.
@@ -278,15 +284,21 @@ public class ChildrenAdjustmentCommand extends AbstractTransactionalCommand {
             // east side.
             List<Node> childrenToMove = resizedPartQuery.getBorderedNodes(PositionConstants.EAST);
             if (!childrenToMove.isEmpty()) {
-                cc.compose(CommandFactory.createICommand(cc.getEditingDomain(), new ShiftDirectBorderedNodesOperation(childrenToMove, horizontalSizeDelta, PositionConstants.HORIZONTAL)));
+                cc.compose(CommandFactory.createICommand(cc.getEditingDomain(), new ShiftDirectBorderedNodesOperation(childrenToMove, new Dimension(horizontalSizeDelta, 0))));
             }
             // The border nodes of the north or south side must eventually be
             // shift to stay in the parent bounds.
-            Map<Node, Integer> childrenToMoveWithDelta = resizedPartQuery.getBorderedNodesToMoveWithDelta(PositionConstants.NORTH, horizontalSizeDelta);
-            childrenToMoveWithDelta.putAll(resizedPartQuery.getBorderedNodesToMoveWithDelta(PositionConstants.SOUTH, horizontalSizeDelta));
-            for (Entry<Node, Integer> entry : childrenToMoveWithDelta.entrySet()) {
-                cc.compose(CommandFactory.createICommand(cc.getEditingDomain(), new ShiftDirectBorderedNodesOperation(Lists.newArrayList(entry.getKey()), entry.getValue().intValue(),
-                        PositionConstants.HORIZONTAL)));
+            Map<Node, Dimension> childrenToMoveWithDelta;
+            if (rq.isResizeFromRight()) {
+                childrenToMoveWithDelta = resizedPartQuery.getBorderedNodesToMoveWithDelta(PositionConstants.NORTH, PositionConstants.EAST, horizontalSizeDelta);
+                childrenToMoveWithDelta.putAll(resizedPartQuery.getBorderedNodesToMoveWithDelta(PositionConstants.SOUTH, PositionConstants.EAST, horizontalSizeDelta));
+            } else {
+                childrenToMoveWithDelta = resizedPartQuery.getBorderedNodesToMoveWithDelta(PositionConstants.NORTH, PositionConstants.WEST, horizontalSizeDelta);
+                childrenToMoveWithDelta.putAll(resizedPartQuery.getBorderedNodesToMoveWithDelta(PositionConstants.SOUTH, PositionConstants.WEST, horizontalSizeDelta));
+
+            }
+            for (Entry<Node, Dimension> entry : childrenToMoveWithDelta.entrySet()) {
+                cc.compose(CommandFactory.createICommand(cc.getEditingDomain(), new ShiftDirectBorderedNodesOperation(Lists.newArrayList(entry.getKey()), entry.getValue())));
             }
             if (rq.isResizeFromLeft() || cbr.isCenteredResize()) {
                 // The edges linked to border node of the west side must adapted
@@ -312,7 +324,7 @@ public class ChildrenAdjustmentCommand extends AbstractTransactionalCommand {
                     List<Node> borderNodes = resizedPartQuery.getBorderedNodes(PositionConstants.NORTH);
                     borderNodes.addAll(resizedPartQuery.getBorderedNodes(PositionConstants.SOUTH));
                     borderNodes.removeAll(childrenToMoveWithDelta.keySet());
-                    cc.compose(CommandFactory.createICommand(cc.getEditingDomain(), new ShiftDirectBorderedNodesOperation(borderNodes, horizontalSizeDelta, PositionConstants.HORIZONTAL)));
+                    cc.compose(CommandFactory.createICommand(cc.getEditingDomain(), new ShiftDirectBorderedNodesOperation(borderNodes, new Dimension(horizontalSizeDelta, 0))));
                 } else {
                     // The edges linked border nodes of the north and south
                     // sides must be adapted to only move the last segment.
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/edit/commands/DistributeCommand.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/edit/commands/DistributeCommand.java
index 8b970dd664..39bd8be708 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/edit/commands/DistributeCommand.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/edit/commands/DistributeCommand.java
@@ -22,7 +22,6 @@ import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.PositionConstants;
 import org.eclipse.draw2d.geometry.Dimension;
 import org.eclipse.draw2d.geometry.Rectangle;
 import org.eclipse.emf.transaction.TransactionalEditingDomain;
@@ -588,10 +587,10 @@ public class DistributeCommand extends AbstractTransactionalCommand {
                 Dimension delta = newBounds.getLocation().getDifference(getBoundsFunction.apply(editPart).getLocation());
                 if (delta.width != 0) {
                     wrappedCommand.compose(CommandFactory.createICommand(wrappedCommand.getEditingDomain(), new ShiftDirectBorderedNodesOperation(Lists.newArrayList((Node) editPart.getModel()),
-                            delta.width, PositionConstants.HORIZONTAL)));
+                            new Dimension(delta.width, 0))));
                 } else {
                     wrappedCommand.compose(CommandFactory.createICommand(wrappedCommand.getEditingDomain(), new ShiftDirectBorderedNodesOperation(Lists.newArrayList((Node) editPart.getModel()),
-                            delta.height, PositionConstants.VERTICAL)));
+                            new Dimension(0, delta.height))));
                 }
                 previousPartBounds = expectedNewBounds;
             }
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/util/EditPartQuery.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/util/EditPartQuery.java
index 99ebdb24d0..24c6e4a5e3 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/util/EditPartQuery.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/util/EditPartQuery.java
@@ -12,30 +12,39 @@ package org.eclipse.sirius.diagram.ui.tools.internal.util;
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import org.eclipse.draw2d.IFigure;
 import org.eclipse.draw2d.PositionConstants;
+import org.eclipse.draw2d.geometry.Dimension;
 import org.eclipse.draw2d.geometry.Rectangle;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gef.EditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderedShapeEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.Bounds;
 import org.eclipse.gmf.runtime.notation.Node;
 import org.eclipse.sirius.diagram.ContainerLayout;
 import org.eclipse.sirius.diagram.DNodeContainer;
 import org.eclipse.sirius.diagram.DNodeList;
+import org.eclipse.sirius.diagram.ui.tools.api.figure.locator.DBorderItemLocator;
 import org.eclipse.sirius.diagram.ui.tools.api.graphical.edit.styles.IBorderItemOffsets;
 
+import com.google.common.base.Function;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
+import com.google.common.collect.ImmutableSortedSet;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Ordering;
 
 /**
  * Queries on GMF edit parts.
@@ -150,7 +159,8 @@ public class EditPartQuery {
 
     /**
      * Return a Map with a move delta for each nodes that must be moved
-     * following the resize of the parent.
+     * following the resize of the parent. The delta is to applied on GMF
+     * location of border nodes (relative to container).
      * 
      * @param expectedSide
      *            the side on which the border item appears as defined in
@@ -165,36 +175,52 @@ public class EditPartQuery {
      *            <li>{@link org.eclipse.draw2d.PositionConstants#SOUTH}, if
      *            parent is resized from East or West</li>
      *            </ul>
+     * @param resizedSide
+     *            the side that is moved as defined in {@link PositionConstants}
+     *            . Possible values are
+     *            <ul>
+     *            <li>{@link org.eclipse.draw2d.PositionConstants#EAST}, if
+     *            parent is resized from East</li>
+     *            <li>{@link org.eclipse.draw2d.PositionConstants#WEST}, if
+     *            parent is resized from West</li>
+     *            <li>{@link org.eclipse.draw2d.PositionConstants#NORTH}, if
+     *            parent is resized from North</li>
+     *            <li>{@link org.eclipse.draw2d.PositionConstants#SOUTH}, if
+     *            parent is resized from South</li>
+     *            </ul>
      * @param parentResizeSize
      *            the resize size of the parent
      * @return A Map with a move delta for each nodes that must be moved
      */
-    public Map<Node, Integer> getBorderedNodesToMoveWithDelta(int expectedSide, int parentResizeSize) {
-        Map<Node, Integer> result = new HashMap<Node, Integer>();
-        if (part instanceof IBorderedShapeEditPart) {
-            // calculate the parent bounds with consideration for the handle
-            // bounds inset.
-            IFigure parentFigure = ((IBorderedShapeEditPart) part).getMainFigure();
-            Rectangle parentBounds = parentFigure.getBounds();
-            if (parentFigure instanceof NodeFigure) {
-                parentBounds = ((NodeFigure) parentFigure).getHandleBounds().getCopy();
-            }
-
-            List<Node> expectedSideNodes = getBorderedNodes(expectedSide);
-            if (parentResizeSize < 0) {
-                // The container is reduced
+    public Map<Node, Dimension> getBorderedNodesToMoveWithDelta(int expectedSide, int resizedSide, int parentResizeSize) {
+        Map<Node, Dimension> result = new HashMap<Node, Dimension>();
+        if (parentResizeSize < 0 && part instanceof IBorderedShapeEditPart) {
+            // The container is reduced
+            List<IBorderItemEditPart> expectedSideEditParts = getBorderNodeEditParts(expectedSide);
+            if (expectedSideEditParts.size() > 0) {
+                // Calculate the parent bounds with consideration for the handle
+                // bounds insets.
+                IFigure parentFigure = ((IBorderedShapeEditPart) part).getBorderedFigure();
+                Rectangle parentBounds = parentFigure.getBounds();
+                if (parentFigure instanceof NodeFigure) {
+                    parentBounds = ((NodeFigure) parentFigure).getHandleBounds().getCopy();
+                }
+                // Sort edit parts according to the resized side (the shortest
+                // border nodes should be in first).
+                Set<IBorderItemEditPart> sortedEditParts = sortEditParts(expectedSideEditParts, resizedSide);
                 if (expectedSide == PositionConstants.EAST || expectedSide == PositionConstants.WEST) {
                     // If the parent is reduced from the north (or from the
                     // south and the new height is too small, the bordered node
                     // must be moved to be near the bottom of parent.
-                    result = getBorderedNodesToMoveVerticallyWithDelta(expectedSideNodes, parentBounds, parentResizeSize);
+                    result = getBorderedNodesToMoveVerticallyWithDelta(sortedEditParts, parentBounds, resizedSide, parentResizeSize);
                 } else if (expectedSide == PositionConstants.NORTH || expectedSide == PositionConstants.SOUTH) {
                     // If the parent is reduced from the east (or from the west
                     // and the new width is too small, the bordered node must be
                     // moved to be near the right of parent.
-                    result = getBorderedNodesToMoveHorizontallyWithDelta(expectedSideNodes, parentBounds, parentResizeSize);
+                    result = getBorderedNodesToMoveHorizontallyWithDelta(sortedEditParts, parentBounds, resizedSide, parentResizeSize);
                 }
             }
+
         }
         return result;
     }
@@ -222,54 +248,274 @@ public class EditPartQuery {
     }
 
     /**
-     * @param nodes
-     *            Nodes potentially concerned by this resize.
+     * @param editParts
+     *            Edit parts potentially concerned by this resize.
      * @param parentBounds
      *            The available bounds to consider for the parent
+     * @param resizedSide
+     *            the side that is moved as defined in {@link PositionConstants}
+     *            . Possible values are
+     *            <ul>
+     *            <li>{@link org.eclipse.draw2d.PositionConstants#NORTH}, if
+     *            parent is resized from North</li>
+     *            <li>{@link org.eclipse.draw2d.PositionConstants#SOUTH}, if
+     *            parent is resized from South</li>
+     *            </ul>
      * @param parentResizeSize
      *            the resize size of the parent
      */
-    private Map<Node, Integer> getBorderedNodesToMoveVerticallyWithDelta(List<Node> nodes, Rectangle parentBounds, int parentResizeSize) {
-        Map<Node, Integer> result = new HashMap<Node, Integer>();
-        for (Node node : nodes) {
+    private Map<Node, Dimension> getBorderedNodesToMoveVerticallyWithDelta(Set<IBorderItemEditPart> editParts, Rectangle parentBounds, int resizedSide, int parentResizeSize) {
+        Map<IBorderItemEditPart, Dimension> defaultComputedShifting = new LinkedHashMap<IBorderItemEditPart, Dimension>();
+        Map<Node, Dimension> shiftingAccordingToBorderItemLocator = new LinkedHashMap<Node, Dimension>();
+        for (IBorderItemEditPart editPart : editParts) {
+            Node node = (Node) editPart.getModel();
             if (node.getLayoutConstraint() instanceof Bounds) {
                 Bounds borderedNodeBounds = (Bounds) node.getLayoutConstraint();
-                // Compute the distance between the bottom of the
-                // container and the bottom of the bordered node (we
-                // add the default_offset because it is used for
-                // our DBorderItemLocator).
-                int distanceFromBottom = parentBounds.height - IBorderItemOffsets.DEFAULT_OFFSET.height - (borderedNodeBounds.getY() + borderedNodeBounds.getHeight());
-                if (distanceFromBottom < -parentResizeSize) {
-                    result.put(node, distanceFromBottom + parentResizeSize);
+                if (PositionConstants.NORTH == resizedSide) {
+                    // Check if the distance from top will be enough after
+                    // resize. If not, this border node must be shift to 0 for y
+                    // axis. If there are several nodes at 0, they will be fixed
+                    // just after with the BorderItemLocator.
+                    if (borderedNodeBounds.getY() < -parentResizeSize) {
+                        defaultComputedShifting.put(editPart, new Dimension(0, -borderedNodeBounds.getY()));
+                    }
+                } else {
+                    // Compute the distance between the bottom of the
+                    // container and the bottom of the bordered node (we
+                    // add the default_offset because it is used for
+                    // our DBorderItemLocator).
+                    int distanceFromBottom = parentBounds.height - IBorderItemOffsets.DEFAULT_OFFSET.height - (borderedNodeBounds.getY() + borderedNodeBounds.getHeight());
+                    // Check if the distance from bottom will be enough after
+                    // resize. If not, this border node must be shift to the
+                    // bottom of the parent. If there are several nodes at the
+                    // bottom of the parent, they will be fixed just after with
+                    // the BorderItemLocator.
+                    if (distanceFromBottom < -parentResizeSize) {
+                        defaultComputedShifting.put(editPart, new Dimension(0, distanceFromBottom + parentResizeSize));
+                    }
                 }
             }
         }
-        return result;
+        // Fix the expected shifting according to the BorderItemLocator (to
+        // avoid conflicts)
+        HashMap<IGraphicalEditPart, IFigure> partToFigureToIgnore = Maps.newHashMap();
+        for (IBorderItemEditPart editPart : defaultComputedShifting.keySet()) {
+            partToFigureToIgnore.put(editPart, editPart.getFigure());
+        }
+        for (IBorderItemEditPart borderItemEditPart : defaultComputedShifting.keySet()) {
+            // We must check that there is no conflicts with
+            // existing border nodes
+            Rectangle currentBounds = borderItemEditPart.getFigure().getBounds();
+            Rectangle expectedNewBounds = currentBounds.getCopy();
+            expectedNewBounds.setX(expectedNewBounds.x + defaultComputedShifting.get(borderItemEditPart).width);
+            expectedNewBounds.setY(expectedNewBounds.y + defaultComputedShifting.get(borderItemEditPart).height);
+            IBorderItemLocator borderItemLocator = borderItemEditPart.getBorderItemLocator();
+            if (borderItemLocator instanceof DBorderItemLocator) {
+                // Temporary resize the parent figure for valid location
+                // computation
+                Rectangle borderItemLocatorParentBounds = ((DBorderItemLocator) borderItemLocator).getParentFigure().getBounds();
+                if (PositionConstants.NORTH == resizedSide) {
+                    borderItemLocatorParentBounds.y = borderItemLocatorParentBounds.y - parentResizeSize;
+                    expectedNewBounds.y = expectedNewBounds.y - parentResizeSize;
+                }
+                borderItemLocatorParentBounds.height = borderItemLocatorParentBounds.height + parentResizeSize;
+                expectedNewBounds = ((DBorderItemLocator) borderItemLocator).getValidLocation(expectedNewBounds, borderItemEditPart.getFigure(), partToFigureToIgnore.values(),
+                        new ArrayList<IFigure>());
+                // Reset the temporary size of the parent figure
+                if (PositionConstants.NORTH == resizedSide) {
+                    borderItemLocatorParentBounds.y = borderItemLocatorParentBounds.y + parentResizeSize;
+                }
+                borderItemLocatorParentBounds.height = borderItemLocatorParentBounds.height - parentResizeSize;
+
+            } else {
+                expectedNewBounds = borderItemLocator.getValidLocation(expectedNewBounds, borderItemEditPart.getFigure());
+            }
+            if (PositionConstants.NORTH == resizedSide) {
+                shiftingAccordingToBorderItemLocator.put((Node) borderItemEditPart.getModel(), new Dimension(expectedNewBounds.x - currentBounds.x, expectedNewBounds.y - currentBounds.y
+                        + parentResizeSize));
+            } else {
+                shiftingAccordingToBorderItemLocator.put((Node) borderItemEditPart.getModel(), new Dimension(expectedNewBounds.x - currentBounds.x, expectedNewBounds.y - currentBounds.y));
+            }
+            // Directly set the figure to be considered by next border item edit
+            // part (if any)
+            borderItemEditPart.getFigure().getBounds().x = expectedNewBounds.x;
+            borderItemEditPart.getFigure().getBounds().y = expectedNewBounds.y;
+            // Remove the located figure
+            partToFigureToIgnore.remove(borderItemEditPart);
+        }
+        return shiftingAccordingToBorderItemLocator;
     }
 
     /**
-     * @param nodes
-     *            Nodes potentially concerned by this resize.
+     * @param editParts
+     *            Edit parts potentially concerned by this resize.
      * @param parentBounds
      *            The available bounds to consider for the parent
+     * @param resizedSide
+     *            the side that is moved as defined in {@link PositionConstants}
+     *            . Possible values are
+     *            <ul>
+     *            <li>{@link org.eclipse.draw2d.PositionConstants#EAST}, if
+     *            parent is resized from East</li>
+     *            <li>{@link org.eclipse.draw2d.PositionConstants#WEST}, if
+     *            parent is resized from West</li>
+     *            </ul>
      * @param parentResizeSize
      *            the resize size of the parent
      */
-    private Map<Node, Integer> getBorderedNodesToMoveHorizontallyWithDelta(List<Node> nodes, Rectangle parentBounds, int parentResizeSize) {
-        Map<Node, Integer> result = new HashMap<Node, Integer>();
-        for (Node node : nodes) {
+    private Map<Node, Dimension> getBorderedNodesToMoveHorizontallyWithDelta(Set<IBorderItemEditPart> editParts, Rectangle parentBounds, int resizedSide, int parentResizeSize) {
+        Map<IBorderItemEditPart, Dimension> defaultComputedShifting = new LinkedHashMap<IBorderItemEditPart, Dimension>();
+        Map<Node, Dimension> shiftingAccordingToBorderItemLocator = new LinkedHashMap<Node, Dimension>();
+        for (IBorderItemEditPart editPart : editParts) {
+            Node node = (Node) editPart.getModel();
             if (node.getLayoutConstraint() instanceof Bounds) {
                 Bounds borderedNodeBounds = (Bounds) node.getLayoutConstraint();
-                // Compute the distance between the right of the
-                // container and the right of the bordered node (we
-                // add the default_offset because it is used for
-                // our DBorderItemLocator).
-                int distanceFromRight = parentBounds.width - IBorderItemOffsets.DEFAULT_OFFSET.height - (borderedNodeBounds.getX() + borderedNodeBounds.getWidth());
-                if (distanceFromRight < -parentResizeSize) {
-                    result.put(node, distanceFromRight + parentResizeSize);
+                if (PositionConstants.WEST == resizedSide) {
+                    // Check if the distance from left will be enough after
+                    // resize. If not, this border node must be shift to 0 for x
+                    // axis. If there are several nodes at 0, they will be fixed
+                    // just after with the BorderItemLocator.
+                    if (borderedNodeBounds.getX() < -parentResizeSize) {
+                        defaultComputedShifting.put(editPart, new Dimension(-borderedNodeBounds.getX(), 0));
+                    }
+                } else {
+                    // Compute the distance between the right of the
+                    // container and the right of the bordered node (we
+                    // add the default_offset because it is used for
+                    // our DBorderItemLocator).
+                    int distanceFromRight = parentBounds.width - IBorderItemOffsets.DEFAULT_OFFSET.height - (borderedNodeBounds.getX() + borderedNodeBounds.getWidth());
+                    // Check if the distance from right will be enough after
+                    // resize. If not, this border node must be shift to the
+                    // right of the parent. If there are several nodes at the
+                    // right of the parent, they will be fixed just after with
+                    // the BorderItemLocator.
+                    if (distanceFromRight < -parentResizeSize) {
+                        defaultComputedShifting.put(editPart, new Dimension(distanceFromRight + parentResizeSize, 0));
+                    }
                 }
             }
         }
-        return result;
+        // Fix the expected shifting according to the borderItemLocator (to
+        // avoid conflicts)
+        HashMap<IGraphicalEditPart, IFigure> partToFigureToIgnore = Maps.newHashMap();
+        for (IBorderItemEditPart editPart : defaultComputedShifting.keySet()) {
+            partToFigureToIgnore.put(editPart, editPart.getFigure());
+        }
+        for (IBorderItemEditPart borderItemEditPart : defaultComputedShifting.keySet()) {
+            // We must check that there is no conflicts with
+            // existing border nodes
+            Rectangle currentBounds = borderItemEditPart.getFigure().getBounds();
+            Rectangle expectedNewBounds = currentBounds.getCopy();
+            expectedNewBounds.setX(expectedNewBounds.x + defaultComputedShifting.get(borderItemEditPart).width);
+            expectedNewBounds.setY(expectedNewBounds.y + defaultComputedShifting.get(borderItemEditPart).height);
+            IBorderItemLocator borderItemLocator = borderItemEditPart.getBorderItemLocator();
+            if (borderItemLocator instanceof DBorderItemLocator) {
+                // Temporary resize the parent figure for valid location
+                // computation
+                Rectangle borderItemLocatorParentBounds = ((DBorderItemLocator) borderItemLocator).getParentFigure().getBounds();
+                if (PositionConstants.WEST == resizedSide) {
+                    borderItemLocatorParentBounds.x = borderItemLocatorParentBounds.x - parentResizeSize;
+                    expectedNewBounds.x = expectedNewBounds.x - parentResizeSize;
+                }
+                borderItemLocatorParentBounds.width = borderItemLocatorParentBounds.width + parentResizeSize;
+                expectedNewBounds = ((DBorderItemLocator) borderItemLocator).getValidLocation(expectedNewBounds, borderItemEditPart.getFigure(), partToFigureToIgnore.values(),
+                        new ArrayList<IFigure>());
+                // Reset the temporary size of the parent figure
+                if (PositionConstants.WEST == resizedSide) {
+                    borderItemLocatorParentBounds.x = borderItemLocatorParentBounds.x + parentResizeSize;
+                }
+                borderItemLocatorParentBounds.width = borderItemLocatorParentBounds.width - parentResizeSize;
+            } else {
+                expectedNewBounds = borderItemLocator.getValidLocation(expectedNewBounds, borderItemEditPart.getFigure());
+            }
+            if (PositionConstants.WEST == resizedSide) {
+                shiftingAccordingToBorderItemLocator.put((Node) borderItemEditPart.getModel(), new Dimension(expectedNewBounds.x - currentBounds.x + parentResizeSize, expectedNewBounds.y
+                        - currentBounds.y));
+            } else {
+                shiftingAccordingToBorderItemLocator.put((Node) borderItemEditPart.getModel(), new Dimension(expectedNewBounds.x - currentBounds.x, expectedNewBounds.y - currentBounds.y));
+            }
+            // Directly set the figure to be considered by next border item edit
+            // part (if any)
+            borderItemEditPart.getFigure().getBounds().x = expectedNewBounds.x;
+            borderItemEditPart.getFigure().getBounds().y = expectedNewBounds.y;
+            // Remove the located figure
+            partToFigureToIgnore.remove(borderItemEditPart);
+        }
+        return shiftingAccordingToBorderItemLocator;
+    }
+
+    /**
+     * Sort the {@link IBorderItemEditPart} according to the resized side.
+     * 
+     * @param nodes
+     *            List of {@link IBorderItemEditPart} to sort
+     * @param resizedSide
+     *            the side that is moved as defined in {@link PositionConstants}
+     *            . Possible values are
+     *            <ul>
+     *            <li>{@link org.eclipse.draw2d.PositionConstants#EAST}, if
+     *            parent is resized from East</li>
+     *            <li>{@link org.eclipse.draw2d.PositionConstants#WEST}, if
+     *            parent is resized from West</li>
+     *            <li>{@link org.eclipse.draw2d.PositionConstants#NORTH}, if
+     *            parent is resized from North</li>
+     *            <li>{@link org.eclipse.draw2d.PositionConstants#SOUTH}, if
+     *            parent is resized from South</li>
+     *            </ul>
+     * @return A new sorted list
+     */
+    private Set<IBorderItemEditPart> sortEditParts(List<IBorderItemEditPart> nodes, int resizedSide) {
+        Function<IBorderItemEditPart, Integer> getValueToCompareFunction;
+        if (PositionConstants.NORTH == resizedSide) {
+            // Smaller y in first
+            getValueToCompareFunction = new Function<IBorderItemEditPart, Integer>() {
+                public Integer apply(IBorderItemEditPart from) {
+                    Node node = (Node) from.getModel();
+                    if (node.getLayoutConstraint() instanceof Bounds) {
+                        Bounds nodeBounds = (Bounds) node.getLayoutConstraint();
+                        return nodeBounds.getY();
+                    }
+                    return 0;
+                }
+            };
+        } else if (PositionConstants.SOUTH == resizedSide) {
+            // Greater (y+height) in first
+            getValueToCompareFunction = new Function<IBorderItemEditPart, Integer>() {
+                public Integer apply(IBorderItemEditPart from) {
+                    Node node = (Node) from.getModel();
+                    if (node.getLayoutConstraint() instanceof Bounds) {
+                        Bounds nodeBounds = (Bounds) node.getLayoutConstraint();
+                        return -(nodeBounds.getY() + nodeBounds.getHeight());
+                    }
+                    return 0;
+                }
+            };
+        } else if (PositionConstants.EAST == resizedSide) {
+            // Greater (x+width) in first
+            getValueToCompareFunction = new Function<IBorderItemEditPart, Integer>() {
+                public Integer apply(IBorderItemEditPart from) {
+                    Node node = (Node) from.getModel();
+                    if (node.getLayoutConstraint() instanceof Bounds) {
+                        Bounds nodeBounds = (Bounds) node.getLayoutConstraint();
+                        return -(nodeBounds.getX() + nodeBounds.getWidth());
+                    }
+                    return 0;
+                }
+            };
+        } else {
+            // Smaller x in first
+            getValueToCompareFunction = new Function<IBorderItemEditPart, Integer>() {
+                public Integer apply(IBorderItemEditPart from) {
+                    Node node = (Node) from.getModel();
+                    if (node.getLayoutConstraint() instanceof Bounds) {
+                        Bounds nodeBounds = (Bounds) node.getLayoutConstraint();
+                        return nodeBounds.getX();
+                    }
+                    return 0;
+                }
+            };
+        }
+        Ordering<IBorderItemEditPart> ordering = Ordering.natural().onResultOf(getValueToCompareFunction);
+        return ImmutableSortedSet.orderedBy(ordering).addAll(nodes).build();
     }
 }
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 f0898eead4..b8d8d176d6 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,5 +1,5 @@
 <?xml version="1.0" encoding="ASCII"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns: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">
+<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.201504091800">
   <ownedViewpoints name="Test case for ticket #1479" modelFileExtension="ecore">
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="TC1479" domainClass="EPackage">
       <defaultLayer name="Default">
@@ -31,14 +31,14 @@
                 <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_purple']"/>
               </style>
             </subNodeMappings>
-            <style xsi:type="style:FlatContainerStyleDescription">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1">
               <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">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1">
             <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']"/>
@@ -72,13 +72,13 @@
             </style>
           </borderedNodeMappings>
           <subNodeMappings name="NodeClassInContainer" semanticCandidatesExpression="feature:eClassifiers" domainClass="EClass">
-            <style xsi:type="style:SquareDescription" labelPosition="node">
+            <style xsi:type="style:SquareDescription" showIcon="false" labelExpression="['C' + name/]" labelPosition="node">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
             </style>
           </subNodeMappings>
-          <style xsi:type="style:FlatContainerStyleDescription">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1">
             <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']"/>
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 4d39be996b..2f69d7842c 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
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<viewpoint:DAnalysis xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:diagram="http://www.eclipse.org/sirius/diagram/1.1.0" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:viewpoint="http://www.eclipse.org/sirius/1.1.0" xsi:schemaLocation="http://www.eclipse.org/sirius/description/1.1.0 http://www.eclipse.org/sirius/1.1.0#//description http://www.eclipse.org/sirius/diagram/description/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description http://www.eclipse.org/sirius/diagram/description/style/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description/style" xmi:id="_dQ5uwOu9Ed6huvz2q8dLQg" selectedViews="_dlNx4Ou9Ed6huvz2q8dLQg" version="8.1.1">
-  <models xmi:type="ecore:EPackage" href="tc1479.ecore#/"/>
-  <ownedViews xmi:type="viewpoint:DRepresentationContainer" xmi:id="_dlNx4Ou9Ed6huvz2q8dLQg" initialized="true">
+<viewpoint:DAnalysis xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:diagram="http://www.eclipse.org/sirius/diagram/1.1.0" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:viewpoint="http://www.eclipse.org/sirius/1.1.0" xsi:schemaLocation="http://www.eclipse.org/sirius/description/1.1.0 http://www.eclipse.org/sirius/1.1.0#//description http://www.eclipse.org/sirius/diagram/description/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description http://www.eclipse.org/sirius/diagram/description/style/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description/style" xmi:id="_dQ5uwOu9Ed6huvz2q8dLQg" selectedViews="_dlNx4Ou9Ed6huvz2q8dLQg" version="11.0.0.201503202000">
+  <semanticResources>platform:/resource/movedBorderNodes/tc-1479/models/tc1479.ecore</semanticResources>
+  <ownedViews xmi:type="viewpoint:DRepresentationContainer" xmi:id="_dlNx4Ou9Ed6huvz2q8dLQg">
     <ownedRepresentations xmi:type="diagram:DSemanticDiagram" xmi:id="_et_-4eu9Ed6huvz2q8dLQg" name="TC1479">
       <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_rzy2YBHpEeK-xJ8W7doAqA" source="GMF_DIAGRAMS">
         <data xmi:type="notation:Diagram" xmi:id="_euGskOu9Ed6huvz2q8dLQg" type="Sirius" element="_et_-4eu9Ed6huvz2q8dLQg" measurementUnit="Pixel">
@@ -319,6 +319,9 @@
           </edges>
         </data>
       </ownedAnnotationEntries>
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_-7UMYPfCEeS3OuyISpbxoQ" source="DANNOTATION_CUSTOMIZATION_KEY">
+        <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_-7UMYffCEeS3OuyISpbxoQ"/>
+      </ownedAnnotationEntries>
       <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_aA-zMJjKEeCGbO5oLE72PQ" name="p1">
         <target xmi:type="ecore:EPackage" href="tc1479.ecore#//p1"/>
         <semanticElements xmi:type="ecore:EPackage" href="tc1479.ecore#//p1"/>
@@ -328,11 +331,8 @@
           <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
           <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
           <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-          <ownedStyle xmi:type="diagram:Square" xmi:id="_aBABUZjKEeCGbO5oLE72PQ">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_aBABUpjKEeCGbO5oLE72PQ"/>
+          <ownedStyle xmi:type="diagram:Square" xmi:id="_aBABUZjKEeCGbO5oLE72PQ" borderColor="138,226,52" color="138,226,52">
             <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']/@borderedNodeMappings[name='BN_EClass']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_aBABU5jKEeCGbO5oLE72PQ" red="138" green="226" blue="52"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_aBABVJjKEeCGbO5oLE72PQ" 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='TC1479']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']"/>
         </ownedBorderedNodes>
@@ -342,11 +342,8 @@
           <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
           <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
           <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-          <ownedStyle xmi:type="diagram:Square" xmi:id="_aBAoYZjKEeCGbO5oLE72PQ">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_aBAoYpjKEeCGbO5oLE72PQ"/>
+          <ownedStyle xmi:type="diagram:Square" xmi:id="_aBAoYZjKEeCGbO5oLE72PQ" borderColor="138,226,52" color="138,226,52">
             <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']/@borderedNodeMappings[name='BN_EClass']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_aBAoY5jKEeCGbO5oLE72PQ" red="138" green="226" blue="52"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_aBAoZJjKEeCGbO5oLE72PQ" 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='TC1479']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']"/>
         </ownedBorderedNodes>
@@ -354,21 +351,14 @@
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
         <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_aA_aQJjKEeCGbO5oLE72PQ">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_aA_aQZjKEeCGbO5oLE72PQ"/>
           <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']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_aA_aQpjKEeCGbO5oLE72PQ"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_aA_aQ5jKEeCGbO5oLE72PQ" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_aA_aRJjKEeCGbO5oLE72PQ" 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:DNode" xmi:id="_jleI4Ch6EeS_5bh30NJTzw" name="CA" width="3" height="3" resizeKind="NSEW">
           <target xmi:type="ecore:EClass" href="tc1479.ecore#//p1/A"/>
           <semanticElements xmi:type="ecore:EClass" href="tc1479.ecore#//p1/A"/>
-          <ownedStyle xmi:type="diagram:Square" xmi:id="_jlev8Ch6EeS_5bh30NJTzw" showIcon="false" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_jlev8Sh6EeS_5bh30NJTzw"/>
+          <ownedStyle xmi:type="diagram:Square" xmi:id="_jlev8Ch6EeS_5bh30NJTzw" showIcon="false" labelPosition="node" color="194,239,255">
             <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']/@subNodeMappings[name='N_EClass']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_jlev8ih6EeS_5bh30NJTzw"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_jlev8yh6EeS_5bh30NJTzw" 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='TC1479']/@defaultLayer/@containerMappings[name='CM_EPackage']/@subNodeMappings[name='N_EClass']"/>
         </ownedDiagramElements>
@@ -378,11 +368,8 @@
           <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
           <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
           <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-          <ownedStyle xmi:type="diagram:Square" xmi:id="_jlf-ECh6EeS_5bh30NJTzw" showIcon="false" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_jlf-ESh6EeS_5bh30NJTzw"/>
+          <ownedStyle xmi:type="diagram:Square" xmi:id="_jlf-ECh6EeS_5bh30NJTzw" showIcon="false" labelPosition="node" color="194,239,255">
             <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']/@subNodeMappings[name='N_EClass']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_jlf-Eih6EeS_5bh30NJTzw"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_jlf-Eyh6EeS_5bh30NJTzw" 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='TC1479']/@defaultLayer/@containerMappings[name='CM_EPackage']/@subNodeMappings[name='N_EClass']"/>
         </ownedDiagramElements>
@@ -396,11 +383,8 @@
           <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
           <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
           <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-          <ownedStyle xmi:type="diagram:Square" xmi:id="_aBBPcZjKEeCGbO5oLE72PQ">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_aBBPcpjKEeCGbO5oLE72PQ"/>
+          <ownedStyle xmi:type="diagram:Square" xmi:id="_aBBPcZjKEeCGbO5oLE72PQ" borderColor="138,226,52" color="138,226,52">
             <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']/@borderedNodeMappings[name='BN_EClass']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_aBBPc5jKEeCGbO5oLE72PQ" red="138" green="226" blue="52"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_aBBPdJjKEeCGbO5oLE72PQ" 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='TC1479']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']"/>
         </ownedBorderedNodes>
@@ -410,11 +394,8 @@
           <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
           <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
           <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-          <ownedStyle xmi:type="diagram:Square" xmi:id="_aBB2gZjKEeCGbO5oLE72PQ">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_aBB2gpjKEeCGbO5oLE72PQ"/>
+          <ownedStyle xmi:type="diagram:Square" xmi:id="_aBB2gZjKEeCGbO5oLE72PQ" borderColor="138,226,52" color="138,226,52">
             <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']/@borderedNodeMappings[name='BN_EClass']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_aBB2g5jKEeCGbO5oLE72PQ" red="138" green="226" blue="52"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_aBB2hJjKEeCGbO5oLE72PQ" 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='TC1479']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']"/>
         </ownedBorderedNodes>
@@ -422,21 +403,14 @@
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
         <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_aA_aRpjKEeCGbO5oLE72PQ">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_aA_aR5jKEeCGbO5oLE72PQ"/>
           <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']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_aA_aSJjKEeCGbO5oLE72PQ"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_aA_aSZjKEeCGbO5oLE72PQ" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_aA_aSpjKEeCGbO5oLE72PQ" 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:DNode" xmi:id="_jliaUCh6EeS_5bh30NJTzw" name="CB" width="3" height="3" resizeKind="NSEW">
           <target xmi:type="ecore:EClass" href="tc1479.ecore#//p2/B"/>
           <semanticElements xmi:type="ecore:EClass" href="tc1479.ecore#//p2/B"/>
-          <ownedStyle xmi:type="diagram:Square" xmi:id="_jljBYCh6EeS_5bh30NJTzw" showIcon="false" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_jljBYSh6EeS_5bh30NJTzw"/>
+          <ownedStyle xmi:type="diagram:Square" xmi:id="_jljBYCh6EeS_5bh30NJTzw" showIcon="false" labelPosition="node" color="194,239,255">
             <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']/@subNodeMappings[name='N_EClass']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_jljBYih6EeS_5bh30NJTzw"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_jljBYyh6EeS_5bh30NJTzw" 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='TC1479']/@defaultLayer/@containerMappings[name='CM_EPackage']/@subNodeMappings[name='N_EClass']"/>
         </ownedDiagramElements>
@@ -446,11 +420,8 @@
           <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
           <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
           <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-          <ownedStyle xmi:type="diagram:Square" xmi:id="_jljocSh6EeS_5bh30NJTzw" showIcon="false" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_jljocih6EeS_5bh30NJTzw"/>
+          <ownedStyle xmi:type="diagram:Square" xmi:id="_jljocSh6EeS_5bh30NJTzw" showIcon="false" labelPosition="node" color="194,239,255">
             <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']/@subNodeMappings[name='N_EClass']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_jljocyh6EeS_5bh30NJTzw"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_jljodCh6EeS_5bh30NJTzw" 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='TC1479']/@defaultLayer/@containerMappings[name='CM_EPackage']/@subNodeMappings[name='N_EClass']"/>
         </ownedDiagramElements>
@@ -460,7 +431,6 @@
         <semanticElements xmi:type="ecore:EClass" href="tc1479.ecore#//p1/A"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_oIwCEeu9Ed6huvz2q8dLQg">
           <description xmi:type="style:EdgeStyleDescription" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='TC1479']/@defaultLayer/@edgeMappings[name='EM_Ref']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_oIwCEuu9Ed6huvz2q8dLQg" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='TC1479']/@defaultLayer/@edgeMappings[name='EM_Ref']"/>
       </ownedDiagramElements>
@@ -469,7 +439,6 @@
         <semanticElements xmi:type="ecore:EClass" href="tc1479.ecore#//p2/D"/>
         <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_VIQmIevdEd6C6oB_tGY4FA">
           <description xmi:type="style:EdgeStyleDescription" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='TC1479']/@defaultLayer/@edgeMappings[name='EM_Ref']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_VIQmIuvdEd6C6oB_tGY4FA" red="136" green="136" blue="136"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:EdgeMapping" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='TC1479']/@defaultLayer/@edgeMappings[name='EM_Ref']"/>
       </ownedDiagramElements>
@@ -480,11 +449,7 @@
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
         <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_OdhjoCnLEeSkw5jQFTzPHw">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_OdhjoSnLEeSkw5jQFTzPHw"/>
           <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']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_OdhjoinLEeSkw5jQFTzPHw"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_OdhjoynLEeSkw5jQFTzPHw" red="255" green="255" blue="255"/>
-          <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">
@@ -494,11 +459,7 @@
           <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">
@@ -507,11 +468,8 @@
             <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"/>
+            <ownedStyle xmi:type="diagram:Square" xmi:id="_rig5cHozEeScG9lRPRjvxQ" showIcon="false" labelPosition="node" color="217,196,215">
               <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>
@@ -521,11 +479,8 @@
             <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"/>
+            <ownedStyle xmi:type="diagram:Square" xmi:id="_rihggXozEeScG9lRPRjvxQ" showIcon="false" labelPosition="node" color="217,196,215">
               <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>
@@ -537,11 +492,7 @@
           <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">
@@ -550,11 +501,8 @@
             <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"/>
+            <ownedStyle xmi:type="diagram:Square" xmi:id="_rijVsHozEeScG9lRPRjvxQ" showIcon="false" labelPosition="node" color="217,196,215">
               <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>
@@ -564,11 +512,8 @@
             <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"/>
+            <ownedStyle xmi:type="diagram:Square" xmi:id="_rikj0HozEeScG9lRPRjvxQ" showIcon="false" labelPosition="node" color="217,196,215">
               <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>
@@ -579,52 +524,36 @@
           <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"/>
+            <ownedStyle xmi:type="diagram:Square" xmi:id="_IvW9MXorEeScG9lRPRjvxQ" borderColor="138,226,52" labelPosition="node" color="138,226,52">
               <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"/>
+            <ownedStyle xmi:type="diagram:Square" xmi:id="_IvYLUXorEeScG9lRPRjvxQ" borderColor="138,226,52" labelPosition="node" color="138,226,52">
               <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"/>
+            <ownedStyle xmi:type="diagram:Square" xmi:id="_IvaAgHorEeScG9lRPRjvxQ" borderColor="138,226,52" labelPosition="node" color="114,159,207">
               <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"/>
+            <ownedStyle xmi:type="diagram:Square" xmi:id="_IvbOoHorEeScG9lRPRjvxQ" borderColor="138,226,52" labelPosition="node" color="114,159,207">
               <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>
@@ -635,52 +564,36 @@
           <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"/>
+            <ownedStyle xmi:type="diagram:Square" xmi:id="_IvccwXorEeScG9lRPRjvxQ" borderColor="138,226,52" labelPosition="node" color="138,226,52">
               <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"/>
+            <ownedStyle xmi:type="diagram:Square" xmi:id="_IveR8HorEeScG9lRPRjvxQ" borderColor="138,226,52" labelPosition="node" color="138,226,52">
               <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"/>
+            <ownedStyle xmi:type="diagram:Square" xmi:id="_IvfgEXorEeScG9lRPRjvxQ" borderColor="138,226,52" labelPosition="node" color="114,159,207">
               <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"/>
+            <ownedStyle xmi:type="diagram:Square" xmi:id="_IvgHIXorEeScG9lRPRjvxQ" borderColor="138,226,52" labelPosition="node" color="114,159,207">
               <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>
@@ -869,6 +782,9 @@
           <styles xmi:type="notation:DiagramStyle" xmi:id="_cmFZwinLEeSkw5jQFTzPHw"/>
         </data>
       </ownedAnnotationEntries>
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_-7UMYvfCEeS3OuyISpbxoQ" source="DANNOTATION_CUSTOMIZATION_KEY">
+        <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_-7UMY_fCEeS3OuyISpbxoQ"/>
+      </ownedAnnotationEntries>
       <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"/>
@@ -878,11 +794,8 @@
           <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
           <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
           <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-          <ownedStyle xmi:type="diagram:Square" xmi:id="_PQfmwCnNEeSkw5jQFTzPHw" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_PQfmwSnNEeSkw5jQFTzPHw"/>
+          <ownedStyle xmi:type="diagram:Square" xmi:id="_PQfmwCnNEeSkw5jQFTzPHw" borderColor="138,226,52" labelPosition="node" color="138,226,52">
             <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="_PQfmwinNEeSkw5jQFTzPHw" red="138" green="226" blue="52"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_PQfmwynNEeSkw5jQFTzPHw" 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>
@@ -892,11 +805,8 @@
           <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
           <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
           <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-          <ownedStyle xmi:type="diagram:Square" xmi:id="_PQgN0CnNEeSkw5jQFTzPHw" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_PQgN0SnNEeSkw5jQFTzPHw"/>
+          <ownedStyle xmi:type="diagram:Square" xmi:id="_PQgN0CnNEeSkw5jQFTzPHw" borderColor="138,226,52" labelPosition="node" color="138,226,52">
             <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="_PQgN0inNEeSkw5jQFTzPHw" red="138" green="226" blue="52"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_PQgN0ynNEeSkw5jQFTzPHw" 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>
@@ -904,38 +814,28 @@
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
         <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_QvXN8SnMEeSkw5jQFTzPHw">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_QvXN8inMEeSkw5jQFTzPHw"/>
           <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="_QvXN8ynMEeSkw5jQFTzPHw"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_QvXN9CnMEeSkw5jQFTzPHw" red="255" green="255" blue="255"/>
-          <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="_wpr1gCnMEeSkw5jQFTzPHw" name="A" width="3" height="3">
+        <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_wpr1gCnMEeSkw5jQFTzPHw" name="CA" 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="_wpsckCnMEeSkw5jQFTzPHw" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_wpsckSnMEeSkw5jQFTzPHw"/>
+          <ownedStyle xmi:type="diagram:Square" xmi:id="_wpsckCnMEeSkw5jQFTzPHw" showIcon="false" borderColor="138,226,52" labelPosition="node" color="114,159,207">
             <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="_wpsckinMEeSkw5jQFTzPHw" red="138" green="226" blue="52"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_CPEX0CnNEeSkw5jQFTzPHw" 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="_wptDoCnMEeSkw5jQFTzPHw" name="B" width="3" height="3">
+        <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_wptDoCnMEeSkw5jQFTzPHw" name="CB" 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="_wptDoSnMEeSkw5jQFTzPHw" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_wptDoinMEeSkw5jQFTzPHw"/>
+          <ownedStyle xmi:type="diagram:Square" xmi:id="_wptDoSnMEeSkw5jQFTzPHw" showIcon="false" borderColor="138,226,52" labelPosition="node" color="114,159,207">
             <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="_wptDoynMEeSkw5jQFTzPHw" red="138" green="226" blue="52"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_CPE-4CnNEeSkw5jQFTzPHw" 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>
@@ -949,11 +849,8 @@
           <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
           <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
           <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-          <ownedStyle xmi:type="diagram:Square" xmi:id="_PQiDACnNEeSkw5jQFTzPHw" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_PQiDASnNEeSkw5jQFTzPHw"/>
+          <ownedStyle xmi:type="diagram:Square" xmi:id="_PQiDACnNEeSkw5jQFTzPHw" borderColor="138,226,52" labelPosition="node" color="138,226,52">
             <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="_PQiDAinNEeSkw5jQFTzPHw" red="138" green="226" blue="52"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_PQiDAynNEeSkw5jQFTzPHw" 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>
@@ -963,11 +860,8 @@
           <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
           <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
           <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-          <ownedStyle xmi:type="diagram:Square" xmi:id="_PQiqECnNEeSkw5jQFTzPHw" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_PQiqESnNEeSkw5jQFTzPHw"/>
+          <ownedStyle xmi:type="diagram:Square" xmi:id="_PQiqECnNEeSkw5jQFTzPHw" borderColor="138,226,52" labelPosition="node" color="138,226,52">
             <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="_PQiqEinNEeSkw5jQFTzPHw" red="138" green="226" blue="52"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_PQiqEynNEeSkw5jQFTzPHw" 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>
@@ -975,32 +869,22 @@
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
         <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_QvX1ASnMEeSkw5jQFTzPHw">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_QvX1AinMEeSkw5jQFTzPHw"/>
           <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="_QvX1AynMEeSkw5jQFTzPHw"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_QvX1BCnMEeSkw5jQFTzPHw" red="255" green="255" blue="255"/>
-          <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="_wptqsCnMEeSkw5jQFTzPHw" name="C" width="3" height="3">
+        <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_wptqsCnMEeSkw5jQFTzPHw" name="CC" 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="_wptqsSnMEeSkw5jQFTzPHw" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_wptqsinMEeSkw5jQFTzPHw"/>
+          <ownedStyle xmi:type="diagram:Square" xmi:id="_wptqsSnMEeSkw5jQFTzPHw" showIcon="false" borderColor="138,226,52" labelPosition="node" color="114,159,207">
             <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="_wptqsynMEeSkw5jQFTzPHw" red="138" green="226" blue="52"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_CPG0ECnNEeSkw5jQFTzPHw" 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="_wpuRwCnMEeSkw5jQFTzPHw" name="D" width="3" height="3">
+        <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_wpuRwCnMEeSkw5jQFTzPHw" name="CD" 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="_wpuRwSnMEeSkw5jQFTzPHw" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_wpuRwinMEeSkw5jQFTzPHw"/>
+          <ownedStyle xmi:type="diagram:Square" xmi:id="_wpuRwSnMEeSkw5jQFTzPHw" showIcon="false" borderColor="138,226,52" labelPosition="node" color="114,159,207">
             <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="_wpuRwynMEeSkw5jQFTzPHw" red="138" green="226" blue="52"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_CPHbICnNEeSkw5jQFTzPHw" 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>
@@ -1014,11 +898,8 @@
           <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
           <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
           <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-          <ownedStyle xmi:type="diagram:Square" xmi:id="_pTwJwSnMEeSkw5jQFTzPHw" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_pTwJwinMEeSkw5jQFTzPHw"/>
+          <ownedStyle xmi:type="diagram:Square" xmi:id="_pTwJwSnMEeSkw5jQFTzPHw" borderColor="138,226,52" labelPosition="node" color="138,226,52">
             <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="_pTwJwynMEeSkw5jQFTzPHw" red="138" green="226" blue="52"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_pTwJxCnMEeSkw5jQFTzPHw" 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>
@@ -1028,22 +909,16 @@
           <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
           <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
           <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-          <ownedStyle xmi:type="diagram:Square" xmi:id="_pTww0SnMEeSkw5jQFTzPHw" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_pTww0inMEeSkw5jQFTzPHw"/>
+          <ownedStyle xmi:type="diagram:Square" xmi:id="_pTww0SnMEeSkw5jQFTzPHw" borderColor="138,226,52" labelPosition="node" color="138,226,52">
             <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="_pTww0ynMEeSkw5jQFTzPHw" red="138" green="226" blue="52"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_pTww1CnMEeSkw5jQFTzPHw" 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="_pTu7oCnMEeSkw5jQFTzPHw" labelPosition="node">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_pTu7oSnMEeSkw5jQFTzPHw"/>
+        <ownedStyle xmi:type="diagram:Square" xmi:id="_pTu7oCnMEeSkw5jQFTzPHw" labelPosition="node" color="194,239,255">
           <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="_pTu7oinMEeSkw5jQFTzPHw"/>
-          <color xmi:type="viewpoint:RGBValues" xmi:id="_pTu7oynMEeSkw5jQFTzPHw" 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='NodePackage']"/>
       </ownedDiagramElements>
@@ -1056,11 +931,8 @@
           <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
           <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
           <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-          <ownedStyle xmi:type="diagram:Square" xmi:id="_pTx-8CnMEeSkw5jQFTzPHw" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_pTx-8SnMEeSkw5jQFTzPHw"/>
+          <ownedStyle xmi:type="diagram:Square" xmi:id="_pTx-8CnMEeSkw5jQFTzPHw" borderColor="138,226,52" labelPosition="node" color="138,226,52">
             <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="_pTx-8inMEeSkw5jQFTzPHw" red="138" green="226" blue="52"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_pTx-8ynMEeSkw5jQFTzPHw" 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>
@@ -1070,22 +942,16 @@
           <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
           <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
           <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-          <ownedStyle xmi:type="diagram:Square" xmi:id="_pTymACnMEeSkw5jQFTzPHw" labelPosition="node">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_pTymASnMEeSkw5jQFTzPHw"/>
+          <ownedStyle xmi:type="diagram:Square" xmi:id="_pTymACnMEeSkw5jQFTzPHw" borderColor="138,226,52" labelPosition="node" color="138,226,52">
             <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="_pTymAinMEeSkw5jQFTzPHw" red="138" green="226" blue="52"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_pTymAynMEeSkw5jQFTzPHw" 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="_pTvisSnMEeSkw5jQFTzPHw" labelPosition="node">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_pTvisinMEeSkw5jQFTzPHw"/>
+        <ownedStyle xmi:type="diagram:Square" xmi:id="_pTvisSnMEeSkw5jQFTzPHw" labelPosition="node" color="194,239,255">
           <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="_pTvisynMEeSkw5jQFTzPHw"/>
-          <color xmi:type="viewpoint:RGBValues" xmi:id="_pTvitCnMEeSkw5jQFTzPHw" 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='NodePackage']"/>
       </ownedDiagramElements>
@@ -1094,6 +960,2142 @@
       <activatedLayers xmi:type="description_1:Layer" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer"/>
       <target xmi:type="ecore:EPackage" href="tc1479.ecore#//p3"/>
     </ownedRepresentations>
+    <ownedRepresentations xmi:type="diagram:DSemanticDiagram" xmi:id="_A7waIPfDEeS3OuyISpbxoQ" name="caseOneNorth">
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_A7waIffDEeS3OuyISpbxoQ" source="GMF_DIAGRAMS">
+        <data xmi:type="notation:Diagram" xmi:id="_A7waIvfDEeS3OuyISpbxoQ" type="Sirius" element="_A7waIPfDEeS3OuyISpbxoQ" measurementUnit="Pixel">
+          <children xmi:type="notation:Node" xmi:id="_A7waI_fDEeS3OuyISpbxoQ" type="2002" element="_A7zdl_fDEeS3OuyISpbxoQ">
+            <children xmi:type="notation:Node" xmi:id="_A7waJPfDEeS3OuyISpbxoQ" type="5006"/>
+            <children xmi:type="notation:Node" xmi:id="_A7waJffDEeS3OuyISpbxoQ" type="7001">
+              <children xmi:type="notation:Node" xmi:id="_A7waJvfDEeS3OuyISpbxoQ" type="3007" element="_A70EhPfDEeS3OuyISpbxoQ">
+                <children xmi:type="notation:Node" xmi:id="_A7waJ_fDEeS3OuyISpbxoQ" type="5003">
+                  <layoutConstraint xmi:type="notation:Location" xmi:id="_A7waKPfDEeS3OuyISpbxoQ" y="5"/>
+                </children>
+                <children xmi:type="notation:Node" xmi:id="_A7waKffDEeS3OuyISpbxoQ" type="3003" element="_A70EhffDEeS3OuyISpbxoQ">
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_A7waKvfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_A7waK_fDEeS3OuyISpbxoQ"/>
+                </children>
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_A7waLPfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_A7waLffDEeS3OuyISpbxoQ" x="75" y="39" width="30" height="30"/>
+              </children>
+              <children xmi:type="notation:Node" xmi:id="_A7waLvfDEeS3OuyISpbxoQ" type="3007" element="_A70EhvfDEeS3OuyISpbxoQ">
+                <children xmi:type="notation:Node" xmi:id="_A7waL_fDEeS3OuyISpbxoQ" type="5003">
+                  <layoutConstraint xmi:type="notation:Location" xmi:id="_A7waMPfDEeS3OuyISpbxoQ" y="5"/>
+                </children>
+                <children xmi:type="notation:Node" xmi:id="_A7waMffDEeS3OuyISpbxoQ" type="3003" element="_A70Eh_fDEeS3OuyISpbxoQ">
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_A7waMvfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_A7waM_fDEeS3OuyISpbxoQ"/>
+                </children>
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_A7waNPfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_A7waNffDEeS3OuyISpbxoQ" x="155" y="39" width="30" height="30"/>
+              </children>
+              <styles xmi:type="notation:SortingStyle" xmi:id="_A7waNvfDEeS3OuyISpbxoQ"/>
+              <styles xmi:type="notation:FilteringStyle" xmi:id="_A7waN_fDEeS3OuyISpbxoQ"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_A7waOPfDEeS3OuyISpbxoQ" type="3012" element="_A7zdmPfDEeS3OuyISpbxoQ">
+              <children xmi:type="notation:Node" xmi:id="_A7waOffDEeS3OuyISpbxoQ" type="5010">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_A7waOvfDEeS3OuyISpbxoQ" x="31"/>
+              </children>
+              <children xmi:type="notation:Node" xmi:id="_A7waO_fDEeS3OuyISpbxoQ" type="3003" element="_A70EgPfDEeS3OuyISpbxoQ">
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_A7waPPfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_A7waPffDEeS3OuyISpbxoQ"/>
+              </children>
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_A7waPvfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_A7waP_fDEeS3OuyISpbxoQ" y="-22" width="30" height="30"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_A7waQPfDEeS3OuyISpbxoQ" type="3012" element="_A70EgffDEeS3OuyISpbxoQ">
+              <children xmi:type="notation:Node" xmi:id="_A7waQffDEeS3OuyISpbxoQ" type="5010">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_A7waQvfDEeS3OuyISpbxoQ" x="31"/>
+              </children>
+              <children xmi:type="notation:Node" xmi:id="_A7waQ_fDEeS3OuyISpbxoQ" type="3003" element="_A70EgvfDEeS3OuyISpbxoQ">
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_A7waRPfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_A7waRffDEeS3OuyISpbxoQ"/>
+              </children>
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_A7waRvfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_A7waR_fDEeS3OuyISpbxoQ" x="-22" y="121" width="30" height="30"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_A7waSPfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_A7waSffDEeS3OuyISpbxoQ" x="60" y="39" width="243" height="163"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_A7waSvfDEeS3OuyISpbxoQ" type="2002" element="_A70EiPfDEeS3OuyISpbxoQ">
+            <children xmi:type="notation:Node" xmi:id="_A7waS_fDEeS3OuyISpbxoQ" type="5006"/>
+            <children xmi:type="notation:Node" xmi:id="_A7waTPfDEeS3OuyISpbxoQ" type="7001">
+              <children xmi:type="notation:Node" xmi:id="_A7waTffDEeS3OuyISpbxoQ" type="3007" element="_A71SpPfDEeS3OuyISpbxoQ">
+                <children xmi:type="notation:Node" xmi:id="_A7waTvfDEeS3OuyISpbxoQ" type="5003">
+                  <layoutConstraint xmi:type="notation:Location" xmi:id="_A7waT_fDEeS3OuyISpbxoQ" y="5"/>
+                </children>
+                <children xmi:type="notation:Node" xmi:id="_A7waUPfDEeS3OuyISpbxoQ" type="3003" element="_A71SpffDEeS3OuyISpbxoQ">
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_A7waUffDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_A7waUvfDEeS3OuyISpbxoQ"/>
+                </children>
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_A7waU_fDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_A7waVPfDEeS3OuyISpbxoQ" x="30" y="29" width="30" height="30"/>
+              </children>
+              <children xmi:type="notation:Node" xmi:id="_A7waVffDEeS3OuyISpbxoQ" type="3007" element="_A715sPfDEeS3OuyISpbxoQ">
+                <children xmi:type="notation:Node" xmi:id="_A7waVvfDEeS3OuyISpbxoQ" type="5003">
+                  <layoutConstraint xmi:type="notation:Location" xmi:id="_A7waV_fDEeS3OuyISpbxoQ" y="5"/>
+                </children>
+                <children xmi:type="notation:Node" xmi:id="_A7waWPfDEeS3OuyISpbxoQ" type="3003" element="_A715sffDEeS3OuyISpbxoQ">
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_A7waWffDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_A7waWvfDEeS3OuyISpbxoQ"/>
+                </children>
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_A7waW_fDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_A7waXPfDEeS3OuyISpbxoQ" x="90" y="29" width="30" height="30"/>
+              </children>
+              <styles xmi:type="notation:SortingStyle" xmi:id="_A7waXffDEeS3OuyISpbxoQ"/>
+              <styles xmi:type="notation:FilteringStyle" xmi:id="_A7waXvfDEeS3OuyISpbxoQ"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_A7waX_fDEeS3OuyISpbxoQ" type="3012" element="_A70EiffDEeS3OuyISpbxoQ">
+              <children xmi:type="notation:Node" xmi:id="_A7waYPfDEeS3OuyISpbxoQ" type="5010">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_A7waYffDEeS3OuyISpbxoQ" x="31"/>
+              </children>
+              <children xmi:type="notation:Node" xmi:id="_A7xBMPfDEeS3OuyISpbxoQ" type="3003" element="_A71SoPfDEeS3OuyISpbxoQ">
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_A7xBMffDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_A7xBMvfDEeS3OuyISpbxoQ"/>
+              </children>
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_A7xBM_fDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_A7xBNPfDEeS3OuyISpbxoQ" x="213" y="121" width="30" height="30"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_A7xBNffDEeS3OuyISpbxoQ" type="3012" element="_A71SoffDEeS3OuyISpbxoQ">
+              <children xmi:type="notation:Node" xmi:id="_A7xBNvfDEeS3OuyISpbxoQ" type="5010">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_A7xBN_fDEeS3OuyISpbxoQ" x="31"/>
+              </children>
+              <children xmi:type="notation:Node" xmi:id="_A7xBOPfDEeS3OuyISpbxoQ" type="3003" element="_A71SovfDEeS3OuyISpbxoQ">
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_A7xBOffDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_A7xBOvfDEeS3OuyISpbxoQ"/>
+              </children>
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_A7xBO_fDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_A7xBPPfDEeS3OuyISpbxoQ" y="-22" width="30" height="30"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_A7xBPffDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_A7xBPvfDEeS3OuyISpbxoQ" x="360" y="39" width="243" height="163"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_A7xBP_fDEeS3OuyISpbxoQ" type="2001" element="_A715svfDEeS3OuyISpbxoQ">
+            <children xmi:type="notation:Node" xmi:id="_A7xBQPfDEeS3OuyISpbxoQ" type="5002">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_A7xBQffDEeS3OuyISpbxoQ" y="5"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_A7xBQvfDEeS3OuyISpbxoQ" type="3001" element="_A715s_fDEeS3OuyISpbxoQ">
+              <children xmi:type="notation:Node" xmi:id="_A7xBQ_fDEeS3OuyISpbxoQ" type="5001">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_A7xBRPfDEeS3OuyISpbxoQ" y="5"/>
+              </children>
+              <children xmi:type="notation:Node" xmi:id="_A7xBRffDEeS3OuyISpbxoQ" type="3003" element="_A715tPfDEeS3OuyISpbxoQ">
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_A7xBRvfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_A7xBR_fDEeS3OuyISpbxoQ"/>
+              </children>
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_A7xBSPfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_A7xBSffDEeS3OuyISpbxoQ" y="-22" width="30" height="30"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_A7xBSvfDEeS3OuyISpbxoQ" type="3001" element="_A715tffDEeS3OuyISpbxoQ">
+              <children xmi:type="notation:Node" xmi:id="_A7zdcPfDEeS3OuyISpbxoQ" type="5001">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_A7zdcffDEeS3OuyISpbxoQ" y="5"/>
+              </children>
+              <children xmi:type="notation:Node" xmi:id="_A7zdcvfDEeS3OuyISpbxoQ" type="3003" element="_A715tvfDEeS3OuyISpbxoQ">
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_A7zdc_fDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_A7zddPfDEeS3OuyISpbxoQ"/>
+              </children>
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_A7zddffDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_A7zddvfDEeS3OuyISpbxoQ" x="31" y="-22" width="30" height="30"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_A7zdd_fDEeS3OuyISpbxoQ" type="3003" element="_A715t_fDEeS3OuyISpbxoQ">
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_A7zdePfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_A7zdeffDEeS3OuyISpbxoQ"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_A7zdevfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_A7zde_fDEeS3OuyISpbxoQ" x="760" y="100" width="100" height="100"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_A7zdfPfDEeS3OuyISpbxoQ" type="2001" element="_A715uPfDEeS3OuyISpbxoQ">
+            <children xmi:type="notation:Node" xmi:id="_A7zdfffDEeS3OuyISpbxoQ" type="5002">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_A7zdfvfDEeS3OuyISpbxoQ" y="5"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_A7zdf_fDEeS3OuyISpbxoQ" type="3001" element="_A715uffDEeS3OuyISpbxoQ">
+              <children xmi:type="notation:Node" xmi:id="_A7zdgPfDEeS3OuyISpbxoQ" type="5001">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_A7zdgffDEeS3OuyISpbxoQ" y="5"/>
+              </children>
+              <children xmi:type="notation:Node" xmi:id="_A7zdgvfDEeS3OuyISpbxoQ" type="3003" element="_A715uvfDEeS3OuyISpbxoQ">
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_A7zdg_fDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_A7zdhPfDEeS3OuyISpbxoQ"/>
+              </children>
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_A7zdhffDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_A7zdhvfDEeS3OuyISpbxoQ" y="-22" width="30" height="30"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_A7zdh_fDEeS3OuyISpbxoQ" type="3001" element="_A715u_fDEeS3OuyISpbxoQ">
+              <children xmi:type="notation:Node" xmi:id="_A7zdiPfDEeS3OuyISpbxoQ" type="5001">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_A7zdiffDEeS3OuyISpbxoQ" y="5"/>
+              </children>
+              <children xmi:type="notation:Node" xmi:id="_A7zdivfDEeS3OuyISpbxoQ" type="3003" element="_A715vPfDEeS3OuyISpbxoQ">
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_A7zdi_fDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_A7zdjPfDEeS3OuyISpbxoQ"/>
+              </children>
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_A7zdjffDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_A7zdjvfDEeS3OuyISpbxoQ" x="31" y="-22" width="30" height="30"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_A7zdj_fDEeS3OuyISpbxoQ" type="3003" element="_A715vffDEeS3OuyISpbxoQ">
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_A7zdkPfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_A7zdkffDEeS3OuyISpbxoQ"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_A7zdkvfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_A7zdk_fDEeS3OuyISpbxoQ" x="760" y="240" width="100" height="100"/>
+          </children>
+          <styles xmi:type="notation:DiagramStyle" xmi:id="_A7zdlPfDEeS3OuyISpbxoQ"/>
+        </data>
+      </ownedAnnotationEntries>
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_A7zdlffDEeS3OuyISpbxoQ" source="DANNOTATION_CUSTOMIZATION_KEY">
+        <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_A7zdlvfDEeS3OuyISpbxoQ"/>
+      </ownedAnnotationEntries>
+      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_A7zdl_fDEeS3OuyISpbxoQ" name="p31">
+        <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="_A7zdmPfDEeS3OuyISpbxoQ" 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"/>
+          <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+          <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+          <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+          <ownedStyle xmi:type="diagram:Square" xmi:id="_A70EgPfDEeS3OuyISpbxoQ" borderColor="138,226,52" labelPosition="node" color="138,226,52">
+            <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"/>
+          </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="_A70EgffDEeS3OuyISpbxoQ" name="B" 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="_A70EgvfDEeS3OuyISpbxoQ" borderColor="138,226,52" labelPosition="node" color="138,226,52">
+            <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"/>
+          </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>
+        <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+        <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+        <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_A70Eg_fDEeS3OuyISpbxoQ">
+          <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"/>
+        </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="_A70EhPfDEeS3OuyISpbxoQ" name="CA" 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="_A70EhffDEeS3OuyISpbxoQ" showIcon="false" borderColor="138,226,52" labelPosition="node" color="114,159,207">
+            <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"/>
+          </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="_A70EhvfDEeS3OuyISpbxoQ" name="CB" 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="_A70Eh_fDEeS3OuyISpbxoQ" showIcon="false" borderColor="138,226,52" labelPosition="node" color="114,159,207">
+            <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"/>
+          </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="_A70EiPfDEeS3OuyISpbxoQ" name="p32">
+        <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="_A70EiffDEeS3OuyISpbxoQ" 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"/>
+          <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+          <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+          <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+          <ownedStyle xmi:type="diagram:Square" xmi:id="_A71SoPfDEeS3OuyISpbxoQ" borderColor="138,226,52" labelPosition="node" color="138,226,52">
+            <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"/>
+          </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="_A71SoffDEeS3OuyISpbxoQ" name="D" 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="_A71SovfDEeS3OuyISpbxoQ" borderColor="138,226,52" labelPosition="node" color="138,226,52">
+            <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"/>
+          </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>
+        <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+        <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+        <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_A71So_fDEeS3OuyISpbxoQ">
+          <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"/>
+        </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="_A71SpPfDEeS3OuyISpbxoQ" name="CC" 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="_A71SpffDEeS3OuyISpbxoQ" showIcon="false" borderColor="138,226,52" labelPosition="node" color="114,159,207">
+            <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"/>
+          </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="_A715sPfDEeS3OuyISpbxoQ" name="CD" 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="_A715sffDEeS3OuyISpbxoQ" showIcon="false" borderColor="138,226,52" labelPosition="node" color="114,159,207">
+            <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"/>
+          </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:DNode" xmi:id="_A715svfDEeS3OuyISpbxoQ" 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"/>
+        <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_A715s_fDEeS3OuyISpbxoQ" 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"/>
+          <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+          <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+          <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+          <ownedStyle xmi:type="diagram:Square" xmi:id="_A715tPfDEeS3OuyISpbxoQ" borderColor="138,226,52" labelPosition="node" color="138,226,52">
+            <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"/>
+          </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="_A715tffDEeS3OuyISpbxoQ" name="B" 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="_A715tvfDEeS3OuyISpbxoQ" borderColor="138,226,52" labelPosition="node" color="138,226,52">
+            <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"/>
+          </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="_A715t_fDEeS3OuyISpbxoQ" labelPosition="node" color="194,239,255">
+          <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"/>
+        </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']"/>
+      </ownedDiagramElements>
+      <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_A715uPfDEeS3OuyISpbxoQ" name="p32" 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="_A715uffDEeS3OuyISpbxoQ" 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"/>
+          <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+          <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+          <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+          <ownedStyle xmi:type="diagram:Square" xmi:id="_A715uvfDEeS3OuyISpbxoQ" borderColor="138,226,52" labelPosition="node" color="138,226,52">
+            <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"/>
+          </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="_A715u_fDEeS3OuyISpbxoQ" name="D" 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="_A715vPfDEeS3OuyISpbxoQ" borderColor="138,226,52" labelPosition="node" color="138,226,52">
+            <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"/>
+          </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="_A715vffDEeS3OuyISpbxoQ" labelPosition="node" color="194,239,255">
+          <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"/>
+        </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']"/>
+      </ownedDiagramElements>
+      <description xmi:type="description_1:DiagramDescription" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']"/>
+      <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_A715vvfDEeS3OuyISpbxoQ"/>
+      <activatedLayers xmi:type="description_1:Layer" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer"/>
+      <target xmi:type="ecore:EPackage" href="tc1479.ecore#//p3"/>
+    </ownedRepresentations>
+    <ownedRepresentations xmi:type="diagram:DSemanticDiagram" xmi:id="_NgVVAPfDEeS3OuyISpbxoQ" name="caseOneWest">
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_NgVVAffDEeS3OuyISpbxoQ" source="GMF_DIAGRAMS">
+        <data xmi:type="notation:Diagram" xmi:id="_NgVVAvfDEeS3OuyISpbxoQ" type="Sirius" element="_NgVVAPfDEeS3OuyISpbxoQ" measurementUnit="Pixel">
+          <children xmi:type="notation:Node" xmi:id="_NgVVA_fDEeS3OuyISpbxoQ" type="2002" element="_NgWjPPfDEeS3OuyISpbxoQ">
+            <children xmi:type="notation:Node" xmi:id="_NgVVBPfDEeS3OuyISpbxoQ" type="5006"/>
+            <children xmi:type="notation:Node" xmi:id="_NgVVBffDEeS3OuyISpbxoQ" type="7001">
+              <children xmi:type="notation:Node" xmi:id="_NgVVBvfDEeS3OuyISpbxoQ" type="3007" element="_NgWjQvfDEeS3OuyISpbxoQ">
+                <children xmi:type="notation:Node" xmi:id="_NgVVB_fDEeS3OuyISpbxoQ" type="5003">
+                  <layoutConstraint xmi:type="notation:Location" xmi:id="_NgVVCPfDEeS3OuyISpbxoQ" y="5"/>
+                </children>
+                <children xmi:type="notation:Node" xmi:id="_NgVVCffDEeS3OuyISpbxoQ" type="3003" element="_NgWjQ_fDEeS3OuyISpbxoQ">
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_NgVVCvfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NgVVC_fDEeS3OuyISpbxoQ"/>
+                </children>
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_NgVVDPfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NgVVDffDEeS3OuyISpbxoQ" x="75" y="39" width="30" height="30"/>
+              </children>
+              <children xmi:type="notation:Node" xmi:id="_NgVVDvfDEeS3OuyISpbxoQ" type="3007" element="_NgWjRPfDEeS3OuyISpbxoQ">
+                <children xmi:type="notation:Node" xmi:id="_NgVVD_fDEeS3OuyISpbxoQ" type="5003">
+                  <layoutConstraint xmi:type="notation:Location" xmi:id="_NgVVEPfDEeS3OuyISpbxoQ" y="5"/>
+                </children>
+                <children xmi:type="notation:Node" xmi:id="_NgVVEffDEeS3OuyISpbxoQ" type="3003" element="_NgWjRffDEeS3OuyISpbxoQ">
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_NgVVEvfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NgVVE_fDEeS3OuyISpbxoQ"/>
+                </children>
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_NgVVFPfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NgVVFffDEeS3OuyISpbxoQ" x="155" y="39" width="30" height="30"/>
+              </children>
+              <styles xmi:type="notation:SortingStyle" xmi:id="_NgVVFvfDEeS3OuyISpbxoQ"/>
+              <styles xmi:type="notation:FilteringStyle" xmi:id="_NgVVF_fDEeS3OuyISpbxoQ"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_NgVVGPfDEeS3OuyISpbxoQ" type="3012" element="_NgWjPffDEeS3OuyISpbxoQ">
+              <children xmi:type="notation:Node" xmi:id="_NgVVGffDEeS3OuyISpbxoQ" type="5010">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_NgV8EPfDEeS3OuyISpbxoQ" x="31"/>
+              </children>
+              <children xmi:type="notation:Node" xmi:id="_NgV8EffDEeS3OuyISpbxoQ" type="3003" element="_NgWjPvfDEeS3OuyISpbxoQ">
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_NgV8EvfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NgV8E_fDEeS3OuyISpbxoQ"/>
+              </children>
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_NgV8FPfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NgV8FffDEeS3OuyISpbxoQ" x="200" y="-22" width="30" height="30"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_NgV8FvfDEeS3OuyISpbxoQ" type="3012" element="_NgWjP_fDEeS3OuyISpbxoQ">
+              <children xmi:type="notation:Node" xmi:id="_NgV8F_fDEeS3OuyISpbxoQ" type="5010">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_NgV8GPfDEeS3OuyISpbxoQ" x="31"/>
+              </children>
+              <children xmi:type="notation:Node" xmi:id="_NgV8GffDEeS3OuyISpbxoQ" type="3003" element="_NgWjQPfDEeS3OuyISpbxoQ">
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_NgV8GvfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NgV8G_fDEeS3OuyISpbxoQ"/>
+              </children>
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_NgV8HPfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NgV8HffDEeS3OuyISpbxoQ" x="-22" y="1" width="30" height="30"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_NgV8HvfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NgV8H_fDEeS3OuyISpbxoQ" x="60" y="39" width="243" height="163"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_NgV8IPfDEeS3OuyISpbxoQ" type="2002" element="_NgWjRvfDEeS3OuyISpbxoQ">
+            <children xmi:type="notation:Node" xmi:id="_NgV8IffDEeS3OuyISpbxoQ" type="5006"/>
+            <children xmi:type="notation:Node" xmi:id="_NgV8IvfDEeS3OuyISpbxoQ" type="7001">
+              <children xmi:type="notation:Node" xmi:id="_NgV8I_fDEeS3OuyISpbxoQ" type="3007" element="_NgWjTPfDEeS3OuyISpbxoQ">
+                <children xmi:type="notation:Node" xmi:id="_NgV8JPfDEeS3OuyISpbxoQ" type="5003">
+                  <layoutConstraint xmi:type="notation:Location" xmi:id="_NgV8JffDEeS3OuyISpbxoQ" y="5"/>
+                </children>
+                <children xmi:type="notation:Node" xmi:id="_NgV8JvfDEeS3OuyISpbxoQ" type="3003" element="_NgWjTffDEeS3OuyISpbxoQ">
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_NgV8J_fDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NgV8KPfDEeS3OuyISpbxoQ"/>
+                </children>
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_NgV8KffDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NgV8KvfDEeS3OuyISpbxoQ" x="30" y="29" width="30" height="30"/>
+              </children>
+              <children xmi:type="notation:Node" xmi:id="_NgV8K_fDEeS3OuyISpbxoQ" type="3007" element="_NgWjTvfDEeS3OuyISpbxoQ">
+                <children xmi:type="notation:Node" xmi:id="_NgV8LPfDEeS3OuyISpbxoQ" type="5003">
+                  <layoutConstraint xmi:type="notation:Location" xmi:id="_NgV8LffDEeS3OuyISpbxoQ" y="5"/>
+                </children>
+                <children xmi:type="notation:Node" xmi:id="_NgV8LvfDEeS3OuyISpbxoQ" type="3003" element="_NgWjT_fDEeS3OuyISpbxoQ">
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_NgV8L_fDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NgV8MPfDEeS3OuyISpbxoQ"/>
+                </children>
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_NgV8MffDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NgV8MvfDEeS3OuyISpbxoQ" x="90" y="29" width="30" height="30"/>
+              </children>
+              <styles xmi:type="notation:SortingStyle" xmi:id="_NgV8M_fDEeS3OuyISpbxoQ"/>
+              <styles xmi:type="notation:FilteringStyle" xmi:id="_NgV8NPfDEeS3OuyISpbxoQ"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_NgV8NffDEeS3OuyISpbxoQ" type="3012" element="_NgWjR_fDEeS3OuyISpbxoQ">
+              <children xmi:type="notation:Node" xmi:id="_NgV8NvfDEeS3OuyISpbxoQ" type="5010">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_NgV8N_fDEeS3OuyISpbxoQ" x="31"/>
+              </children>
+              <children xmi:type="notation:Node" xmi:id="_NgV8OPfDEeS3OuyISpbxoQ" type="3003" element="_NgWjSPfDEeS3OuyISpbxoQ">
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_NgV8OffDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NgV8OvfDEeS3OuyISpbxoQ"/>
+              </children>
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_NgV8O_fDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NgV8PPfDEeS3OuyISpbxoQ" x="213" y="1" width="30" height="30"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_NgV8PffDEeS3OuyISpbxoQ" type="3012" element="_NgWjSffDEeS3OuyISpbxoQ">
+              <children xmi:type="notation:Node" xmi:id="_NgV8PvfDEeS3OuyISpbxoQ" type="5010">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_NgV8P_fDEeS3OuyISpbxoQ" x="31"/>
+              </children>
+              <children xmi:type="notation:Node" xmi:id="_NgV8QPfDEeS3OuyISpbxoQ" type="3003" element="_NgWjSvfDEeS3OuyISpbxoQ">
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_NgV8QffDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NgV8QvfDEeS3OuyISpbxoQ"/>
+              </children>
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_NgV8Q_fDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NgV8RPfDEeS3OuyISpbxoQ" x="200" y="153" width="30" height="30"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_NgV8RffDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NgV8RvfDEeS3OuyISpbxoQ" x="360" y="39" width="243" height="163"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_NgV8R_fDEeS3OuyISpbxoQ" type="2001" element="_NgWjUPfDEeS3OuyISpbxoQ">
+            <children xmi:type="notation:Node" xmi:id="_NgV8SPfDEeS3OuyISpbxoQ" type="5002">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_NgV8SffDEeS3OuyISpbxoQ" y="5"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_NgV8SvfDEeS3OuyISpbxoQ" type="3001" element="_NgWjUffDEeS3OuyISpbxoQ">
+              <children xmi:type="notation:Node" xmi:id="_NgV8S_fDEeS3OuyISpbxoQ" type="5001">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_NgV8TPfDEeS3OuyISpbxoQ" y="5"/>
+              </children>
+              <children xmi:type="notation:Node" xmi:id="_NgV8TffDEeS3OuyISpbxoQ" type="3003" element="_NgWjUvfDEeS3OuyISpbxoQ">
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_NgV8TvfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NgV8T_fDEeS3OuyISpbxoQ"/>
+              </children>
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_NgV8UPfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NgV8UffDEeS3OuyISpbxoQ" y="-22" width="30" height="30"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_NgV8UvfDEeS3OuyISpbxoQ" type="3001" element="_NgWjU_fDEeS3OuyISpbxoQ">
+              <children xmi:type="notation:Node" xmi:id="_NgV8U_fDEeS3OuyISpbxoQ" type="5001">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_NgV8VPfDEeS3OuyISpbxoQ" y="5"/>
+              </children>
+              <children xmi:type="notation:Node" xmi:id="_NgV8VffDEeS3OuyISpbxoQ" type="3003" element="_NgWjVPfDEeS3OuyISpbxoQ">
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_NgV8VvfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NgV8V_fDEeS3OuyISpbxoQ"/>
+              </children>
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_NgV8WPfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NgV8WffDEeS3OuyISpbxoQ" x="31" y="-22" width="30" height="30"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_NgV8WvfDEeS3OuyISpbxoQ" type="3003" element="_NgWjVffDEeS3OuyISpbxoQ">
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_NgV8W_fDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NgV8XPfDEeS3OuyISpbxoQ"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_NgV8XffDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NgWjIPfDEeS3OuyISpbxoQ" x="760" y="100" width="100" height="100"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_NgWjIffDEeS3OuyISpbxoQ" type="2001" element="_NgWjVvfDEeS3OuyISpbxoQ">
+            <children xmi:type="notation:Node" xmi:id="_NgWjIvfDEeS3OuyISpbxoQ" type="5002">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_NgWjI_fDEeS3OuyISpbxoQ" y="5"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_NgWjJPfDEeS3OuyISpbxoQ" type="3001" element="_NgWjV_fDEeS3OuyISpbxoQ">
+              <children xmi:type="notation:Node" xmi:id="_NgWjJffDEeS3OuyISpbxoQ" type="5001">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_NgWjJvfDEeS3OuyISpbxoQ" y="5"/>
+              </children>
+              <children xmi:type="notation:Node" xmi:id="_NgWjJ_fDEeS3OuyISpbxoQ" type="3003" element="_NgWjWPfDEeS3OuyISpbxoQ">
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_NgWjKPfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NgWjKffDEeS3OuyISpbxoQ"/>
+              </children>
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_NgWjKvfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NgWjK_fDEeS3OuyISpbxoQ" y="-22" width="30" height="30"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_NgWjLPfDEeS3OuyISpbxoQ" type="3001" element="_NgWjWffDEeS3OuyISpbxoQ">
+              <children xmi:type="notation:Node" xmi:id="_NgWjLffDEeS3OuyISpbxoQ" type="5001">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_NgWjLvfDEeS3OuyISpbxoQ" y="5"/>
+              </children>
+              <children xmi:type="notation:Node" xmi:id="_NgWjL_fDEeS3OuyISpbxoQ" type="3003" element="_NgWjWvfDEeS3OuyISpbxoQ">
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_NgWjMPfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NgWjMffDEeS3OuyISpbxoQ"/>
+              </children>
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_NgWjMvfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NgWjM_fDEeS3OuyISpbxoQ" x="31" y="-22" width="30" height="30"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_NgWjNPfDEeS3OuyISpbxoQ" type="3003" element="_NgWjW_fDEeS3OuyISpbxoQ">
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_NgWjNffDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NgWjNvfDEeS3OuyISpbxoQ"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_NgWjN_fDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NgWjOPfDEeS3OuyISpbxoQ" x="760" y="240" width="100" height="100"/>
+          </children>
+          <styles xmi:type="notation:DiagramStyle" xmi:id="_NgWjOffDEeS3OuyISpbxoQ"/>
+        </data>
+      </ownedAnnotationEntries>
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_NgWjOvfDEeS3OuyISpbxoQ" source="DANNOTATION_CUSTOMIZATION_KEY">
+        <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_NgWjO_fDEeS3OuyISpbxoQ"/>
+      </ownedAnnotationEntries>
+      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_NgWjPPfDEeS3OuyISpbxoQ" name="p31">
+        <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="_NgWjPffDEeS3OuyISpbxoQ" 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"/>
+          <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+          <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+          <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+          <ownedStyle xmi:type="diagram:Square" xmi:id="_NgWjPvfDEeS3OuyISpbxoQ" borderColor="138,226,52" labelPosition="node" color="138,226,52">
+            <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"/>
+          </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="_NgWjP_fDEeS3OuyISpbxoQ" name="B" 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="_NgWjQPfDEeS3OuyISpbxoQ" borderColor="138,226,52" labelPosition="node" color="138,226,52">
+            <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"/>
+          </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>
+        <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+        <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+        <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_NgWjQffDEeS3OuyISpbxoQ">
+          <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"/>
+        </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="_NgWjQvfDEeS3OuyISpbxoQ" name="CA" 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="_NgWjQ_fDEeS3OuyISpbxoQ" showIcon="false" borderColor="138,226,52" labelPosition="node" color="114,159,207">
+            <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"/>
+          </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="_NgWjRPfDEeS3OuyISpbxoQ" name="CB" 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="_NgWjRffDEeS3OuyISpbxoQ" showIcon="false" borderColor="138,226,52" labelPosition="node" color="114,159,207">
+            <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"/>
+          </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="_NgWjRvfDEeS3OuyISpbxoQ" name="p32">
+        <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="_NgWjR_fDEeS3OuyISpbxoQ" 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"/>
+          <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+          <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+          <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+          <ownedStyle xmi:type="diagram:Square" xmi:id="_NgWjSPfDEeS3OuyISpbxoQ" borderColor="138,226,52" labelPosition="node" color="138,226,52">
+            <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"/>
+          </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="_NgWjSffDEeS3OuyISpbxoQ" name="D" 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="_NgWjSvfDEeS3OuyISpbxoQ" borderColor="138,226,52" labelPosition="node" color="138,226,52">
+            <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"/>
+          </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>
+        <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+        <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+        <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_NgWjS_fDEeS3OuyISpbxoQ">
+          <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"/>
+        </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="_NgWjTPfDEeS3OuyISpbxoQ" name="CC" 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="_NgWjTffDEeS3OuyISpbxoQ" showIcon="false" borderColor="138,226,52" labelPosition="node" color="114,159,207">
+            <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"/>
+          </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="_NgWjTvfDEeS3OuyISpbxoQ" name="CD" 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="_NgWjT_fDEeS3OuyISpbxoQ" showIcon="false" borderColor="138,226,52" labelPosition="node" color="114,159,207">
+            <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"/>
+          </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:DNode" xmi:id="_NgWjUPfDEeS3OuyISpbxoQ" 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"/>
+        <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_NgWjUffDEeS3OuyISpbxoQ" 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"/>
+          <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+          <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+          <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+          <ownedStyle xmi:type="diagram:Square" xmi:id="_NgWjUvfDEeS3OuyISpbxoQ" borderColor="138,226,52" labelPosition="node" color="138,226,52">
+            <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"/>
+          </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="_NgWjU_fDEeS3OuyISpbxoQ" name="B" 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="_NgWjVPfDEeS3OuyISpbxoQ" borderColor="138,226,52" labelPosition="node" color="138,226,52">
+            <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"/>
+          </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="_NgWjVffDEeS3OuyISpbxoQ" labelPosition="node" color="194,239,255">
+          <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"/>
+        </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']"/>
+      </ownedDiagramElements>
+      <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_NgWjVvfDEeS3OuyISpbxoQ" name="p32" 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="_NgWjV_fDEeS3OuyISpbxoQ" 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"/>
+          <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+          <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+          <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+          <ownedStyle xmi:type="diagram:Square" xmi:id="_NgWjWPfDEeS3OuyISpbxoQ" borderColor="138,226,52" labelPosition="node" color="138,226,52">
+            <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"/>
+          </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="_NgWjWffDEeS3OuyISpbxoQ" name="D" 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="_NgWjWvfDEeS3OuyISpbxoQ" borderColor="138,226,52" labelPosition="node" color="138,226,52">
+            <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"/>
+          </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="_NgWjW_fDEeS3OuyISpbxoQ" labelPosition="node" color="194,239,255">
+          <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"/>
+        </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']"/>
+      </ownedDiagramElements>
+      <description xmi:type="description_1:DiagramDescription" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']"/>
+      <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_NgWjXPfDEeS3OuyISpbxoQ"/>
+      <activatedLayers xmi:type="description_1:Layer" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer"/>
+      <target xmi:type="ecore:EPackage" href="tc1479.ecore#//p3"/>
+    </ownedRepresentations>
+    <ownedRepresentations xmi:type="diagram:DSemanticDiagram" xmi:id="_UxYgwPfDEeS3OuyISpbxoQ" name="caseTwoNorth">
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_UxYgwffDEeS3OuyISpbxoQ" source="GMF_DIAGRAMS">
+        <data xmi:type="notation:Diagram" xmi:id="_UxYgwvfDEeS3OuyISpbxoQ" type="Sirius" element="_UxYgwPfDEeS3OuyISpbxoQ" measurementUnit="Pixel">
+          <children xmi:type="notation:Node" xmi:id="_UxYgw_fDEeS3OuyISpbxoQ" type="2002" element="_UxaV8_fDEeS3OuyISpbxoQ">
+            <children xmi:type="notation:Node" xmi:id="_UxYgxPfDEeS3OuyISpbxoQ" type="5006"/>
+            <children xmi:type="notation:Node" xmi:id="_UxYgxffDEeS3OuyISpbxoQ" type="7001">
+              <children xmi:type="notation:Node" xmi:id="_UxYgxvfDEeS3OuyISpbxoQ" type="3007" element="_UxaV-ffDEeS3OuyISpbxoQ">
+                <children xmi:type="notation:Node" xmi:id="_UxYgx_fDEeS3OuyISpbxoQ" type="5003">
+                  <layoutConstraint xmi:type="notation:Location" xmi:id="_UxYgyPfDEeS3OuyISpbxoQ" y="5"/>
+                </children>
+                <children xmi:type="notation:Node" xmi:id="_UxYgyffDEeS3OuyISpbxoQ" type="3003" element="_UxaV-vfDEeS3OuyISpbxoQ">
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_UxYgyvfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UxYgy_fDEeS3OuyISpbxoQ"/>
+                </children>
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_UxYgzPfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UxYgzffDEeS3OuyISpbxoQ" x="75" y="39" width="30" height="30"/>
+              </children>
+              <children xmi:type="notation:Node" xmi:id="_UxYgzvfDEeS3OuyISpbxoQ" type="3007" element="_UxaV-_fDEeS3OuyISpbxoQ">
+                <children xmi:type="notation:Node" xmi:id="_UxYgz_fDEeS3OuyISpbxoQ" type="5003">
+                  <layoutConstraint xmi:type="notation:Location" xmi:id="_UxYg0PfDEeS3OuyISpbxoQ" y="5"/>
+                </children>
+                <children xmi:type="notation:Node" xmi:id="_UxYg0ffDEeS3OuyISpbxoQ" type="3003" element="_UxaV_PfDEeS3OuyISpbxoQ">
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_UxYg0vfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UxYg0_fDEeS3OuyISpbxoQ"/>
+                </children>
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_UxYg1PfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UxZH0PfDEeS3OuyISpbxoQ" x="155" y="39" width="30" height="30"/>
+              </children>
+              <styles xmi:type="notation:SortingStyle" xmi:id="_UxZH0ffDEeS3OuyISpbxoQ"/>
+              <styles xmi:type="notation:FilteringStyle" xmi:id="_UxZH0vfDEeS3OuyISpbxoQ"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_UxZH0_fDEeS3OuyISpbxoQ" type="3012" element="_UxaV9PfDEeS3OuyISpbxoQ">
+              <children xmi:type="notation:Node" xmi:id="_UxZH1PfDEeS3OuyISpbxoQ" type="5010">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_UxZH1ffDEeS3OuyISpbxoQ" x="31"/>
+              </children>
+              <children xmi:type="notation:Node" xmi:id="_UxZH1vfDEeS3OuyISpbxoQ" type="3003" element="_UxaV9ffDEeS3OuyISpbxoQ">
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_UxZH1_fDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UxZH2PfDEeS3OuyISpbxoQ"/>
+              </children>
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_UxZH2ffDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UxZH2vfDEeS3OuyISpbxoQ" x="-22" y="101" width="30" height="30"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_UxZH2_fDEeS3OuyISpbxoQ" type="3012" element="_UxaV9vfDEeS3OuyISpbxoQ">
+              <children xmi:type="notation:Node" xmi:id="_UxZH3PfDEeS3OuyISpbxoQ" type="5010">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_UxZH3ffDEeS3OuyISpbxoQ" x="31"/>
+              </children>
+              <children xmi:type="notation:Node" xmi:id="_UxZH3vfDEeS3OuyISpbxoQ" type="3003" element="_UxaV9_fDEeS3OuyISpbxoQ">
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_UxZH3_fDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UxZH4PfDEeS3OuyISpbxoQ"/>
+              </children>
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_UxZH4ffDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UxZH4vfDEeS3OuyISpbxoQ" x="-22" y="41" width="30" height="30"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_UxZH4_fDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UxZH5PfDEeS3OuyISpbxoQ" x="60" y="39" width="243" height="184"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_UxZH5ffDEeS3OuyISpbxoQ" type="2002" element="_UxaV_ffDEeS3OuyISpbxoQ">
+            <children xmi:type="notation:Node" xmi:id="_UxZH5vfDEeS3OuyISpbxoQ" type="5006"/>
+            <children xmi:type="notation:Node" xmi:id="_UxZH5_fDEeS3OuyISpbxoQ" type="7001">
+              <children xmi:type="notation:Node" xmi:id="_UxZH6PfDEeS3OuyISpbxoQ" type="3007" element="_UxaWA_fDEeS3OuyISpbxoQ">
+                <children xmi:type="notation:Node" xmi:id="_UxZH6ffDEeS3OuyISpbxoQ" type="5003">
+                  <layoutConstraint xmi:type="notation:Location" xmi:id="_UxZH6vfDEeS3OuyISpbxoQ" y="5"/>
+                </children>
+                <children xmi:type="notation:Node" xmi:id="_UxZH6_fDEeS3OuyISpbxoQ" type="3003" element="_UxaWBPfDEeS3OuyISpbxoQ">
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_UxZH7PfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UxZH7ffDEeS3OuyISpbxoQ"/>
+                </children>
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_UxZH7vfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UxZH7_fDEeS3OuyISpbxoQ" x="30" y="29" width="30" height="30"/>
+              </children>
+              <children xmi:type="notation:Node" xmi:id="_UxZH8PfDEeS3OuyISpbxoQ" type="3007" element="_UxaWBffDEeS3OuyISpbxoQ">
+                <children xmi:type="notation:Node" xmi:id="_UxZH8ffDEeS3OuyISpbxoQ" type="5003">
+                  <layoutConstraint xmi:type="notation:Location" xmi:id="_UxZH8vfDEeS3OuyISpbxoQ" y="5"/>
+                </children>
+                <children xmi:type="notation:Node" xmi:id="_UxZH8_fDEeS3OuyISpbxoQ" type="3003" element="_UxaWBvfDEeS3OuyISpbxoQ">
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_UxZH9PfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UxZH9ffDEeS3OuyISpbxoQ"/>
+                </children>
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_UxZH9vfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UxZH9_fDEeS3OuyISpbxoQ" x="90" y="29" width="30" height="30"/>
+              </children>
+              <styles xmi:type="notation:SortingStyle" xmi:id="_UxZH-PfDEeS3OuyISpbxoQ"/>
+              <styles xmi:type="notation:FilteringStyle" xmi:id="_UxZH-ffDEeS3OuyISpbxoQ"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_UxZH-vfDEeS3OuyISpbxoQ" type="3012" element="_UxaV_vfDEeS3OuyISpbxoQ">
+              <children xmi:type="notation:Node" xmi:id="_UxZH-_fDEeS3OuyISpbxoQ" type="5010">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_UxZH_PfDEeS3OuyISpbxoQ" x="31"/>
+              </children>
+              <children xmi:type="notation:Node" xmi:id="_UxZH_ffDEeS3OuyISpbxoQ" type="3003" element="_UxaV__fDEeS3OuyISpbxoQ">
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_UxZH_vfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UxZH__fDEeS3OuyISpbxoQ"/>
+              </children>
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_UxZIAPfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UxZIAffDEeS3OuyISpbxoQ" x="213" y="101" width="30" height="30"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_UxZIAvfDEeS3OuyISpbxoQ" type="3012" element="_UxaWAPfDEeS3OuyISpbxoQ">
+              <children xmi:type="notation:Node" xmi:id="_UxZIA_fDEeS3OuyISpbxoQ" type="5010">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_UxZu4PfDEeS3OuyISpbxoQ" x="31"/>
+              </children>
+              <children xmi:type="notation:Node" xmi:id="_UxZu4ffDEeS3OuyISpbxoQ" type="3003" element="_UxaWAffDEeS3OuyISpbxoQ">
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_UxZu4vfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UxZu4_fDEeS3OuyISpbxoQ"/>
+              </children>
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_UxZu5PfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UxZu5ffDEeS3OuyISpbxoQ" x="233" y="39" width="30" height="30"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_UxZu5vfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UxZu5_fDEeS3OuyISpbxoQ" x="360" y="40" width="243" height="183"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_UxZu6PfDEeS3OuyISpbxoQ" type="2001" element="_UxaWB_fDEeS3OuyISpbxoQ">
+            <children xmi:type="notation:Node" xmi:id="_UxZu6ffDEeS3OuyISpbxoQ" type="5002">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_UxZu6vfDEeS3OuyISpbxoQ" y="5"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_UxZu6_fDEeS3OuyISpbxoQ" type="3001" element="_UxaWCPfDEeS3OuyISpbxoQ">
+              <children xmi:type="notation:Node" xmi:id="_UxZu7PfDEeS3OuyISpbxoQ" type="5001">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_UxZu7ffDEeS3OuyISpbxoQ" y="5"/>
+              </children>
+              <children xmi:type="notation:Node" xmi:id="_UxZu7vfDEeS3OuyISpbxoQ" type="3003" element="_UxaWCffDEeS3OuyISpbxoQ">
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_UxZu7_fDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UxZu8PfDEeS3OuyISpbxoQ"/>
+              </children>
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_UxZu8ffDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UxZu8vfDEeS3OuyISpbxoQ" y="-22" width="30" height="30"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_UxZu8_fDEeS3OuyISpbxoQ" type="3001" element="_UxaWCvfDEeS3OuyISpbxoQ">
+              <children xmi:type="notation:Node" xmi:id="_UxZu9PfDEeS3OuyISpbxoQ" type="5001">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_UxZu9ffDEeS3OuyISpbxoQ" y="5"/>
+              </children>
+              <children xmi:type="notation:Node" xmi:id="_UxZu9vfDEeS3OuyISpbxoQ" type="3003" element="_UxaWC_fDEeS3OuyISpbxoQ">
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_UxZu9_fDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UxZu-PfDEeS3OuyISpbxoQ"/>
+              </children>
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_UxZu-ffDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UxZu-vfDEeS3OuyISpbxoQ" x="31" y="-22" width="30" height="30"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_UxZu-_fDEeS3OuyISpbxoQ" type="3003" element="_UxaWDPfDEeS3OuyISpbxoQ">
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_UxZu_PfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UxZu_ffDEeS3OuyISpbxoQ"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_UxZu_vfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UxZu__fDEeS3OuyISpbxoQ" x="760" y="100" width="100" height="100"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_UxZvAPfDEeS3OuyISpbxoQ" type="2001" element="_UxaWDffDEeS3OuyISpbxoQ">
+            <children xmi:type="notation:Node" xmi:id="_UxZvAffDEeS3OuyISpbxoQ" type="5002">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_UxZvAvfDEeS3OuyISpbxoQ" y="5"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_UxZvA_fDEeS3OuyISpbxoQ" type="3001" element="_UxaWDvfDEeS3OuyISpbxoQ">
+              <children xmi:type="notation:Node" xmi:id="_UxZvBPfDEeS3OuyISpbxoQ" type="5001">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_UxZvBffDEeS3OuyISpbxoQ" y="5"/>
+              </children>
+              <children xmi:type="notation:Node" xmi:id="_UxZvBvfDEeS3OuyISpbxoQ" type="3003" element="_UxaWD_fDEeS3OuyISpbxoQ">
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_UxZvB_fDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UxZvCPfDEeS3OuyISpbxoQ"/>
+              </children>
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_UxZvCffDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UxZvCvfDEeS3OuyISpbxoQ" y="-22" width="30" height="30"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_UxZvC_fDEeS3OuyISpbxoQ" type="3001" element="_UxaWEPfDEeS3OuyISpbxoQ">
+              <children xmi:type="notation:Node" xmi:id="_UxZvDPfDEeS3OuyISpbxoQ" type="5001">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_UxZvDffDEeS3OuyISpbxoQ" y="5"/>
+              </children>
+              <children xmi:type="notation:Node" xmi:id="_UxZvDvfDEeS3OuyISpbxoQ" type="3003" element="_UxaWEffDEeS3OuyISpbxoQ">
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_UxZvD_fDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UxZvEPfDEeS3OuyISpbxoQ"/>
+              </children>
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_UxZvEffDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UxZvEvfDEeS3OuyISpbxoQ" x="31" y="-22" width="30" height="30"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_UxZvE_fDEeS3OuyISpbxoQ" type="3003" element="_UxaWEvfDEeS3OuyISpbxoQ">
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_UxZvFPfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UxZvFffDEeS3OuyISpbxoQ"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_UxZvFvfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UxZvF_fDEeS3OuyISpbxoQ" x="760" y="240" width="100" height="100"/>
+          </children>
+          <styles xmi:type="notation:DiagramStyle" xmi:id="_UxaV8PfDEeS3OuyISpbxoQ"/>
+        </data>
+      </ownedAnnotationEntries>
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_UxaV8ffDEeS3OuyISpbxoQ" source="DANNOTATION_CUSTOMIZATION_KEY">
+        <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_UxaV8vfDEeS3OuyISpbxoQ"/>
+      </ownedAnnotationEntries>
+      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_UxaV8_fDEeS3OuyISpbxoQ" name="p31">
+        <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="_UxaV9PfDEeS3OuyISpbxoQ" 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"/>
+          <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+          <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+          <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+          <ownedStyle xmi:type="diagram:Square" xmi:id="_UxaV9ffDEeS3OuyISpbxoQ" borderColor="138,226,52" labelPosition="node" color="138,226,52">
+            <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"/>
+          </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="_UxaV9vfDEeS3OuyISpbxoQ" name="B" 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="_UxaV9_fDEeS3OuyISpbxoQ" borderColor="138,226,52" labelPosition="node" color="138,226,52">
+            <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"/>
+          </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>
+        <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+        <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+        <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_UxaV-PfDEeS3OuyISpbxoQ">
+          <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"/>
+        </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="_UxaV-ffDEeS3OuyISpbxoQ" name="CA" 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="_UxaV-vfDEeS3OuyISpbxoQ" showIcon="false" borderColor="138,226,52" labelPosition="node" color="114,159,207">
+            <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"/>
+          </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="_UxaV-_fDEeS3OuyISpbxoQ" name="CB" 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="_UxaV_PfDEeS3OuyISpbxoQ" showIcon="false" borderColor="138,226,52" labelPosition="node" color="114,159,207">
+            <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"/>
+          </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="_UxaV_ffDEeS3OuyISpbxoQ" name="p32">
+        <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="_UxaV_vfDEeS3OuyISpbxoQ" 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"/>
+          <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+          <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+          <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+          <ownedStyle xmi:type="diagram:Square" xmi:id="_UxaV__fDEeS3OuyISpbxoQ" borderColor="138,226,52" labelPosition="node" color="138,226,52">
+            <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"/>
+          </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="_UxaWAPfDEeS3OuyISpbxoQ" name="D" 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="_UxaWAffDEeS3OuyISpbxoQ" borderColor="138,226,52" labelPosition="node" color="138,226,52">
+            <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"/>
+          </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>
+        <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+        <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+        <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_UxaWAvfDEeS3OuyISpbxoQ">
+          <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"/>
+        </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="_UxaWA_fDEeS3OuyISpbxoQ" name="CC" 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="_UxaWBPfDEeS3OuyISpbxoQ" showIcon="false" borderColor="138,226,52" labelPosition="node" color="114,159,207">
+            <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"/>
+          </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="_UxaWBffDEeS3OuyISpbxoQ" name="CD" 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="_UxaWBvfDEeS3OuyISpbxoQ" showIcon="false" borderColor="138,226,52" labelPosition="node" color="114,159,207">
+            <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"/>
+          </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:DNode" xmi:id="_UxaWB_fDEeS3OuyISpbxoQ" 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"/>
+        <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_UxaWCPfDEeS3OuyISpbxoQ" 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"/>
+          <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+          <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+          <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+          <ownedStyle xmi:type="diagram:Square" xmi:id="_UxaWCffDEeS3OuyISpbxoQ" borderColor="138,226,52" labelPosition="node" color="138,226,52">
+            <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"/>
+          </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="_UxaWCvfDEeS3OuyISpbxoQ" name="B" 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="_UxaWC_fDEeS3OuyISpbxoQ" borderColor="138,226,52" labelPosition="node" color="138,226,52">
+            <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"/>
+          </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="_UxaWDPfDEeS3OuyISpbxoQ" labelPosition="node" color="194,239,255">
+          <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"/>
+        </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']"/>
+      </ownedDiagramElements>
+      <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_UxaWDffDEeS3OuyISpbxoQ" name="p32" 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="_UxaWDvfDEeS3OuyISpbxoQ" 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"/>
+          <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+          <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+          <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+          <ownedStyle xmi:type="diagram:Square" xmi:id="_UxaWD_fDEeS3OuyISpbxoQ" borderColor="138,226,52" labelPosition="node" color="138,226,52">
+            <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"/>
+          </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="_UxaWEPfDEeS3OuyISpbxoQ" name="D" 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="_UxaWEffDEeS3OuyISpbxoQ" borderColor="138,226,52" labelPosition="node" color="138,226,52">
+            <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"/>
+          </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="_UxaWEvfDEeS3OuyISpbxoQ" labelPosition="node" color="194,239,255">
+          <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"/>
+        </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']"/>
+      </ownedDiagramElements>
+      <description xmi:type="description_1:DiagramDescription" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']"/>
+      <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_UxaWE_fDEeS3OuyISpbxoQ"/>
+      <activatedLayers xmi:type="description_1:Layer" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer"/>
+      <target xmi:type="ecore:EPackage" href="tc1479.ecore#//p3"/>
+    </ownedRepresentations>
+    <ownedRepresentations xmi:type="diagram:DSemanticDiagram" xmi:id="_dIFtAPfDEeS3OuyISpbxoQ" name="caseTwoSouth">
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_dIFtAffDEeS3OuyISpbxoQ" source="GMF_DIAGRAMS">
+        <data xmi:type="notation:Diagram" xmi:id="_dIFtAvfDEeS3OuyISpbxoQ" type="Sirius" element="_dIFtAPfDEeS3OuyISpbxoQ" measurementUnit="Pixel">
+          <children xmi:type="notation:Node" xmi:id="_dIGUEPfDEeS3OuyISpbxoQ" type="2002" element="_dIHiOPfDEeS3OuyISpbxoQ">
+            <children xmi:type="notation:Node" xmi:id="_dIGUEffDEeS3OuyISpbxoQ" type="5006"/>
+            <children xmi:type="notation:Node" xmi:id="_dIGUEvfDEeS3OuyISpbxoQ" type="7001">
+              <children xmi:type="notation:Node" xmi:id="_dIGUE_fDEeS3OuyISpbxoQ" type="3007" element="_dIHiPvfDEeS3OuyISpbxoQ">
+                <children xmi:type="notation:Node" xmi:id="_dIGUFPfDEeS3OuyISpbxoQ" type="5003">
+                  <layoutConstraint xmi:type="notation:Location" xmi:id="_dIGUFffDEeS3OuyISpbxoQ" y="5"/>
+                </children>
+                <children xmi:type="notation:Node" xmi:id="_dIGUFvfDEeS3OuyISpbxoQ" type="3003" element="_dIHiP_fDEeS3OuyISpbxoQ">
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_dIGUF_fDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dIGUGPfDEeS3OuyISpbxoQ"/>
+                </children>
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_dIGUGffDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dIGUGvfDEeS3OuyISpbxoQ" x="75" y="39" width="30" height="30"/>
+              </children>
+              <children xmi:type="notation:Node" xmi:id="_dIGUG_fDEeS3OuyISpbxoQ" type="3007" element="_dIHiQPfDEeS3OuyISpbxoQ">
+                <children xmi:type="notation:Node" xmi:id="_dIGUHPfDEeS3OuyISpbxoQ" type="5003">
+                  <layoutConstraint xmi:type="notation:Location" xmi:id="_dIGUHffDEeS3OuyISpbxoQ" y="5"/>
+                </children>
+                <children xmi:type="notation:Node" xmi:id="_dIGUHvfDEeS3OuyISpbxoQ" type="3003" element="_dIHiQffDEeS3OuyISpbxoQ">
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_dIGUH_fDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dIGUIPfDEeS3OuyISpbxoQ"/>
+                </children>
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_dIGUIffDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dIGUIvfDEeS3OuyISpbxoQ" x="155" y="39" width="30" height="30"/>
+              </children>
+              <styles xmi:type="notation:SortingStyle" xmi:id="_dIGUI_fDEeS3OuyISpbxoQ"/>
+              <styles xmi:type="notation:FilteringStyle" xmi:id="_dIGUJPfDEeS3OuyISpbxoQ"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_dIGUJffDEeS3OuyISpbxoQ" type="3012" element="_dIHiOffDEeS3OuyISpbxoQ">
+              <children xmi:type="notation:Node" xmi:id="_dIGUJvfDEeS3OuyISpbxoQ" type="5010">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_dIGUJ_fDEeS3OuyISpbxoQ" x="31"/>
+              </children>
+              <children xmi:type="notation:Node" xmi:id="_dIGUKPfDEeS3OuyISpbxoQ" type="3003" element="_dIHiOvfDEeS3OuyISpbxoQ">
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_dIGUKffDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dIGUKvfDEeS3OuyISpbxoQ"/>
+              </children>
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_dIGUK_fDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dIGULPfDEeS3OuyISpbxoQ" x="-22" y="44" width="30" height="30"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_dIGULffDEeS3OuyISpbxoQ" type="3012" element="_dIHiO_fDEeS3OuyISpbxoQ">
+              <children xmi:type="notation:Node" xmi:id="_dIGULvfDEeS3OuyISpbxoQ" type="5010">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_dIGUL_fDEeS3OuyISpbxoQ" x="31"/>
+              </children>
+              <children xmi:type="notation:Node" xmi:id="_dIGUMPfDEeS3OuyISpbxoQ" type="3003" element="_dIHiPPfDEeS3OuyISpbxoQ">
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_dIGUMffDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dIGUMvfDEeS3OuyISpbxoQ"/>
+              </children>
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_dIGUM_fDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dIGUNPfDEeS3OuyISpbxoQ" x="-22" y="106" width="30" height="30"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_dIGUNffDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dIGUNvfDEeS3OuyISpbxoQ" x="60" y="39" width="243" height="163"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_dIGUN_fDEeS3OuyISpbxoQ" type="2002" element="_dIHiQvfDEeS3OuyISpbxoQ">
+            <children xmi:type="notation:Node" xmi:id="_dIGUOPfDEeS3OuyISpbxoQ" type="5006"/>
+            <children xmi:type="notation:Node" xmi:id="_dIGUOffDEeS3OuyISpbxoQ" type="7001">
+              <children xmi:type="notation:Node" xmi:id="_dIGUOvfDEeS3OuyISpbxoQ" type="3007" element="_dIHiSPfDEeS3OuyISpbxoQ">
+                <children xmi:type="notation:Node" xmi:id="_dIGUO_fDEeS3OuyISpbxoQ" type="5003">
+                  <layoutConstraint xmi:type="notation:Location" xmi:id="_dIGUPPfDEeS3OuyISpbxoQ" y="5"/>
+                </children>
+                <children xmi:type="notation:Node" xmi:id="_dIGUPffDEeS3OuyISpbxoQ" type="3003" element="_dIHiSffDEeS3OuyISpbxoQ">
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_dIGUPvfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dIGUP_fDEeS3OuyISpbxoQ"/>
+                </children>
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_dIGUQPfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dIGUQffDEeS3OuyISpbxoQ" x="30" y="29" width="30" height="30"/>
+              </children>
+              <children xmi:type="notation:Node" xmi:id="_dIGUQvfDEeS3OuyISpbxoQ" type="3007" element="_dIHiSvfDEeS3OuyISpbxoQ">
+                <children xmi:type="notation:Node" xmi:id="_dIGUQ_fDEeS3OuyISpbxoQ" type="5003">
+                  <layoutConstraint xmi:type="notation:Location" xmi:id="_dIGURPfDEeS3OuyISpbxoQ" y="5"/>
+                </children>
+                <children xmi:type="notation:Node" xmi:id="_dIGURffDEeS3OuyISpbxoQ" type="3003" element="_dIHiS_fDEeS3OuyISpbxoQ">
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_dIGURvfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dIGUR_fDEeS3OuyISpbxoQ"/>
+                </children>
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_dIGUSPfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dIGUSffDEeS3OuyISpbxoQ" x="90" y="29" width="30" height="30"/>
+              </children>
+              <styles xmi:type="notation:SortingStyle" xmi:id="_dIGUSvfDEeS3OuyISpbxoQ"/>
+              <styles xmi:type="notation:FilteringStyle" xmi:id="_dIGUS_fDEeS3OuyISpbxoQ"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_dIGUTPfDEeS3OuyISpbxoQ" type="3012" element="_dIHiQ_fDEeS3OuyISpbxoQ">
+              <children xmi:type="notation:Node" xmi:id="_dIGUTffDEeS3OuyISpbxoQ" type="5010">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_dIGUTvfDEeS3OuyISpbxoQ" x="31"/>
+              </children>
+              <children xmi:type="notation:Node" xmi:id="_dIGUT_fDEeS3OuyISpbxoQ" type="3003" element="_dIHiRPfDEeS3OuyISpbxoQ">
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_dIG7IPfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dIG7IffDEeS3OuyISpbxoQ"/>
+              </children>
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_dIG7IvfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dIG7I_fDEeS3OuyISpbxoQ" x="233" y="43" width="30" height="30"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_dIG7JPfDEeS3OuyISpbxoQ" type="3012" element="_dIHiRffDEeS3OuyISpbxoQ">
+              <children xmi:type="notation:Node" xmi:id="_dIG7JffDEeS3OuyISpbxoQ" type="5010">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_dIG7JvfDEeS3OuyISpbxoQ" x="31"/>
+              </children>
+              <children xmi:type="notation:Node" xmi:id="_dIG7J_fDEeS3OuyISpbxoQ" type="3003" element="_dIHiRvfDEeS3OuyISpbxoQ">
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_dIG7KPfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dIG7KffDEeS3OuyISpbxoQ"/>
+              </children>
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_dIG7KvfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dIG7K_fDEeS3OuyISpbxoQ" x="233" y="105" width="30" height="30"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_dIG7LPfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dIG7LffDEeS3OuyISpbxoQ" x="360" y="40" width="243" height="163"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_dIG7LvfDEeS3OuyISpbxoQ" type="2001" element="_dIHiTPfDEeS3OuyISpbxoQ">
+            <children xmi:type="notation:Node" xmi:id="_dIG7L_fDEeS3OuyISpbxoQ" type="5002">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_dIG7MPfDEeS3OuyISpbxoQ" y="5"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_dIG7MffDEeS3OuyISpbxoQ" type="3001" element="_dIHiTffDEeS3OuyISpbxoQ">
+              <children xmi:type="notation:Node" xmi:id="_dIG7MvfDEeS3OuyISpbxoQ" type="5001">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_dIG7M_fDEeS3OuyISpbxoQ" y="5"/>
+              </children>
+              <children xmi:type="notation:Node" xmi:id="_dIG7NPfDEeS3OuyISpbxoQ" type="3003" element="_dIHiTvfDEeS3OuyISpbxoQ">
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_dIG7NffDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dIG7NvfDEeS3OuyISpbxoQ"/>
+              </children>
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_dIG7N_fDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dIG7OPfDEeS3OuyISpbxoQ" y="-22" width="30" height="30"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_dIG7OffDEeS3OuyISpbxoQ" type="3001" element="_dIHiT_fDEeS3OuyISpbxoQ">
+              <children xmi:type="notation:Node" xmi:id="_dIG7OvfDEeS3OuyISpbxoQ" type="5001">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_dIG7O_fDEeS3OuyISpbxoQ" y="5"/>
+              </children>
+              <children xmi:type="notation:Node" xmi:id="_dIG7PPfDEeS3OuyISpbxoQ" type="3003" element="_dIHiUPfDEeS3OuyISpbxoQ">
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_dIG7PffDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dIG7PvfDEeS3OuyISpbxoQ"/>
+              </children>
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_dIG7P_fDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dIG7QPfDEeS3OuyISpbxoQ" x="31" y="-22" width="30" height="30"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_dIG7QffDEeS3OuyISpbxoQ" type="3003" element="_dIHiUffDEeS3OuyISpbxoQ">
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_dIG7QvfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dIG7Q_fDEeS3OuyISpbxoQ"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_dIG7RPfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dIG7RffDEeS3OuyISpbxoQ" x="760" y="100" width="100" height="100"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_dIG7RvfDEeS3OuyISpbxoQ" type="2001" element="_dIHiUvfDEeS3OuyISpbxoQ">
+            <children xmi:type="notation:Node" xmi:id="_dIG7R_fDEeS3OuyISpbxoQ" type="5002">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_dIG7SPfDEeS3OuyISpbxoQ" y="5"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_dIG7SffDEeS3OuyISpbxoQ" type="3001" element="_dIHiU_fDEeS3OuyISpbxoQ">
+              <children xmi:type="notation:Node" xmi:id="_dIG7SvfDEeS3OuyISpbxoQ" type="5001">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_dIG7S_fDEeS3OuyISpbxoQ" y="5"/>
+              </children>
+              <children xmi:type="notation:Node" xmi:id="_dIG7TPfDEeS3OuyISpbxoQ" type="3003" element="_dIHiVPfDEeS3OuyISpbxoQ">
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_dIG7TffDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dIG7TvfDEeS3OuyISpbxoQ"/>
+              </children>
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_dIG7T_fDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dIG7UPfDEeS3OuyISpbxoQ" y="-22" width="30" height="30"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_dIG7UffDEeS3OuyISpbxoQ" type="3001" element="_dIHiVffDEeS3OuyISpbxoQ">
+              <children xmi:type="notation:Node" xmi:id="_dIG7UvfDEeS3OuyISpbxoQ" type="5001">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_dIG7U_fDEeS3OuyISpbxoQ" y="5"/>
+              </children>
+              <children xmi:type="notation:Node" xmi:id="_dIG7VPfDEeS3OuyISpbxoQ" type="3003" element="_dIHiVvfDEeS3OuyISpbxoQ">
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_dIG7VffDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dIG7VvfDEeS3OuyISpbxoQ"/>
+              </children>
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_dIG7V_fDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dIG7WPfDEeS3OuyISpbxoQ" x="31" y="-22" width="30" height="30"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_dIHiMPfDEeS3OuyISpbxoQ" type="3003" element="_dIHiV_fDEeS3OuyISpbxoQ">
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_dIHiMffDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dIHiMvfDEeS3OuyISpbxoQ"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_dIHiM_fDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dIHiNPfDEeS3OuyISpbxoQ" x="760" y="240" width="100" height="100"/>
+          </children>
+          <styles xmi:type="notation:DiagramStyle" xmi:id="_dIHiNffDEeS3OuyISpbxoQ"/>
+        </data>
+      </ownedAnnotationEntries>
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_dIHiNvfDEeS3OuyISpbxoQ" source="DANNOTATION_CUSTOMIZATION_KEY">
+        <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_dIHiN_fDEeS3OuyISpbxoQ"/>
+      </ownedAnnotationEntries>
+      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_dIHiOPfDEeS3OuyISpbxoQ" name="p31">
+        <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="_dIHiOffDEeS3OuyISpbxoQ" 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"/>
+          <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+          <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+          <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+          <ownedStyle xmi:type="diagram:Square" xmi:id="_dIHiOvfDEeS3OuyISpbxoQ" borderColor="138,226,52" labelPosition="node" color="138,226,52">
+            <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"/>
+          </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="_dIHiO_fDEeS3OuyISpbxoQ" name="B" 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="_dIHiPPfDEeS3OuyISpbxoQ" borderColor="138,226,52" labelPosition="node" color="138,226,52">
+            <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"/>
+          </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>
+        <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+        <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+        <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_dIHiPffDEeS3OuyISpbxoQ">
+          <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"/>
+        </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="_dIHiPvfDEeS3OuyISpbxoQ" name="CA" 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="_dIHiP_fDEeS3OuyISpbxoQ" showIcon="false" borderColor="138,226,52" labelPosition="node" color="114,159,207">
+            <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"/>
+          </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="_dIHiQPfDEeS3OuyISpbxoQ" name="CB" 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="_dIHiQffDEeS3OuyISpbxoQ" showIcon="false" borderColor="138,226,52" labelPosition="node" color="114,159,207">
+            <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"/>
+          </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="_dIHiQvfDEeS3OuyISpbxoQ" name="p32">
+        <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="_dIHiQ_fDEeS3OuyISpbxoQ" 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"/>
+          <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+          <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+          <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+          <ownedStyle xmi:type="diagram:Square" xmi:id="_dIHiRPfDEeS3OuyISpbxoQ" borderColor="138,226,52" labelPosition="node" color="138,226,52">
+            <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"/>
+          </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="_dIHiRffDEeS3OuyISpbxoQ" name="D" 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="_dIHiRvfDEeS3OuyISpbxoQ" borderColor="138,226,52" labelPosition="node" color="138,226,52">
+            <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"/>
+          </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>
+        <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+        <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+        <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_dIHiR_fDEeS3OuyISpbxoQ">
+          <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"/>
+        </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="_dIHiSPfDEeS3OuyISpbxoQ" name="CC" 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="_dIHiSffDEeS3OuyISpbxoQ" showIcon="false" borderColor="138,226,52" labelPosition="node" color="114,159,207">
+            <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"/>
+          </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="_dIHiSvfDEeS3OuyISpbxoQ" name="CD" 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="_dIHiS_fDEeS3OuyISpbxoQ" showIcon="false" borderColor="138,226,52" labelPosition="node" color="114,159,207">
+            <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"/>
+          </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:DNode" xmi:id="_dIHiTPfDEeS3OuyISpbxoQ" 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"/>
+        <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_dIHiTffDEeS3OuyISpbxoQ" 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"/>
+          <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+          <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+          <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+          <ownedStyle xmi:type="diagram:Square" xmi:id="_dIHiTvfDEeS3OuyISpbxoQ" borderColor="138,226,52" labelPosition="node" color="138,226,52">
+            <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"/>
+          </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="_dIHiT_fDEeS3OuyISpbxoQ" name="B" 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="_dIHiUPfDEeS3OuyISpbxoQ" borderColor="138,226,52" labelPosition="node" color="138,226,52">
+            <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"/>
+          </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="_dIHiUffDEeS3OuyISpbxoQ" labelPosition="node" color="194,239,255">
+          <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"/>
+        </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']"/>
+      </ownedDiagramElements>
+      <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_dIHiUvfDEeS3OuyISpbxoQ" name="p32" 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="_dIHiU_fDEeS3OuyISpbxoQ" 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"/>
+          <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+          <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+          <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+          <ownedStyle xmi:type="diagram:Square" xmi:id="_dIHiVPfDEeS3OuyISpbxoQ" borderColor="138,226,52" labelPosition="node" color="138,226,52">
+            <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"/>
+          </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="_dIHiVffDEeS3OuyISpbxoQ" name="D" 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="_dIHiVvfDEeS3OuyISpbxoQ" borderColor="138,226,52" labelPosition="node" color="138,226,52">
+            <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"/>
+          </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="_dIHiV_fDEeS3OuyISpbxoQ" labelPosition="node" color="194,239,255">
+          <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"/>
+        </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']"/>
+      </ownedDiagramElements>
+      <description xmi:type="description_1:DiagramDescription" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']"/>
+      <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_dIHiWPfDEeS3OuyISpbxoQ"/>
+      <activatedLayers xmi:type="description_1:Layer" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer"/>
+      <target xmi:type="ecore:EPackage" href="tc1479.ecore#//p3"/>
+    </ownedRepresentations>
+    <ownedRepresentations xmi:type="diagram:DSemanticDiagram" xmi:id="_htUywPfDEeS3OuyISpbxoQ" name="caseTwoWest">
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_htUywffDEeS3OuyISpbxoQ" source="GMF_DIAGRAMS">
+        <data xmi:type="notation:Diagram" xmi:id="_htUywvfDEeS3OuyISpbxoQ" type="Sirius" element="_htUywPfDEeS3OuyISpbxoQ" measurementUnit="Pixel">
+          <children xmi:type="notation:Node" xmi:id="_htUyw_fDEeS3OuyISpbxoQ" type="2002" element="_htWA4vfDEeS3OuyISpbxoQ">
+            <children xmi:type="notation:Node" xmi:id="_htUyxPfDEeS3OuyISpbxoQ" type="5006"/>
+            <children xmi:type="notation:Node" xmi:id="_htUyxffDEeS3OuyISpbxoQ" type="7001">
+              <children xmi:type="notation:Node" xmi:id="_htUyxvfDEeS3OuyISpbxoQ" type="3007" element="_htWA6PfDEeS3OuyISpbxoQ">
+                <children xmi:type="notation:Node" xmi:id="_htUyx_fDEeS3OuyISpbxoQ" type="5003">
+                  <layoutConstraint xmi:type="notation:Location" xmi:id="_htUyyPfDEeS3OuyISpbxoQ" y="5"/>
+                </children>
+                <children xmi:type="notation:Node" xmi:id="_htUyyffDEeS3OuyISpbxoQ" type="3003" element="_htWA6ffDEeS3OuyISpbxoQ">
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_htUyyvfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_htUyy_fDEeS3OuyISpbxoQ"/>
+                </children>
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_htUyzPfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_htUyzffDEeS3OuyISpbxoQ" x="75" y="39" width="30" height="30"/>
+              </children>
+              <children xmi:type="notation:Node" xmi:id="_htUyzvfDEeS3OuyISpbxoQ" type="3007" element="_htWA6vfDEeS3OuyISpbxoQ">
+                <children xmi:type="notation:Node" xmi:id="_htUyz_fDEeS3OuyISpbxoQ" type="5003">
+                  <layoutConstraint xmi:type="notation:Location" xmi:id="_htUy0PfDEeS3OuyISpbxoQ" y="5"/>
+                </children>
+                <children xmi:type="notation:Node" xmi:id="_htUy0ffDEeS3OuyISpbxoQ" type="3003" element="_htWA6_fDEeS3OuyISpbxoQ">
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_htUy0vfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_htUy0_fDEeS3OuyISpbxoQ"/>
+                </children>
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_htUy1PfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_htUy1ffDEeS3OuyISpbxoQ" x="155" y="39" width="30" height="30"/>
+              </children>
+              <styles xmi:type="notation:SortingStyle" xmi:id="_htUy1vfDEeS3OuyISpbxoQ"/>
+              <styles xmi:type="notation:FilteringStyle" xmi:id="_htUy1_fDEeS3OuyISpbxoQ"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_htUy2PfDEeS3OuyISpbxoQ" type="3012" element="_htWA4_fDEeS3OuyISpbxoQ">
+              <children xmi:type="notation:Node" xmi:id="_htUy2ffDEeS3OuyISpbxoQ" type="5010">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_htUy2vfDEeS3OuyISpbxoQ" x="31"/>
+              </children>
+              <children xmi:type="notation:Node" xmi:id="_htUy2_fDEeS3OuyISpbxoQ" type="3003" element="_htWA5PfDEeS3OuyISpbxoQ">
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_htUy3PfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_htUy3ffDEeS3OuyISpbxoQ"/>
+              </children>
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_htUy3vfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_htUy3_fDEeS3OuyISpbxoQ" x="140" y="-22" width="30" height="30"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_htUy4PfDEeS3OuyISpbxoQ" type="3012" element="_htWA5ffDEeS3OuyISpbxoQ">
+              <children xmi:type="notation:Node" xmi:id="_htUy4ffDEeS3OuyISpbxoQ" type="5010">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_htUy4vfDEeS3OuyISpbxoQ" x="31"/>
+              </children>
+              <children xmi:type="notation:Node" xmi:id="_htUy4_fDEeS3OuyISpbxoQ" type="3003" element="_htWA5vfDEeS3OuyISpbxoQ">
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_htUy5PfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_htUy5ffDEeS3OuyISpbxoQ"/>
+              </children>
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_htUy5vfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_htUy5_fDEeS3OuyISpbxoQ" x="40" y="-22" width="30" height="30"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_htUy6PfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_htUy6ffDEeS3OuyISpbxoQ" x="60" y="39" width="243" height="163"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_htUy6vfDEeS3OuyISpbxoQ" type="2002" element="_htWA7PfDEeS3OuyISpbxoQ">
+            <children xmi:type="notation:Node" xmi:id="_htUy6_fDEeS3OuyISpbxoQ" type="5006"/>
+            <children xmi:type="notation:Node" xmi:id="_htUy7PfDEeS3OuyISpbxoQ" type="7001">
+              <children xmi:type="notation:Node" xmi:id="_htUy7ffDEeS3OuyISpbxoQ" type="3007" element="_htWA8vfDEeS3OuyISpbxoQ">
+                <children xmi:type="notation:Node" xmi:id="_htUy7vfDEeS3OuyISpbxoQ" type="5003">
+                  <layoutConstraint xmi:type="notation:Location" xmi:id="_htUy7_fDEeS3OuyISpbxoQ" y="5"/>
+                </children>
+                <children xmi:type="notation:Node" xmi:id="_htUy8PfDEeS3OuyISpbxoQ" type="3003" element="_htWA8_fDEeS3OuyISpbxoQ">
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_htUy8ffDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_htUy8vfDEeS3OuyISpbxoQ"/>
+                </children>
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_htVZ0PfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_htVZ0ffDEeS3OuyISpbxoQ" x="30" y="29" width="30" height="30"/>
+              </children>
+              <children xmi:type="notation:Node" xmi:id="_htVZ0vfDEeS3OuyISpbxoQ" type="3007" element="_htWA9PfDEeS3OuyISpbxoQ">
+                <children xmi:type="notation:Node" xmi:id="_htVZ0_fDEeS3OuyISpbxoQ" type="5003">
+                  <layoutConstraint xmi:type="notation:Location" xmi:id="_htVZ1PfDEeS3OuyISpbxoQ" y="5"/>
+                </children>
+                <children xmi:type="notation:Node" xmi:id="_htVZ1ffDEeS3OuyISpbxoQ" type="3003" element="_htWA9ffDEeS3OuyISpbxoQ">
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_htVZ1vfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_htVZ1_fDEeS3OuyISpbxoQ"/>
+                </children>
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_htVZ2PfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_htVZ2ffDEeS3OuyISpbxoQ" x="90" y="29" width="30" height="30"/>
+              </children>
+              <styles xmi:type="notation:SortingStyle" xmi:id="_htVZ2vfDEeS3OuyISpbxoQ"/>
+              <styles xmi:type="notation:FilteringStyle" xmi:id="_htVZ2_fDEeS3OuyISpbxoQ"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_htVZ3PfDEeS3OuyISpbxoQ" type="3012" element="_htWA7ffDEeS3OuyISpbxoQ">
+              <children xmi:type="notation:Node" xmi:id="_htVZ3ffDEeS3OuyISpbxoQ" type="5010">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_htVZ3vfDEeS3OuyISpbxoQ" x="31"/>
+              </children>
+              <children xmi:type="notation:Node" xmi:id="_htVZ3_fDEeS3OuyISpbxoQ" type="3003" element="_htWA7vfDEeS3OuyISpbxoQ">
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_htVZ4PfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_htVZ4ffDEeS3OuyISpbxoQ"/>
+              </children>
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_htVZ4vfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_htVZ4_fDEeS3OuyISpbxoQ" x="140" y="153" width="30" height="30"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_htVZ5PfDEeS3OuyISpbxoQ" type="3012" element="_htWA7_fDEeS3OuyISpbxoQ">
+              <children xmi:type="notation:Node" xmi:id="_htVZ5ffDEeS3OuyISpbxoQ" type="5010">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_htVZ5vfDEeS3OuyISpbxoQ" x="31"/>
+              </children>
+              <children xmi:type="notation:Node" xmi:id="_htVZ5_fDEeS3OuyISpbxoQ" type="3003" element="_htWA8PfDEeS3OuyISpbxoQ">
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_htVZ6PfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_htVZ6ffDEeS3OuyISpbxoQ"/>
+              </children>
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_htVZ6vfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_htVZ6_fDEeS3OuyISpbxoQ" x="40" y="153" width="30" height="30"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_htVZ7PfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_htVZ7ffDEeS3OuyISpbxoQ" x="360" y="39" width="243" height="163"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_htVZ7vfDEeS3OuyISpbxoQ" type="2001" element="_htWA9vfDEeS3OuyISpbxoQ">
+            <children xmi:type="notation:Node" xmi:id="_htVZ7_fDEeS3OuyISpbxoQ" type="5002">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_htVZ8PfDEeS3OuyISpbxoQ" y="5"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_htVZ8ffDEeS3OuyISpbxoQ" type="3001" element="_htWA9_fDEeS3OuyISpbxoQ">
+              <children xmi:type="notation:Node" xmi:id="_htVZ8vfDEeS3OuyISpbxoQ" type="5001">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_htVZ8_fDEeS3OuyISpbxoQ" y="5"/>
+              </children>
+              <children xmi:type="notation:Node" xmi:id="_htVZ9PfDEeS3OuyISpbxoQ" type="3003" element="_htWA-PfDEeS3OuyISpbxoQ">
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_htVZ9ffDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_htVZ9vfDEeS3OuyISpbxoQ"/>
+              </children>
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_htVZ9_fDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_htVZ-PfDEeS3OuyISpbxoQ" y="-22" width="30" height="30"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_htVZ-ffDEeS3OuyISpbxoQ" type="3001" element="_htWA-ffDEeS3OuyISpbxoQ">
+              <children xmi:type="notation:Node" xmi:id="_htVZ-vfDEeS3OuyISpbxoQ" type="5001">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_htVZ-_fDEeS3OuyISpbxoQ" y="5"/>
+              </children>
+              <children xmi:type="notation:Node" xmi:id="_htVZ_PfDEeS3OuyISpbxoQ" type="3003" element="_htWA-vfDEeS3OuyISpbxoQ">
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_htVZ_ffDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_htVZ_vfDEeS3OuyISpbxoQ"/>
+              </children>
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_htVZ__fDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_htVaAPfDEeS3OuyISpbxoQ" x="31" y="-22" width="30" height="30"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_htVaAffDEeS3OuyISpbxoQ" type="3003" element="_htWA-_fDEeS3OuyISpbxoQ">
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_htVaAvfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_htVaA_fDEeS3OuyISpbxoQ"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_htVaBPfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_htVaBffDEeS3OuyISpbxoQ" x="760" y="100" width="100" height="100"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_htVaBvfDEeS3OuyISpbxoQ" type="2001" element="_htWA_PfDEeS3OuyISpbxoQ">
+            <children xmi:type="notation:Node" xmi:id="_htVaB_fDEeS3OuyISpbxoQ" type="5002">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_htVaCPfDEeS3OuyISpbxoQ" y="5"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_htVaCffDEeS3OuyISpbxoQ" type="3001" element="_htWA_ffDEeS3OuyISpbxoQ">
+              <children xmi:type="notation:Node" xmi:id="_htVaCvfDEeS3OuyISpbxoQ" type="5001">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_htVaC_fDEeS3OuyISpbxoQ" y="5"/>
+              </children>
+              <children xmi:type="notation:Node" xmi:id="_htVaDPfDEeS3OuyISpbxoQ" type="3003" element="_htWA_vfDEeS3OuyISpbxoQ">
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_htVaDffDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_htVaDvfDEeS3OuyISpbxoQ"/>
+              </children>
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_htVaD_fDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_htVaEPfDEeS3OuyISpbxoQ" y="-22" width="30" height="30"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_htVaEffDEeS3OuyISpbxoQ" type="3001" element="_htWA__fDEeS3OuyISpbxoQ">
+              <children xmi:type="notation:Node" xmi:id="_htVaEvfDEeS3OuyISpbxoQ" type="5001">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_htVaE_fDEeS3OuyISpbxoQ" y="5"/>
+              </children>
+              <children xmi:type="notation:Node" xmi:id="_htVaFPfDEeS3OuyISpbxoQ" type="3003" element="_htWBAPfDEeS3OuyISpbxoQ">
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_htVaFffDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_htVaFvfDEeS3OuyISpbxoQ"/>
+              </children>
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_htVaF_fDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_htVaGPfDEeS3OuyISpbxoQ" x="31" y="-22" width="30" height="30"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_htVaGffDEeS3OuyISpbxoQ" type="3003" element="_htWBAffDEeS3OuyISpbxoQ">
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_htVaGvfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_htVaG_fDEeS3OuyISpbxoQ"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_htVaHPfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_htVaHffDEeS3OuyISpbxoQ" x="760" y="240" width="100" height="100"/>
+          </children>
+          <styles xmi:type="notation:DiagramStyle" xmi:id="_htVaHvfDEeS3OuyISpbxoQ"/>
+        </data>
+      </ownedAnnotationEntries>
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_htWA4PfDEeS3OuyISpbxoQ" source="DANNOTATION_CUSTOMIZATION_KEY">
+        <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_htWA4ffDEeS3OuyISpbxoQ"/>
+      </ownedAnnotationEntries>
+      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_htWA4vfDEeS3OuyISpbxoQ" name="p31">
+        <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="_htWA4_fDEeS3OuyISpbxoQ" 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"/>
+          <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+          <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+          <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+          <ownedStyle xmi:type="diagram:Square" xmi:id="_htWA5PfDEeS3OuyISpbxoQ" borderColor="138,226,52" labelPosition="node" color="138,226,52">
+            <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"/>
+          </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="_htWA5ffDEeS3OuyISpbxoQ" name="B" 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="_htWA5vfDEeS3OuyISpbxoQ" borderColor="138,226,52" labelPosition="node" color="138,226,52">
+            <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"/>
+          </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>
+        <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+        <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+        <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_htWA5_fDEeS3OuyISpbxoQ">
+          <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"/>
+        </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="_htWA6PfDEeS3OuyISpbxoQ" name="CA" 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="_htWA6ffDEeS3OuyISpbxoQ" showIcon="false" borderColor="138,226,52" labelPosition="node" color="114,159,207">
+            <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"/>
+          </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="_htWA6vfDEeS3OuyISpbxoQ" name="CB" 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="_htWA6_fDEeS3OuyISpbxoQ" showIcon="false" borderColor="138,226,52" labelPosition="node" color="114,159,207">
+            <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"/>
+          </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="_htWA7PfDEeS3OuyISpbxoQ" name="p32">
+        <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="_htWA7ffDEeS3OuyISpbxoQ" 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"/>
+          <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+          <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+          <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+          <ownedStyle xmi:type="diagram:Square" xmi:id="_htWA7vfDEeS3OuyISpbxoQ" borderColor="138,226,52" labelPosition="node" color="138,226,52">
+            <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"/>
+          </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="_htWA7_fDEeS3OuyISpbxoQ" name="D" 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="_htWA8PfDEeS3OuyISpbxoQ" borderColor="138,226,52" labelPosition="node" color="138,226,52">
+            <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"/>
+          </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>
+        <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+        <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+        <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_htWA8ffDEeS3OuyISpbxoQ">
+          <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"/>
+        </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="_htWA8vfDEeS3OuyISpbxoQ" name="CC" 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="_htWA8_fDEeS3OuyISpbxoQ" showIcon="false" borderColor="138,226,52" labelPosition="node" color="114,159,207">
+            <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"/>
+          </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="_htWA9PfDEeS3OuyISpbxoQ" name="CD" 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="_htWA9ffDEeS3OuyISpbxoQ" showIcon="false" borderColor="138,226,52" labelPosition="node" color="114,159,207">
+            <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"/>
+          </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:DNode" xmi:id="_htWA9vfDEeS3OuyISpbxoQ" 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"/>
+        <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_htWA9_fDEeS3OuyISpbxoQ" 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"/>
+          <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+          <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+          <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+          <ownedStyle xmi:type="diagram:Square" xmi:id="_htWA-PfDEeS3OuyISpbxoQ" borderColor="138,226,52" labelPosition="node" color="138,226,52">
+            <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"/>
+          </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="_htWA-ffDEeS3OuyISpbxoQ" name="B" 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="_htWA-vfDEeS3OuyISpbxoQ" borderColor="138,226,52" labelPosition="node" color="138,226,52">
+            <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"/>
+          </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="_htWA-_fDEeS3OuyISpbxoQ" labelPosition="node" color="194,239,255">
+          <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"/>
+        </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']"/>
+      </ownedDiagramElements>
+      <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_htWA_PfDEeS3OuyISpbxoQ" name="p32" 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="_htWA_ffDEeS3OuyISpbxoQ" 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"/>
+          <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+          <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+          <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+          <ownedStyle xmi:type="diagram:Square" xmi:id="_htWA_vfDEeS3OuyISpbxoQ" borderColor="138,226,52" labelPosition="node" color="138,226,52">
+            <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"/>
+          </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="_htWA__fDEeS3OuyISpbxoQ" name="D" 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="_htWBAPfDEeS3OuyISpbxoQ" borderColor="138,226,52" labelPosition="node" color="138,226,52">
+            <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"/>
+          </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="_htWBAffDEeS3OuyISpbxoQ" labelPosition="node" color="194,239,255">
+          <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"/>
+        </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']"/>
+      </ownedDiagramElements>
+      <description xmi:type="description_1:DiagramDescription" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']"/>
+      <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_htWBAvfDEeS3OuyISpbxoQ"/>
+      <activatedLayers xmi:type="description_1:Layer" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer"/>
+      <target xmi:type="ecore:EPackage" href="tc1479.ecore#//p3"/>
+    </ownedRepresentations>
+    <ownedRepresentations xmi:type="diagram:DSemanticDiagram" xmi:id="_kugEwPfDEeS3OuyISpbxoQ" name="caseTwoEast">
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_kugEwffDEeS3OuyISpbxoQ" source="GMF_DIAGRAMS">
+        <data xmi:type="notation:Diagram" xmi:id="_kugr0PfDEeS3OuyISpbxoQ" type="Sirius" element="_kugEwPfDEeS3OuyISpbxoQ" measurementUnit="Pixel">
+          <children xmi:type="notation:Node" xmi:id="_kugr0ffDEeS3OuyISpbxoQ" type="2002" element="_kuhTFPfDEeS3OuyISpbxoQ">
+            <children xmi:type="notation:Node" xmi:id="_kugr0vfDEeS3OuyISpbxoQ" type="5006"/>
+            <children xmi:type="notation:Node" xmi:id="_kugr0_fDEeS3OuyISpbxoQ" type="7001">
+              <children xmi:type="notation:Node" xmi:id="_kugr1PfDEeS3OuyISpbxoQ" type="3007" element="_kuhTGvfDEeS3OuyISpbxoQ">
+                <children xmi:type="notation:Node" xmi:id="_kugr1ffDEeS3OuyISpbxoQ" type="5003">
+                  <layoutConstraint xmi:type="notation:Location" xmi:id="_kugr1vfDEeS3OuyISpbxoQ" y="5"/>
+                </children>
+                <children xmi:type="notation:Node" xmi:id="_kugr1_fDEeS3OuyISpbxoQ" type="3003" element="_kuhTG_fDEeS3OuyISpbxoQ">
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_kugr2PfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kugr2ffDEeS3OuyISpbxoQ"/>
+                </children>
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_kugr2vfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kugr2_fDEeS3OuyISpbxoQ" x="75" y="39" width="30" height="30"/>
+              </children>
+              <children xmi:type="notation:Node" xmi:id="_kugr3PfDEeS3OuyISpbxoQ" type="3007" element="_kuhTHPfDEeS3OuyISpbxoQ">
+                <children xmi:type="notation:Node" xmi:id="_kugr3ffDEeS3OuyISpbxoQ" type="5003">
+                  <layoutConstraint xmi:type="notation:Location" xmi:id="_kugr3vfDEeS3OuyISpbxoQ" y="5"/>
+                </children>
+                <children xmi:type="notation:Node" xmi:id="_kugr3_fDEeS3OuyISpbxoQ" type="3003" element="_kuhTHffDEeS3OuyISpbxoQ">
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_kugr4PfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kugr4ffDEeS3OuyISpbxoQ"/>
+                </children>
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_kugr4vfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kugr4_fDEeS3OuyISpbxoQ" x="155" y="39" width="30" height="30"/>
+              </children>
+              <styles xmi:type="notation:SortingStyle" xmi:id="_kugr5PfDEeS3OuyISpbxoQ"/>
+              <styles xmi:type="notation:FilteringStyle" xmi:id="_kugr5ffDEeS3OuyISpbxoQ"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_kugr5vfDEeS3OuyISpbxoQ" type="3012" element="_kuhTFffDEeS3OuyISpbxoQ">
+              <children xmi:type="notation:Node" xmi:id="_kugr5_fDEeS3OuyISpbxoQ" type="5010">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_kugr6PfDEeS3OuyISpbxoQ" x="31"/>
+              </children>
+              <children xmi:type="notation:Node" xmi:id="_kugr6ffDEeS3OuyISpbxoQ" type="3003" element="_kuhTFvfDEeS3OuyISpbxoQ">
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_kugr6vfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kugr6_fDEeS3OuyISpbxoQ"/>
+              </children>
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_kugr7PfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kugr7ffDEeS3OuyISpbxoQ" x="51" y="-22" width="30" height="30"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_kugr7vfDEeS3OuyISpbxoQ" type="3012" element="_kuhTF_fDEeS3OuyISpbxoQ">
+              <children xmi:type="notation:Node" xmi:id="_kugr7_fDEeS3OuyISpbxoQ" type="5010">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_kugr8PfDEeS3OuyISpbxoQ" x="31"/>
+              </children>
+              <children xmi:type="notation:Node" xmi:id="_kugr8ffDEeS3OuyISpbxoQ" type="3003" element="_kuhTGPfDEeS3OuyISpbxoQ">
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_kugr8vfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kugr8_fDEeS3OuyISpbxoQ"/>
+              </children>
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_kugr9PfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kugr9ffDEeS3OuyISpbxoQ" x="160" y="-22" width="30" height="30"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_kugr9vfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kugr9_fDEeS3OuyISpbxoQ" x="60" y="39" width="243" height="163"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_kugr-PfDEeS3OuyISpbxoQ" type="2002" element="_kuhTHvfDEeS3OuyISpbxoQ">
+            <children xmi:type="notation:Node" xmi:id="_kugr-ffDEeS3OuyISpbxoQ" type="5006"/>
+            <children xmi:type="notation:Node" xmi:id="_kugr-vfDEeS3OuyISpbxoQ" type="7001">
+              <children xmi:type="notation:Node" xmi:id="_kugr-_fDEeS3OuyISpbxoQ" type="3007" element="_kuhTJPfDEeS3OuyISpbxoQ">
+                <children xmi:type="notation:Node" xmi:id="_kugr_PfDEeS3OuyISpbxoQ" type="5003">
+                  <layoutConstraint xmi:type="notation:Location" xmi:id="_kugr_ffDEeS3OuyISpbxoQ" y="5"/>
+                </children>
+                <children xmi:type="notation:Node" xmi:id="_kugr_vfDEeS3OuyISpbxoQ" type="3003" element="_kuhTJffDEeS3OuyISpbxoQ">
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_kugr__fDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kugsAPfDEeS3OuyISpbxoQ"/>
+                </children>
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_kugsAffDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kugsAvfDEeS3OuyISpbxoQ" x="30" y="29" width="30" height="30"/>
+              </children>
+              <children xmi:type="notation:Node" xmi:id="_kugsA_fDEeS3OuyISpbxoQ" type="3007" element="_kuhTJvfDEeS3OuyISpbxoQ">
+                <children xmi:type="notation:Node" xmi:id="_kugsBPfDEeS3OuyISpbxoQ" type="5003">
+                  <layoutConstraint xmi:type="notation:Location" xmi:id="_kugsBffDEeS3OuyISpbxoQ" y="5"/>
+                </children>
+                <children xmi:type="notation:Node" xmi:id="_kugsBvfDEeS3OuyISpbxoQ" type="3003" element="_kuhTJ_fDEeS3OuyISpbxoQ">
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_kugsB_fDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kugsCPfDEeS3OuyISpbxoQ"/>
+                </children>
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_kugsCffDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kugsCvfDEeS3OuyISpbxoQ" x="90" y="29" width="30" height="30"/>
+              </children>
+              <styles xmi:type="notation:SortingStyle" xmi:id="_kugsC_fDEeS3OuyISpbxoQ"/>
+              <styles xmi:type="notation:FilteringStyle" xmi:id="_kugsDPfDEeS3OuyISpbxoQ"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_kugsDffDEeS3OuyISpbxoQ" type="3012" element="_kuhTH_fDEeS3OuyISpbxoQ">
+              <children xmi:type="notation:Node" xmi:id="_kugsDvfDEeS3OuyISpbxoQ" type="5010">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_kugsD_fDEeS3OuyISpbxoQ" x="31"/>
+              </children>
+              <children xmi:type="notation:Node" xmi:id="_kugsEPfDEeS3OuyISpbxoQ" type="3003" element="_kuhTIPfDEeS3OuyISpbxoQ">
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_kugsEffDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kugsEvfDEeS3OuyISpbxoQ"/>
+              </children>
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_kugsE_fDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kugsFPfDEeS3OuyISpbxoQ" x="60" y="153" width="30" height="30"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_kugsFffDEeS3OuyISpbxoQ" type="3012" element="_kuhTIffDEeS3OuyISpbxoQ">
+              <children xmi:type="notation:Node" xmi:id="_kugsFvfDEeS3OuyISpbxoQ" type="5010">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_kugsF_fDEeS3OuyISpbxoQ" x="31"/>
+              </children>
+              <children xmi:type="notation:Node" xmi:id="_kugsGPfDEeS3OuyISpbxoQ" type="3003" element="_kuhTIvfDEeS3OuyISpbxoQ">
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_kugsGffDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kugsGvfDEeS3OuyISpbxoQ"/>
+              </children>
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_kugsG_fDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kugsHPfDEeS3OuyISpbxoQ" x="160" y="153" width="30" height="30"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_kugsHffDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kuhS4PfDEeS3OuyISpbxoQ" x="360" y="39" width="243" height="163"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_kuhS4ffDEeS3OuyISpbxoQ" type="2001" element="_kuhTKPfDEeS3OuyISpbxoQ">
+            <children xmi:type="notation:Node" xmi:id="_kuhS4vfDEeS3OuyISpbxoQ" type="5002">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_kuhS4_fDEeS3OuyISpbxoQ" y="5"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_kuhS5PfDEeS3OuyISpbxoQ" type="3001" element="_kuhTKffDEeS3OuyISpbxoQ">
+              <children xmi:type="notation:Node" xmi:id="_kuhS5ffDEeS3OuyISpbxoQ" type="5001">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_kuhS5vfDEeS3OuyISpbxoQ" y="5"/>
+              </children>
+              <children xmi:type="notation:Node" xmi:id="_kuhS5_fDEeS3OuyISpbxoQ" type="3003" element="_kuhTKvfDEeS3OuyISpbxoQ">
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_kuhS6PfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kuhS6ffDEeS3OuyISpbxoQ"/>
+              </children>
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_kuhS6vfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kuhS6_fDEeS3OuyISpbxoQ" y="-22" width="30" height="30"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_kuhS7PfDEeS3OuyISpbxoQ" type="3001" element="_kuh58PfDEeS3OuyISpbxoQ">
+              <children xmi:type="notation:Node" xmi:id="_kuhS7ffDEeS3OuyISpbxoQ" type="5001">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_kuhS7vfDEeS3OuyISpbxoQ" y="5"/>
+              </children>
+              <children xmi:type="notation:Node" xmi:id="_kuhS7_fDEeS3OuyISpbxoQ" type="3003" element="_kuh58ffDEeS3OuyISpbxoQ">
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_kuhS8PfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kuhS8ffDEeS3OuyISpbxoQ"/>
+              </children>
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_kuhS8vfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kuhS8_fDEeS3OuyISpbxoQ" x="31" y="-22" width="30" height="30"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_kuhS9PfDEeS3OuyISpbxoQ" type="3003" element="_kuh58vfDEeS3OuyISpbxoQ">
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_kuhS9ffDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kuhS9vfDEeS3OuyISpbxoQ"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_kuhS9_fDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kuhS-PfDEeS3OuyISpbxoQ" x="760" y="100" width="100" height="100"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_kuhS-ffDEeS3OuyISpbxoQ" type="2001" element="_kuh58_fDEeS3OuyISpbxoQ">
+            <children xmi:type="notation:Node" xmi:id="_kuhS-vfDEeS3OuyISpbxoQ" type="5002">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_kuhS-_fDEeS3OuyISpbxoQ" y="5"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_kuhS_PfDEeS3OuyISpbxoQ" type="3001" element="_kuh59PfDEeS3OuyISpbxoQ">
+              <children xmi:type="notation:Node" xmi:id="_kuhS_ffDEeS3OuyISpbxoQ" type="5001">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_kuhS_vfDEeS3OuyISpbxoQ" y="5"/>
+              </children>
+              <children xmi:type="notation:Node" xmi:id="_kuhS__fDEeS3OuyISpbxoQ" type="3003" element="_kuh59ffDEeS3OuyISpbxoQ">
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_kuhTAPfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kuhTAffDEeS3OuyISpbxoQ"/>
+              </children>
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_kuhTAvfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kuhTA_fDEeS3OuyISpbxoQ" y="-22" width="30" height="30"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_kuhTBPfDEeS3OuyISpbxoQ" type="3001" element="_kuh59vfDEeS3OuyISpbxoQ">
+              <children xmi:type="notation:Node" xmi:id="_kuhTBffDEeS3OuyISpbxoQ" type="5001">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_kuhTBvfDEeS3OuyISpbxoQ" y="5"/>
+              </children>
+              <children xmi:type="notation:Node" xmi:id="_kuhTB_fDEeS3OuyISpbxoQ" type="3003" element="_kuh59_fDEeS3OuyISpbxoQ">
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_kuhTCPfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kuhTCffDEeS3OuyISpbxoQ"/>
+              </children>
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_kuhTCvfDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kuhTC_fDEeS3OuyISpbxoQ" x="31" y="-22" width="30" height="30"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_kuhTDPfDEeS3OuyISpbxoQ" type="3003" element="_kuh5-PfDEeS3OuyISpbxoQ">
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_kuhTDffDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="12"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kuhTDvfDEeS3OuyISpbxoQ"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_kuhTD_fDEeS3OuyISpbxoQ" fontName="Comic Sans MS" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kuhTEPfDEeS3OuyISpbxoQ" x="760" y="240" width="100" height="100"/>
+          </children>
+          <styles xmi:type="notation:DiagramStyle" xmi:id="_kuhTEffDEeS3OuyISpbxoQ"/>
+        </data>
+      </ownedAnnotationEntries>
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_kuhTEvfDEeS3OuyISpbxoQ" source="DANNOTATION_CUSTOMIZATION_KEY">
+        <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_kuhTE_fDEeS3OuyISpbxoQ"/>
+      </ownedAnnotationEntries>
+      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_kuhTFPfDEeS3OuyISpbxoQ" name="p31">
+        <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="_kuhTFffDEeS3OuyISpbxoQ" 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"/>
+          <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+          <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+          <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+          <ownedStyle xmi:type="diagram:Square" xmi:id="_kuhTFvfDEeS3OuyISpbxoQ" borderColor="138,226,52" labelPosition="node" color="138,226,52">
+            <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"/>
+          </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="_kuhTF_fDEeS3OuyISpbxoQ" name="B" 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="_kuhTGPfDEeS3OuyISpbxoQ" borderColor="138,226,52" labelPosition="node" color="138,226,52">
+            <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"/>
+          </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>
+        <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+        <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+        <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_kuhTGffDEeS3OuyISpbxoQ">
+          <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"/>
+        </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="_kuhTGvfDEeS3OuyISpbxoQ" name="CA" 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="_kuhTG_fDEeS3OuyISpbxoQ" showIcon="false" borderColor="138,226,52" labelPosition="node" color="114,159,207">
+            <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"/>
+          </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="_kuhTHPfDEeS3OuyISpbxoQ" name="CB" 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="_kuhTHffDEeS3OuyISpbxoQ" showIcon="false" borderColor="138,226,52" labelPosition="node" color="114,159,207">
+            <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"/>
+          </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="_kuhTHvfDEeS3OuyISpbxoQ" name="p32">
+        <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="_kuhTH_fDEeS3OuyISpbxoQ" 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"/>
+          <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+          <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+          <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+          <ownedStyle xmi:type="diagram:Square" xmi:id="_kuhTIPfDEeS3OuyISpbxoQ" borderColor="138,226,52" labelPosition="node" color="138,226,52">
+            <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"/>
+          </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="_kuhTIffDEeS3OuyISpbxoQ" name="D" 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="_kuhTIvfDEeS3OuyISpbxoQ" borderColor="138,226,52" labelPosition="node" color="138,226,52">
+            <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"/>
+          </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>
+        <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+        <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+        <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_kuhTI_fDEeS3OuyISpbxoQ">
+          <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"/>
+        </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="_kuhTJPfDEeS3OuyISpbxoQ" name="CC" 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="_kuhTJffDEeS3OuyISpbxoQ" showIcon="false" borderColor="138,226,52" labelPosition="node" color="114,159,207">
+            <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"/>
+          </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="_kuhTJvfDEeS3OuyISpbxoQ" name="CD" 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="_kuhTJ_fDEeS3OuyISpbxoQ" showIcon="false" borderColor="138,226,52" labelPosition="node" color="114,159,207">
+            <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"/>
+          </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:DNode" xmi:id="_kuhTKPfDEeS3OuyISpbxoQ" 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"/>
+        <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_kuhTKffDEeS3OuyISpbxoQ" 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"/>
+          <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+          <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+          <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+          <ownedStyle xmi:type="diagram:Square" xmi:id="_kuhTKvfDEeS3OuyISpbxoQ" borderColor="138,226,52" labelPosition="node" color="138,226,52">
+            <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"/>
+          </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="_kuh58PfDEeS3OuyISpbxoQ" name="B" 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="_kuh58ffDEeS3OuyISpbxoQ" borderColor="138,226,52" labelPosition="node" color="138,226,52">
+            <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"/>
+          </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="_kuh58vfDEeS3OuyISpbxoQ" labelPosition="node" color="194,239,255">
+          <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"/>
+        </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']"/>
+      </ownedDiagramElements>
+      <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_kuh58_fDEeS3OuyISpbxoQ" name="p32" 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="_kuh59PfDEeS3OuyISpbxoQ" 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"/>
+          <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+          <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+          <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+          <ownedStyle xmi:type="diagram:Square" xmi:id="_kuh59ffDEeS3OuyISpbxoQ" borderColor="138,226,52" labelPosition="node" color="138,226,52">
+            <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"/>
+          </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="_kuh59vfDEeS3OuyISpbxoQ" name="D" 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="_kuh59_fDEeS3OuyISpbxoQ" borderColor="138,226,52" labelPosition="node" color="138,226,52">
+            <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"/>
+          </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="_kuh5-PfDEeS3OuyISpbxoQ" labelPosition="node" color="194,239,255">
+          <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"/>
+        </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']"/>
+      </ownedDiagramElements>
+      <description xmi:type="description_1:DiagramDescription" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']"/>
+      <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_kuh5-ffDEeS3OuyISpbxoQ"/>
+      <activatedLayers xmi:type="description_1:Layer" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='DiagWithBorderNodeOnNode']/@defaultLayer"/>
+      <target xmi:type="ecore:EPackage" href="tc1479.ecore#//p3"/>
+    </ownedRepresentations>
     <viewpoint xmi:type="description:Viewpoint" href="../description/tc1479.odesign#//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']"/>
   </ownedViews>
 </viewpoint:DAnalysis>
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 718578baed..14916bbab4 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
@@ -27,6 +27,7 @@ import org.eclipse.sirius.tests.swtbot.support.api.editor.SWTBotSiriusDiagramEdi
 import org.eclipse.sirius.tests.swtbot.support.utils.SWTBotUtils;
 import org.eclipse.swtbot.eclipse.gef.finder.widgets.SWTBotGefEditPart;
 import org.hamcrest.Matcher;
+import org.junit.Assert;
 
 /**
  * Check the stability of children after the resize of their parent:
@@ -61,16 +62,36 @@ public class ChildrenPositionStabilityAfterParentResizeTest extends AbstractSiri
 
     private static final Point EXPECTED_INITIAL_POSITION_NODE_D = new Point(29, 75);
 
+    private static final Point TRANSLATION_PLUS_60X = new Point(60, 0);
+
+    private static final Point TRANSLATION_PLUS_120X = new Point(120, 0);
+
     private static final Point TRANSLATION_PLUS_180X = new Point(180, 0);
 
+    private static final Point TRANSLATION_PLUS_200X = new Point(200, 0);
+
     private static final Point TRANSLATION_MINUS_100X = new Point(-100, 0);
 
+    private static final Point TRANSLATION_MINUS_140X = new Point(-140, 0);
+
     private static final Point TRANSLATION_PLUS_100X = new Point(100, 0);
 
+    private static final Point TRANSLATION_MINUS_80X = new Point(-80, 0);
+
+    private static final Point TRANSLATION_MINUS_60Y = new Point(0, -60);
+
     private static final Point TRANSLATION_MINUS_80Y = new Point(0, -80);
 
+    private static final Point TRANSLATION_PLUS_40Y = new Point(0, 40);
+
+    private static final Point TRANSLATION_PLUS_60Y = new Point(0, 60);
+
     private static final Point TRANSLATION_PLUS_80Y = new Point(0, 80);
 
+    private static final Point TRANSLATION_PLUS_100Y = new Point(0, 100);
+
+    private static final Point TRANSLATION_PLUS_140Y = new Point(0, 140);
+
     private static final String MODEL = "models/tc1479.ecore";
 
     private static final String SESSION_FILE = "models/tc1479.aird";
@@ -85,8 +106,6 @@ public class ChildrenPositionStabilityAfterParentResizeTest extends AbstractSiri
 
     private UILocalSession localSession;
 
-    private SWTBotSiriusDiagramEditor editor;
-
     private Rectangle aBefore;
 
     private Rectangle bBefore;
@@ -122,6 +141,12 @@ public class ChildrenPositionStabilityAfterParentResizeTest extends AbstractSiri
     protected void onSetUpAfterOpeningDesignerPerspective() throws Exception {
         sessionAirdResource = new UIResource(designerProject, FILE_DIR, "tc1479.aird");
         localSession = designerPerspective.openSessionFromFile(sessionAirdResource);
+    }
+
+    /**
+     * Open the diagram TC1479 and initialize global variables.
+     */
+    protected void initializeTC1479Case() {
         openDiagram("TC1479", "TC1479");
         aBefore = getBounds("A");
         assertThat("Unexpected initial position for bordered node 'A'.", aBefore.getLocation(), equalTo(EXPECTED_INITIAL_POSITION_A));
@@ -150,6 +175,7 @@ public class ChildrenPositionStabilityAfterParentResizeTest extends AbstractSiri
      *             if an error occurs
      */
     public void test_A_after_expand_P1_to_the_right() throws Exception {
+        initializeTC1479Case();
         CheckSelectedCondition cS = new CheckSelectedCondition(editor, "p1");
         Rectangle bounds = editor.clickCentered("p1");
         bot.waitUntil(cS);
@@ -163,6 +189,7 @@ public class ChildrenPositionStabilityAfterParentResizeTest extends AbstractSiri
      *             if an error occurs
      */
     public void test_C_after_expand_P1_to_the_right() throws Exception {
+        initializeTC1479Case();
         CheckSelectedCondition cS = new CheckSelectedCondition(editor, "p1");
         Rectangle bounds = editor.clickCentered("p1");
         bot.waitUntil(cS);
@@ -175,6 +202,7 @@ public class ChildrenPositionStabilityAfterParentResizeTest extends AbstractSiri
      *             if an error occurs
      */
     public void test_A_after_expand_P1_to_the_left() throws Exception {
+        initializeTC1479Case();
         CheckSelectedCondition cS = new CheckSelectedCondition(editor, "p1");
         Rectangle bounds = editor.clickCentered("p1");
         bot.waitUntil(cS);
@@ -188,6 +216,7 @@ public class ChildrenPositionStabilityAfterParentResizeTest extends AbstractSiri
      *             if an error occurs
      */
     public void test_C_after_expand_P1_to_the_left() throws Exception {
+        initializeTC1479Case();
         CheckSelectedCondition cS = new CheckSelectedCondition(editor, "p1");
         Rectangle bounds = editor.clickCentered("p1");
         bot.waitUntil(cS);
@@ -201,6 +230,7 @@ public class ChildrenPositionStabilityAfterParentResizeTest extends AbstractSiri
      *             if an error occurs
      */
     public void test_A_after_expand_P1_to_the_top() throws Exception {
+        initializeTC1479Case();
         CheckSelectedCondition cS = new CheckSelectedCondition(editor, "p1");
         Rectangle bounds = editor.clickCentered("p1");
         bot.waitUntil(cS);
@@ -214,6 +244,7 @@ public class ChildrenPositionStabilityAfterParentResizeTest extends AbstractSiri
      *             if an error occurs
      */
     public void test_C_after_expand_P1_to_the_top() throws Exception {
+        initializeTC1479Case();
         CheckSelectedCondition cS = new CheckSelectedCondition(editor, "p1");
         Rectangle bounds = editor.clickCentered("p1");
         bot.waitUntil(cS);
@@ -227,6 +258,7 @@ public class ChildrenPositionStabilityAfterParentResizeTest extends AbstractSiri
      *             if an error occurs
      */
     public void test_A_after_expand_P1_to_the_bottom() throws Exception {
+        initializeTC1479Case();
         CheckSelectedCondition cS = new CheckSelectedCondition(editor, "p1");
         Rectangle bounds = editor.clickCentered("p1");
         bot.waitUntil(cS);
@@ -240,6 +272,7 @@ public class ChildrenPositionStabilityAfterParentResizeTest extends AbstractSiri
      *             if an error occurs
      */
     public void test_C_after_expand_P1_to_the_bottom() throws Exception {
+        initializeTC1479Case();
         CheckSelectedCondition cS = new CheckSelectedCondition(editor, "p1");
         Rectangle bounds = editor.clickCentered("p1");
         bot.waitUntil(cS);
@@ -252,6 +285,7 @@ public class ChildrenPositionStabilityAfterParentResizeTest extends AbstractSiri
      *             if an error occurs
      */
     public void test_B_after_expand_P2_to_the_right() throws Exception {
+        initializeTC1479Case();
         CheckSelectedCondition cS = new CheckSelectedCondition(editor, "p2");
         Rectangle bounds = editor.clickCentered("p2");
         bot.waitUntil(cS);
@@ -266,6 +300,7 @@ public class ChildrenPositionStabilityAfterParentResizeTest extends AbstractSiri
      *             if an error occurs
      */
     protected void test_D_after_expand_P2_to_the_right(ZoomLevel zoomLevel) throws Exception {
+        initializeTC1479Case();
         editor.zoom(zoomLevel);
         try {
             CheckSelectedCondition cS = new CheckSelectedCondition(editor, "p2");
@@ -305,6 +340,7 @@ public class ChildrenPositionStabilityAfterParentResizeTest extends AbstractSiri
      *             if an error occurs
      */
     protected void test_D_after_expand_P31_to_the_right(ZoomLevel zoomLevel) throws Exception {
+        initializeTC1479Case();
         editor.maximize();
         editor.zoom(zoomLevel);
         try {
@@ -346,6 +382,7 @@ public class ChildrenPositionStabilityAfterParentResizeTest extends AbstractSiri
      *             if an error occurs
      */
     protected void test_D_after_expand_P31_to_the_left(ZoomLevel zoomLevel) throws Exception {
+        initializeTC1479Case();
         editor.maximize();
         editor.zoom(zoomLevel);
         try {
@@ -386,6 +423,7 @@ public class ChildrenPositionStabilityAfterParentResizeTest extends AbstractSiri
      *             if an error occurs
      */
     protected void test_D_after_expand_P31_to_the_top(ZoomLevel zoomLevel) throws Exception {
+        initializeTC1479Case();
         editor.maximize();
         editor.zoom(zoomLevel);
         try {
@@ -426,6 +464,7 @@ public class ChildrenPositionStabilityAfterParentResizeTest extends AbstractSiri
      *             if an error occurs
      */
     protected void test_D_after_expand_P31_to_the_bottom(ZoomLevel zoomLevel) throws Exception {
+        initializeTC1479Case();
         editor.maximize();
         editor.zoom(zoomLevel);
         try {
@@ -464,6 +503,7 @@ public class ChildrenPositionStabilityAfterParentResizeTest extends AbstractSiri
      *             if an error occurs
      */
     public void test_B_after_expand_P2_to_the_left() throws Exception {
+        initializeTC1479Case();
         CheckSelectedCondition cS = new CheckSelectedCondition(editor, "p2");
         Rectangle bounds = editor.clickCentered("p2");
         bot.waitUntil(cS);
@@ -478,6 +518,7 @@ public class ChildrenPositionStabilityAfterParentResizeTest extends AbstractSiri
      *             if an error occurs
      */
     protected void test_D_after_expand_P2_to_the_left(ZoomLevel zoomLevel) throws Exception {
+        initializeTC1479Case();
         editor.zoom(zoomLevel);
         try {
             CheckSelectedCondition cS = new CheckSelectedCondition(editor, "p2");
@@ -514,6 +555,7 @@ public class ChildrenPositionStabilityAfterParentResizeTest extends AbstractSiri
      *             if an error occurs
      */
     public void test_B_after_expand_P2_to_the_top() throws Exception {
+        initializeTC1479Case();
         CheckSelectedCondition cS = new CheckSelectedCondition(editor, "p2");
         Rectangle bounds = editor.clickCentered("p2");
         bot.waitUntil(cS);
@@ -529,6 +571,7 @@ public class ChildrenPositionStabilityAfterParentResizeTest extends AbstractSiri
      *             if an error occurs
      */
     protected void test_D_after_expand_P2_to_the_top(ZoomLevel zoomLevel) throws Exception {
+        initializeTC1479Case();
         editor.zoom(zoomLevel);
         try {
             CheckSelectedCondition cS = new CheckSelectedCondition(editor, "p2");
@@ -565,6 +608,7 @@ public class ChildrenPositionStabilityAfterParentResizeTest extends AbstractSiri
      *             if an error occurs
      */
     public void test_B_after_expand_P2_to_the_bottom() throws Exception {
+        initializeTC1479Case();
         CheckSelectedCondition cS = new CheckSelectedCondition(editor, "p2");
         Rectangle bounds = editor.clickCentered("p2");
         bot.waitUntil(cS);
@@ -580,6 +624,7 @@ public class ChildrenPositionStabilityAfterParentResizeTest extends AbstractSiri
      *             if an error occurs
      */
     protected void test_D_after_expand_P2_to_the_bottom(ZoomLevel zoomLevel) throws Exception {
+        initializeTC1479Case();
         editor.zoom(zoomLevel);
         try {
             CheckSelectedCondition cS = new CheckSelectedCondition(editor, "p2");
@@ -616,22 +661,24 @@ public class ChildrenPositionStabilityAfterParentResizeTest extends AbstractSiri
      *             if an error occurs
      */
     public void test_D_after_resizing_P2_from_north_to_south_on_two_drags() throws Exception {
+        initializeTC1479Case();
         CheckSelectedCondition cS = new CheckSelectedCondition(editor, "p2");
         Rectangle bounds = editor.clickCentered("p2");
         bot.waitUntil(cS);
 
-        editor.drag(bounds.getTop(), bounds.getTop().getTranslated(TRANSLATION_PLUS_80Y));
+        editor.drag(bounds.getTop(), bounds.getTop().getTranslated(TRANSLATION_PLUS_60Y));
         final Rectangle boundsAfterFirstDrag = getBounds("D");
+        assertEquals("The port's position isn't the same before and after the first drag!", dBefore.y, boundsAfterFirstDrag.y);
 
         bounds = editor.clickCentered("p2");
         bot.waitUntil(cS);
         SWTBotUtils.waitAllUiEvents();
 
         // Second drag
-        editor.drag(bounds.getTop(), bounds.getTop().getTranslated(TRANSLATION_MINUS_80Y));
+        editor.drag(bounds.getTop(), bounds.getTop().getTranslated(TRANSLATION_MINUS_60Y));
         final Rectangle boundsAfterSecondDrag = getBounds("D");
 
-        assertEquals("The port's position isn't the same before and after the second drag!", boundsAfterSecondDrag.y, boundsAfterFirstDrag.y);
+        assertEquals("The port's position isn't the same before and after the second drag!", boundsAfterFirstDrag.y, boundsAfterSecondDrag.y);
     }
 
     /**
@@ -639,6 +686,7 @@ public class ChildrenPositionStabilityAfterParentResizeTest extends AbstractSiri
      *             if an error occurs
      */
     public void test_D_after_resizing_P2_from_south_to_north_on_two_drags() throws Exception {
+        initializeTC1479Case();
         CheckSelectedCondition cS = new CheckSelectedCondition(editor, "p2");
         Rectangle bounds = editor.clickCentered("p2");
         bot.waitUntil(cS);
@@ -663,6 +711,7 @@ public class ChildrenPositionStabilityAfterParentResizeTest extends AbstractSiri
      *             if an error occurs
      */
     public void test_B_after_resizing_P2_from_east_to_west_on_two_drags() throws Exception {
+        initializeTC1479Case();
         CheckSelectedCondition cS = new CheckSelectedCondition(editor, "p2");
         Rectangle bounds = editor.clickCentered("p2");
         bot.waitUntil(cS);
@@ -687,6 +736,7 @@ public class ChildrenPositionStabilityAfterParentResizeTest extends AbstractSiri
      *             if an error occurs
      */
     public void test_B_after_resizing_P2_from_west_to_east_on_two_drags() throws Exception {
+        initializeTC1479Case();
         CheckSelectedCondition cS = new CheckSelectedCondition(editor, "p2");
         Rectangle bounds = editor.clickCentered("p2");
         bot.waitUntil(cS);
@@ -711,20 +761,21 @@ public class ChildrenPositionStabilityAfterParentResizeTest extends AbstractSiri
      *             if an error occurs
      */
     public void test_D_after_resizing_P2_from_north_to_south_on_close_reopen_diag() throws Exception {
+        initializeTC1479Case();
         CheckSelectedCondition cS = new CheckSelectedCondition(editor, "p2");
         Rectangle bounds = editor.clickCentered("p2");
         bot.waitUntil(cS);
 
-        editor.drag(bounds.getTop(), bounds.getTop().getTranslated(TRANSLATION_PLUS_80Y));
-        Rectangle boundsAfterDrag = getBounds("D");
-        checkBoundsAfterDrag("D", equalTo(boundsAfterDrag));
+        editor.drag(bounds.getTop(), bounds.getTop().getTranslated(TRANSLATION_PLUS_60Y));
+        checkBoundsAfterDrag("D", equalTo(dBefore));
     }
 
     /**
      * @throws Exception
      *             if an error occurs
      */
-    public void test_D_after_resizing_P2_from_south_to_nort_on_close_reopen_diag() throws Exception {
+    public void test_D_after_resizing_P2_from_west_to_east_on_close_reopen_diag() throws Exception {
+        initializeTC1479Case();
         CheckSelectedCondition cS = new CheckSelectedCondition(editor, "p2");
         Rectangle bounds = editor.clickCentered("p2");
         bot.waitUntil(cS);
@@ -739,13 +790,13 @@ public class ChildrenPositionStabilityAfterParentResizeTest extends AbstractSiri
      *             if an error occurs
      */
     public void test_B_after_resizing_P2_from_east_to_west_on_close_reopen_diag() throws Exception {
+        initializeTC1479Case();
         CheckSelectedCondition cS = new CheckSelectedCondition(editor, "p2");
         Rectangle bounds = editor.clickCentered("p2");
         bot.waitUntil(cS);
 
-        editor.drag(bounds.getRight(), bounds.getRight().getTranslated(TRANSLATION_MINUS_100X));
-        Rectangle boundsAfterDrag = getBounds("B");
-        checkBoundsAfterDrag("B", equalTo(boundsAfterDrag));
+        editor.drag(bounds.getRight(), bounds.getRight().getTranslated(TRANSLATION_MINUS_80X));
+        checkBoundsAfterDrag("B", equalTo(bBefore));
         checkBoundsAfterDrag("CB", equalTo(nodeBBefore));
     }
 
@@ -754,16 +805,328 @@ public class ChildrenPositionStabilityAfterParentResizeTest extends AbstractSiri
      *             if an error occurs
      */
     public void test_B_after_resizing_P2_from_west_to_east_on_close_reopen_diag() throws Exception {
+        initializeTC1479Case();
         CheckSelectedCondition cS = new CheckSelectedCondition(editor, "p2");
         Rectangle bounds = editor.clickCentered("p2");
         bot.waitUntil(cS);
 
         editor.drag(bounds.getLeft(), bounds.getLeft().getTranslated(TRANSLATION_MINUS_100X));
-        Rectangle boundsAfterDrag = getBounds("B");
-        checkBoundsAfterDrag("B", equalTo(boundsAfterDrag));
+        checkBoundsAfterDrag("B", equalTo(bBefore));
         checkBoundsAfterDrag("CB", equalTo(nodeBBefore.getTranslated(TRANSLATION_MINUS_100X.getNegated())));
     }
 
+    /**
+     * @throws Exception
+     *             if an error occurs
+     */
+    public void test_resize_do_not_move_opposite_border_node_north() throws Exception {
+        openDiagram("DiagWithBorderNodeOnNode", "caseOneNorth");
+        // Check border node on west side
+        CheckSelectedCondition p31SelectedCondition = new CheckSelectedCondition(editor, "p31");
+        Rectangle bounds = editor.clickCentered("p31");
+        bot.waitUntil(p31SelectedCondition);
+
+        final Rectangle bBoundsBeforeDrag = getBounds("B");
+        editor.drag(bounds.getTop(), bounds.getTop().getTranslated(TRANSLATION_PLUS_80Y));
+        checkBoundsAfterDrag("B", equalTo(bBoundsBeforeDrag), "DiagWithBorderNodeOnNode", "caseOneNorth");
+
+        // Check border node on east side
+        CheckSelectedCondition p32SelectedCondition = new CheckSelectedCondition(editor, "p32");
+        bounds = editor.clickCentered("p32");
+        bot.waitUntil(p32SelectedCondition);
+
+        final Rectangle cBoundsBeforeDrag = getBounds("C");
+        editor.drag(bounds.getTop(), bounds.getTop().getTranslated(TRANSLATION_PLUS_80Y));
+        checkBoundsAfterDrag("C", equalTo(cBoundsBeforeDrag), "DiagWithBorderNodeOnNode", "caseOneNorth");
+    }
+
+    /**
+     * @throws Exception
+     *             if an error occurs
+     */
+    public void test_resize_do_not_move_opposite_border_node_west() throws Exception {
+        openDiagram("DiagWithBorderNodeOnNode", "caseOneWest");
+        // Check border node on north side
+        CheckSelectedCondition p31SelectedCondition = new CheckSelectedCondition(editor, "p31");
+        Rectangle bounds = editor.clickCentered("p31");
+        bot.waitUntil(p31SelectedCondition);
+
+        final Rectangle aBoundsBeforeDrag = getBounds("A");
+        editor.drag(bounds.getTop(), bounds.getTop().getTranslated(TRANSLATION_PLUS_100X));
+        checkBoundsAfterDrag("A", equalTo(aBoundsBeforeDrag), "DiagWithBorderNodeOnNode", "caseOneWest");
+
+        // Check border node on south side
+        CheckSelectedCondition p32SelectedCondition = new CheckSelectedCondition(editor, "p32");
+        bounds = editor.clickCentered("p32");
+        bot.waitUntil(p32SelectedCondition);
+
+        final Rectangle dBoundsBeforeDrag = getBounds("D");
+        editor.drag(bounds.getTop(), bounds.getTop().getTranslated(TRANSLATION_PLUS_100X));
+        checkBoundsAfterDrag("D", equalTo(dBoundsBeforeDrag), "DiagWithBorderNodeOnNode", "caseOneWest");
+    }
+
+    /**
+     * @throws Exception
+     *             if an error occurs
+     */
+    public void test_resize_move_border_node_to_stay_in_parent_bounds_north() throws Exception {
+        openDiagram("DiagWithBorderNodeOnNode", "caseTwoNorth");
+        // Check border node on west side
+        CheckSelectedCondition p31SelectedCondition = new CheckSelectedCondition(editor, "p31");
+        Rectangle parentBounds = editor.clickCentered("p31");
+        bot.waitUntil(p31SelectedCondition);
+
+        // Moved at parent y axis
+        Point newParentTop = parentBounds.getTop().getTranslated(TRANSLATION_PLUS_60Y);
+        editor.drag(parentBounds.getTop(), newParentTop);
+        Rectangle bBoundsAfterDrag = getBounds("B");
+        assertEquals("B is not at the expected y location", newParentTop.y, bBoundsAfterDrag.y);
+        undo();
+
+        // Moved just under its brother
+        Rectangle aBoundsBeforeDrag = getBounds("A");
+        editor.drag(parentBounds.getTop(), parentBounds.getTop().getTranslated(TRANSLATION_PLUS_80Y));
+        bBoundsAfterDrag = getBounds("B");
+        assertEquals("B is not at the expected y location", aBoundsBeforeDrag.getBottom().y + 1, bBoundsAfterDrag.y);
+        undo();
+
+        // Moved at parent y axis and second border node changed of side
+        newParentTop = parentBounds.getTop().getTranslated(TRANSLATION_PLUS_140Y);
+        editor.drag(parentBounds.getTop(), newParentTop);
+        bBoundsAfterDrag = getBounds("B");
+        Rectangle aBoundsAfterDrag = getBounds("A");
+        assertEquals("B is not at the expected y location", newParentTop.y, bBoundsAfterDrag.y);
+        Assert.assertNotEquals("A is not at the expected x location", aBoundsBeforeDrag.x, aBoundsAfterDrag.x);
+
+        // Check border node on east side
+        CheckSelectedCondition p32SelectedCondition = new CheckSelectedCondition(editor, "p32");
+        parentBounds = editor.clickCentered("p32");
+        bot.waitUntil(p32SelectedCondition);
+
+        // Moved at parent y axis
+        newParentTop = parentBounds.getTop().getTranslated(TRANSLATION_PLUS_60Y);
+        editor.drag(parentBounds.getTop(), newParentTop);
+        Rectangle dBoundsAfterDrag = getBounds("D");
+        assertEquals("D is not at the expected y location", newParentTop.y, dBoundsAfterDrag.y);
+        undo();
+
+        // Moved just under its brother
+        Rectangle cBoundsBeforeDrag = getBounds("C");
+        editor.drag(parentBounds.getTop(), parentBounds.getTop().getTranslated(TRANSLATION_PLUS_80Y));
+        dBoundsAfterDrag = getBounds("D");
+        assertEquals("D is not at the expected y location", cBoundsBeforeDrag.getBottom().y + 1, dBoundsAfterDrag.y);
+        undo();
+
+        // Moved at parent y axis and second border node changed of side
+        newParentTop = parentBounds.getTop().getTranslated(TRANSLATION_PLUS_140Y);
+        editor.drag(parentBounds.getTop(), newParentTop);
+        dBoundsAfterDrag = getBounds("D");
+        Rectangle cBoundsAfterDrag = getBounds("C");
+        assertEquals("D is not at the expected y location", newParentTop.y, dBoundsAfterDrag.y);
+        Assert.assertNotEquals("C is not at the expected x location", cBoundsBeforeDrag.x, cBoundsAfterDrag.x);
+    }
+
+    /**
+     * @throws Exception
+     *             if an error occurs
+     */
+    public void test_resize_move_border_node_to_stay_in_parent_bounds_south() throws Exception {
+        openDiagram("DiagWithBorderNodeOnNode", "caseTwoSouth");
+        // Check border node on west side
+        CheckSelectedCondition p31SelectedCondition = new CheckSelectedCondition(editor, "p31");
+        Rectangle parentBounds = editor.clickCentered("p31");
+        bot.waitUntil(p31SelectedCondition);
+
+        // Moved at parent bottom y axis
+        Point newParentBottom = parentBounds.getBottom().getTranslated(TRANSLATION_PLUS_40Y.getNegated());
+        editor.drag(parentBounds.getBottom(), newParentBottom);
+        Rectangle bBoundsAfterDrag = getBounds("B");
+        assertEquals("B is not at the expected y location", newParentBottom.y - bBoundsAfterDrag.height - 10, bBoundsAfterDrag.y);
+        undo();
+
+        // Moved just above its brother
+        Rectangle aBoundsBeforeDrag = getBounds("A");
+        editor.drag(parentBounds.getBottom(), parentBounds.getBottom().getTranslated(TRANSLATION_PLUS_60Y.getNegated()));
+        bBoundsAfterDrag = getBounds("B");
+        assertEquals("B is not at the expected y location", aBoundsBeforeDrag.getTop().y - 1, bBoundsAfterDrag.getBottom().y);
+        undo();
+
+        // Moved at parent bottom y axis and second border node changed of side
+        newParentBottom = parentBounds.getBottom().getTranslated(TRANSLATION_PLUS_100Y.getNegated());
+        editor.drag(parentBounds.getBottom(), newParentBottom);
+        bBoundsAfterDrag = getBounds("B");
+        Rectangle aBoundsAfterDrag = getBounds("A");
+        assertEquals("B is not at the expected y location", newParentBottom.y - bBoundsAfterDrag.height - 10, bBoundsAfterDrag.y);
+        Assert.assertNotEquals("A is not at the expected x location", aBoundsBeforeDrag.x, aBoundsAfterDrag.x);
+
+        // Check border node on east side
+        CheckSelectedCondition p32SelectedCondition = new CheckSelectedCondition(editor, "p32");
+        parentBounds = editor.clickCentered("p32");
+        bot.waitUntil(p32SelectedCondition);
+
+        // Moved at 0 y axis
+        newParentBottom = parentBounds.getBottom().getTranslated(TRANSLATION_PLUS_40Y.getNegated());
+        editor.drag(parentBounds.getBottom(), newParentBottom);
+        Rectangle dBoundsAfterDrag = getBounds("D");
+        assertEquals("D is not at the expected y location", newParentBottom.y - dBoundsAfterDrag.height - 10, dBoundsAfterDrag.y);
+        undo();
+
+        // Moved just above its brother
+        Rectangle cBoundsBeforeDrag = getBounds("C");
+        editor.drag(parentBounds.getBottom(), parentBounds.getBottom().getTranslated(TRANSLATION_PLUS_60Y.getNegated()));
+        dBoundsAfterDrag = getBounds("D");
+        assertEquals("D is not at the expected y location", cBoundsBeforeDrag.getTop().y - 1, dBoundsAfterDrag.getBottom().y);
+        undo();
+
+        // Moved at parent bottom y axis and second border node changed of side
+        newParentBottom = parentBounds.getBottom().getTranslated(TRANSLATION_PLUS_100Y.getNegated());
+        editor.drag(parentBounds.getBottom(), newParentBottom);
+        dBoundsAfterDrag = getBounds("D");
+        Rectangle cBoundsAfterDrag = getBounds("C");
+        assertEquals("D is not at the expected y location", newParentBottom.y - dBoundsAfterDrag.height - 10, dBoundsAfterDrag.y);
+        Assert.assertNotEquals("C is not at the expected x location", cBoundsBeforeDrag.x, cBoundsAfterDrag.x);
+    }
+
+    /**
+     * @throws Exception
+     *             if an error occurs
+     */
+    public void test_resize_move_border_node_to_stay_in_parent_bounds_west() throws Exception {
+        openDiagram("DiagWithBorderNodeOnNode", "caseTwoWest");
+        // Check border node on north side
+        CheckSelectedCondition p31SelectedCondition = new CheckSelectedCondition(editor, "p31");
+        Rectangle parentBounds = editor.clickCentered("p31");
+        bot.waitUntil(p31SelectedCondition);
+
+        // Moved at parent x axis
+        Point newParentLeft = parentBounds.getLeft().getTranslated(TRANSLATION_PLUS_60X);
+        editor.drag(parentBounds.getLeft(), newParentLeft);
+        Rectangle bBoundsAfterDrag = getBounds("B");
+        assertEquals("B is not at the expected x location", newParentLeft.x, bBoundsAfterDrag.x);
+        undo();
+
+        // Moved just after its brother
+        Rectangle aBoundsBeforeDrag = getBounds("A");
+        editor.drag(parentBounds.getLeft(), parentBounds.getLeft().getTranslated(TRANSLATION_PLUS_120X));
+        bBoundsAfterDrag = getBounds("B");
+        assertEquals("B is not at the expected x location", aBoundsBeforeDrag.getRight().x + 1, bBoundsAfterDrag.x);
+        undo();
+
+        // Moved at parent x axis and second border node just after
+        newParentLeft = parentBounds.getLeft().getTranslated(TRANSLATION_PLUS_180X);
+        editor.drag(parentBounds.getLeft(), newParentLeft);
+        bBoundsAfterDrag = getBounds("B");
+        Rectangle aBoundsAfterDrag = getBounds("A");
+        assertEquals("B is not at the expected x location", newParentLeft.x, bBoundsAfterDrag.x);
+        assertEquals("A is not at the expected x location", bBoundsAfterDrag.getRight().x + 1, aBoundsAfterDrag.x);
+        undo();
+
+        // Moved at parent x axis and second border node changed of side
+        newParentLeft = parentBounds.getLeft().getTranslated(TRANSLATION_PLUS_200X);
+        editor.drag(parentBounds.getLeft(), newParentLeft);
+        bBoundsAfterDrag = getBounds("B");
+        aBoundsAfterDrag = getBounds("A");
+        assertEquals("B is not at the expected x location", newParentLeft.x, bBoundsAfterDrag.x);
+        Assert.assertNotEquals("A is not at the expected y location", aBoundsBeforeDrag.y, aBoundsAfterDrag.y);
+
+        // Check border node on south side
+        CheckSelectedCondition p32SelectedCondition = new CheckSelectedCondition(editor, "p32");
+        parentBounds = editor.clickCentered("p32");
+        bot.waitUntil(p32SelectedCondition);
+
+        // Moved at parent x axis
+        newParentLeft = parentBounds.getLeft().getTranslated(TRANSLATION_PLUS_60X);
+        editor.drag(parentBounds.getLeft(), newParentLeft);
+        Rectangle dBoundsAfterDrag = getBounds("D");
+        assertEquals("D is not at the expected x location", newParentLeft.x, dBoundsAfterDrag.x);
+        undo();
+
+        // Moved just after its brother
+        Rectangle cBoundsBeforeDrag = getBounds("C");
+        editor.drag(parentBounds.getLeft(), parentBounds.getLeft().getTranslated(TRANSLATION_PLUS_120X));
+        dBoundsAfterDrag = getBounds("D");
+        assertEquals("D is not at the expected x location", cBoundsBeforeDrag.getRight().x + 1, dBoundsAfterDrag.x);
+        undo();
+
+        // Moved at parent x axis and second border node just after
+        newParentLeft = parentBounds.getLeft().getTranslated(TRANSLATION_PLUS_180X);
+        editor.drag(parentBounds.getLeft(), newParentLeft);
+        dBoundsAfterDrag = getBounds("D");
+        Rectangle cBoundsAfterDrag = getBounds("C");
+        assertEquals("D is not at the expected x location", newParentLeft.x, dBoundsAfterDrag.x);
+        assertEquals("C is not at the expected x location", dBoundsAfterDrag.getRight().x + 1, cBoundsAfterDrag.x);
+        undo();
+
+        // Moved at parent x axis and second border node changed of side
+        newParentLeft = parentBounds.getLeft().getTranslated(TRANSLATION_PLUS_200X);
+        editor.drag(parentBounds.getLeft(), parentBounds.getLeft().getTranslated(TRANSLATION_PLUS_200X));
+        dBoundsAfterDrag = getBounds("D");
+        cBoundsAfterDrag = getBounds("C");
+        assertEquals("D is not at the expected x location", newParentLeft.x, dBoundsAfterDrag.x);
+        Assert.assertNotEquals("C is not at the expected y location", cBoundsBeforeDrag.y, cBoundsAfterDrag.y);
+    }
+
+    /**
+     * @throws Exception
+     *             if an error occurs
+     */
+    public void test_resize_move_border_node_to_stay_in_parent_bounds_east() throws Exception {
+        openDiagram("DiagWithBorderNodeOnNode", "caseTwoEast");
+        // Check border node on north side
+        CheckSelectedCondition p31SelectedCondition = new CheckSelectedCondition(editor, "p31");
+        Rectangle parentBounds = editor.clickCentered("p31");
+        bot.waitUntil(p31SelectedCondition);
+
+        // Moved at parent right axis
+        Point newParentRight = parentBounds.getRight().getTranslated(TRANSLATION_PLUS_60X.getNegated());
+        editor.drag(parentBounds.getRight(), newParentRight);
+        Rectangle bBoundsAfterDrag = getBounds("B");
+        assertEquals("B is not at the expected x location", newParentRight.x - bBoundsAfterDrag.width - 10, bBoundsAfterDrag.x);
+        undo();
+
+        // Moved just before its brother
+        Rectangle aBoundsBeforeDrag = getBounds("A");
+        editor.drag(parentBounds.getRight(), parentBounds.getRight().getTranslated(TRANSLATION_MINUS_140X));
+        bBoundsAfterDrag = getBounds("B");
+        assertEquals("B is not at the expected x location", aBoundsBeforeDrag.x - bBoundsAfterDrag.width - 1, bBoundsAfterDrag.x);
+        undo();
+
+        // Moved at parent right axis and second border node changed of side
+        newParentRight = parentBounds.getRight().getTranslated(TRANSLATION_PLUS_180X.getNegated());
+        editor.drag(parentBounds.getRight(), newParentRight);
+        bBoundsAfterDrag = getBounds("B");
+        Rectangle aBoundsAfterDrag = getBounds("A");
+        assertEquals("B is not at the expected x location", newParentRight.x - bBoundsAfterDrag.width - 10, bBoundsAfterDrag.x);
+        Assert.assertNotEquals("A is not at the expected y location", aBoundsBeforeDrag.y, aBoundsAfterDrag.y);
+
+        // Check border node on south side
+        CheckSelectedCondition p32SelectedCondition = new CheckSelectedCondition(editor, "p32");
+        parentBounds = editor.clickCentered("p32");
+        bot.waitUntil(p32SelectedCondition);
+
+        // Moved at parent right axis
+        newParentRight = parentBounds.getRight().getTranslated(TRANSLATION_PLUS_60X.getNegated());
+        editor.drag(parentBounds.getRight(), newParentRight);
+        Rectangle dBoundsAfterDrag = getBounds("D");
+        assertEquals("D is not at the expected x location", newParentRight.x - bBoundsAfterDrag.width - 10, dBoundsAfterDrag.x);
+        undo();
+
+        // Moved just before its brother
+        Rectangle cBoundsBeforeDrag = getBounds("C");
+        editor.drag(parentBounds.getRight(), parentBounds.getRight().getTranslated(TRANSLATION_MINUS_140X));
+        dBoundsAfterDrag = getBounds("D");
+        assertEquals("D is not at the expected x location", cBoundsBeforeDrag.x - dBoundsAfterDrag.width - 1, dBoundsAfterDrag.x);
+        undo();
+
+        // Moved at parent right axis and second border node changed of side
+        newParentRight = parentBounds.getRight().getTranslated(TRANSLATION_PLUS_180X.getNegated());
+        editor.drag(parentBounds.getRight(), newParentRight);
+        dBoundsAfterDrag = getBounds("D");
+        Rectangle cBoundsAfterDrag = getBounds("C");
+        assertEquals("D is not at the expected x location", newParentRight.x - dBoundsAfterDrag.width - 10, dBoundsAfterDrag.x);
+        Assert.assertNotEquals("C is not at the expected y location", cBoundsBeforeDrag.y, cBoundsAfterDrag.y);
+    }
+
     private void openDiagram(final String representationName, final String diagramName) {
         editor = (SWTBotSiriusDiagramEditor) openRepresentation(localSession.getOpenedSession(), representationName, diagramName, DDiagram.class);
         editor.setSnapToGrid(false);
@@ -791,6 +1154,22 @@ public class ChildrenPositionStabilityAfterParentResizeTest extends AbstractSiri
      *            The matcher to do the check
      */
     private void checkBoundsAfterDrag(String portName, Matcher<Rectangle> matcher) {
+        checkBoundsAfterDrag(portName, matcher, "TC1479", "TC1479");
+    }
+
+    /**
+     * Check that the bounds is OK :
+     * <UL>
+     * <LI>just after the drag,</LI>
+     * <LI>after a save, close and open of the editor.</LI>
+     * </UL>
+     * 
+     * @param portName
+     *            The name of the port to check.
+     * @param matcher
+     *            The matcher to do the check
+     */
+    private void checkBoundsAfterDrag(String portName, Matcher<Rectangle> matcher, String representationName, String diagramName) {
         // Check just after drag
         final Rectangle boundsAfterDrag = getBounds(portName);
         assertThat(boundsAfterDrag, matcher);
@@ -798,7 +1177,7 @@ public class ChildrenPositionStabilityAfterParentResizeTest extends AbstractSiri
         editor.save();
         editor.close();
         SWTBotUtils.waitAllUiEvents();
-        openDiagram("TC1479", "TC1479");
+        openDiagram(representationName, diagramName);
         final Rectangle boundsAfterReopening = getBounds(portName);
         assertThat("The port's position isn't the same before and after reopening the representation!", boundsAfterReopening, matcher);
     }