[498474] Edge must have a snap back labels action

-Add a "Snap Back Label(s)" action on diagram edges in contextual menu
format. This action reset the edge labels location to its creation
default one.

Bug: 498474
Change-Id: I6425ccc4baf56aef3f3fb65912823c3562ce20f3
Signed-off-by: pguilet <pierre.guilet@obeo.fr>

20 files changed, 1745 insertions, 10 deletions

diff --git a/plugins/org.eclipse.sirius.diagram.ui/plugin.properties b/plugins/org.eclipse.sirius.diagram.ui/plugin.properties
index 4c7df53131..19acb7de86 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/plugin.properties
+++ b/plugins/org.eclipse.sirius.diagram.ui/plugin.properties
@@ -1108,6 +1108,9 @@ SiriusDocumentProvider_SaveNextResourceTask=Saving {0}
 SiriusDocumentProvider_UnsynchronizedFileSaveError=The file has been changed on the file system
 SiriusDocumentProvider_handleElementContentChanged=Failed to refresh hierarchy for changed resource
 SiriusDocumentProvider_isModifiable=Updating cache failed
+SiriusEdgeSnapBackAction_EdgeSnapBackActionToolTipText=Snap Back Label(s)
+SiriusEdgeSnapBackAction_EdgeSnapBackLabel=Snap &Back Label(s)
+SiriusEdgeSnapBackAction_EdgeSnapBackCommandLabel=Snap Back Label(s)
 SiriusElementChooserDialog_SelectModelElementTitle=Select model element
 SiriusEnhancedPrintActionHelper_invalidIworkbenchPart = Invalid IWorkbenchPart
 SiriusInitDiagramFileAction_InitDiagramFileResourceErrorDialogMessage=Model file loading failed
diff --git a/plugins/org.eclipse.sirius.diagram.ui/plugin.xml b/plugins/org.eclipse.sirius.diagram.ui/plugin.xml
index 3b935f9474..bf42015e4f 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/plugin.xml
+++ b/plugins/org.eclipse.sirius.diagram.ui/plugin.xml
@@ -162,7 +162,18 @@
                  toolbarPath="/toolbarCopyAppearanceGroup">
            </partAction>
          </partContribution>
-
+         
+		<popupContribution class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider">
+            <popupStructuredContributionCriteria objectClass="org.eclipse.sirius.diagram.ui.edit.api.part.AbstractDiagramEdgeEditPart">
+            </popupStructuredContributionCriteria>
+            <popupMenu path="/filterFormatGroup" id="formatMenu">
+            </popupMenu>
+            <popupMenuGroup path="/formatMenu/" id="miscellaneousGroup">
+            </popupMenuGroup>
+            <popupAction path="/formatMenu/miscellaneousGroup" id="edgeSnapBackAction">
+            </popupAction>
+          </popupContribution>       
+          
          <popupContribution class="org.eclipse.sirius.diagram.ui.tools.internal.menu.DiagramEditorContextMenuProvider">
             <popupStructuredContributionCriteria objectClass="org.eclipse.sirius.diagram.ui.edit.api.part.ISiriusEditPart" />
             <popupMenuGroup path="/editMenu/" id="copyFormatGroup" separator="true"/>
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/edit/api/part/AbstractDiagramEdgeEditPart.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/edit/api/part/AbstractDiagramEdgeEditPart.java
index 1fd6cb71d1..7bd11747e2 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/edit/api/part/AbstractDiagramEdgeEditPart.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/edit/api/part/AbstractDiagramEdgeEditPart.java
@@ -54,6 +54,7 @@ import org.eclipse.sirius.diagram.ui.edit.internal.part.DiagramElementEditPartOp
 import org.eclipse.sirius.diagram.ui.edit.internal.part.EditStatusUpdater;
 import org.eclipse.sirius.diagram.ui.graphical.edit.policies.DEdgeSelectionFeedbackEditPolicy;
 import org.eclipse.sirius.diagram.ui.graphical.edit.policies.LaunchToolEditPolicy;
+import org.eclipse.sirius.diagram.ui.graphical.edit.policies.SiriusEdgeLabelSnapBackEditPolicy;
 import org.eclipse.sirius.diagram.ui.graphical.edit.policies.SiriusPropertyHandlerEditPolicy;
 import org.eclipse.sirius.diagram.ui.internal.edit.policies.SiriusConnectionEditPolicy;
 import org.eclipse.sirius.diagram.ui.tools.api.figure.SiriusWrapLabel;
@@ -64,7 +65,6 @@ import org.eclipse.sirius.diagram.ui.tools.internal.graphical.edit.policies.Siri
 import org.eclipse.sirius.diagram.ui.tools.internal.routers.SiriusBendpointConnectionRouter;
 import org.eclipse.sirius.diagram.ui.tools.internal.ruler.SiriusSnapToHelperUtil;
 import org.eclipse.sirius.ext.gmf.runtime.editparts.GraphicalHelper;
-import org.eclipse.sirius.ext.gmf.runtime.editpolicies.SiriusSnapFeedbackPolicy;
 import org.eclipse.sirius.viewpoint.description.tool.AbstractToolDescription;
 import org.eclipse.sirius.viewpoint.description.tool.PaneBasedSelectionWizardDescription;
 import org.eclipse.sirius.viewpoint.description.tool.SelectionWizardDescription;
@@ -161,8 +161,9 @@ public abstract class AbstractDiagramEdgeEditPart extends ConnectionNodeEditPart
         } else {
             installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, selectionFeedBackEditPolicy);
         }
-        // Replace the feedback policy to have a lighter color for guides
-        installEditPolicy(EditPolicyRoles.SNAP_FEEDBACK_ROLE, new SiriusSnapFeedbackPolicy());
+        // Policy that handles snap back action and have a lighter color for
+        // guides
+        installEditPolicy(EditPolicyRoles.SNAP_FEEDBACK_ROLE, new SiriusEdgeLabelSnapBackEditPolicy());
     }
 
     @Override
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/graphical/edit/policies/SiriusEdgeLabelSnapBackEditPolicy.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/graphical/edit/policies/SiriusEdgeLabelSnapBackEditPolicy.java
new file mode 100644
index 0000000000..de24d9c2c3
--- /dev/null
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/graphical/edit/policies/SiriusEdgeLabelSnapBackEditPolicy.java
@@ -0,0 +1,102 @@
+/*******************************************************************************
+ * Copyright (c) 2016 THALES GLOBAL SERVICES and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.sirius.diagram.ui.graphical.edit.policies;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
+import org.eclipse.gmf.runtime.diagram.ui.commands.SetBoundsCommand;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.LabelEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;
+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.sirius.diagram.DDiagramElement;
+import org.eclipse.sirius.diagram.ui.internal.edit.parts.AbstractDEdgeNameEditPart;
+import org.eclipse.sirius.diagram.ui.provider.Messages;
+import org.eclipse.sirius.diagram.ui.tools.api.ui.actions.ActionIds;
+import org.eclipse.sirius.ext.gmf.runtime.editpolicies.SiriusSnapFeedbackPolicy;
+
+/**
+ * Sirius edit policy which support the {@link ActionIds#EDGE_SNAP_BACK} request
+ * type on AbstractDiagramEdgeEditPart.
+ * 
+ * Returns a composed command with one {@link SetBoundsCommand} by existing
+ * labels of the edge with offset to its default location at creation.
+ * 
+ * @author pguilet
+ */
+public class SiriusEdgeLabelSnapBackEditPolicy extends SiriusSnapFeedbackPolicy {
+
+    /**
+     * Returns a <code>Command</code> which sets the label's offset to its
+     * original position.
+     * 
+     * @param request
+     *            the request
+     * @return the command
+     */
+    @Override
+    public Command getCommand(Request request) {
+        if (ActionIds.EDGE_SNAP_BACK.equals(request.getType())) {
+            View view = (View) getHost().getModel();
+            if (view.getElement() instanceof DDiagramElement) {
+                List<?> childrenPart = getHost().getChildren();
+                TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost()).getEditingDomain();
+                // Since 4.0 we can have a maximum of three labels.
+                List<SetBoundsCommand> list = new ArrayList<SetBoundsCommand>(3);
+                for (Object childPart : childrenPart) {
+                    if (childPart instanceof AbstractDEdgeNameEditPart && !((AbstractDEdgeNameEditPart) childPart).getEditText().isEmpty()) {
+                        View model = (View) ((AbstractDEdgeNameEditPart) childPart).getModel();
+                        String hint = model.getType();
+                        Point offset = LabelEditPart.getSnapBackPosition(hint);
+                        if (offset != null) {
+                            SetBoundsCommand moveCommand = new SetBoundsCommand(editingDomain, DiagramUIMessages.SetLocationCommand_Label_Resize, new EObjectAdapter(model), offset);
+                            list.add(moveCommand);
+                        }
+                    }
+                }
+                if (list.size() > 0) {
+                    CompositeCommand compositeCommand = new CompositeCommand(Messages.SiriusEdgeSnapBackAction_EdgeSnapBackCommandLabel, list);
+                    return new ICommandProxy(compositeCommand);
+                }
+
+            }
+
+        }
+        return null;
+    }
+
+    @Override
+    public EditPart getTargetEditPart(Request request) {
+        if (understandsRequest(request))
+            return getHost();
+        return super.getTargetEditPart(request);
+    }
+
+    /**
+     * Understands RActionIds.EDGE_SNAP_BACK request types.
+     * 
+     * @param request
+     * @return boolean
+     */
+    @Override
+    public boolean understandsRequest(Request request) {
+        return ActionIds.EDGE_SNAP_BACK.equals(request.getType());
+    }
+}
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/providers/SiriusContributionItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/providers/SiriusContributionItemProvider.java
index c000e60f0c..20d606c7c5 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/providers/SiriusContributionItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/providers/SiriusContributionItemProvider.java
@@ -20,6 +20,7 @@ import org.eclipse.sirius.diagram.ui.tools.internal.actions.DeselectAllAction;
 import org.eclipse.sirius.diagram.ui.tools.internal.actions.SaveAsImageFileAction;
 import org.eclipse.sirius.diagram.ui.tools.internal.actions.SelectHiddenElementsAction;
 import org.eclipse.sirius.diagram.ui.tools.internal.actions.SiriusCopyAppearancePropertiesAction;
+import org.eclipse.sirius.diagram.ui.tools.internal.actions.SiriusEdgeSnapBackAction;
 import org.eclipse.sirius.diagram.ui.tools.internal.actions.SizeBothAction;
 import org.eclipse.sirius.diagram.ui.tools.internal.actions.TabbarRouterAction;
 import org.eclipse.sirius.diagram.ui.tools.internal.actions.distribute.DistributeAction;
@@ -74,6 +75,8 @@ public class SiriusContributionItemProvider extends AbstractContributionItemProv
             result = new SelectHiddenElementsAction(workbenchPage);
         } else if (ActionIds.ROUTING_STYLE.equals(actionId)) {
             result = TabbarRouterAction.createTreeRouterAction(workbenchPage);
+        } else if (ActionIds.EDGE_SNAP_BACK.equals(actionId)) {
+            result = new SiriusEdgeSnapBackAction(workbenchPage);
         } else if (ActionIds.DESELECT_ALL.equals(actionId)) {
             result = new DeselectAllAction();
         } else if (ActionIds.DISTRIBUTE_GAPS_HORIZONTALLY.equals(actionId)) {
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/ui/actions/ActionIds.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/ui/actions/ActionIds.java
index 5752a9aba6..8690a62a5d 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/ui/actions/ActionIds.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/ui/actions/ActionIds.java
@@ -104,4 +104,8 @@ public interface ActionIds {
      */
     String ACTION_SIRIUS_COPY_APPEARANCE_PROPERTIES = "siriusCopyAppearancePropertiesAction"; //$NON-NLS-1$
 
+    /**
+     * Action's id of the action snap backing all labels of an edge.
+     */
+    String EDGE_SNAP_BACK = "edgeSnapBackAction"; //$NON-NLS-1$
 }
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/actions/SiriusEdgeSnapBackAction.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/actions/SiriusEdgeSnapBackAction.java
new file mode 100644
index 0000000000..b666704991
--- /dev/null
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/actions/SiriusEdgeSnapBackAction.java
@@ -0,0 +1,64 @@
+/*******************************************************************************
+ * Copyright (c) 2016 THALES GLOBAL SERVICES and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.sirius.diagram.ui.tools.internal.actions;
+
+import org.eclipse.gef.Request;
+import org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction;
+import org.eclipse.gmf.runtime.diagram.ui.actions.internal.l10n.DiagramUIActionsPluginImages;
+import org.eclipse.sirius.diagram.ui.provider.Messages;
+import org.eclipse.sirius.diagram.ui.tools.api.ui.actions.ActionIds;
+import org.eclipse.ui.IWorkbenchPage;
+
+/**
+ * Action that will permit a user to snap back all existing and non empty labels
+ * of a connection back to its original position relative to the connection.
+ * 
+ * @author <a href="mailto:pierre.guilet@obeo.fr">Pierre Guilet</a>
+ */
+@SuppressWarnings("restriction")
+public class SiriusEdgeSnapBackAction extends DiagramAction {
+
+    /**
+     * Initialize action.
+     * 
+     * @param page
+     *            the {@link IWorkbenchPage} where the action takes place.
+     */
+    public SiriusEdgeSnapBackAction(IWorkbenchPage page) {
+        super(page);
+    }
+
+    @Override
+    public void init() {
+        super.init();
+        setText(Messages.SiriusEdgeSnapBackAction_EdgeSnapBackLabel);
+        setId(ActionIds.EDGE_SNAP_BACK);
+        setToolTipText(Messages.SiriusEdgeSnapBackAction_EdgeSnapBackActionToolTipText);
+        setImageDescriptor(DiagramUIActionsPluginImages.DESC_SNAPBACK);
+        setHoverImageDescriptor(getImageDescriptor());
+    }
+
+    @Override
+    protected Request createTargetRequest() {
+        return new Request(ActionIds.EDGE_SNAP_BACK);
+    }
+
+    @Override
+    protected boolean isSelectionListener() {
+        return true;
+    }
+
+    @Override
+    protected boolean isOperationHistoryListener() {
+        return true;
+    }
+
+}
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src/org/eclipse/sirius/diagram/ui/provider/Messages.java b/plugins/org.eclipse.sirius.diagram.ui/src/org/eclipse/sirius/diagram/ui/provider/Messages.java
index a39d9755a0..3a7ea0bf73 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src/org/eclipse/sirius/diagram/ui/provider/Messages.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src/org/eclipse/sirius/diagram/ui/provider/Messages.java
@@ -1107,6 +1107,15 @@ public final class Messages {
     public static String SiriusDocumentProvider_UnsynchronizedFileSaveError;
 
     @TranslatableMessage
+    public static String SiriusEdgeSnapBackAction_EdgeSnapBackActionToolTipText;
+
+    @TranslatableMessage
+    public static String SiriusEdgeSnapBackAction_EdgeSnapBackLabel;
+
+    @TranslatableMessage
+    public static String SiriusEdgeSnapBackAction_EdgeSnapBackCommandLabel;
+
+    @TranslatableMessage
     public static String SiriusElementChooserDialog_SelectModelElementTitle;
 
     @TranslatableMessage
diff --git a/plugins/org.eclipse.sirius.doc/doc/Release_Notes.html b/plugins/org.eclipse.sirius.doc/doc/Release_Notes.html
index 97302e3edb..5f58196e14 100644
--- a/plugins/org.eclipse.sirius.doc/doc/Release_Notes.html
+++ b/plugins/org.eclipse.sirius.doc/doc/Release_Notes.html
@@ -221,6 +221,10 @@
 			<code>org.eclipse.sirius.diagram.ui</code>
 		</h4>
 		<ul>
+			<li><span class="label label-success">Added</span> The constant 
+				<code>EDGE_SNAP_BACK</code> has been added in class 
+				<code>org.eclipse.sirius.diagram.ui.tools.api.ui.actions.ActionIds</code>. It corresponds to the new snap back label action id that is present on edges.
+			</li>
 			<li><span class="label label-success">Added</span> 2 methods are added in 
 				<code>org.eclipse.sirius.diagram.ui.tools.api.layout.SiriusLayoutDataManager</code> (and also in 
 				<code>org.eclipse.sirius.diagram.ui.tools.api.layout.AbstractSiriusLayoutDataManager</code>):
diff --git a/plugins/org.eclipse.sirius.doc/doc/Release_Notes.textile b/plugins/org.eclipse.sirius.doc/doc/Release_Notes.textile
index 854efe1afb..0785276bac 100644
--- a/plugins/org.eclipse.sirius.doc/doc/Release_Notes.textile
+++ b/plugins/org.eclipse.sirius.doc/doc/Release_Notes.textile
@@ -49,6 +49,7 @@ h4. Changes in @org.eclipse.sirius.diagram@
 
 h4. Changes in @org.eclipse.sirius.diagram.ui@
 
+* <span class="label label-success">Added</span> The constant @EDGE_SNAP_BACK@ has been added in class @org.eclipse.sirius.diagram.ui.tools.api.ui.actions.ActionIds@. It corresponds to the new snap back label action id that is present on edges.
 * <span class="label label-success">Added</span> 2 methods are added in @org.eclipse.sirius.diagram.ui.tools.api.layout.SiriusLayoutDataManager@ (and also in @org.eclipse.sirius.diagram.ui.tools.api.layout.AbstractSiriusLayoutDataManager@):
 ** @applyFormat(IGraphicalEditPart)@: Apply the current format data (layout data and style data) to the given edit part.
 ** @applyStyle(IGraphicalEditPart)@: Apply the current style data to the give edit part.
diff --git a/plugins/org.eclipse.sirius.doc/doc/user/diagrams/Diagrams.html b/plugins/org.eclipse.sirius.doc/doc/user/diagrams/Diagrams.html
index 7da94c4a84..2095e6463b 100644
--- a/plugins/org.eclipse.sirius.doc/doc/user/diagrams/Diagrams.html
+++ b/plugins/org.eclipse.sirius.doc/doc/user/diagrams/Diagrams.html
@@ -267,6 +267,27 @@
 			</li>
 		</ul>
 		<h3 id="Manageedges">Manage edges</h3>
+		<h4 id="Snapbackedgelabels">Snap back edge labels</h4>
+		<p>All visible edge labels can be snapped back to their default position by using the action 
+			<em>Snap back label(s)</em>. This action is available within the edge contextual menu under the format section 
+			<em>Format/Snap back label(s)</em>:
+			<br/>
+			<img border="0" src="images/snap-back-label.png"/>
+		</p>
+		<p>The result of this action is visible here: 
+			<br/>
+			<img border="0" src="images/snapped-back-label.png"/>
+		</p>
+		<p>This action is also available individually for each visible label of an edge. To use it, you have to use the action 
+			<em>Snap Back</em> under the label contextual menu 
+			<em>Format/Snap Back</em>:
+			<br/>
+			<img border="0" src="images/snap-back-label-from-label.png"/>
+		</p>
+		<p>The result of this action is visible here: </p>
+		<p>
+			<img border="0" src="images/snapped-back-label-from-label.png"/>
+		</p>
 		<h4 id="Movebendpoints">Move bend-points</h4>
 		<p>It is possible to snap the bend-points to all shapes by pressing <kdb>F4</kdb> shortcut key during the move. This feature is only available if the 
 			<a href="#snap_to_shapes">Snap to shapes</a> is already activated for the current diagram. As for 
diff --git a/plugins/org.eclipse.sirius.doc/doc/user/diagrams/Diagrams.textile b/plugins/org.eclipse.sirius.doc/doc/user/diagrams/Diagrams.textile
index a25d68e22c..c855ed5383 100644
--- a/plugins/org.eclipse.sirius.doc/doc/user/diagrams/Diagrams.textile
+++ b/plugins/org.eclipse.sirius.doc/doc/user/diagrams/Diagrams.textile
@@ -109,6 +109,21 @@ There are specific shortcuts to change the move behavior:
 
 h3. Manage edges
 
+h4. Snap back edge labels
+
+All visible edge labels can be snapped back to their default position by using the action _Snap back label(s)_. This action is available within the edge contextual menu under the format section _Format/Snap back label(s)_:
+!images/snap-back-label.png!
+
+The result of this action is visible here: 
+!images/snapped-back-label.png!
+
+This action is also available individually for each visible label of an edge. To use it, you have to use the action _Snap Back_ under the label contextual menu _Format/Snap Back_:
+!images/snap-back-label-from-label.png!
+
+The result of this action is visible here: 
+
+!images/snapped-back-label-from-label.png!
+
 h4. Move bend-points
 
 It is possible to snap the bend-points to all shapes by pressing <kdb>F4</kdb> shortcut key during the move. This feature is only available if the "Snap to shapes":#snap_to_shapes is already activated for the current diagram. As for _Snap to grid_, and unlike to snap for node, there is no guide drawn during the move.
diff --git a/plugins/org.eclipse.sirius.doc/doc/user/diagrams/images/snap-back-label-from-label.png b/plugins/org.eclipse.sirius.doc/doc/user/diagrams/images/snap-back-label-from-label.png
new file mode 100644
index 0000000000..857ab78c9a
--- /dev/null
+++ b/plugins/org.eclipse.sirius.doc/doc/user/diagrams/images/snap-back-label-from-label.png
diff --git a/plugins/org.eclipse.sirius.doc/doc/user/diagrams/images/snap-back-label.png b/plugins/org.eclipse.sirius.doc/doc/user/diagrams/images/snap-back-label.png
new file mode 100644
index 0000000000..5bafb8d161
--- /dev/null
+++ b/plugins/org.eclipse.sirius.doc/doc/user/diagrams/images/snap-back-label.png
diff --git a/plugins/org.eclipse.sirius.doc/doc/user/diagrams/images/snapped-back-label-from-label.png b/plugins/org.eclipse.sirius.doc/doc/user/diagrams/images/snapped-back-label-from-label.png
new file mode 100644
index 0000000000..fe1aebf11c
--- /dev/null
+++ b/plugins/org.eclipse.sirius.doc/doc/user/diagrams/images/snapped-back-label-from-label.png
diff --git a/plugins/org.eclipse.sirius.doc/doc/user/diagrams/images/snapped-back-label.png b/plugins/org.eclipse.sirius.doc/doc/user/diagrams/images/snapped-back-label.png
new file mode 100644
index 0000000000..2e7041638b
--- /dev/null
+++ b/plugins/org.eclipse.sirius.doc/doc/user/diagrams/images/snapped-back-label.png
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/edgeLabelMove/VSMForEdgeLabelsMoveTest.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/edgeLabelMove/VSMForEdgeLabelsMoveTest.odesign
index b6f6ae99ef..8aa2b1ff4b 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/edgeLabelMove/VSMForEdgeLabelsMoveTest.odesign
+++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/edgeLabelMove/VSMForEdgeLabelsMoveTest.odesign
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" name="VSMForEdgeLabelsMoveTest" version="10.1.3.201511131800">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" name="VSMForEdgeLabelsMoveTest" version="11.0.0.201601261200">
   <ownedViewpoints name="VSMForEdgeLabelsMoveTest" modelFileExtension="ecore">
     <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='Diagram']/@defaultLayer/@toolSections.1/@ownedTools[name='Drop%20EClass']" name="Diagram" domainClass="ecore.EPackage">
       <metamodel href="http://www.eclipse.org/emf/2002/Ecore#/"/>
@@ -393,6 +393,204 @@
         </toolSections>
       </defaultLayer>
     </ownedRepresentations>
+    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="DiagramWithBeginAndCenterLabel" domainClass="ecore.EPackage">
+      <metamodel href="http://www.eclipse.org/emf/2002/Ecore#/"/>
+      <defaultLayer name="Default">
+        <edgeMappings name="EReference" preconditionExpression="[not name.equalsIgnoreCase('inOut')/]" semanticElements="var:self" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithBeginAndCenterLabel']/@defaultLayer/@containerMappings[name='EClass']" targetMapping="//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithBeginAndCenterLabel']/@defaultLayer/@containerMappings[name='EClass']" targetFinderExpression="feature:eType" sourceFinderExpression="feature:eContainer" domainClass="ecore.EReference" useDomainElement="true">
+          <style sourceArrow="Diamond" routingStyle="manhattan">
+            <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+            <beginLabelStyleDescription labelExpression="aql:self.name+'Begin'">
+              <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+            </beginLabelStyleDescription>
+            <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.name+'Center'">
+              <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+            </centerLabelStyleDescription>
+          </style>
+        </edgeMappings>
+        <edgeMappings name="ESupertypes" semanticCandidatesExpression="" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithBeginAndCenterLabel']/@defaultLayer/@containerMappings[name='EClass']" targetMapping="//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithBeginAndCenterLabel']/@defaultLayer/@containerMappings[name='EClass']" targetFinderExpression="feature:eSuperTypes">
+          <style targetArrow="InputClosedArrow" routingStyle="tree">
+            <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
+            <centerLabelStyleDescription showIcon="false">
+              <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+            </centerLabelStyleDescription>
+          </style>
+        </edgeMappings>
+        <containerMappings name="EClass" semanticCandidatesExpression="[eClassifiers/]" synchronizationLock="true" domainClass="ecore.EClass" childrenPresentation="List">
+          <borderedNodeMappings name="PortIn" preconditionExpression="[name.equalsIgnoreCase('in')/]" semanticCandidatesExpression="feature:eAttributes" createElements="false" domainClass="ecore.EAttribute">
+            <style xsi:type="style:SquareDescription" showIcon="false" labelExpression="" hideLabelByDefault="true" sizeComputationExpression="1" resizeKind="NSEW">
+              <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+              <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+              <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
+            </style>
+          </borderedNodeMappings>
+          <borderedNodeMappings name="PortOut" preconditionExpression="[name.equalsIgnoreCase('out')/]" semanticCandidatesExpression="feature:eAttributes" createElements="false" domainClass="ecore.EAttribute">
+            <style xsi:type="style:SquareDescription" showIcon="false" labelExpression="" hideLabelByDefault="true" sizeComputationExpression="1" resizeKind="NSEW">
+              <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+              <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+              <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
+            </style>
+          </borderedNodeMappings>
+          <subNodeMappings name="Operation" semanticCandidatesExpression="feature:eOperations" domainClass="ecore.EOperation">
+            <style xsi:type="style:BundledImageDescription" labelExpression="[name + '()'/]" labelAlignment="LEFT" tooltipExpression="feature:name" sizeComputationExpression="2">
+              <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+              <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+              <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+            </style>
+          </subNodeMappings>
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="8" arcHeight="8" borderSizeComputationExpression="1" tooltipExpression="feature:name" roundedCorner="true" widthComputationExpression="12" heightComputationExpression="10" backgroundStyle="Liquid" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='EClass']">
+            <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']"/>
+          </style>
+          <conditionnalStyles predicateExpression="feature:interface">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="8" arcHeight="8" borderColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Dark%20EClass']" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_interface.gif" tooltipExpression="feature:name" roundedCorner="true" widthComputationExpression="12" heightComputationExpression="10" backgroundStyle="Liquid" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Abstract%20EClass']">
+              <labelFormat>italic</labelFormat>
+              <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+              <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
+            </style>
+          </conditionnalStyles>
+          <conditionnalStyles predicateExpression="feature:abstract">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="8" arcHeight="8" borderColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Dark%20EClass']" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" tooltipExpression="service:renderTooltip" roundedCorner="true" widthComputationExpression="12" heightComputationExpression="10" backgroundStyle="Liquid" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Abstract%20EClass']">
+              <labelFormat>italic</labelFormat>
+              <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+              <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
+            </style>
+          </conditionnalStyles>
+        </containerMappings>
+      </defaultLayer>
+      <additionalLayers name="Package" activeByDefault="true"/>
+    </ownedRepresentations>
+    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="DiagramWithZeroSpecifiedLabel" domainClass="ecore.EPackage">
+      <metamodel href="http://www.eclipse.org/emf/2002/Ecore#/"/>
+      <defaultLayer name="Default">
+        <edgeMappings name="EReference" preconditionExpression="[not name.equalsIgnoreCase('inOut')/]" semanticElements="var:self" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithZeroSpecifiedLabel']/@defaultLayer/@containerMappings[name='EClass']" targetMapping="//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithZeroSpecifiedLabel']/@defaultLayer/@containerMappings[name='EClass']" targetFinderExpression="feature:eType" sourceFinderExpression="feature:eContainer" domainClass="ecore.EReference" useDomainElement="true">
+          <style sourceArrow="Diamond" routingStyle="manhattan">
+            <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          </style>
+        </edgeMappings>
+        <edgeMappings name="ESupertypes" semanticCandidatesExpression="" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithZeroSpecifiedLabel']/@defaultLayer/@containerMappings[name='EClass']" targetMapping="//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithZeroSpecifiedLabel']/@defaultLayer/@containerMappings[name='EClass']" targetFinderExpression="feature:eSuperTypes">
+          <style targetArrow="InputClosedArrow" routingStyle="tree">
+            <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
+            <centerLabelStyleDescription showIcon="false">
+              <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+            </centerLabelStyleDescription>
+          </style>
+        </edgeMappings>
+        <containerMappings name="EClass" semanticCandidatesExpression="[eClassifiers/]" synchronizationLock="true" domainClass="ecore.EClass" childrenPresentation="List">
+          <borderedNodeMappings name="PortIn" preconditionExpression="[name.equalsIgnoreCase('in')/]" semanticCandidatesExpression="feature:eAttributes" createElements="false" domainClass="ecore.EAttribute">
+            <style xsi:type="style:SquareDescription" showIcon="false" labelExpression="" hideLabelByDefault="true" sizeComputationExpression="1" resizeKind="NSEW">
+              <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+              <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+              <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
+            </style>
+          </borderedNodeMappings>
+          <borderedNodeMappings name="PortOut" preconditionExpression="[name.equalsIgnoreCase('out')/]" semanticCandidatesExpression="feature:eAttributes" createElements="false" domainClass="ecore.EAttribute">
+            <style xsi:type="style:SquareDescription" showIcon="false" labelExpression="" hideLabelByDefault="true" sizeComputationExpression="1" resizeKind="NSEW">
+              <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+              <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+              <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
+            </style>
+          </borderedNodeMappings>
+          <subNodeMappings name="Operation" semanticCandidatesExpression="feature:eOperations" domainClass="ecore.EOperation">
+            <style xsi:type="style:BundledImageDescription" labelExpression="[name + '()'/]" labelAlignment="LEFT" tooltipExpression="feature:name" sizeComputationExpression="2">
+              <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+              <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+              <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+            </style>
+          </subNodeMappings>
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="8" arcHeight="8" borderSizeComputationExpression="1" tooltipExpression="feature:name" roundedCorner="true" widthComputationExpression="12" heightComputationExpression="10" backgroundStyle="Liquid" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='EClass']">
+            <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']"/>
+          </style>
+          <conditionnalStyles predicateExpression="feature:interface">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="8" arcHeight="8" borderColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Dark%20EClass']" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_interface.gif" tooltipExpression="feature:name" roundedCorner="true" widthComputationExpression="12" heightComputationExpression="10" backgroundStyle="Liquid" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Abstract%20EClass']">
+              <labelFormat>italic</labelFormat>
+              <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+              <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
+            </style>
+          </conditionnalStyles>
+          <conditionnalStyles predicateExpression="feature:abstract">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="8" arcHeight="8" borderColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Dark%20EClass']" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" tooltipExpression="service:renderTooltip" roundedCorner="true" widthComputationExpression="12" heightComputationExpression="10" backgroundStyle="Liquid" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Abstract%20EClass']">
+              <labelFormat>italic</labelFormat>
+              <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+              <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
+            </style>
+          </conditionnalStyles>
+        </containerMappings>
+      </defaultLayer>
+      <additionalLayers name="Package" activeByDefault="true"/>
+    </ownedRepresentations>
+    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="DiagramWithEmptyLabel" domainClass="ecore.EPackage">
+      <metamodel href="http://www.eclipse.org/emf/2002/Ecore#/"/>
+      <defaultLayer name="Default">
+        <edgeMappings name="EReference" preconditionExpression="[not name.equalsIgnoreCase('inOut')/]" semanticElements="var:self" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithEmptyLabel']/@defaultLayer/@containerMappings[name='EClass']" targetMapping="//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithEmptyLabel']/@defaultLayer/@containerMappings[name='EClass']" targetFinderExpression="feature:eType" sourceFinderExpression="feature:eContainer" domainClass="ecore.EReference" useDomainElement="true">
+          <style sourceArrow="Diamond" routingStyle="manhattan">
+            <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+            <beginLabelStyleDescription labelExpression="aql:''">
+              <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+            </beginLabelStyleDescription>
+            <centerLabelStyleDescription showIcon="false" labelExpression="aql:''">
+              <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+            </centerLabelStyleDescription>
+            <endLabelStyleDescription showIcon="false" labelExpression="aql:''">
+              <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+            </endLabelStyleDescription>
+          </style>
+        </edgeMappings>
+        <edgeMappings name="ESupertypes" semanticCandidatesExpression="" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithEmptyLabel']/@defaultLayer/@containerMappings[name='EClass']" targetMapping="//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithEmptyLabel']/@defaultLayer/@containerMappings[name='EClass']" targetFinderExpression="feature:eSuperTypes">
+          <style targetArrow="InputClosedArrow" routingStyle="tree">
+            <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
+            <centerLabelStyleDescription showIcon="false">
+              <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+            </centerLabelStyleDescription>
+          </style>
+        </edgeMappings>
+        <containerMappings name="EClass" semanticCandidatesExpression="[eClassifiers/]" synchronizationLock="true" domainClass="ecore.EClass" childrenPresentation="List">
+          <borderedNodeMappings name="PortIn" preconditionExpression="[name.equalsIgnoreCase('in')/]" semanticCandidatesExpression="feature:eAttributes" createElements="false" domainClass="ecore.EAttribute">
+            <style xsi:type="style:SquareDescription" showIcon="false" labelExpression="" hideLabelByDefault="true" sizeComputationExpression="1" resizeKind="NSEW">
+              <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+              <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+              <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
+            </style>
+          </borderedNodeMappings>
+          <borderedNodeMappings name="PortOut" preconditionExpression="[name.equalsIgnoreCase('out')/]" semanticCandidatesExpression="feature:eAttributes" createElements="false" domainClass="ecore.EAttribute">
+            <style xsi:type="style:SquareDescription" showIcon="false" labelExpression="" hideLabelByDefault="true" sizeComputationExpression="1" resizeKind="NSEW">
+              <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+              <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+              <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
+            </style>
+          </borderedNodeMappings>
+          <subNodeMappings name="Operation" semanticCandidatesExpression="feature:eOperations" domainClass="ecore.EOperation">
+            <style xsi:type="style:BundledImageDescription" labelExpression="[name + '()'/]" labelAlignment="LEFT" tooltipExpression="feature:name" sizeComputationExpression="2">
+              <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+              <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+              <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+            </style>
+          </subNodeMappings>
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="8" arcHeight="8" borderSizeComputationExpression="1" tooltipExpression="feature:name" roundedCorner="true" widthComputationExpression="12" heightComputationExpression="10" backgroundStyle="Liquid" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='EClass']">
+            <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']"/>
+          </style>
+          <conditionnalStyles predicateExpression="feature:interface">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="8" arcHeight="8" borderColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Dark%20EClass']" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_interface.gif" tooltipExpression="feature:name" roundedCorner="true" widthComputationExpression="12" heightComputationExpression="10" backgroundStyle="Liquid" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Abstract%20EClass']">
+              <labelFormat>italic</labelFormat>
+              <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+              <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
+            </style>
+          </conditionnalStyles>
+          <conditionnalStyles predicateExpression="feature:abstract">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="8" arcHeight="8" borderColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Dark%20EClass']" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" tooltipExpression="service:renderTooltip" roundedCorner="true" widthComputationExpression="12" heightComputationExpression="10" backgroundStyle="Liquid" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Abstract%20EClass']">
+              <labelFormat>italic</labelFormat>
+              <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+              <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
+            </style>
+          </conditionnalStyles>
+        </containerMappings>
+      </defaultLayer>
+      <additionalLayers name="Package" activeByDefault="true"/>
+    </ownedRepresentations>
   </ownedViewpoints>
   <userColorsPalettes name="Ecore Palette">
     <entries xsi:type="description:UserFixedColor" red="255" green="252" blue="216" name="EClass"/>
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/edgeLabelMove/edgeLabelsMoveTest.aird b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/edgeLabelMove/edgeLabelsMoveTest.aird
index bed4956666..c805286596 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/edgeLabelMove/edgeLabelsMoveTest.aird
+++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/edgeLabelMove/edgeLabelsMoveTest.aird
@@ -1,7 +1,40 @@
 <?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="_MDjUwDRaEeW-JPmEvExBjQ" selectedViews="_wQK38DRaEeW-JPmEvExBjQ" version="10.1.0.201507101000">
+<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="_MDjUwDRaEeW-JPmEvExBjQ" selectedViews="_wQK38DRaEeW-JPmEvExBjQ" version="11.1.0.201606300900">
   <semanticResources>edgeLabelsMoveTest.ecore</semanticResources>
-  <ownedViews xmi:type="viewpoint:DRepresentationContainer" xmi:id="_wQK38DRaEeW-JPmEvExBjQ">
+  <ownedViews xmi:type="viewpoint:DView" xmi:id="_wQK38DRaEeW-JPmEvExBjQ">
+    <viewpoint xmi:type="description:Viewpoint" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']"/>
+    <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" xmi:id="_DzzcgFVqEeaFcNS-NDRImw" name="EdgeWith3SegmentsHVH" representation="_z9TRADRaEeW-JPmEvExBjQ">
+      <description xmi:type="description_1:DiagramDescription" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='Diagram']"/>
+      <target xmi:type="ecore:EPackage" href="edgeLabelsMoveTest.ecore#/"/>
+    </ownedRepresentationDescriptors>
+    <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" xmi:id="_DzzcgVVqEeaFcNS-NDRImw" name="EdgeWithObliqueSegments" representation="_cc4l8EW5EeWfqPjg73IDww">
+      <description xmi:type="description_1:DiagramDescription" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='Diagram']"/>
+      <target xmi:type="ecore:EPackage" href="edgeLabelsMoveTest.ecore#/"/>
+    </ownedRepresentationDescriptors>
+    <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" xmi:id="_DzzcglVqEeaFcNS-NDRImw" name="diagramWithBracketEdge" representation="_w-4x8FIQEeWrtsfg4F0J7g">
+      <description xmi:type="description_1:DiagramDescription" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithBracketEdge']"/>
+      <target xmi:type="ecore:EPackage" href="edgeLabelsMoveTest.ecore#//P1"/>
+    </ownedRepresentationDescriptors>
+    <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" xmi:id="_FKKygFVqEeaFcNS-NDRImw" name="DiagramWithBeginAndCenterLabel" representation="_FKNOwFVqEeaFcNS-NDRImw">
+      <description xmi:type="description_1:DiagramDescription" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithLabelExistenceVariation']"/>
+      <target xmi:type="ecore:EPackage" href="edgeLabelsMoveTest.ecore#/"/>
+    </ownedRepresentationDescriptors>
+    <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" xmi:id="_UdFRAFVsEeaFcNS-NDRImw" name="DiagramWithBeginAndCenterLabel" representation="_UdFRAVVsEeaFcNS-NDRImw">
+      <description xmi:type="description_1:DiagramDescription" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithBeginAndCenterLabel']"/>
+      <target xmi:type="ecore:EPackage" href="edgeLabelsMoveTest.ecore#/"/>
+    </ownedRepresentationDescriptors>
+    <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" xmi:id="_hTdGgFVsEeaFcNS-NDRImw" name="DiagramWithZeroSpecifiedLabel" representation="_hTdGgVVsEeaFcNS-NDRImw">
+      <description xmi:type="description_1:DiagramDescription" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithZeroSpecifiedLabel']"/>
+      <target xmi:type="ecore:EPackage" href="edgeLabelsMoveTest.ecore#/"/>
+    </ownedRepresentationDescriptors>
+    <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" xmi:id="_soaMkFVsEeaFcNS-NDRImw" name="DiagramWithEmptyLabels" representation="_soaMkVVsEeaFcNS-NDRImw">
+      <description xmi:type="description_1:DiagramDescription" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithEmptyLabels']"/>
+      <target xmi:type="ecore:EPackage" href="edgeLabelsMoveTest.ecore#/"/>
+    </ownedRepresentationDescriptors>
+    <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" xmi:id="_75RukFVsEeaFcNS-NDRImw" name="DiagramWithEmptyLabel" representation="_75RukVVsEeaFcNS-NDRImw">
+      <description xmi:type="description_1:DiagramDescription" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithEmptyLabel']"/>
+      <target xmi:type="ecore:EPackage" href="edgeLabelsMoveTest.ecore#/"/>
+    </ownedRepresentationDescriptors>
     <ownedRepresentations xmi:type="diagram:DSemanticDiagram" xmi:id="_z9TRADRaEeW-JPmEvExBjQ" name="EdgeWith3SegmentsHVH">
       <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_z9TRATRaEeW-JPmEvExBjQ" source="DANNOTATION_CUSTOMIZATION_KEY">
         <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_z9TRAjRaEeW-JPmEvExBjQ"/>
@@ -615,6 +648,1067 @@
       <activatedLayers xmi:type="description_1:Layer" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithBracketEdge']/@defaultLayer"/>
       <target xmi:type="ecore:EPackage" href="edgeLabelsMoveTest.ecore#//P1"/>
     </ownedRepresentations>
-    <viewpoint xmi:type="description:Viewpoint" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']"/>
+    <ownedRepresentations xmi:type="diagram:DSemanticDiagram" xmi:id="_FKNOwFVqEeaFcNS-NDRImw" name="DiagramWithBeginAndCenterLabel">
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_FKNOwVVqEeaFcNS-NDRImw" source="DANNOTATION_CUSTOMIZATION_KEY">
+        <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_FKNOwlVqEeaFcNS-NDRImw"/>
+      </ownedAnnotationEntries>
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_FKjNAFVqEeaFcNS-NDRImw" source="GMF_DIAGRAMS">
+        <data xmi:type="notation:Diagram" xmi:id="_FKjNAVVqEeaFcNS-NDRImw" type="Sirius" element="_FKNOwFVqEeaFcNS-NDRImw" measurementUnit="Pixel">
+          <children xmi:type="notation:Node" xmi:id="_FKydkFVqEeaFcNS-NDRImw" type="2003" element="_FKNOw1VqEeaFcNS-NDRImw">
+            <children xmi:type="notation:Node" xmi:id="_FLj5oFVqEeaFcNS-NDRImw" type="5007"/>
+            <children xmi:type="notation:Node" xmi:id="_FLlHwFVqEeaFcNS-NDRImw" type="7004">
+              <styles xmi:type="notation:SortingStyle" xmi:id="_FLlHwVVqEeaFcNS-NDRImw"/>
+              <styles xmi:type="notation:FilteringStyle" xmi:id="_FLlHwlVqEeaFcNS-NDRImw"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_FKydkVVqEeaFcNS-NDRImw" fontName="Segoe UI" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FKydklVqEeaFcNS-NDRImw" x="175" y="235"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_FLtqoFVqEeaFcNS-NDRImw" type="2003" element="_FKNOxVVqEeaFcNS-NDRImw">
+            <children xmi:type="notation:Node" xmi:id="_FLuRsFVqEeaFcNS-NDRImw" type="5007"/>
+            <children xmi:type="notation:Node" xmi:id="_FLuRsVVqEeaFcNS-NDRImw" type="7004">
+              <styles xmi:type="notation:SortingStyle" xmi:id="_FLuRslVqEeaFcNS-NDRImw"/>
+              <styles xmi:type="notation:FilteringStyle" xmi:id="_FLuRs1VqEeaFcNS-NDRImw"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_FLtqoVVqEeaFcNS-NDRImw" fontName="Segoe UI" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FLtqolVqEeaFcNS-NDRImw" x="205"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_FLu4wFVqEeaFcNS-NDRImw" type="2003" element="_FKNOx1VqEeaFcNS-NDRImw">
+            <children xmi:type="notation:Node" xmi:id="_FLvf0FVqEeaFcNS-NDRImw" type="5007"/>
+            <children xmi:type="notation:Node" xmi:id="_FLvf0VVqEeaFcNS-NDRImw" type="7004">
+              <styles xmi:type="notation:SortingStyle" xmi:id="_FLvf0lVqEeaFcNS-NDRImw"/>
+              <styles xmi:type="notation:FilteringStyle" xmi:id="_FLvf01VqEeaFcNS-NDRImw"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_FLu4wVVqEeaFcNS-NDRImw" fontName="Segoe UI" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FLu4wlVqEeaFcNS-NDRImw" x="375" y="160"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_FLwG4FVqEeaFcNS-NDRImw" type="2003" element="_FKNOyVVqEeaFcNS-NDRImw">
+            <children xmi:type="notation:Node" xmi:id="_FLwt8FVqEeaFcNS-NDRImw" type="5007"/>
+            <children xmi:type="notation:Node" xmi:id="_FLxVAFVqEeaFcNS-NDRImw" type="7004">
+              <styles xmi:type="notation:SortingStyle" xmi:id="_FLxVAVVqEeaFcNS-NDRImw"/>
+              <styles xmi:type="notation:FilteringStyle" xmi:id="_FLxVAlVqEeaFcNS-NDRImw"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_FLwG4VVqEeaFcNS-NDRImw" fontName="Segoe UI" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FLwG4lVqEeaFcNS-NDRImw" x="375"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_FLxVA1VqEeaFcNS-NDRImw" type="2003" element="_FKNOy1VqEeaFcNS-NDRImw">
+            <children xmi:type="notation:Node" xmi:id="_FLx8EFVqEeaFcNS-NDRImw" type="5007"/>
+            <children xmi:type="notation:Node" xmi:id="_FLyjIFVqEeaFcNS-NDRImw" type="7004">
+              <styles xmi:type="notation:SortingStyle" xmi:id="_FLyjIVVqEeaFcNS-NDRImw"/>
+              <styles xmi:type="notation:FilteringStyle" xmi:id="_FLyjIlVqEeaFcNS-NDRImw"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_FLxVBFVqEeaFcNS-NDRImw" fontName="Segoe UI" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FLxVBVVqEeaFcNS-NDRImw" x="555" y="160"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_FLyjI1VqEeaFcNS-NDRImw" type="2003" element="_FKNOzVVqEeaFcNS-NDRImw">
+            <children xmi:type="notation:Node" xmi:id="_FLzKMFVqEeaFcNS-NDRImw" type="5007"/>
+            <children xmi:type="notation:Node" xmi:id="_FLzKMVVqEeaFcNS-NDRImw" type="7004">
+              <styles xmi:type="notation:SortingStyle" xmi:id="_FLzxQFVqEeaFcNS-NDRImw"/>
+              <styles xmi:type="notation:FilteringStyle" xmi:id="_FLzxQVVqEeaFcNS-NDRImw"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_FLyjJFVqEeaFcNS-NDRImw" fontName="Segoe UI" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FLyjJVVqEeaFcNS-NDRImw" x="555"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_FL20kFVqEeaFcNS-NDRImw" visible="false" type="2002" element="_FKNOz1VqEeaFcNS-NDRImw">
+            <children xmi:type="notation:Node" xmi:id="_FL4CsFVqEeaFcNS-NDRImw" type="5006"/>
+            <children xmi:type="notation:Node" xmi:id="_FL7GAFVqEeaFcNS-NDRImw" type="7001">
+              <children xmi:type="notation:Node" xmi:id="_FL_XcFVqEeaFcNS-NDRImw" visible="false" type="3009" element="_FKNO0VVqEeaFcNS-NDRImw">
+                <children xmi:type="notation:Node" xmi:id="_FL_-gFVqEeaFcNS-NDRImw" type="5004"/>
+                <children xmi:type="notation:Node" xmi:id="_FMDo4FVqEeaFcNS-NDRImw" type="7003">
+                  <styles xmi:type="notation:SortingStyle" xmi:id="_FMDo4VVqEeaFcNS-NDRImw"/>
+                  <styles xmi:type="notation:FilteringStyle" xmi:id="_FMDo4lVqEeaFcNS-NDRImw"/>
+                </children>
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_FL_XcVVqEeaFcNS-NDRImw" fontName="Segoe UI" fontHeight="8"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FL_XclVqEeaFcNS-NDRImw" x="30" y="159"/>
+              </children>
+              <children xmi:type="notation:Node" xmi:id="_FME3AFVqEeaFcNS-NDRImw" visible="false" type="3009" element="_FKNO01VqEeaFcNS-NDRImw">
+                <children xmi:type="notation:Node" xmi:id="_FME3A1VqEeaFcNS-NDRImw" type="5004"/>
+                <children xmi:type="notation:Node" xmi:id="_FMFeEFVqEeaFcNS-NDRImw" type="7003">
+                  <styles xmi:type="notation:SortingStyle" xmi:id="_FMFeEVVqEeaFcNS-NDRImw"/>
+                  <styles xmi:type="notation:FilteringStyle" xmi:id="_FMFeElVqEeaFcNS-NDRImw"/>
+                </children>
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_FME3AVVqEeaFcNS-NDRImw" fontName="Segoe UI" fontHeight="8"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FME3AlVqEeaFcNS-NDRImw" x="30" y="29"/>
+              </children>
+              <styles xmi:type="notation:SortingStyle" xmi:id="_FL7GAVVqEeaFcNS-NDRImw"/>
+              <styles xmi:type="notation:FilteringStyle" xmi:id="_FL7GAlVqEeaFcNS-NDRImw"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_FL20kVVqEeaFcNS-NDRImw" fontColor="9031421" fontName="Segoe UI" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FL20klVqEeaFcNS-NDRImw"/>
+          </children>
+          <styles xmi:type="notation:DiagramStyle" xmi:id="_FKjNAlVqEeaFcNS-NDRImw"/>
+          <edges xmi:type="notation:Edge" xmi:id="_FMyosFVqEeaFcNS-NDRImw" type="4001" element="_FKNO1VVqEeaFcNS-NDRImw" source="_FKydkFVqEeaFcNS-NDRImw" target="_FLtqoFVqEeaFcNS-NDRImw">
+            <children xmi:type="notation:Node" xmi:id="_FMz20FVqEeaFcNS-NDRImw" type="6001">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FMz20VVqEeaFcNS-NDRImw" x="15" y="-71"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_FM1sAFVqEeaFcNS-NDRImw" type="6002">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FM1sAVVqEeaFcNS-NDRImw" x="21" y="66"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_FM2TEFVqEeaFcNS-NDRImw" type="6003">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FM2TEVVqEeaFcNS-NDRImw" x="-7" y="47"/>
+            </children>
+            <styles xmi:type="notation:ConnectorStyle" xmi:id="_FMyosVVqEeaFcNS-NDRImw" routing="Rectilinear"/>
+            <styles xmi:type="notation:FontStyle" xmi:id="_FMyoslVqEeaFcNS-NDRImw" fontName="Segoe UI" fontHeight="8"/>
+            <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_FMyos1VqEeaFcNS-NDRImw" points="[16, 0, -14, 137]$[16, -137, -14, 0]"/>
+            <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FNArIFVqEeaFcNS-NDRImw" id="(0.5,0.0)"/>
+            <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FNArIVVqEeaFcNS-NDRImw" id="(0.5,1.0)"/>
+          </edges>
+          <edges xmi:type="notation:Edge" xmi:id="_FNBSMFVqEeaFcNS-NDRImw" type="4001" element="_FKNO2lVqEeaFcNS-NDRImw" source="_FLu4wFVqEeaFcNS-NDRImw" target="_FLwG4FVqEeaFcNS-NDRImw">
+            <children xmi:type="notation:Node" xmi:id="_FNB5QFVqEeaFcNS-NDRImw" type="6001">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FNB5QVVqEeaFcNS-NDRImw" y="-10"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_FNB5QlVqEeaFcNS-NDRImw" type="6002">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FNB5Q1VqEeaFcNS-NDRImw" y="10"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_FNB5RFVqEeaFcNS-NDRImw" type="6003">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FNB5RVVqEeaFcNS-NDRImw" y="10"/>
+            </children>
+            <styles xmi:type="notation:ConnectorStyle" xmi:id="_FNBSMVVqEeaFcNS-NDRImw" routing="Rectilinear"/>
+            <styles xmi:type="notation:FontStyle" xmi:id="_FNBSMlVqEeaFcNS-NDRImw" fontName="Segoe UI" fontHeight="8"/>
+            <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_FNBSM1VqEeaFcNS-NDRImw" points="[0, -50, 0, 110]$[0, -110, 0, 50]"/>
+            <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FNCgUFVqEeaFcNS-NDRImw" id="(0.5,0.0)"/>
+            <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FNCgUVVqEeaFcNS-NDRImw" id="(0.5,1.0)"/>
+          </edges>
+          <edges xmi:type="notation:Edge" xmi:id="_FNCgUlVqEeaFcNS-NDRImw" type="4001" element="_FKNO31VqEeaFcNS-NDRImw" source="_FLxVA1VqEeaFcNS-NDRImw" target="_FLyjI1VqEeaFcNS-NDRImw">
+            <children xmi:type="notation:Node" xmi:id="_FNDHYFVqEeaFcNS-NDRImw" type="6001">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FNDHYVVqEeaFcNS-NDRImw" y="-10"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_FNDHYlVqEeaFcNS-NDRImw" type="6002">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FNDHY1VqEeaFcNS-NDRImw" y="10"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_FNDHZFVqEeaFcNS-NDRImw" type="6003">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FNDHZVVqEeaFcNS-NDRImw" y="10"/>
+            </children>
+            <styles xmi:type="notation:ConnectorStyle" xmi:id="_FNCgU1VqEeaFcNS-NDRImw" routing="Rectilinear"/>
+            <styles xmi:type="notation:FontStyle" xmi:id="_FNCgVFVqEeaFcNS-NDRImw" fontName="Segoe UI" fontHeight="8"/>
+            <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_FNCgVVVqEeaFcNS-NDRImw" points="[0, -50, 0, 110]$[0, -110, 0, 50]"/>
+            <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FNDucFVqEeaFcNS-NDRImw" id="(0.5,0.0)"/>
+            <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FNDucVVqEeaFcNS-NDRImw" id="(0.5,1.0)"/>
+          </edges>
+          <edges xmi:type="notation:Edge" xmi:id="_FNDuclVqEeaFcNS-NDRImw" visible="false" type="4001" element="_FKNO5FVqEeaFcNS-NDRImw" source="_FL_XcFVqEeaFcNS-NDRImw" target="_FME3AFVqEeaFcNS-NDRImw">
+            <children xmi:type="notation:Node" xmi:id="_FNEVgFVqEeaFcNS-NDRImw" type="6001">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FNEVgVVqEeaFcNS-NDRImw" y="-10"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_FNEVglVqEeaFcNS-NDRImw" type="6002">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FNEVg1VqEeaFcNS-NDRImw" y="10"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_FNEVhFVqEeaFcNS-NDRImw" type="6003">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FNEVhVVqEeaFcNS-NDRImw" y="10"/>
+            </children>
+            <styles xmi:type="notation:ConnectorStyle" xmi:id="_FNDuc1VqEeaFcNS-NDRImw" routing="Rectilinear"/>
+            <styles xmi:type="notation:FontStyle" xmi:id="_FNDudFVqEeaFcNS-NDRImw" fontName="Segoe UI" fontHeight="8"/>
+            <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_FNDudVVqEeaFcNS-NDRImw" points="[0, -50, 0, 110]$[0, -110, 0, 50]"/>
+            <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FNE8kFVqEeaFcNS-NDRImw" id="(0.5,0.0)"/>
+            <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FNE8kVVqEeaFcNS-NDRImw" id="(0.5,1.0)"/>
+          </edges>
+        </data>
+      </ownedAnnotationEntries>
+      <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_FKNOw1VqEeaFcNS-NDRImw" name="A" tooltipText="A" outgoingEdges="_FKNO1VVqEeaFcNS-NDRImw" width="12" height="10">
+        <target xmi:type="ecore:EClass" href="edgeLabelsMoveTest.ecore#//A"/>
+        <semanticElements xmi:type="ecore:EClass" href="edgeLabelsMoveTest.ecore#//A"/>
+        <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+        <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+        <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_FKNOxFVqEeaFcNS-NDRImw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+          <description xmi:type="style:FlatContainerStyleDescription" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithLabelExistenceVariation']/@defaultLayer/@containerMappings[name='EClass']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:ContainerMapping" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithLabelExistenceVariation']/@defaultLayer/@containerMappings[name='EClass']"/>
+      </ownedDiagramElements>
+      <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_FKNOxVVqEeaFcNS-NDRImw" name="B" tooltipText="B" incomingEdges="_FKNO1VVqEeaFcNS-NDRImw" width="12" height="10">
+        <target xmi:type="ecore:EClass" href="edgeLabelsMoveTest.ecore#//B"/>
+        <semanticElements xmi:type="ecore:EClass" href="edgeLabelsMoveTest.ecore#//B"/>
+        <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+        <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+        <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_FKNOxlVqEeaFcNS-NDRImw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+          <description xmi:type="style:FlatContainerStyleDescription" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithLabelExistenceVariation']/@defaultLayer/@containerMappings[name='EClass']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:ContainerMapping" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithLabelExistenceVariation']/@defaultLayer/@containerMappings[name='EClass']"/>
+      </ownedDiagramElements>
+      <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_FKNOx1VqEeaFcNS-NDRImw" name="C" tooltipText="C" outgoingEdges="_FKNO2lVqEeaFcNS-NDRImw" width="12" height="10">
+        <target xmi:type="ecore:EClass" href="edgeLabelsMoveTest.ecore#//C"/>
+        <semanticElements xmi:type="ecore:EClass" href="edgeLabelsMoveTest.ecore#//C"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_FKNOyFVqEeaFcNS-NDRImw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+          <description xmi:type="style:FlatContainerStyleDescription" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithLabelExistenceVariation']/@defaultLayer/@containerMappings[name='EClass']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:ContainerMapping" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithLabelExistenceVariation']/@defaultLayer/@containerMappings[name='EClass']"/>
+      </ownedDiagramElements>
+      <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_FKNOyVVqEeaFcNS-NDRImw" name="D" tooltipText="D" incomingEdges="_FKNO2lVqEeaFcNS-NDRImw" width="12" height="10">
+        <target xmi:type="ecore:EClass" href="edgeLabelsMoveTest.ecore#//D"/>
+        <semanticElements xmi:type="ecore:EClass" href="edgeLabelsMoveTest.ecore#//D"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_FKNOylVqEeaFcNS-NDRImw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+          <description xmi:type="style:FlatContainerStyleDescription" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithLabelExistenceVariation']/@defaultLayer/@containerMappings[name='EClass']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:ContainerMapping" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithLabelExistenceVariation']/@defaultLayer/@containerMappings[name='EClass']"/>
+      </ownedDiagramElements>
+      <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_FKNOy1VqEeaFcNS-NDRImw" name="E" tooltipText="E" outgoingEdges="_FKNO31VqEeaFcNS-NDRImw" width="12" height="10">
+        <target xmi:type="ecore:EClass" href="edgeLabelsMoveTest.ecore#//E"/>
+        <semanticElements xmi:type="ecore:EClass" href="edgeLabelsMoveTest.ecore#//E"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_FKNOzFVqEeaFcNS-NDRImw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+          <description xmi:type="style:FlatContainerStyleDescription" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithLabelExistenceVariation']/@defaultLayer/@containerMappings[name='EClass']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:ContainerMapping" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithLabelExistenceVariation']/@defaultLayer/@containerMappings[name='EClass']"/>
+      </ownedDiagramElements>
+      <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_FKNOzVVqEeaFcNS-NDRImw" name="F" tooltipText="F" incomingEdges="_FKNO31VqEeaFcNS-NDRImw" width="12" height="10">
+        <target xmi:type="ecore:EClass" href="edgeLabelsMoveTest.ecore#//F"/>
+        <semanticElements xmi:type="ecore:EClass" href="edgeLabelsMoveTest.ecore#//F"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_FKNOzlVqEeaFcNS-NDRImw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+          <description xmi:type="style:FlatContainerStyleDescription" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithLabelExistenceVariation']/@defaultLayer/@containerMappings[name='EClass']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:ContainerMapping" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithLabelExistenceVariation']/@defaultLayer/@containerMappings[name='EClass']"/>
+      </ownedDiagramElements>
+      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_FKNOz1VqEeaFcNS-NDRImw" name="P1" visible="false">
+        <target xmi:type="ecore:EPackage" href="edgeLabelsMoveTest.ecore#//P1"/>
+        <semanticElements xmi:type="ecore:EPackage" href="edgeLabelsMoveTest.ecore#//P1"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_FKNO0FVqEeaFcNS-NDRImw" labelColor="253,206,137" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid">
+          <description xmi:type="style:FlatContainerStyleDescription" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithLabelExistenceVariation']/@defaultLayer/@containerMappings[name='Dropped%20Package']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:ContainerMapping" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithLabelExistenceVariation']/@defaultLayer/@containerMappings[name='Dropped%20Package']"/>
+        <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_FKNO0VVqEeaFcNS-NDRImw" name="C1A" visible="false" tooltipText="C1A" outgoingEdges="_FKNO5FVqEeaFcNS-NDRImw" width="12" height="10">
+          <target xmi:type="ecore:EClass" href="edgeLabelsMoveTest.ecore#//P1/C1A"/>
+          <semanticElements xmi:type="ecore:EClass" href="edgeLabelsMoveTest.ecore#//P1/C1A"/>
+          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_FKNO0lVqEeaFcNS-NDRImw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+            <description xmi:type="style:FlatContainerStyleDescription" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithLabelExistenceVariation']/@defaultLayer/@containerMappings[name='EClass']/@style"/>
+          </ownedStyle>
+          <actualMapping xmi:type="description_1:ContainerMapping" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithLabelExistenceVariation']/@defaultLayer/@containerMappings[name='EClass']"/>
+        </ownedDiagramElements>
+        <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_FKNO01VqEeaFcNS-NDRImw" name="C1B" visible="false" tooltipText="C1B" incomingEdges="_FKNO5FVqEeaFcNS-NDRImw" width="12" height="10">
+          <target xmi:type="ecore:EClass" href="edgeLabelsMoveTest.ecore#//P1/C1B"/>
+          <semanticElements xmi:type="ecore:EClass" href="edgeLabelsMoveTest.ecore#//P1/C1B"/>
+          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_FKNO1FVqEeaFcNS-NDRImw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+            <description xmi:type="style:FlatContainerStyleDescription" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithLabelExistenceVariation']/@defaultLayer/@containerMappings[name='EClass']/@style"/>
+          </ownedStyle>
+          <actualMapping xmi:type="description_1:ContainerMapping" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithLabelExistenceVariation']/@defaultLayer/@containerMappings[name='EClass']"/>
+        </ownedDiagramElements>
+      </ownedDiagramElements>
+      <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_FKNO1VVqEeaFcNS-NDRImw" name="refToBCenter" sourceNode="_FKNOw1VqEeaFcNS-NDRImw" targetNode="_FKNOxVVqEeaFcNS-NDRImw" beginLabel="refToBBegin" endLabel="refToBEnd">
+        <target xmi:type="ecore:EReference" href="edgeLabelsMoveTest.ecore#//A/refToB"/>
+        <semanticElements xmi:type="ecore:EReference" href="edgeLabelsMoveTest.ecore#//A/refToB"/>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_FKNO1lVqEeaFcNS-NDRImw" sourceArrow="Diamond" routingStyle="manhattan" strokeColor="0,0,0">
+          <description xmi:type="style:EdgeStyleDescription" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithLabelExistenceVariation']/@defaultLayer/@edgeMappings[name='EReference']/@style"/>
+          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_FKNO11VqEeaFcNS-NDRImw"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_FKNO2FVqEeaFcNS-NDRImw" showIcon="false"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_FKNO2VVqEeaFcNS-NDRImw" showIcon="false"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:EdgeMapping" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithLabelExistenceVariation']/@defaultLayer/@edgeMappings[name='EReference']"/>
+      </ownedDiagramElements>
+      <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_FKNO2lVqEeaFcNS-NDRImw" name="refToDCenter" sourceNode="_FKNOx1VqEeaFcNS-NDRImw" targetNode="_FKNOyVVqEeaFcNS-NDRImw" beginLabel="refToDBegin" endLabel="refToDEnd">
+        <target xmi:type="ecore:EReference" href="edgeLabelsMoveTest.ecore#//C/refToD"/>
+        <semanticElements xmi:type="ecore:EReference" href="edgeLabelsMoveTest.ecore#//C/refToD"/>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_FKNO21VqEeaFcNS-NDRImw" sourceArrow="Diamond" routingStyle="manhattan" strokeColor="0,0,0">
+          <description xmi:type="style:EdgeStyleDescription" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithLabelExistenceVariation']/@defaultLayer/@edgeMappings[name='EReference']/@style"/>
+          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_FKNO3FVqEeaFcNS-NDRImw"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_FKNO3VVqEeaFcNS-NDRImw" showIcon="false"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_FKNO3lVqEeaFcNS-NDRImw" showIcon="false"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:EdgeMapping" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithLabelExistenceVariation']/@defaultLayer/@edgeMappings[name='EReference']"/>
+      </ownedDiagramElements>
+      <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_FKNO31VqEeaFcNS-NDRImw" name="refToFCenter" sourceNode="_FKNOy1VqEeaFcNS-NDRImw" targetNode="_FKNOzVVqEeaFcNS-NDRImw" beginLabel="refToFBegin" endLabel="refToFEnd">
+        <target xmi:type="ecore:EReference" href="edgeLabelsMoveTest.ecore#//E/refToF"/>
+        <semanticElements xmi:type="ecore:EReference" href="edgeLabelsMoveTest.ecore#//E/refToF"/>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_FKNO4FVqEeaFcNS-NDRImw" sourceArrow="Diamond" routingStyle="manhattan" strokeColor="0,0,0">
+          <description xmi:type="style:EdgeStyleDescription" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithLabelExistenceVariation']/@defaultLayer/@edgeMappings[name='EReference']/@style"/>
+          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_FKNO4VVqEeaFcNS-NDRImw"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_FKNO4lVqEeaFcNS-NDRImw" showIcon="false"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_FKNO41VqEeaFcNS-NDRImw" showIcon="false"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:EdgeMapping" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithLabelExistenceVariation']/@defaultLayer/@edgeMappings[name='EReference']"/>
+      </ownedDiagramElements>
+      <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_FKNO5FVqEeaFcNS-NDRImw" name="refToC1BCenter" visible="false" sourceNode="_FKNO0VVqEeaFcNS-NDRImw" targetNode="_FKNO01VqEeaFcNS-NDRImw" beginLabel="refToC1BBegin" endLabel="refToC1BEnd">
+        <target xmi:type="ecore:EReference" href="edgeLabelsMoveTest.ecore#//P1/C1A/refToC1B"/>
+        <semanticElements xmi:type="ecore:EReference" href="edgeLabelsMoveTest.ecore#//P1/C1A/refToC1B"/>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_FKNO5VVqEeaFcNS-NDRImw" sourceArrow="Diamond" routingStyle="manhattan" strokeColor="0,0,0">
+          <description xmi:type="style:EdgeStyleDescription" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithLabelExistenceVariation']/@defaultLayer/@edgeMappings[name='EReference']/@style"/>
+          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_FKNO5lVqEeaFcNS-NDRImw"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_FKNO51VqEeaFcNS-NDRImw" showIcon="false"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_FKNO6FVqEeaFcNS-NDRImw" showIcon="false"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:EdgeMapping" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithLabelExistenceVariation']/@defaultLayer/@edgeMappings[name='EReference']"/>
+      </ownedDiagramElements>
+      <description xmi:type="description_1:DiagramDescription" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithLabelExistenceVariation']"/>
+      <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_FKNO6VVqEeaFcNS-NDRImw"/>
+      <activatedLayers xmi:type="description_1:Layer" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithLabelExistenceVariation']/@defaultLayer"/>
+      <activatedLayers xmi:type="description_1:AdditionalLayer" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithLabelExistenceVariation']/@additionalLayers[name='Package']"/>
+      <target xmi:type="ecore:EPackage" href="edgeLabelsMoveTest.ecore#/"/>
+    </ownedRepresentations>
+    <ownedRepresentations xmi:type="diagram:DSemanticDiagram" xmi:id="_UdFRAVVsEeaFcNS-NDRImw" name="DiagramWithBeginAndCenterLabel">
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_UdFRAlVsEeaFcNS-NDRImw" source="DANNOTATION_CUSTOMIZATION_KEY">
+        <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_UdFRA1VsEeaFcNS-NDRImw"/>
+      </ownedAnnotationEntries>
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_UdF4EFVsEeaFcNS-NDRImw" source="GMF_DIAGRAMS">
+        <data xmi:type="notation:Diagram" xmi:id="_UdF4EVVsEeaFcNS-NDRImw" type="Sirius" element="_UdFRAVVsEeaFcNS-NDRImw" measurementUnit="Pixel">
+          <children xmi:type="notation:Node" xmi:id="_UdF4E1VsEeaFcNS-NDRImw" type="2003" element="_UdFRBFVsEeaFcNS-NDRImw">
+            <children xmi:type="notation:Node" xmi:id="_UdGfIFVsEeaFcNS-NDRImw" type="5007"/>
+            <children xmi:type="notation:Node" xmi:id="_UdGfIVVsEeaFcNS-NDRImw" type="7004">
+              <styles xmi:type="notation:SortingStyle" xmi:id="_UdGfIlVsEeaFcNS-NDRImw"/>
+              <styles xmi:type="notation:FilteringStyle" xmi:id="_UdGfI1VsEeaFcNS-NDRImw"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_UdF4FFVsEeaFcNS-NDRImw" fontName="Segoe UI" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UdF4FVVsEeaFcNS-NDRImw" y="160"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_UdHGMFVsEeaFcNS-NDRImw" type="2003" element="_UdFRBlVsEeaFcNS-NDRImw">
+            <children xmi:type="notation:Node" xmi:id="_UdHtQFVsEeaFcNS-NDRImw" type="5007"/>
+            <children xmi:type="notation:Node" xmi:id="_UdHtQVVsEeaFcNS-NDRImw" type="7004">
+              <styles xmi:type="notation:SortingStyle" xmi:id="_UdHtQlVsEeaFcNS-NDRImw"/>
+              <styles xmi:type="notation:FilteringStyle" xmi:id="_UdHtQ1VsEeaFcNS-NDRImw"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_UdHGMVVsEeaFcNS-NDRImw" fontName="Segoe UI" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UdHGMlVsEeaFcNS-NDRImw"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_UdHtRFVsEeaFcNS-NDRImw" type="2003" element="_UdFRCFVsEeaFcNS-NDRImw">
+            <children xmi:type="notation:Node" xmi:id="_UdIUUFVsEeaFcNS-NDRImw" type="5007"/>
+            <children xmi:type="notation:Node" xmi:id="_UdIUUVVsEeaFcNS-NDRImw" type="7004">
+              <styles xmi:type="notation:SortingStyle" xmi:id="_UdIUUlVsEeaFcNS-NDRImw"/>
+              <styles xmi:type="notation:FilteringStyle" xmi:id="_UdIUU1VsEeaFcNS-NDRImw"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_UdHtRVVsEeaFcNS-NDRImw" fontName="Segoe UI" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UdHtRlVsEeaFcNS-NDRImw" x="150" y="160"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_UdI7YFVsEeaFcNS-NDRImw" type="2003" element="_UdFRClVsEeaFcNS-NDRImw">
+            <children xmi:type="notation:Node" xmi:id="_UdI7Y1VsEeaFcNS-NDRImw" type="5007"/>
+            <children xmi:type="notation:Node" xmi:id="_UdJicFVsEeaFcNS-NDRImw" type="7004">
+              <styles xmi:type="notation:SortingStyle" xmi:id="_UdJicVVsEeaFcNS-NDRImw"/>
+              <styles xmi:type="notation:FilteringStyle" xmi:id="_UdJiclVsEeaFcNS-NDRImw"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_UdI7YVVsEeaFcNS-NDRImw" fontName="Segoe UI" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UdI7YlVsEeaFcNS-NDRImw" x="150"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_UdJic1VsEeaFcNS-NDRImw" type="2003" element="_UdFRDFVsEeaFcNS-NDRImw">
+            <children xmi:type="notation:Node" xmi:id="_UdKJgFVsEeaFcNS-NDRImw" type="5007"/>
+            <children xmi:type="notation:Node" xmi:id="_UdKJgVVsEeaFcNS-NDRImw" type="7004">
+              <styles xmi:type="notation:SortingStyle" xmi:id="_UdKJglVsEeaFcNS-NDRImw"/>
+              <styles xmi:type="notation:FilteringStyle" xmi:id="_UdKJg1VsEeaFcNS-NDRImw"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_UdJidFVsEeaFcNS-NDRImw" fontName="Segoe UI" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UdJidVVsEeaFcNS-NDRImw" x="330" y="160"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_UdKJhFVsEeaFcNS-NDRImw" type="2003" element="_UdFRDlVsEeaFcNS-NDRImw">
+            <children xmi:type="notation:Node" xmi:id="_UdKwkFVsEeaFcNS-NDRImw" type="5007"/>
+            <children xmi:type="notation:Node" xmi:id="_UdKwkVVsEeaFcNS-NDRImw" type="7004">
+              <styles xmi:type="notation:SortingStyle" xmi:id="_UdKwklVsEeaFcNS-NDRImw"/>
+              <styles xmi:type="notation:FilteringStyle" xmi:id="_UdKwk1VsEeaFcNS-NDRImw"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_UdKJhVVsEeaFcNS-NDRImw" fontName="Segoe UI" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UdKJhlVsEeaFcNS-NDRImw" x="330"/>
+          </children>
+          <styles xmi:type="notation:DiagramStyle" xmi:id="_UdF4ElVsEeaFcNS-NDRImw"/>
+          <edges xmi:type="notation:Edge" xmi:id="_UdLXoFVsEeaFcNS-NDRImw" type="4001" element="_UdFREFVsEeaFcNS-NDRImw" source="_UdF4E1VsEeaFcNS-NDRImw" target="_UdHGMFVsEeaFcNS-NDRImw">
+            <children xmi:type="notation:Node" xmi:id="_UdL-sFVsEeaFcNS-NDRImw" type="6001">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UdL-sVVsEeaFcNS-NDRImw" x="13" y="44"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_UdL-slVsEeaFcNS-NDRImw" type="6002">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UdL-s1VsEeaFcNS-NDRImw" x="-2" y="46"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_UdL-tFVsEeaFcNS-NDRImw" type="6003">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UdL-tVVsEeaFcNS-NDRImw" y="10"/>
+            </children>
+            <styles xmi:type="notation:ConnectorStyle" xmi:id="_UdLXoVVsEeaFcNS-NDRImw" routing="Rectilinear"/>
+            <styles xmi:type="notation:FontStyle" xmi:id="_UdLXolVsEeaFcNS-NDRImw" fontName="Segoe UI" fontHeight="8"/>
+            <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UdLXo1VsEeaFcNS-NDRImw" points="[0, -50, 0, 110]$[0, -110, 0, 50]"/>
+            <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UdMlwFVsEeaFcNS-NDRImw" id="(0.5,0.0)"/>
+            <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UdMlwVVsEeaFcNS-NDRImw" id="(0.5,1.0)"/>
+          </edges>
+          <edges xmi:type="notation:Edge" xmi:id="_UdMlwlVsEeaFcNS-NDRImw" type="4001" element="_UdFRFFVsEeaFcNS-NDRImw" source="_UdHtRFVsEeaFcNS-NDRImw" target="_UdI7YFVsEeaFcNS-NDRImw">
+            <children xmi:type="notation:Node" xmi:id="_UdNM0FVsEeaFcNS-NDRImw" type="6001">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UdNM0VVsEeaFcNS-NDRImw" y="-10"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_UdNM0lVsEeaFcNS-NDRImw" type="6002">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UdNM01VsEeaFcNS-NDRImw" y="10"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_UdNM1FVsEeaFcNS-NDRImw" type="6003">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UdNM1VVsEeaFcNS-NDRImw" y="10"/>
+            </children>
+            <styles xmi:type="notation:ConnectorStyle" xmi:id="_UdMlw1VsEeaFcNS-NDRImw" routing="Rectilinear"/>
+            <styles xmi:type="notation:FontStyle" xmi:id="_UdMlxFVsEeaFcNS-NDRImw" fontName="Segoe UI" fontHeight="8"/>
+            <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UdMlxVVsEeaFcNS-NDRImw" points="[0, -50, 0, 110]$[0, -110, 0, 50]"/>
+            <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UdNz4FVsEeaFcNS-NDRImw" id="(0.5,0.0)"/>
+            <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UdNz4VVsEeaFcNS-NDRImw" id="(0.5,1.0)"/>
+          </edges>
+          <edges xmi:type="notation:Edge" xmi:id="_UdNz4lVsEeaFcNS-NDRImw" type="4001" element="_UdFRGFVsEeaFcNS-NDRImw" source="_UdJic1VsEeaFcNS-NDRImw" target="_UdKJhFVsEeaFcNS-NDRImw">
+            <children xmi:type="notation:Node" xmi:id="_UdOa8FVsEeaFcNS-NDRImw" type="6001">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UdOa8VVsEeaFcNS-NDRImw" x="8" y="58"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_UdOa8lVsEeaFcNS-NDRImw" type="6002">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UdOa81VsEeaFcNS-NDRImw" x="-2" y="66"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_UdOa9FVsEeaFcNS-NDRImw" type="6003">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UdOa9VVsEeaFcNS-NDRImw" y="10"/>
+            </children>
+            <styles xmi:type="notation:ConnectorStyle" xmi:id="_UdNz41VsEeaFcNS-NDRImw" routing="Rectilinear"/>
+            <styles xmi:type="notation:FontStyle" xmi:id="_UdNz5FVsEeaFcNS-NDRImw" fontName="Segoe UI" fontHeight="8"/>
+            <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UdNz5VVsEeaFcNS-NDRImw" points="[0, -50, 0, 110]$[0, -110, 0, 50]"/>
+            <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UdPCAFVsEeaFcNS-NDRImw" id="(0.5,0.0)"/>
+            <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UdPCAVVsEeaFcNS-NDRImw" id="(0.5,1.0)"/>
+          </edges>
+        </data>
+      </ownedAnnotationEntries>
+      <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_UdFRBFVsEeaFcNS-NDRImw" name="A" tooltipText="A" outgoingEdges="_UdFREFVsEeaFcNS-NDRImw" width="12" height="10">
+        <target xmi:type="ecore:EClass" href="edgeLabelsMoveTest.ecore#//A"/>
+        <semanticElements xmi:type="ecore:EClass" href="edgeLabelsMoveTest.ecore#//A"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_UdFRBVVsEeaFcNS-NDRImw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+          <description xmi:type="style:FlatContainerStyleDescription" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithBeginAndCenterLabel']/@defaultLayer/@containerMappings[name='EClass']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:ContainerMapping" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithBeginAndCenterLabel']/@defaultLayer/@containerMappings[name='EClass']"/>
+      </ownedDiagramElements>
+      <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_UdFRBlVsEeaFcNS-NDRImw" name="B" tooltipText="B" incomingEdges="_UdFREFVsEeaFcNS-NDRImw" width="12" height="10">
+        <target xmi:type="ecore:EClass" href="edgeLabelsMoveTest.ecore#//B"/>
+        <semanticElements xmi:type="ecore:EClass" href="edgeLabelsMoveTest.ecore#//B"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_UdFRB1VsEeaFcNS-NDRImw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+          <description xmi:type="style:FlatContainerStyleDescription" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithBeginAndCenterLabel']/@defaultLayer/@containerMappings[name='EClass']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:ContainerMapping" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithBeginAndCenterLabel']/@defaultLayer/@containerMappings[name='EClass']"/>
+      </ownedDiagramElements>
+      <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_UdFRCFVsEeaFcNS-NDRImw" name="C" tooltipText="C" outgoingEdges="_UdFRFFVsEeaFcNS-NDRImw" width="12" height="10">
+        <target xmi:type="ecore:EClass" href="edgeLabelsMoveTest.ecore#//C"/>
+        <semanticElements xmi:type="ecore:EClass" href="edgeLabelsMoveTest.ecore#//C"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_UdFRCVVsEeaFcNS-NDRImw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+          <description xmi:type="style:FlatContainerStyleDescription" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithBeginAndCenterLabel']/@defaultLayer/@containerMappings[name='EClass']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:ContainerMapping" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithBeginAndCenterLabel']/@defaultLayer/@containerMappings[name='EClass']"/>
+      </ownedDiagramElements>
+      <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_UdFRClVsEeaFcNS-NDRImw" name="D" tooltipText="D" incomingEdges="_UdFRFFVsEeaFcNS-NDRImw" width="12" height="10">
+        <target xmi:type="ecore:EClass" href="edgeLabelsMoveTest.ecore#//D"/>
+        <semanticElements xmi:type="ecore:EClass" href="edgeLabelsMoveTest.ecore#//D"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_UdFRC1VsEeaFcNS-NDRImw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+          <description xmi:type="style:FlatContainerStyleDescription" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithBeginAndCenterLabel']/@defaultLayer/@containerMappings[name='EClass']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:ContainerMapping" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithBeginAndCenterLabel']/@defaultLayer/@containerMappings[name='EClass']"/>
+      </ownedDiagramElements>
+      <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_UdFRDFVsEeaFcNS-NDRImw" name="E" tooltipText="E" outgoingEdges="_UdFRGFVsEeaFcNS-NDRImw" width="12" height="10">
+        <target xmi:type="ecore:EClass" href="edgeLabelsMoveTest.ecore#//E"/>
+        <semanticElements xmi:type="ecore:EClass" href="edgeLabelsMoveTest.ecore#//E"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_UdFRDVVsEeaFcNS-NDRImw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+          <description xmi:type="style:FlatContainerStyleDescription" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithBeginAndCenterLabel']/@defaultLayer/@containerMappings[name='EClass']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:ContainerMapping" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithBeginAndCenterLabel']/@defaultLayer/@containerMappings[name='EClass']"/>
+      </ownedDiagramElements>
+      <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_UdFRDlVsEeaFcNS-NDRImw" name="F" tooltipText="F" incomingEdges="_UdFRGFVsEeaFcNS-NDRImw" width="12" height="10">
+        <target xmi:type="ecore:EClass" href="edgeLabelsMoveTest.ecore#//F"/>
+        <semanticElements xmi:type="ecore:EClass" href="edgeLabelsMoveTest.ecore#//F"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_UdFRD1VsEeaFcNS-NDRImw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+          <description xmi:type="style:FlatContainerStyleDescription" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithBeginAndCenterLabel']/@defaultLayer/@containerMappings[name='EClass']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:ContainerMapping" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithBeginAndCenterLabel']/@defaultLayer/@containerMappings[name='EClass']"/>
+      </ownedDiagramElements>
+      <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_UdFREFVsEeaFcNS-NDRImw" name="refToBCenter" sourceNode="_UdFRBFVsEeaFcNS-NDRImw" targetNode="_UdFRBlVsEeaFcNS-NDRImw" beginLabel="refToBBegin">
+        <target xmi:type="ecore:EReference" href="edgeLabelsMoveTest.ecore#//A/refToB"/>
+        <semanticElements xmi:type="ecore:EReference" href="edgeLabelsMoveTest.ecore#//A/refToB"/>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_UdFREVVsEeaFcNS-NDRImw" sourceArrow="Diamond" routingStyle="manhattan" strokeColor="0,0,0">
+          <description xmi:type="style:EdgeStyleDescription" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithBeginAndCenterLabel']/@defaultLayer/@edgeMappings[name='EReference']/@style"/>
+          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_UdFRElVsEeaFcNS-NDRImw"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_UdFRE1VsEeaFcNS-NDRImw" showIcon="false"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:EdgeMapping" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithBeginAndCenterLabel']/@defaultLayer/@edgeMappings[name='EReference']"/>
+      </ownedDiagramElements>
+      <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_UdFRFFVsEeaFcNS-NDRImw" name="refToDCenter" sourceNode="_UdFRCFVsEeaFcNS-NDRImw" targetNode="_UdFRClVsEeaFcNS-NDRImw" beginLabel="refToDBegin">
+        <target xmi:type="ecore:EReference" href="edgeLabelsMoveTest.ecore#//C/refToD"/>
+        <semanticElements xmi:type="ecore:EReference" href="edgeLabelsMoveTest.ecore#//C/refToD"/>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_UdFRFVVsEeaFcNS-NDRImw" sourceArrow="Diamond" routingStyle="manhattan" strokeColor="0,0,0">
+          <description xmi:type="style:EdgeStyleDescription" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithBeginAndCenterLabel']/@defaultLayer/@edgeMappings[name='EReference']/@style"/>
+          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_UdFRFlVsEeaFcNS-NDRImw"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_UdFRF1VsEeaFcNS-NDRImw" showIcon="false"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:EdgeMapping" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithBeginAndCenterLabel']/@defaultLayer/@edgeMappings[name='EReference']"/>
+      </ownedDiagramElements>
+      <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_UdFRGFVsEeaFcNS-NDRImw" name="refToFCenter" sourceNode="_UdFRDFVsEeaFcNS-NDRImw" targetNode="_UdFRDlVsEeaFcNS-NDRImw" beginLabel="refToFBegin">
+        <target xmi:type="ecore:EReference" href="edgeLabelsMoveTest.ecore#//E/refToF"/>
+        <semanticElements xmi:type="ecore:EReference" href="edgeLabelsMoveTest.ecore#//E/refToF"/>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_UdFRGVVsEeaFcNS-NDRImw" sourceArrow="Diamond" routingStyle="manhattan" strokeColor="0,0,0">
+          <description xmi:type="style:EdgeStyleDescription" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithBeginAndCenterLabel']/@defaultLayer/@edgeMappings[name='EReference']/@style"/>
+          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_UdFRGlVsEeaFcNS-NDRImw"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_UdFRG1VsEeaFcNS-NDRImw" showIcon="false"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:EdgeMapping" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithBeginAndCenterLabel']/@defaultLayer/@edgeMappings[name='EReference']"/>
+      </ownedDiagramElements>
+      <description xmi:type="description_1:DiagramDescription" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithBeginAndCenterLabel']"/>
+      <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_UdFRHFVsEeaFcNS-NDRImw"/>
+      <activatedLayers xmi:type="description_1:Layer" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithBeginAndCenterLabel']/@defaultLayer"/>
+      <activatedLayers xmi:type="description_1:AdditionalLayer" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithBeginAndCenterLabel']/@additionalLayers[name='Package']"/>
+      <target xmi:type="ecore:EPackage" href="edgeLabelsMoveTest.ecore#/"/>
+    </ownedRepresentations>
+    <ownedRepresentations xmi:type="diagram:DSemanticDiagram" xmi:id="_hTdGgVVsEeaFcNS-NDRImw" name="DiagramWithZeroSpecifiedLabel">
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_hTdGglVsEeaFcNS-NDRImw" source="DANNOTATION_CUSTOMIZATION_KEY">
+        <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_hTdGg1VsEeaFcNS-NDRImw"/>
+      </ownedAnnotationEntries>
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_hTdGl1VsEeaFcNS-NDRImw" source="GMF_DIAGRAMS">
+        <data xmi:type="notation:Diagram" xmi:id="_hTdGmFVsEeaFcNS-NDRImw" type="Sirius" element="_hTdGgVVsEeaFcNS-NDRImw" measurementUnit="Pixel">
+          <children xmi:type="notation:Node" xmi:id="_hTdGmlVsEeaFcNS-NDRImw" type="2003" element="_hTdGhFVsEeaFcNS-NDRImw">
+            <children xmi:type="notation:Node" xmi:id="_hTeUoFVsEeaFcNS-NDRImw" type="5007"/>
+            <children xmi:type="notation:Node" xmi:id="_hTe7sFVsEeaFcNS-NDRImw" type="7004">
+              <styles xmi:type="notation:SortingStyle" xmi:id="_hTe7sVVsEeaFcNS-NDRImw"/>
+              <styles xmi:type="notation:FilteringStyle" xmi:id="_hTe7slVsEeaFcNS-NDRImw"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_hTdGm1VsEeaFcNS-NDRImw" fontName="Segoe UI" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hTdGnFVsEeaFcNS-NDRImw" y="160"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_hTe7s1VsEeaFcNS-NDRImw" type="2003" element="_hTdGhlVsEeaFcNS-NDRImw">
+            <children xmi:type="notation:Node" xmi:id="_hTfiwFVsEeaFcNS-NDRImw" type="5007"/>
+            <children xmi:type="notation:Node" xmi:id="_hTfiwVVsEeaFcNS-NDRImw" type="7004">
+              <styles xmi:type="notation:SortingStyle" xmi:id="_hTfiwlVsEeaFcNS-NDRImw"/>
+              <styles xmi:type="notation:FilteringStyle" xmi:id="_hTfiw1VsEeaFcNS-NDRImw"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_hTe7tFVsEeaFcNS-NDRImw" fontName="Segoe UI" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hTe7tVVsEeaFcNS-NDRImw"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_hTgJ0FVsEeaFcNS-NDRImw" type="2003" element="_hTdGiFVsEeaFcNS-NDRImw">
+            <children xmi:type="notation:Node" xmi:id="_hTgw4FVsEeaFcNS-NDRImw" type="5007"/>
+            <children xmi:type="notation:Node" xmi:id="_hTgw4VVsEeaFcNS-NDRImw" type="7004">
+              <styles xmi:type="notation:SortingStyle" xmi:id="_hTgw4lVsEeaFcNS-NDRImw"/>
+              <styles xmi:type="notation:FilteringStyle" xmi:id="_hTgw41VsEeaFcNS-NDRImw"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_hTgJ0VVsEeaFcNS-NDRImw" fontName="Segoe UI" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hTgJ0lVsEeaFcNS-NDRImw" x="150" y="160"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_hThX8FVsEeaFcNS-NDRImw" type="2003" element="_hTdGilVsEeaFcNS-NDRImw">
+            <children xmi:type="notation:Node" xmi:id="_hTh_AFVsEeaFcNS-NDRImw" type="5007"/>
+            <children xmi:type="notation:Node" xmi:id="_hTh_AVVsEeaFcNS-NDRImw" type="7004">
+              <styles xmi:type="notation:SortingStyle" xmi:id="_hTh_AlVsEeaFcNS-NDRImw"/>
+              <styles xmi:type="notation:FilteringStyle" xmi:id="_hTh_A1VsEeaFcNS-NDRImw"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_hThX8VVsEeaFcNS-NDRImw" fontName="Segoe UI" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hThX8lVsEeaFcNS-NDRImw" x="150"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_hTimEFVsEeaFcNS-NDRImw" type="2003" element="_hTdGjFVsEeaFcNS-NDRImw">
+            <children xmi:type="notation:Node" xmi:id="_hTimE1VsEeaFcNS-NDRImw" type="5007"/>
+            <children xmi:type="notation:Node" xmi:id="_hTjNIFVsEeaFcNS-NDRImw" type="7004">
+              <styles xmi:type="notation:SortingStyle" xmi:id="_hTjNIVVsEeaFcNS-NDRImw"/>
+              <styles xmi:type="notation:FilteringStyle" xmi:id="_hTjNIlVsEeaFcNS-NDRImw"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_hTimEVVsEeaFcNS-NDRImw" fontName="Segoe UI" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hTimElVsEeaFcNS-NDRImw" x="330" y="160"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_hTjNI1VsEeaFcNS-NDRImw" type="2003" element="_hTdGjlVsEeaFcNS-NDRImw">
+            <children xmi:type="notation:Node" xmi:id="_hTj0MFVsEeaFcNS-NDRImw" type="5007"/>
+            <children xmi:type="notation:Node" xmi:id="_hTj0MVVsEeaFcNS-NDRImw" type="7004">
+              <styles xmi:type="notation:SortingStyle" xmi:id="_hTj0MlVsEeaFcNS-NDRImw"/>
+              <styles xmi:type="notation:FilteringStyle" xmi:id="_hTj0M1VsEeaFcNS-NDRImw"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_hTjNJFVsEeaFcNS-NDRImw" fontName="Segoe UI" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hTjNJVVsEeaFcNS-NDRImw" x="330"/>
+          </children>
+          <styles xmi:type="notation:DiagramStyle" xmi:id="_hTdGmVVsEeaFcNS-NDRImw"/>
+          <edges xmi:type="notation:Edge" xmi:id="_hTkbQFVsEeaFcNS-NDRImw" type="4001" element="_hTdGkFVsEeaFcNS-NDRImw" source="_hTdGmlVsEeaFcNS-NDRImw" target="_hTe7s1VsEeaFcNS-NDRImw">
+            <children xmi:type="notation:Node" xmi:id="_hTkbRFVsEeaFcNS-NDRImw" type="6001">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hTkbRVVsEeaFcNS-NDRImw" y="-10"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_hTkbRlVsEeaFcNS-NDRImw" type="6002">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hTkbR1VsEeaFcNS-NDRImw" y="10"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_hTlCUFVsEeaFcNS-NDRImw" type="6003">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hTlCUVVsEeaFcNS-NDRImw" y="10"/>
+            </children>
+            <styles xmi:type="notation:ConnectorStyle" xmi:id="_hTkbQVVsEeaFcNS-NDRImw" routing="Rectilinear"/>
+            <styles xmi:type="notation:FontStyle" xmi:id="_hTkbQlVsEeaFcNS-NDRImw" fontName="Segoe UI"/>
+            <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hTkbQ1VsEeaFcNS-NDRImw" points="[0, -50, 0, 110]$[0, -110, 0, 50]"/>
+            <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hTlCUlVsEeaFcNS-NDRImw" id="(0.5,0.0)"/>
+            <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hTlCU1VsEeaFcNS-NDRImw" id="(0.5,1.0)"/>
+          </edges>
+          <edges xmi:type="notation:Edge" xmi:id="_hTlpYFVsEeaFcNS-NDRImw" type="4001" element="_hTdGklVsEeaFcNS-NDRImw" source="_hTgJ0FVsEeaFcNS-NDRImw" target="_hThX8FVsEeaFcNS-NDRImw">
+            <children xmi:type="notation:Node" xmi:id="_hTlpZFVsEeaFcNS-NDRImw" type="6001">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hTlpZVVsEeaFcNS-NDRImw" y="-10"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_hTlpZlVsEeaFcNS-NDRImw" type="6002">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hTlpZ1VsEeaFcNS-NDRImw" y="10"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_hTlpaFVsEeaFcNS-NDRImw" type="6003">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hTlpaVVsEeaFcNS-NDRImw" y="10"/>
+            </children>
+            <styles xmi:type="notation:ConnectorStyle" xmi:id="_hTlpYVVsEeaFcNS-NDRImw" routing="Rectilinear"/>
+            <styles xmi:type="notation:FontStyle" xmi:id="_hTlpYlVsEeaFcNS-NDRImw" fontName="Segoe UI"/>
+            <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hTlpY1VsEeaFcNS-NDRImw" points="[0, -50, 0, 110]$[0, -110, 0, 50]"/>
+            <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hTmQcFVsEeaFcNS-NDRImw" id="(0.5,0.0)"/>
+            <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hTmQcVVsEeaFcNS-NDRImw" id="(0.5,1.0)"/>
+          </edges>
+          <edges xmi:type="notation:Edge" xmi:id="_hTmQclVsEeaFcNS-NDRImw" type="4001" element="_hTdGlFVsEeaFcNS-NDRImw" source="_hTimEFVsEeaFcNS-NDRImw" target="_hTjNI1VsEeaFcNS-NDRImw">
+            <children xmi:type="notation:Node" xmi:id="_hTmQdlVsEeaFcNS-NDRImw" type="6001">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hTmQd1VsEeaFcNS-NDRImw" y="-10"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_hTmQeFVsEeaFcNS-NDRImw" type="6002">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hTmQeVVsEeaFcNS-NDRImw" y="10"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_hTm3gFVsEeaFcNS-NDRImw" type="6003">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hTm3gVVsEeaFcNS-NDRImw" y="10"/>
+            </children>
+            <styles xmi:type="notation:ConnectorStyle" xmi:id="_hTmQc1VsEeaFcNS-NDRImw" routing="Rectilinear"/>
+            <styles xmi:type="notation:FontStyle" xmi:id="_hTmQdFVsEeaFcNS-NDRImw" fontName="Segoe UI"/>
+            <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hTmQdVVsEeaFcNS-NDRImw" points="[0, -50, 0, 110]$[0, -110, 0, 50]"/>
+            <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hTm3glVsEeaFcNS-NDRImw" id="(0.5,0.0)"/>
+            <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hTm3g1VsEeaFcNS-NDRImw" id="(0.5,1.0)"/>
+          </edges>
+        </data>
+      </ownedAnnotationEntries>
+      <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_hTdGhFVsEeaFcNS-NDRImw" name="A" tooltipText="A" outgoingEdges="_hTdGkFVsEeaFcNS-NDRImw" width="12" height="10">
+        <target xmi:type="ecore:EClass" href="edgeLabelsMoveTest.ecore#//A"/>
+        <semanticElements xmi:type="ecore:EClass" href="edgeLabelsMoveTest.ecore#//A"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_hTdGhVVsEeaFcNS-NDRImw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+          <description xmi:type="style:FlatContainerStyleDescription" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithZeroSpecifiedLabel']/@defaultLayer/@containerMappings[name='EClass']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:ContainerMapping" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithZeroSpecifiedLabel']/@defaultLayer/@containerMappings[name='EClass']"/>
+      </ownedDiagramElements>
+      <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_hTdGhlVsEeaFcNS-NDRImw" name="B" tooltipText="B" incomingEdges="_hTdGkFVsEeaFcNS-NDRImw" width="12" height="10">
+        <target xmi:type="ecore:EClass" href="edgeLabelsMoveTest.ecore#//B"/>
+        <semanticElements xmi:type="ecore:EClass" href="edgeLabelsMoveTest.ecore#//B"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_hTdGh1VsEeaFcNS-NDRImw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+          <description xmi:type="style:FlatContainerStyleDescription" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithZeroSpecifiedLabel']/@defaultLayer/@containerMappings[name='EClass']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:ContainerMapping" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithZeroSpecifiedLabel']/@defaultLayer/@containerMappings[name='EClass']"/>
+      </ownedDiagramElements>
+      <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_hTdGiFVsEeaFcNS-NDRImw" name="C" tooltipText="C" outgoingEdges="_hTdGklVsEeaFcNS-NDRImw" width="12" height="10">
+        <target xmi:type="ecore:EClass" href="edgeLabelsMoveTest.ecore#//C"/>
+        <semanticElements xmi:type="ecore:EClass" href="edgeLabelsMoveTest.ecore#//C"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_hTdGiVVsEeaFcNS-NDRImw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+          <description xmi:type="style:FlatContainerStyleDescription" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithZeroSpecifiedLabel']/@defaultLayer/@containerMappings[name='EClass']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:ContainerMapping" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithZeroSpecifiedLabel']/@defaultLayer/@containerMappings[name='EClass']"/>
+      </ownedDiagramElements>
+      <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_hTdGilVsEeaFcNS-NDRImw" name="D" tooltipText="D" incomingEdges="_hTdGklVsEeaFcNS-NDRImw" width="12" height="10">
+        <target xmi:type="ecore:EClass" href="edgeLabelsMoveTest.ecore#//D"/>
+        <semanticElements xmi:type="ecore:EClass" href="edgeLabelsMoveTest.ecore#//D"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_hTdGi1VsEeaFcNS-NDRImw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+          <description xmi:type="style:FlatContainerStyleDescription" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithZeroSpecifiedLabel']/@defaultLayer/@containerMappings[name='EClass']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:ContainerMapping" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithZeroSpecifiedLabel']/@defaultLayer/@containerMappings[name='EClass']"/>
+      </ownedDiagramElements>
+      <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_hTdGjFVsEeaFcNS-NDRImw" name="E" tooltipText="E" outgoingEdges="_hTdGlFVsEeaFcNS-NDRImw" width="12" height="10">
+        <target xmi:type="ecore:EClass" href="edgeLabelsMoveTest.ecore#//E"/>
+        <semanticElements xmi:type="ecore:EClass" href="edgeLabelsMoveTest.ecore#//E"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_hTdGjVVsEeaFcNS-NDRImw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+          <description xmi:type="style:FlatContainerStyleDescription" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithZeroSpecifiedLabel']/@defaultLayer/@containerMappings[name='EClass']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:ContainerMapping" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithZeroSpecifiedLabel']/@defaultLayer/@containerMappings[name='EClass']"/>
+      </ownedDiagramElements>
+      <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_hTdGjlVsEeaFcNS-NDRImw" name="F" tooltipText="F" incomingEdges="_hTdGlFVsEeaFcNS-NDRImw" width="12" height="10">
+        <target xmi:type="ecore:EClass" href="edgeLabelsMoveTest.ecore#//F"/>
+        <semanticElements xmi:type="ecore:EClass" href="edgeLabelsMoveTest.ecore#//F"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_hTdGj1VsEeaFcNS-NDRImw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+          <description xmi:type="style:FlatContainerStyleDescription" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithZeroSpecifiedLabel']/@defaultLayer/@containerMappings[name='EClass']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:ContainerMapping" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithZeroSpecifiedLabel']/@defaultLayer/@containerMappings[name='EClass']"/>
+      </ownedDiagramElements>
+      <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_hTdGkFVsEeaFcNS-NDRImw" sourceNode="_hTdGhFVsEeaFcNS-NDRImw" targetNode="_hTdGhlVsEeaFcNS-NDRImw">
+        <target xmi:type="ecore:EReference" href="edgeLabelsMoveTest.ecore#//A/refToB"/>
+        <semanticElements xmi:type="ecore:EReference" href="edgeLabelsMoveTest.ecore#//A/refToB"/>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_hTdGkVVsEeaFcNS-NDRImw" sourceArrow="Diamond" routingStyle="manhattan" strokeColor="0,0,0">
+          <description xmi:type="style:EdgeStyleDescription" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithZeroSpecifiedLabel']/@defaultLayer/@edgeMappings[name='EReference']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:EdgeMapping" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithZeroSpecifiedLabel']/@defaultLayer/@edgeMappings[name='EReference']"/>
+      </ownedDiagramElements>
+      <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_hTdGklVsEeaFcNS-NDRImw" sourceNode="_hTdGiFVsEeaFcNS-NDRImw" targetNode="_hTdGilVsEeaFcNS-NDRImw">
+        <target xmi:type="ecore:EReference" href="edgeLabelsMoveTest.ecore#//C/refToD"/>
+        <semanticElements xmi:type="ecore:EReference" href="edgeLabelsMoveTest.ecore#//C/refToD"/>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_hTdGk1VsEeaFcNS-NDRImw" sourceArrow="Diamond" routingStyle="manhattan" strokeColor="0,0,0">
+          <description xmi:type="style:EdgeStyleDescription" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithZeroSpecifiedLabel']/@defaultLayer/@edgeMappings[name='EReference']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:EdgeMapping" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithZeroSpecifiedLabel']/@defaultLayer/@edgeMappings[name='EReference']"/>
+      </ownedDiagramElements>
+      <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_hTdGlFVsEeaFcNS-NDRImw" sourceNode="_hTdGjFVsEeaFcNS-NDRImw" targetNode="_hTdGjlVsEeaFcNS-NDRImw">
+        <target xmi:type="ecore:EReference" href="edgeLabelsMoveTest.ecore#//E/refToF"/>
+        <semanticElements xmi:type="ecore:EReference" href="edgeLabelsMoveTest.ecore#//E/refToF"/>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_hTdGlVVsEeaFcNS-NDRImw" sourceArrow="Diamond" routingStyle="manhattan" strokeColor="0,0,0">
+          <description xmi:type="style:EdgeStyleDescription" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithZeroSpecifiedLabel']/@defaultLayer/@edgeMappings[name='EReference']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:EdgeMapping" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithZeroSpecifiedLabel']/@defaultLayer/@edgeMappings[name='EReference']"/>
+      </ownedDiagramElements>
+      <description xmi:type="description_1:DiagramDescription" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithZeroSpecifiedLabel']"/>
+      <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_hTdGllVsEeaFcNS-NDRImw"/>
+      <activatedLayers xmi:type="description_1:Layer" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithZeroSpecifiedLabel']/@defaultLayer"/>
+      <activatedLayers xmi:type="description_1:AdditionalLayer" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithZeroSpecifiedLabel']/@additionalLayers[name='Package']"/>
+      <target xmi:type="ecore:EPackage" href="edgeLabelsMoveTest.ecore#/"/>
+    </ownedRepresentations>
+    <ownedRepresentations xmi:type="diagram:DSemanticDiagram" xmi:id="_soaMkVVsEeaFcNS-NDRImw" name="DiagramWithEmptyLabels">
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_soaMklVsEeaFcNS-NDRImw" source="DANNOTATION_CUSTOMIZATION_KEY">
+        <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_soaMk1VsEeaFcNS-NDRImw"/>
+      </ownedAnnotationEntries>
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_soazoFVsEeaFcNS-NDRImw" source="GMF_DIAGRAMS">
+        <data xmi:type="notation:Diagram" xmi:id="_soazoVVsEeaFcNS-NDRImw" type="Sirius" element="_soaMkVVsEeaFcNS-NDRImw" measurementUnit="Pixel">
+          <children xmi:type="notation:Node" xmi:id="_sobasFVsEeaFcNS-NDRImw" type="2003" element="_soaMlFVsEeaFcNS-NDRImw">
+            <children xmi:type="notation:Node" xmi:id="_socBwFVsEeaFcNS-NDRImw" type="5007"/>
+            <children xmi:type="notation:Node" xmi:id="_socBwVVsEeaFcNS-NDRImw" type="7004">
+              <styles xmi:type="notation:SortingStyle" xmi:id="_socBwlVsEeaFcNS-NDRImw"/>
+              <styles xmi:type="notation:FilteringStyle" xmi:id="_socBw1VsEeaFcNS-NDRImw"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_sobasVVsEeaFcNS-NDRImw" fontName="Segoe UI" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sobaslVsEeaFcNS-NDRImw" y="160"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_socBxFVsEeaFcNS-NDRImw" type="2003" element="_soaMllVsEeaFcNS-NDRImw">
+            <children xmi:type="notation:Node" xmi:id="_soco0FVsEeaFcNS-NDRImw" type="5007"/>
+            <children xmi:type="notation:Node" xmi:id="_soco0VVsEeaFcNS-NDRImw" type="7004">
+              <styles xmi:type="notation:SortingStyle" xmi:id="_soco0lVsEeaFcNS-NDRImw"/>
+              <styles xmi:type="notation:FilteringStyle" xmi:id="_soco01VsEeaFcNS-NDRImw"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_socBxVVsEeaFcNS-NDRImw" fontName="Segoe UI" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_socBxlVsEeaFcNS-NDRImw"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sodP4FVsEeaFcNS-NDRImw" type="2003" element="_soaMmFVsEeaFcNS-NDRImw">
+            <children xmi:type="notation:Node" xmi:id="_sodP41VsEeaFcNS-NDRImw" type="5007"/>
+            <children xmi:type="notation:Node" xmi:id="_sodP5FVsEeaFcNS-NDRImw" type="7004">
+              <styles xmi:type="notation:SortingStyle" xmi:id="_sodP5VVsEeaFcNS-NDRImw"/>
+              <styles xmi:type="notation:FilteringStyle" xmi:id="_sodP5lVsEeaFcNS-NDRImw"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_sodP4VVsEeaFcNS-NDRImw" fontName="Segoe UI" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sodP4lVsEeaFcNS-NDRImw" x="150" y="160"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sod28FVsEeaFcNS-NDRImw" type="2003" element="_soaMmlVsEeaFcNS-NDRImw">
+            <children xmi:type="notation:Node" xmi:id="_sod281VsEeaFcNS-NDRImw" type="5007"/>
+            <children xmi:type="notation:Node" xmi:id="_soeeAFVsEeaFcNS-NDRImw" type="7004">
+              <styles xmi:type="notation:SortingStyle" xmi:id="_soeeAVVsEeaFcNS-NDRImw"/>
+              <styles xmi:type="notation:FilteringStyle" xmi:id="_soeeAlVsEeaFcNS-NDRImw"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_sod28VVsEeaFcNS-NDRImw" fontName="Segoe UI" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sod28lVsEeaFcNS-NDRImw" x="150"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_soeeA1VsEeaFcNS-NDRImw" type="2003" element="_soaMnFVsEeaFcNS-NDRImw">
+            <children xmi:type="notation:Node" xmi:id="_sofFEFVsEeaFcNS-NDRImw" type="5007"/>
+            <children xmi:type="notation:Node" xmi:id="_sofFEVVsEeaFcNS-NDRImw" type="7004">
+              <styles xmi:type="notation:SortingStyle" xmi:id="_sofFElVsEeaFcNS-NDRImw"/>
+              <styles xmi:type="notation:FilteringStyle" xmi:id="_sofFE1VsEeaFcNS-NDRImw"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_soeeBFVsEeaFcNS-NDRImw" fontName="Segoe UI" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_soeeBVVsEeaFcNS-NDRImw" x="330" y="160"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_sofsIFVsEeaFcNS-NDRImw" type="2003" element="_soaMnlVsEeaFcNS-NDRImw">
+            <children xmi:type="notation:Node" xmi:id="_sofsI1VsEeaFcNS-NDRImw" type="5007"/>
+            <children xmi:type="notation:Node" xmi:id="_sogTMFVsEeaFcNS-NDRImw" type="7004">
+              <styles xmi:type="notation:SortingStyle" xmi:id="_sogTMVVsEeaFcNS-NDRImw"/>
+              <styles xmi:type="notation:FilteringStyle" xmi:id="_sogTMlVsEeaFcNS-NDRImw"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_sofsIVVsEeaFcNS-NDRImw" fontName="Segoe UI" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sofsIlVsEeaFcNS-NDRImw" x="330"/>
+          </children>
+          <styles xmi:type="notation:DiagramStyle" xmi:id="_soazolVsEeaFcNS-NDRImw"/>
+          <edges xmi:type="notation:Edge" xmi:id="_sogTM1VsEeaFcNS-NDRImw" type="4001" element="_soaMoFVsEeaFcNS-NDRImw" source="_sobasFVsEeaFcNS-NDRImw" target="_socBxFVsEeaFcNS-NDRImw">
+            <children xmi:type="notation:Node" xmi:id="_sog6QFVsEeaFcNS-NDRImw" type="6001">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sog6QVVsEeaFcNS-NDRImw" y="-10"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sog6QlVsEeaFcNS-NDRImw" type="6002">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sog6Q1VsEeaFcNS-NDRImw" y="10"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_sog6RFVsEeaFcNS-NDRImw" type="6003">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sog6RVVsEeaFcNS-NDRImw" y="10"/>
+            </children>
+            <styles xmi:type="notation:ConnectorStyle" xmi:id="_sogTNFVsEeaFcNS-NDRImw" routing="Rectilinear"/>
+            <styles xmi:type="notation:FontStyle" xmi:id="_sogTNVVsEeaFcNS-NDRImw" fontName="Segoe UI" fontHeight="8"/>
+            <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sogTNlVsEeaFcNS-NDRImw" points="[0, -50, 0, 110]$[0, -110, 0, 50]"/>
+            <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sohhUFVsEeaFcNS-NDRImw" id="(0.5,0.0)"/>
+            <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sohhUVVsEeaFcNS-NDRImw" id="(0.5,1.0)"/>
+          </edges>
+          <edges xmi:type="notation:Edge" xmi:id="_sohhUlVsEeaFcNS-NDRImw" type="4001" element="_soaMpVVsEeaFcNS-NDRImw" source="_sodP4FVsEeaFcNS-NDRImw" target="_sod28FVsEeaFcNS-NDRImw">
+            <children xmi:type="notation:Node" xmi:id="_soiIYFVsEeaFcNS-NDRImw" type="6001">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_soiIYVVsEeaFcNS-NDRImw" y="-10"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_soiIYlVsEeaFcNS-NDRImw" type="6002">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_soiIY1VsEeaFcNS-NDRImw" y="10"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_soiIZFVsEeaFcNS-NDRImw" type="6003">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_soiIZVVsEeaFcNS-NDRImw" y="10"/>
+            </children>
+            <styles xmi:type="notation:ConnectorStyle" xmi:id="_sohhU1VsEeaFcNS-NDRImw" routing="Rectilinear"/>
+            <styles xmi:type="notation:FontStyle" xmi:id="_sohhVFVsEeaFcNS-NDRImw" fontName="Segoe UI" fontHeight="8"/>
+            <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sohhVVVsEeaFcNS-NDRImw" points="[0, -50, 0, 110]$[0, -110, 0, 50]"/>
+            <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_soiIZlVsEeaFcNS-NDRImw" id="(0.5,0.0)"/>
+            <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_soiIZ1VsEeaFcNS-NDRImw" id="(0.5,1.0)"/>
+          </edges>
+          <edges xmi:type="notation:Edge" xmi:id="_soivcFVsEeaFcNS-NDRImw" type="4001" element="_soaMqlVsEeaFcNS-NDRImw" source="_soeeA1VsEeaFcNS-NDRImw" target="_sofsIFVsEeaFcNS-NDRImw">
+            <children xmi:type="notation:Node" xmi:id="_soivdFVsEeaFcNS-NDRImw" type="6001">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_soivdVVsEeaFcNS-NDRImw" x="13" y="63"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_soivdlVsEeaFcNS-NDRImw" type="6002">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_soivd1VsEeaFcNS-NDRImw" x="-2" y="86"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_soiveFVsEeaFcNS-NDRImw" type="6003">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_soiveVVsEeaFcNS-NDRImw" y="10"/>
+            </children>
+            <styles xmi:type="notation:ConnectorStyle" xmi:id="_soivcVVsEeaFcNS-NDRImw" routing="Rectilinear"/>
+            <styles xmi:type="notation:FontStyle" xmi:id="_soivclVsEeaFcNS-NDRImw" fontName="Segoe UI" fontHeight="8"/>
+            <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_soivc1VsEeaFcNS-NDRImw" points="[0, -50, 0, 110]$[0, -110, 0, 50]"/>
+            <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sojWgFVsEeaFcNS-NDRImw" id="(0.5,0.0)"/>
+            <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sojWgVVsEeaFcNS-NDRImw" id="(0.5,1.0)"/>
+          </edges>
+        </data>
+      </ownedAnnotationEntries>
+      <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_soaMlFVsEeaFcNS-NDRImw" name="A" tooltipText="A" outgoingEdges="_soaMoFVsEeaFcNS-NDRImw" width="12" height="10">
+        <target xmi:type="ecore:EClass" href="edgeLabelsMoveTest.ecore#//A"/>
+        <semanticElements xmi:type="ecore:EClass" href="edgeLabelsMoveTest.ecore#//A"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_soaMlVVsEeaFcNS-NDRImw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+          <description xmi:type="style:FlatContainerStyleDescription" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithEmptyLabels']/@defaultLayer/@containerMappings[name='EClass']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:ContainerMapping" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithEmptyLabels']/@defaultLayer/@containerMappings[name='EClass']"/>
+      </ownedDiagramElements>
+      <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_soaMllVsEeaFcNS-NDRImw" name="B" tooltipText="B" incomingEdges="_soaMoFVsEeaFcNS-NDRImw" width="12" height="10">
+        <target xmi:type="ecore:EClass" href="edgeLabelsMoveTest.ecore#//B"/>
+        <semanticElements xmi:type="ecore:EClass" href="edgeLabelsMoveTest.ecore#//B"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_soaMl1VsEeaFcNS-NDRImw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+          <description xmi:type="style:FlatContainerStyleDescription" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithEmptyLabels']/@defaultLayer/@containerMappings[name='EClass']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:ContainerMapping" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithEmptyLabels']/@defaultLayer/@containerMappings[name='EClass']"/>
+      </ownedDiagramElements>
+      <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_soaMmFVsEeaFcNS-NDRImw" name="C" tooltipText="C" outgoingEdges="_soaMpVVsEeaFcNS-NDRImw" width="12" height="10">
+        <target xmi:type="ecore:EClass" href="edgeLabelsMoveTest.ecore#//C"/>
+        <semanticElements xmi:type="ecore:EClass" href="edgeLabelsMoveTest.ecore#//C"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_soaMmVVsEeaFcNS-NDRImw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+          <description xmi:type="style:FlatContainerStyleDescription" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithEmptyLabels']/@defaultLayer/@containerMappings[name='EClass']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:ContainerMapping" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithEmptyLabels']/@defaultLayer/@containerMappings[name='EClass']"/>
+      </ownedDiagramElements>
+      <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_soaMmlVsEeaFcNS-NDRImw" name="D" tooltipText="D" incomingEdges="_soaMpVVsEeaFcNS-NDRImw" width="12" height="10">
+        <target xmi:type="ecore:EClass" href="edgeLabelsMoveTest.ecore#//D"/>
+        <semanticElements xmi:type="ecore:EClass" href="edgeLabelsMoveTest.ecore#//D"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_soaMm1VsEeaFcNS-NDRImw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+          <description xmi:type="style:FlatContainerStyleDescription" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithEmptyLabels']/@defaultLayer/@containerMappings[name='EClass']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:ContainerMapping" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithEmptyLabels']/@defaultLayer/@containerMappings[name='EClass']"/>
+      </ownedDiagramElements>
+      <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_soaMnFVsEeaFcNS-NDRImw" name="E" tooltipText="E" outgoingEdges="_soaMqlVsEeaFcNS-NDRImw" width="12" height="10">
+        <target xmi:type="ecore:EClass" href="edgeLabelsMoveTest.ecore#//E"/>
+        <semanticElements xmi:type="ecore:EClass" href="edgeLabelsMoveTest.ecore#//E"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_soaMnVVsEeaFcNS-NDRImw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+          <description xmi:type="style:FlatContainerStyleDescription" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithEmptyLabels']/@defaultLayer/@containerMappings[name='EClass']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:ContainerMapping" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithEmptyLabels']/@defaultLayer/@containerMappings[name='EClass']"/>
+      </ownedDiagramElements>
+      <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_soaMnlVsEeaFcNS-NDRImw" name="F" tooltipText="F" incomingEdges="_soaMqlVsEeaFcNS-NDRImw" width="12" height="10">
+        <target xmi:type="ecore:EClass" href="edgeLabelsMoveTest.ecore#//F"/>
+        <semanticElements xmi:type="ecore:EClass" href="edgeLabelsMoveTest.ecore#//F"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_soaMn1VsEeaFcNS-NDRImw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+          <description xmi:type="style:FlatContainerStyleDescription" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithEmptyLabels']/@defaultLayer/@containerMappings[name='EClass']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:ContainerMapping" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithEmptyLabels']/@defaultLayer/@containerMappings[name='EClass']"/>
+      </ownedDiagramElements>
+      <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_soaMoFVsEeaFcNS-NDRImw" name="refToBCenter" sourceNode="_soaMlFVsEeaFcNS-NDRImw" targetNode="_soaMllVsEeaFcNS-NDRImw" beginLabel="refToBBegin">
+        <target xmi:type="ecore:EReference" href="edgeLabelsMoveTest.ecore#//A/refToB"/>
+        <semanticElements xmi:type="ecore:EReference" href="edgeLabelsMoveTest.ecore#//A/refToB"/>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_soaMoVVsEeaFcNS-NDRImw" sourceArrow="Diamond" routingStyle="manhattan" strokeColor="0,0,0">
+          <description xmi:type="style:EdgeStyleDescription" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithEmptyLabels']/@defaultLayer/@edgeMappings[name='EReference']/@style"/>
+          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_soaMolVsEeaFcNS-NDRImw"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_soaMo1VsEeaFcNS-NDRImw" showIcon="false"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_soaMpFVsEeaFcNS-NDRImw" showIcon="false"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:EdgeMapping" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithEmptyLabels']/@defaultLayer/@edgeMappings[name='EReference']"/>
+      </ownedDiagramElements>
+      <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_soaMpVVsEeaFcNS-NDRImw" name="refToDCenter" sourceNode="_soaMmFVsEeaFcNS-NDRImw" targetNode="_soaMmlVsEeaFcNS-NDRImw" beginLabel="refToDBegin">
+        <target xmi:type="ecore:EReference" href="edgeLabelsMoveTest.ecore#//C/refToD"/>
+        <semanticElements xmi:type="ecore:EReference" href="edgeLabelsMoveTest.ecore#//C/refToD"/>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_soaMplVsEeaFcNS-NDRImw" sourceArrow="Diamond" routingStyle="manhattan" strokeColor="0,0,0">
+          <description xmi:type="style:EdgeStyleDescription" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithEmptyLabels']/@defaultLayer/@edgeMappings[name='EReference']/@style"/>
+          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_soaMp1VsEeaFcNS-NDRImw"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_soaMqFVsEeaFcNS-NDRImw" showIcon="false"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_soaMqVVsEeaFcNS-NDRImw" showIcon="false"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:EdgeMapping" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithEmptyLabels']/@defaultLayer/@edgeMappings[name='EReference']"/>
+      </ownedDiagramElements>
+      <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_soaMqlVsEeaFcNS-NDRImw" name="refToFCenter" sourceNode="_soaMnFVsEeaFcNS-NDRImw" targetNode="_soaMnlVsEeaFcNS-NDRImw" beginLabel="refToFBegin">
+        <target xmi:type="ecore:EReference" href="edgeLabelsMoveTest.ecore#//E/refToF"/>
+        <semanticElements xmi:type="ecore:EReference" href="edgeLabelsMoveTest.ecore#//E/refToF"/>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_soaMq1VsEeaFcNS-NDRImw" sourceArrow="Diamond" routingStyle="manhattan" strokeColor="0,0,0">
+          <description xmi:type="style:EdgeStyleDescription" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithEmptyLabels']/@defaultLayer/@edgeMappings[name='EReference']/@style"/>
+          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_soaMrFVsEeaFcNS-NDRImw"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_soaMrVVsEeaFcNS-NDRImw" showIcon="false"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_soaMrlVsEeaFcNS-NDRImw" showIcon="false"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:EdgeMapping" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithEmptyLabels']/@defaultLayer/@edgeMappings[name='EReference']"/>
+      </ownedDiagramElements>
+      <description xmi:type="description_1:DiagramDescription" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithEmptyLabels']"/>
+      <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_soaMr1VsEeaFcNS-NDRImw"/>
+      <activatedLayers xmi:type="description_1:Layer" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithEmptyLabels']/@defaultLayer"/>
+      <activatedLayers xmi:type="description_1:AdditionalLayer" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithEmptyLabels']/@additionalLayers[name='Package']"/>
+      <target xmi:type="ecore:EPackage" href="edgeLabelsMoveTest.ecore#/"/>
+    </ownedRepresentations>
+    <ownedRepresentations xmi:type="diagram:DSemanticDiagram" xmi:id="_75RukVVsEeaFcNS-NDRImw" name="DiagramWithEmptyLabel">
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_75RuklVsEeaFcNS-NDRImw" source="DANNOTATION_CUSTOMIZATION_KEY">
+        <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_75Ruk1VsEeaFcNS-NDRImw"/>
+      </ownedAnnotationEntries>
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_75SVoFVsEeaFcNS-NDRImw" source="GMF_DIAGRAMS">
+        <data xmi:type="notation:Diagram" xmi:id="_75SVoVVsEeaFcNS-NDRImw" type="Sirius" element="_75RukVVsEeaFcNS-NDRImw" measurementUnit="Pixel">
+          <children xmi:type="notation:Node" xmi:id="_75SVo1VsEeaFcNS-NDRImw" type="2003" element="_75RulFVsEeaFcNS-NDRImw">
+            <children xmi:type="notation:Node" xmi:id="_75S8sFVsEeaFcNS-NDRImw" type="5007"/>
+            <children xmi:type="notation:Node" xmi:id="_75S8sVVsEeaFcNS-NDRImw" type="7004">
+              <styles xmi:type="notation:SortingStyle" xmi:id="_75S8slVsEeaFcNS-NDRImw"/>
+              <styles xmi:type="notation:FilteringStyle" xmi:id="_75S8s1VsEeaFcNS-NDRImw"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_75SVpFVsEeaFcNS-NDRImw" fontName="Segoe UI" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_75SVpVVsEeaFcNS-NDRImw" y="160"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_75TjwFVsEeaFcNS-NDRImw" type="2003" element="_75RullVsEeaFcNS-NDRImw">
+            <children xmi:type="notation:Node" xmi:id="_75Tjw1VsEeaFcNS-NDRImw" type="5007"/>
+            <children xmi:type="notation:Node" xmi:id="_75TjxFVsEeaFcNS-NDRImw" type="7004">
+              <styles xmi:type="notation:SortingStyle" xmi:id="_75TjxVVsEeaFcNS-NDRImw"/>
+              <styles xmi:type="notation:FilteringStyle" xmi:id="_75TjxlVsEeaFcNS-NDRImw"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_75TjwVVsEeaFcNS-NDRImw" fontName="Segoe UI" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_75TjwlVsEeaFcNS-NDRImw"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_75UK0FVsEeaFcNS-NDRImw" type="2003" element="_75RumFVsEeaFcNS-NDRImw">
+            <children xmi:type="notation:Node" xmi:id="_75UK01VsEeaFcNS-NDRImw" type="5007"/>
+            <children xmi:type="notation:Node" xmi:id="_75Ux4FVsEeaFcNS-NDRImw" type="7004">
+              <styles xmi:type="notation:SortingStyle" xmi:id="_75Ux4VVsEeaFcNS-NDRImw"/>
+              <styles xmi:type="notation:FilteringStyle" xmi:id="_75Ux4lVsEeaFcNS-NDRImw"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_75UK0VVsEeaFcNS-NDRImw" fontName="Segoe UI" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_75UK0lVsEeaFcNS-NDRImw" x="150" y="160"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_75Ux41VsEeaFcNS-NDRImw" type="2003" element="_75RumlVsEeaFcNS-NDRImw">
+            <children xmi:type="notation:Node" xmi:id="_75VY8FVsEeaFcNS-NDRImw" type="5007"/>
+            <children xmi:type="notation:Node" xmi:id="_75VY8VVsEeaFcNS-NDRImw" type="7004">
+              <styles xmi:type="notation:SortingStyle" xmi:id="_75VY8lVsEeaFcNS-NDRImw"/>
+              <styles xmi:type="notation:FilteringStyle" xmi:id="_75VY81VsEeaFcNS-NDRImw"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_75Ux5FVsEeaFcNS-NDRImw" fontName="Segoe UI" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_75Ux5VVsEeaFcNS-NDRImw" x="150"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_75VY9FVsEeaFcNS-NDRImw" type="2003" element="_75RunFVsEeaFcNS-NDRImw">
+            <children xmi:type="notation:Node" xmi:id="_75WAAFVsEeaFcNS-NDRImw" type="5007"/>
+            <children xmi:type="notation:Node" xmi:id="_75WAAVVsEeaFcNS-NDRImw" type="7004">
+              <styles xmi:type="notation:SortingStyle" xmi:id="_75WAAlVsEeaFcNS-NDRImw"/>
+              <styles xmi:type="notation:FilteringStyle" xmi:id="_75WAA1VsEeaFcNS-NDRImw"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_75VY9VVsEeaFcNS-NDRImw" fontName="Segoe UI" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_75VY9lVsEeaFcNS-NDRImw" x="330" y="160"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_75WABFVsEeaFcNS-NDRImw" type="2003" element="_75RunlVsEeaFcNS-NDRImw">
+            <children xmi:type="notation:Node" xmi:id="_75WnEFVsEeaFcNS-NDRImw" type="5007"/>
+            <children xmi:type="notation:Node" xmi:id="_75WnEVVsEeaFcNS-NDRImw" type="7004">
+              <styles xmi:type="notation:SortingStyle" xmi:id="_75WnElVsEeaFcNS-NDRImw"/>
+              <styles xmi:type="notation:FilteringStyle" xmi:id="_75WnE1VsEeaFcNS-NDRImw"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_75WABVVsEeaFcNS-NDRImw" fontName="Segoe UI" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_75WABlVsEeaFcNS-NDRImw" x="330"/>
+          </children>
+          <styles xmi:type="notation:DiagramStyle" xmi:id="_75SVolVsEeaFcNS-NDRImw"/>
+          <edges xmi:type="notation:Edge" xmi:id="_75XOIFVsEeaFcNS-NDRImw" type="4001" element="_75RuoFVsEeaFcNS-NDRImw" source="_75SVo1VsEeaFcNS-NDRImw" target="_75TjwFVsEeaFcNS-NDRImw">
+            <children xmi:type="notation:Node" xmi:id="_75X1MFVsEeaFcNS-NDRImw" type="6001">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_75X1MVVsEeaFcNS-NDRImw" y="-10"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_75X1MlVsEeaFcNS-NDRImw" type="6002">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_75X1M1VsEeaFcNS-NDRImw" y="10"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_75X1NFVsEeaFcNS-NDRImw" type="6003">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_75X1NVVsEeaFcNS-NDRImw" y="10"/>
+            </children>
+            <styles xmi:type="notation:ConnectorStyle" xmi:id="_75XOIVVsEeaFcNS-NDRImw" routing="Rectilinear"/>
+            <styles xmi:type="notation:FontStyle" xmi:id="_75XOIlVsEeaFcNS-NDRImw" fontName="Segoe UI" fontHeight="8"/>
+            <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_75XOI1VsEeaFcNS-NDRImw" points="[0, -50, 0, 110]$[0, -110, 0, 50]"/>
+            <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_75X1NlVsEeaFcNS-NDRImw" id="(0.5,0.0)"/>
+            <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_75X1N1VsEeaFcNS-NDRImw" id="(0.5,1.0)"/>
+          </edges>
+          <edges xmi:type="notation:Edge" xmi:id="_75YcQFVsEeaFcNS-NDRImw" type="4001" element="_75RupVVsEeaFcNS-NDRImw" source="_75UK0FVsEeaFcNS-NDRImw" target="_75Ux41VsEeaFcNS-NDRImw">
+            <children xmi:type="notation:Node" xmi:id="_75YcRFVsEeaFcNS-NDRImw" type="6001">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_75YcRVVsEeaFcNS-NDRImw" y="-10"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_75YcRlVsEeaFcNS-NDRImw" type="6002">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_75YcR1VsEeaFcNS-NDRImw" y="10"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_75YcSFVsEeaFcNS-NDRImw" type="6003">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_75YcSVVsEeaFcNS-NDRImw" y="10"/>
+            </children>
+            <styles xmi:type="notation:ConnectorStyle" xmi:id="_75YcQVVsEeaFcNS-NDRImw" routing="Rectilinear"/>
+            <styles xmi:type="notation:FontStyle" xmi:id="_75YcQlVsEeaFcNS-NDRImw" fontName="Segoe UI" fontHeight="8"/>
+            <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_75YcQ1VsEeaFcNS-NDRImw" points="[0, -50, 0, 110]$[0, -110, 0, 50]"/>
+            <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_75ZDUFVsEeaFcNS-NDRImw" id="(0.5,0.0)"/>
+            <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_75ZDUVVsEeaFcNS-NDRImw" id="(0.5,1.0)"/>
+          </edges>
+          <edges xmi:type="notation:Edge" xmi:id="_75ZqYFVsEeaFcNS-NDRImw" type="4001" element="_75RuqlVsEeaFcNS-NDRImw" source="_75VY9FVsEeaFcNS-NDRImw" target="_75WABFVsEeaFcNS-NDRImw">
+            <children xmi:type="notation:Node" xmi:id="_75aRcFVsEeaFcNS-NDRImw" type="6001">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_75aRcVVsEeaFcNS-NDRImw" x="8" y="58"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_75a4gFVsEeaFcNS-NDRImw" type="6002">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_75a4gVVsEeaFcNS-NDRImw" x="3" y="98"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_75a4glVsEeaFcNS-NDRImw" type="6003">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_75a4g1VsEeaFcNS-NDRImw" y="10"/>
+            </children>
+            <styles xmi:type="notation:ConnectorStyle" xmi:id="_75ZqYVVsEeaFcNS-NDRImw" routing="Rectilinear"/>
+            <styles xmi:type="notation:FontStyle" xmi:id="_75ZqYlVsEeaFcNS-NDRImw" fontName="Segoe UI" fontHeight="8"/>
+            <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_75ZqY1VsEeaFcNS-NDRImw" points="[0, -50, 0, 110]$[0, -110, 0, 50]"/>
+            <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_75bfkFVsEeaFcNS-NDRImw" id="(0.5,0.0)"/>
+            <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_75bfkVVsEeaFcNS-NDRImw" id="(0.5,1.0)"/>
+          </edges>
+        </data>
+      </ownedAnnotationEntries>
+      <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_75RulFVsEeaFcNS-NDRImw" name="A" tooltipText="A" outgoingEdges="_75RuoFVsEeaFcNS-NDRImw" width="12" height="10">
+        <target xmi:type="ecore:EClass" href="edgeLabelsMoveTest.ecore#//A"/>
+        <semanticElements xmi:type="ecore:EClass" href="edgeLabelsMoveTest.ecore#//A"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_75RulVVsEeaFcNS-NDRImw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+          <description xmi:type="style:FlatContainerStyleDescription" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithEmptyLabel']/@defaultLayer/@containerMappings[name='EClass']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:ContainerMapping" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithEmptyLabel']/@defaultLayer/@containerMappings[name='EClass']"/>
+      </ownedDiagramElements>
+      <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_75RullVsEeaFcNS-NDRImw" name="B" tooltipText="B" incomingEdges="_75RuoFVsEeaFcNS-NDRImw" width="12" height="10">
+        <target xmi:type="ecore:EClass" href="edgeLabelsMoveTest.ecore#//B"/>
+        <semanticElements xmi:type="ecore:EClass" href="edgeLabelsMoveTest.ecore#//B"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_75Rul1VsEeaFcNS-NDRImw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+          <description xmi:type="style:FlatContainerStyleDescription" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithEmptyLabel']/@defaultLayer/@containerMappings[name='EClass']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:ContainerMapping" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithEmptyLabel']/@defaultLayer/@containerMappings[name='EClass']"/>
+      </ownedDiagramElements>
+      <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_75RumFVsEeaFcNS-NDRImw" name="C" tooltipText="C" outgoingEdges="_75RupVVsEeaFcNS-NDRImw" width="12" height="10">
+        <target xmi:type="ecore:EClass" href="edgeLabelsMoveTest.ecore#//C"/>
+        <semanticElements xmi:type="ecore:EClass" href="edgeLabelsMoveTest.ecore#//C"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_75RumVVsEeaFcNS-NDRImw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+          <description xmi:type="style:FlatContainerStyleDescription" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithEmptyLabel']/@defaultLayer/@containerMappings[name='EClass']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:ContainerMapping" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithEmptyLabel']/@defaultLayer/@containerMappings[name='EClass']"/>
+      </ownedDiagramElements>
+      <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_75RumlVsEeaFcNS-NDRImw" name="D" tooltipText="D" incomingEdges="_75RupVVsEeaFcNS-NDRImw" width="12" height="10">
+        <target xmi:type="ecore:EClass" href="edgeLabelsMoveTest.ecore#//D"/>
+        <semanticElements xmi:type="ecore:EClass" href="edgeLabelsMoveTest.ecore#//D"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_75Rum1VsEeaFcNS-NDRImw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+          <description xmi:type="style:FlatContainerStyleDescription" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithEmptyLabel']/@defaultLayer/@containerMappings[name='EClass']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:ContainerMapping" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithEmptyLabel']/@defaultLayer/@containerMappings[name='EClass']"/>
+      </ownedDiagramElements>
+      <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_75RunFVsEeaFcNS-NDRImw" name="E" tooltipText="E" outgoingEdges="_75RuqlVsEeaFcNS-NDRImw" width="12" height="10">
+        <target xmi:type="ecore:EClass" href="edgeLabelsMoveTest.ecore#//E"/>
+        <semanticElements xmi:type="ecore:EClass" href="edgeLabelsMoveTest.ecore#//E"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_75RunVVsEeaFcNS-NDRImw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+          <description xmi:type="style:FlatContainerStyleDescription" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithEmptyLabel']/@defaultLayer/@containerMappings[name='EClass']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:ContainerMapping" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithEmptyLabel']/@defaultLayer/@containerMappings[name='EClass']"/>
+      </ownedDiagramElements>
+      <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_75RunlVsEeaFcNS-NDRImw" name="F" tooltipText="F" incomingEdges="_75RuqlVsEeaFcNS-NDRImw" width="12" height="10">
+        <target xmi:type="ecore:EClass" href="edgeLabelsMoveTest.ecore#//F"/>
+        <semanticElements xmi:type="ecore:EClass" href="edgeLabelsMoveTest.ecore#//F"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_75Run1VsEeaFcNS-NDRImw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+          <description xmi:type="style:FlatContainerStyleDescription" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithEmptyLabel']/@defaultLayer/@containerMappings[name='EClass']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:ContainerMapping" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithEmptyLabel']/@defaultLayer/@containerMappings[name='EClass']"/>
+      </ownedDiagramElements>
+      <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_75RuoFVsEeaFcNS-NDRImw" sourceNode="_75RulFVsEeaFcNS-NDRImw" targetNode="_75RullVsEeaFcNS-NDRImw">
+        <target xmi:type="ecore:EReference" href="edgeLabelsMoveTest.ecore#//A/refToB"/>
+        <semanticElements xmi:type="ecore:EReference" href="edgeLabelsMoveTest.ecore#//A/refToB"/>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_75RuoVVsEeaFcNS-NDRImw" sourceArrow="Diamond" routingStyle="manhattan" strokeColor="0,0,0">
+          <description xmi:type="style:EdgeStyleDescription" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithEmptyLabel']/@defaultLayer/@edgeMappings[name='EReference']/@style"/>
+          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_75RuolVsEeaFcNS-NDRImw"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_75Ruo1VsEeaFcNS-NDRImw" showIcon="false"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_75RupFVsEeaFcNS-NDRImw" showIcon="false"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:EdgeMapping" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithEmptyLabel']/@defaultLayer/@edgeMappings[name='EReference']"/>
+      </ownedDiagramElements>
+      <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_75RupVVsEeaFcNS-NDRImw" sourceNode="_75RumFVsEeaFcNS-NDRImw" targetNode="_75RumlVsEeaFcNS-NDRImw">
+        <target xmi:type="ecore:EReference" href="edgeLabelsMoveTest.ecore#//C/refToD"/>
+        <semanticElements xmi:type="ecore:EReference" href="edgeLabelsMoveTest.ecore#//C/refToD"/>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_75RuplVsEeaFcNS-NDRImw" sourceArrow="Diamond" routingStyle="manhattan" strokeColor="0,0,0">
+          <description xmi:type="style:EdgeStyleDescription" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithEmptyLabel']/@defaultLayer/@edgeMappings[name='EReference']/@style"/>
+          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_75Rup1VsEeaFcNS-NDRImw"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_75RuqFVsEeaFcNS-NDRImw" showIcon="false"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_75RuqVVsEeaFcNS-NDRImw" showIcon="false"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:EdgeMapping" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithEmptyLabel']/@defaultLayer/@edgeMappings[name='EReference']"/>
+      </ownedDiagramElements>
+      <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_75RuqlVsEeaFcNS-NDRImw" sourceNode="_75RunFVsEeaFcNS-NDRImw" targetNode="_75RunlVsEeaFcNS-NDRImw">
+        <target xmi:type="ecore:EReference" href="edgeLabelsMoveTest.ecore#//E/refToF"/>
+        <semanticElements xmi:type="ecore:EReference" href="edgeLabelsMoveTest.ecore#//E/refToF"/>
+        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_75Ruq1VsEeaFcNS-NDRImw" sourceArrow="Diamond" routingStyle="manhattan" strokeColor="0,0,0">
+          <description xmi:type="style:EdgeStyleDescription" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithEmptyLabel']/@defaultLayer/@edgeMappings[name='EReference']/@style"/>
+          <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_75RurFVsEeaFcNS-NDRImw"/>
+          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_75RurVVsEeaFcNS-NDRImw" showIcon="false"/>
+          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_75RurlVsEeaFcNS-NDRImw" showIcon="false"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:EdgeMapping" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithEmptyLabel']/@defaultLayer/@edgeMappings[name='EReference']"/>
+      </ownedDiagramElements>
+      <description xmi:type="description_1:DiagramDescription" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithEmptyLabel']"/>
+      <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_75Rur1VsEeaFcNS-NDRImw"/>
+      <activatedLayers xmi:type="description_1:Layer" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithEmptyLabel']/@defaultLayer"/>
+      <activatedLayers xmi:type="description_1:AdditionalLayer" href="VSMForEdgeLabelsMoveTest.odesign#//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithEmptyLabel']/@additionalLayers[name='Package']"/>
+      <target xmi:type="ecore:EPackage" href="edgeLabelsMoveTest.ecore#/"/>
+    </ownedRepresentations>
   </ownedViews>
 </viewpoint:DAnalysis>
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/EdgeLabelsMoveFromEdgeMoveTest.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/EdgeLabelsMoveFromEdgeMoveTest.java
index 0bff372eec..402651419e 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/EdgeLabelsMoveFromEdgeMoveTest.java
+++ b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/EdgeLabelsMoveFromEdgeMoveTest.java
@@ -10,7 +10,10 @@
  *******************************************************************************/
 package org.eclipse.sirius.tests.swtbot;
 
+import static org.junit.Assert.assertNotEquals;
+
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -25,6 +28,7 @@ import org.eclipse.draw2d.geometry.PrecisionPoint;
 import org.eclipse.draw2d.geometry.Rectangle;
 import org.eclipse.draw2d.geometry.Transform;
 import org.eclipse.draw2d.geometry.Vector;
+import org.eclipse.gef.Request;
 import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.LabelEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.internal.util.LabelViewConstants;
@@ -32,16 +36,21 @@ import org.eclipse.gmf.runtime.draw2d.ui.geometry.LineSeg;
 import org.eclipse.gmf.runtime.draw2d.ui.geometry.LineSeg.KeyPoint;
 import org.eclipse.gmf.runtime.draw2d.ui.geometry.PointListUtilities;
 import org.eclipse.sirius.diagram.DDiagram;
+import org.eclipse.sirius.diagram.ui.edit.api.part.AbstractDiagramEdgeEditPart;
+import org.eclipse.sirius.diagram.ui.edit.api.part.AbstractDiagramEdgeEditPart.ViewEdgeFigure;
+import org.eclipse.sirius.diagram.ui.edit.api.part.AbstractDiagramNameEditPart;
 import org.eclipse.sirius.diagram.ui.edit.api.part.IAbstractDiagramNodeEditPart;
 import org.eclipse.sirius.diagram.ui.internal.edit.parts.AbstractDEdgeNameEditPart;
 import org.eclipse.sirius.diagram.ui.internal.edit.parts.DEdgeBeginNameEditPart;
 import org.eclipse.sirius.diagram.ui.internal.edit.parts.DEdgeEndNameEditPart;
 import org.eclipse.sirius.diagram.ui.internal.edit.parts.DEdgeNameEditPart;
 import org.eclipse.sirius.diagram.ui.part.SiriusVisualIDRegistry;
+import org.eclipse.sirius.diagram.ui.tools.api.ui.actions.ActionIds;
 import org.eclipse.sirius.tests.support.api.GraphicTestsSupportHelp;
 import org.eclipse.sirius.tests.swtbot.support.api.AbstractSiriusSwtBotGefTestCase;
 import org.eclipse.sirius.tests.swtbot.support.api.business.UIDiagramRepresentation.ZoomLevel;
 import org.eclipse.sirius.tests.swtbot.support.api.business.UIResource;
+import org.eclipse.sirius.tests.swtbot.support.api.condition.CheckEditPartMoved;
 import org.eclipse.sirius.tests.swtbot.support.api.editor.SWTBotSiriusDiagramEditor;
 import org.eclipse.sirius.tests.swtbot.support.utils.SWTBotUtils;
 import org.eclipse.swt.SWT;
@@ -1120,4 +1129,201 @@ public class EdgeLabelsMoveFromEdgeMoveTest extends AbstractSiriusSwtBotGefTestC
         diagramEditor.maximize();
         return diagramEditor;
     }
+
+    /**
+     * Tests that begin, end and center labels of an edge are snapped back when
+     * the action "Snap Back Label(s) is used on it.
+     */
+    public void testSingleSnapBackOnEdgeWithThreeLabels() {
+        String diagramName = "EdgeWith3SegmentsHVH";
+
+        diagramEditor = setUpEditorAccordingToDimensions(diagramName, ZoomLevel.ZOOM_100);
+
+        String beginLabel = "refToFBegin";
+        String centerLabel = "refToFCenter";
+        String endLabel = "refToFEnd";
+
+        // Expected distance between edge center and label origin point after
+        // using the action.
+        Map<String, Long> expectedLabelToDistanceWithEdge = new HashMap<String, Long>();
+        expectedLabelToDistanceWithEdge.put(beginLabel, Long.valueOf(65));
+        expectedLabelToDistanceWithEdge.put(centerLabel, Long.valueOf(13));
+        expectedLabelToDistanceWithEdge.put(endLabel, Long.valueOf(92));
+
+        checkLabelsSnapBack("E", "F", beginLabel, centerLabel, endLabel, expectedLabelToDistanceWithEdge);
+    }
+
+    /**
+     * Tests that begin and center labels of an edge are snapped back when the
+     * action "Snap Back Label(s) is used on it and no end label is specified.
+     */
+    public void testSingleSnapBackOnEdgeWithTwoLabels() {
+        String diagramName = "DiagramWithBeginAndCenterLabel";
+
+        diagramEditor = setUpEditorAccordingToDimensions(diagramName, diagramName, ZoomLevel.ZOOM_100);
+
+        String beginLabel = "refToFBegin";
+        String centerLabel = "refToFCenter";
+
+        // Expected distance between edge center and label origin point after
+        // using the action.
+        Map<String, Long> expectedLabelToDistanceWithEdge = new HashMap<String, Long>();
+        expectedLabelToDistanceWithEdge.put(beginLabel, Long.valueOf(24));
+        expectedLabelToDistanceWithEdge.put(centerLabel, Long.valueOf(10));
+
+        checkLabelsSnapBack("E", "F", beginLabel, centerLabel, null, expectedLabelToDistanceWithEdge);
+    }
+
+    /**
+     * Tests that edge labels don't move when using snap back label action on an
+     * edge without labels defined.
+     */
+    public void testSingleSnapBackOnEdgeWithZeroLabels() {
+        String diagramName = "DiagramWithZeroSpecifiedLabel";
+
+        diagramEditor = setUpEditorAccordingToDimensions(diagramName, diagramName, ZoomLevel.ZOOM_100);
+
+        checkAllEdgeLabelsDontMove("E", "F");
+    }
+
+    /**
+     * Tests that edge labels don't move when using snap back label action on an
+     * edge with empty labels.
+     */
+    public void testSingleSnapBackOnEdgeWithEmptyLabels() {
+        String diagramName = "DiagramWithEmptyLabel";
+
+        diagramEditor = setUpEditorAccordingToDimensions(diagramName, diagramName, ZoomLevel.ZOOM_100);
+
+        checkAllEdgeLabelsDontMove("E", "F");
+    }
+
+    /**
+     * Verifies that all labels of the edge related to the given source and
+     * target part does not move when Snap back Label(s) action is run.
+     * 
+     * @param targetEditPartName
+     *            the name of the edit part used as target of the edge from
+     *            which we test the snap back labels action.
+     * @param sourceEditPartName
+     *            the name of the edit part used as source of the edge from
+     *            which we test the snap back labels action.
+     * @param beginLabelName
+     *            the name of the begin label of an edge.
+     * @param centerLabelName
+     *            the name of the center label of an edge.
+     * @param endLabelName
+     *            the name of the end label of an edge.
+     * 
+     */
+    private void checkAllEdgeLabelsDontMove(String sourceEditPartName, String targetEditPartName) {
+        SWTBotGefEditPart sourceEditPart = diagramEditor.getEditPart(sourceEditPartName, IAbstractDiagramNodeEditPart.class);
+        SWTBotGefEditPart targetEditPart = diagramEditor.getEditPart(targetEditPartName, IAbstractDiagramNodeEditPart.class);
+        SWTBotGefConnectionEditPart swtEdgeEditPart = diagramEditor.getConnectionEditPart(sourceEditPart, targetEditPart).get(0);
+
+        AbstractDiagramEdgeEditPart edgeEditPart = (AbstractDiagramEdgeEditPart) swtEdgeEditPart.part();
+
+        List<?> children = edgeEditPart.getChildren();
+        assertEquals(3, children.size());
+
+        AbstractDiagramNameEditPart lablOne = (AbstractDiagramNameEditPart) children.get(0);
+        AbstractDiagramNameEditPart lablTwo = (AbstractDiagramNameEditPart) children.get(1);
+        AbstractDiagramNameEditPart lablThree = (AbstractDiagramNameEditPart) children.get(2);
+
+        Rectangle originalBoundLabelOne = lablOne.getFigure().getBounds().getTranslated(0, 0);
+        Rectangle originalBoundLabelTwo = lablTwo.getFigure().getBounds().getTranslated(0, 0);
+        Rectangle originalBoundLabelThree = lablThree.getFigure().getBounds().getTranslated(0, 0);
+
+        edgeEditPart.performRequest(new Request(ActionIds.EDGE_SNAP_BACK));
+        SWTBotUtils.waitAllUiEvents();
+
+        // We verify that labels have not moved.
+        assertEquals("Label '" + lablOne.getEditText() + "' position has changed whereas it should have not.", originalBoundLabelOne, lablOne.getFigure().getBounds());
+        assertEquals("Label '" + lablTwo.getEditText() + "' position has changed whereas it should have not.", originalBoundLabelTwo, lablTwo.getFigure().getBounds());
+        assertEquals("Label '" + lablThree.getEditText() + "' position has changed whereas it should have not.", originalBoundLabelThree, lablThree.getFigure().getBounds());
+
+    }
+
+    /**
+     * Verifies that given label(s) are snapped back correctly by using the
+     * given original and expected distances between edge center and labels
+     * origin points.
+     * 
+     * @param targetEditPartName
+     *            the name of the edit part used as target of the edge from
+     *            which we test the snap back labels action.
+     * @param sourceEditPartName
+     *            the name of the edit part used as source of the edge from
+     *            which we test the snap back labels action.
+     * @param beginLabelName
+     *            the name of the begin label of an edge.
+     * @param centerLabelName
+     *            the name of the center label of an edge.
+     * @param endLabelName
+     *            the name of the end label of an edge.
+     * @param expectedLabelToDistanceWithEdge
+     *            a map containing the original distance between edge center and
+     *            label origin point.
+     */
+    private void checkLabelsSnapBack(String sourceEditPartName, String targetEditPartName, String beginLabelName, String centerLabelName, String endLabelName,
+            Map<String, Long> expectedLabelToDistanceWithEdge) {
+        SWTBotGefEditPart sourceEditPart = diagramEditor.getEditPart(sourceEditPartName, IAbstractDiagramNodeEditPart.class);
+        SWTBotGefEditPart targetEditPart = diagramEditor.getEditPart(targetEditPartName, IAbstractDiagramNodeEditPart.class);
+        SWTBotGefConnectionEditPart swtEdgeEditPart = diagramEditor.getConnectionEditPart(sourceEditPart, targetEditPart).get(0);
+
+        AbstractDiagramEdgeEditPart edgeEditPart = (AbstractDiagramEdgeEditPart) swtEdgeEditPart.part();
+        Point edgeCenter = ((ViewEdgeFigure) edgeEditPart.getFigure()).getPoints().getMidpoint();
+
+        List<?> children = edgeEditPart.getChildren();
+        assertEquals("Wrong number of children parts", 3, children.size());
+
+        SWTBotGefEditPart botBeginRefPart = beginLabelName != null ? diagramEditor.getEditPart(beginLabelName) : null;
+        SWTBotGefEditPart botCenterRefPart = centerLabelName != null ? diagramEditor.getEditPart(centerLabelName) : null;
+        SWTBotGefEditPart botEndRefPart = endLabelName != null ? diagramEditor.getEditPart(endLabelName) : null;
+        AbstractDEdgeNameEditPart beginRefPart = beginLabelName != null ? (AbstractDEdgeNameEditPart) botBeginRefPart.part() : null;
+        AbstractDEdgeNameEditPart centerRefPart = centerLabelName != null ? (AbstractDEdgeNameEditPart) botCenterRefPart.part() : null;
+        AbstractDEdgeNameEditPart endRefPart = endLabelName != null ? (AbstractDEdgeNameEditPart) botEndRefPart.part() : null;
+
+        Point boundBeginRef = beginLabelName != null ? beginRefPart.getFigure().getBounds().getCenter() : null;
+        Point boundCenterRef = centerLabelName != null ? centerRefPart.getFigure().getBounds().getCenter() : null;
+        Point boundEndRef = endLabelName != null ? endRefPart.getFigure().getBounds().getCenter() : null;
+
+        // We check the labels are not to their default location
+        if (beginLabelName != null)
+            assertNotEquals("Label '" + beginLabelName + "'must not be to the default position", expectedLabelToDistanceWithEdge.get(beginLabelName),
+                    (Long) Math.round(edgeCenter.getDistance(boundBeginRef)));
+        if (centerLabelName != null)
+            assertNotEquals("Label '" + centerLabelName + "'must not be to the default position", expectedLabelToDistanceWithEdge.get(centerLabelName),
+                    (Long) Math.round(edgeCenter.getDistance(boundCenterRef)));
+        if (endLabelName != null)
+            assertNotEquals("Label '" + endLabelName + "'must not be to the default position", expectedLabelToDistanceWithEdge.get(endLabelName),
+                    (Long) Math.round(edgeCenter.getDistance(boundEndRef)));
+
+        CheckEditPartMoved checkBeginRefPartMoved = beginLabelName != null ? new CheckEditPartMoved(botBeginRefPart) : null;
+        CheckEditPartMoved checkCenterRefPartMoved = centerLabelName != null ? new CheckEditPartMoved(botCenterRefPart) : null;
+        CheckEditPartMoved checkEndRefPartMoved = endLabelName != null ? new CheckEditPartMoved(botEndRefPart) : null;
+
+        edgeEditPart.performRequest(new Request(ActionIds.EDGE_SNAP_BACK));
+        if (beginLabelName != null)
+            bot.waitUntil(checkBeginRefPartMoved);
+        if (centerLabelName != null)
+            bot.waitUntil(checkCenterRefPartMoved);
+        if (endLabelName != null)
+            bot.waitUntil(checkEndRefPartMoved);
+
+        boundBeginRef = beginLabelName != null ? beginRefPart.getFigure().getBounds().getCenter() : null;
+        boundCenterRef = centerLabelName != null ? centerRefPart.getFigure().getBounds().getCenter() : null;
+        boundEndRef = endLabelName != null ? endRefPart.getFigure().getBounds().getCenter() : null;
+        // We verify that labels have been moved near the edge at its default
+        // location.
+        if (beginLabelName != null)
+            assertEquals("Label '" + beginLabelName + "'must be to its default position", expectedLabelToDistanceWithEdge.get(beginLabelName),
+                    (Long) Math.round(edgeCenter.getDistance(boundBeginRef)));
+        if (centerLabelName != null)
+            assertEquals("Label '" + centerLabelName + "'must be to its default position", expectedLabelToDistanceWithEdge.get(centerLabelName),
+                    (Long) Math.round(edgeCenter.getDistance(boundCenterRef)));
+        if (endLabelName != null)
+            assertEquals("Label '" + endLabelName + "'must be to its default position", expectedLabelToDistanceWithEdge.get(endLabelName), (Long) Math.round(edgeCenter.getDistance(boundEndRef)));
+
+    }
 }
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/suite/AllTestSuite.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/suite/AllTestSuite.java
index 5ca1dea3a2..60a018f19f 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/suite/AllTestSuite.java
+++ b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/suite/AllTestSuite.java
@@ -154,7 +154,7 @@ public class AllTestSuite extends TestCase {
         suite.addTestSuite(CompartmentsDragAndDropTest.class);
         suite.addTestSuite(EdgeSelectionTest.class);
         suite.addTestSuite(DiagramMouseZoomTest.class);
-
+        suite.addTestSuite(EdgeLabelsMoveFromEdgeMoveTest.class);
     }
 
     /**
@@ -247,7 +247,6 @@ public class AllTestSuite extends TestCase {
         suite.addTestSuite(EdgeStabilityOnBendpointsAlignmentTest.class);
         suite.addTestSuite(EdgeStabilityOnDragAndDropTest.class);
         suite.addTestSuite(EdgeLabelStabilityTest.class);
-        suite.addTestSuite(EdgeLabelsMoveFromEdgeMoveTest.class);
         suite.addTestSuite(EdgeLabelsMoveTest.class);
         suite.addTestSuite(EdgeStabilityOnLayerManagementTest.class);
         suite.addTestSuite(EdgeOnFigureWithAlphaAnchorTest.class);