[525933] Add corresponding tests

These tests correspond to manual tests described in https://bugs.eclipse.org/bugs/show_bug.cgi?id=525933#c9 . Only "undo layer activation label" and "icon decorator on tabbar's layer menu" are not automatically tested. bug: 525933 Change-Id: I2745b40ce25fc4d936edb56d0fd3be50c6e9d6d2 Signed-off-by: Laurent Redor <laurent.redor@obeo.fr>
author: Laurent Redor 2017-11-08 13:25:39 +0000
committer: Laurent Redor 2017-11-16 09:40:47 +0000
commit: 641c44b9275f78ce9ed31b72fabe0bdf44ff100e (patch)
tree: ed66808178881b8210bad53fca364561dab1b1dd
parent: e58a294cab81c59681037339d6d6f958e4d0653d (diff)
download: org.eclipse.sirius-641c44b9275f78ce9ed31b72fabe0bdf44ff100e.tar.gz
org.eclipse.sirius-641c44b9275f78ce9ed31b72fabe0bdf44ff100e.tar.xz
org.eclipse.sirius-641c44b9275f78ce9ed31b72fabe0bdf44ff100e.zip
16 files changed, 1041 insertions, 641 deletions
diff --git a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/util/ReflectionHelper.java b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/util/ReflectionHelper.java
index f982b0f7b6..2e315aa7a7 100644
--- a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/util/ReflectionHelper.java
+++ b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/util/ReflectionHelper.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2012 THALES GLOBAL SERVICES.
+ * Copyright (c) 2011, 2017 THALES GLOBAL SERVICES.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -215,12 +215,45 @@ public final class ReflectionHelper {
     }
 
     /**
+     * Invoke a method and return the result.
+     * 
+     * @param object
+     *            The object on which we must invoke method
+     * @param aClass
+     *            The class which declares the method
+     * @param methodName
+     *            The name of the method to invoke
+     * @param parameterTypes
+     *            The type of the parameters
+     * @param parameters
+     *            The parameters of the method
+     * @param setVisible
+     *            true to set the method visible before calling.
+     * @return the result if the method is invoke without exception, null otherwise.
+     */
+    public static Object invokeMethodWithoutExceptionWithReturn(Object object, Class aClass, String methodName, Class<?>[] parameterTypes, Object[] parameters, boolean setVisible) {
+        try {
+            return invokeMethod(object, aClass, methodName, parameterTypes, parameters, setVisible);
+        } catch (SecurityException e) {
+            // Do nothing
+        } catch (IllegalArgumentException e) {
+            // Do nothing
+        } catch (NoSuchMethodException e) {
+            // Do nothing
+        } catch (IllegalAccessException e) {
+            // Do nothing
+        } catch (InvocationTargetException e) {
+            // Do nothing
+        }
+        return null;
+    }
+
+    /**
      * Get the class corresponding to his name.
      * 
      * @param className
      *            The name of the searched class
-     * @return an empty option if there is no corresponding class, an option
-     *         with the corresponding class otherwise.
+     * @return an empty option if there is no corresponding class, an option with the corresponding class otherwise.
      */
     public static Option<Class> getClassForNameWithoutException(String className) {
         try {
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/tools/palette/toolSection.aird b/plugins/org.eclipse.sirius.tests.junit/data/unit/tools/palette/toolSection.aird
index e0d70a75c4..4a50a61252 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/tools/palette/toolSection.aird
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/tools/palette/toolSection.aird
@@ -1,13 +1,16 @@
 <?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:viewpoint="http://www.eclipse.org/sirius/1.1.0" xsi:schemaLocation="http://www.eclipse.org/sirius/description/1.1.0 http://www.eclipse.org/sirius/1.1.0#//description http://www.eclipse.org/sirius/diagram/description/1.1.0 http://www.eclipse.org/sirius/1.1.0#//diagram/description http://www.eclipse.org/sirius/diagram/1.1.0 http://www.eclipse.org/sirius/1.1.0#//diagram" xmi:id="_KKCC8CIgEd-asvFvTQzt7g" selectedViews="_KhAYgCIgEd-asvFvTQzt7g" version="8.0.0">
-  <models xmi:type="ecore:EPackage" href="toolSection.ecore#/"/>
-  <ownedViews xmi:type="viewpoint:DRepresentationContainer" xmi:id="_KhAYgCIgEd-asvFvTQzt7g" initialized="true">
+<viewpoint:DAnalysis xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:diagram="http://www.eclipse.org/sirius/diagram/1.1.0" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns: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" xmi:id="_KKCC8CIgEd-asvFvTQzt7g" selectedViews="_KhAYgCIgEd-asvFvTQzt7g" version="10.1.9.201706271200">
+  <semanticResources>toolSection.ecore</semanticResources>
+  <ownedViews xmi:type="viewpoint:DRepresentationContainer" xmi:id="_KhAYgCIgEd-asvFvTQzt7g">
     <ownedRepresentations xmi:type="diagram:DSemanticDiagram" xmi:id="_LUo04SIgEd-asvFvTQzt7g" name="new toolSectionLayers">
       <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_sg4DABHiEeKS07mYEJy8yw" source="GMF_DIAGRAMS">
         <data xmi:type="notation:Diagram" xmi:id="_533HwSYLEd-nV44Ptnh8oA" type="Sirius" element="_LUo04SIgEd-asvFvTQzt7g" measurementUnit="Pixel">
           <styles xmi:type="notation:DiagramStyle" xmi:id="_533HwiYLEd-nV44Ptnh8oA"/>
         </data>
       </ownedAnnotationEntries>
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_FUu3IMR5EeeDus9jETcw0Q" source="DANNOTATION_CUSTOMIZATION_KEY">
+        <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_FUu3IcR5EeeDus9jETcw0Q"/>
+      </ownedAnnotationEntries>
       <description xmi:type="description_1:DiagramDescription" href="toolSection.odesign#//@ownedViewpoints[name='toolSection']/@ownedRepresentations[name='toolSectionLayers']"/>
       <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_LUo04iIgEd-asvFvTQzt7g"/>
       <activatedLayers xmi:type="description_1:Layer" href="toolSection.odesign#//@ownedViewpoints[name='toolSection']/@ownedRepresentations[name='toolSectionLayers']/@defaultLayer"/>
@@ -20,19 +23,33 @@
           <styles xmi:type="notation:DiagramStyle" xmi:id="_39NG8ibREd-rtb2NqI4LJQ"/>
         </data>
       </ownedAnnotationEntries>
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_FUu3IsR5EeeDus9jETcw0Q" source="DANNOTATION_CUSTOMIZATION_KEY">
+        <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_FUu3I8R5EeeDus9jETcw0Q"/>
+      </ownedAnnotationEntries>
       <description xmi:type="description_1:DiagramDescription" href="toolSection.odesign#//@ownedViewpoints[name='toolSection']/@ownedRepresentations[name='toolSectionWithoutLayers']"/>
       <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_L0lgQiIgEd-asvFvTQzt7g"/>
       <target xmi:type="ecore:EPackage" href="toolSection.ecore#/"/>
     </ownedRepresentations>
-    <viewpoint xmi:type="description:Viewpoint" href="toolSection.odesign#//@ownedViewpoints[name='toolSection']"/>
-    <diagramSet xmi:type="diagram:DDiagramSet" xmi:id="_LUo04CIgEd-asvFvTQzt7g" diagrams="_LUo04SIgEd-asvFvTQzt7g">
+    <ownedRepresentations xmi:type="diagram:DSemanticDiagram" xmi:id="_VRsqIMR5EeeDus9jETcw0Q" name="new toolSectionLayers2">
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_VRsqIcR5EeeDus9jETcw0Q" source="GMF_DIAGRAMS">
+        <data xmi:type="notation:Diagram" xmi:id="_VRsqIsR5EeeDus9jETcw0Q" type="Sirius" element="_VRsqIMR5EeeDus9jETcw0Q" measurementUnit="Pixel">
+          <styles xmi:type="notation:DiagramStyle" xmi:id="_VRsqI8R5EeeDus9jETcw0Q"/>
+        </data>
+      </ownedAnnotationEntries>
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_VRsqJMR5EeeDus9jETcw0Q" source="DANNOTATION_CUSTOMIZATION_KEY">
+        <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_VRsqJcR5EeeDus9jETcw0Q"/>
+      </ownedAnnotationEntries>
       <description xmi:type="description_1:DiagramDescription" href="toolSection.odesign#//@ownedViewpoints[name='toolSection']/@ownedRepresentations[name='toolSectionLayers']"/>
-    </diagramSet>
-    <diagramSet xmi:type="diagram:DDiagramSet" xmi:id="_L0lgQCIgEd-asvFvTQzt7g" diagrams="_L0lgQSIgEd-asvFvTQzt7g">
-      <description xmi:type="description_1:DiagramDescription" href="toolSection.odesign#//@ownedViewpoints[name='toolSection']/@ownedRepresentations[name='toolSectionWithoutLayers']"/>
-    </diagramSet>
+      <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_VRsqJsR5EeeDus9jETcw0Q"/>
+      <activatedLayers xmi:type="description_1:Layer" href="toolSection.odesign#//@ownedViewpoints[name='toolSection']/@ownedRepresentations[name='toolSectionLayers']/@defaultLayer"/>
+      <activatedLayers xmi:type="description_1:AdditionalLayer" href="toolSection.odesign#//@ownedViewpoints[name='toolSection']/@ownedRepresentations[name='toolSectionLayers']/@additionalLayers[name='L2%20enabled']"/>
+      <activatedLayers xmi:type="description_1:AdditionalLayer" href="toolSection.odesign#//@ownedViewpoints[name='toolSection']/@ownedRepresentations[name='toolSectionLayers']/@additionalLayers[name='L4']"/>
+      <activatedLayers xmi:type="description_1:AdditionalLayer" href="toolSection.odesign#//@ownedViewpoints[name='toolSection']/@ownedRepresentations[name='toolSectionLayers']/@additionalLayers[name='L5']"/>
+      <target xmi:type="ecore:EPackage" href="toolSection.ecore#/"/>
+    </ownedRepresentations>
+    <viewpoint xmi:type="description:Viewpoint" href="toolSection.odesign#//@ownedViewpoints[name='toolSection']"/>
   </ownedViews>
-  <ownedViews xmi:type="viewpoint:DRepresentationContainer" xmi:id="_5RvkASU8Ed-Zj-dNDXlF8Q" initialized="true">
+  <ownedViews xmi:type="viewpoint:DRepresentationContainer" xmi:id="_5RvkASU8Ed-Zj-dNDXlF8Q">
     <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Archetype']"/>
   </ownedViews>
 </viewpoint:DAnalysis>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/tools/palette/toolSection.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/tools/palette/toolSection.odesign
index faad7d508a..c111aa4b24 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/tools/palette/toolSection.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/tools/palette/toolSection.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: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" version="8.0.0">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns: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" version="10.1.3.201511131800">
   <ownedViewpoints name="toolSection" modelFileExtension="ecore">
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="toolSectionLayers" domainClass="EPackage">
       <defaultLayer name="L1">
@@ -113,6 +113,24 @@
           </ownedTools>
         </toolSections>
       </additionalLayers>
+      <additionalLayers name="L4">
+        <toolSections name="L4">
+          <ownedTools xsi:type="tool:ToolDescription" name="ToolL4">
+            <element name="element"/>
+            <elementView name="elementView"/>
+            <initialOperation/>
+          </ownedTools>
+        </toolSections>
+      </additionalLayers>
+      <additionalLayers name="L5" activeByDefault="true">
+        <toolSections name="L5">
+          <ownedTools xsi:type="tool:ToolDescription" name="ToolL5">
+            <element name="element"/>
+            <elementView name="elementView"/>
+            <initialOperation/>
+          </ownedTools>
+        </toolSections>
+      </additionalLayers>
     </ownedRepresentations>
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="toolSectionWithoutLayers" domainClass="EPackage">
       <toolSection name="WithoutLayerNotEmptySection50">
diff --git a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/tools/palette/AbstractPaletteManagerSectionTest.java b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/tools/palette/AbstractPaletteManagerSectionTest.java
index f844160c3e..f1933fac41 100644
--- a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/tools/palette/AbstractPaletteManagerSectionTest.java
+++ b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/tools/palette/AbstractPaletteManagerSectionTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2014 THALES GLOBAL SERVICES.
+ * Copyright (c) 2010, 2017 THALES GLOBAL SERVICES.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -22,7 +22,7 @@ import org.eclipse.sirius.viewpoint.DRepresentation;
 import com.google.common.collect.Iterables;
 
 /**
- * Comon code for palette tests
+ * Common code for palette tests
  * 
  * @author dlecan
  */
@@ -47,24 +47,30 @@ public abstract class AbstractPaletteManagerSectionTest extends AbstractPaletteM
         genericSetUp(SEMANTIC_MODEL_PATH, MODELER_PATH, SESSION_PATH);
         SessionUIManager.INSTANCE.createUISession(session);
 
-        Collection<DRepresentation> representations = getRepresentations(getRepresentationDescriptionName());
+        diagram = getDiagram(getRepresentationDescriptionName(), getRepresentationDescriptionInstanceName());
+    }
+
+    /**
+     * Get the representation with the given representation description name and
+     * the given name.
+     * 
+     * @param diagramDescriptionName
+     *            the name of the diagram description. <code>null</code> is not
+     *            excepted.
+     * @param diagramName
+     *            the name of the diagram. <code>null</code> is not excepted.
+     * @return The corresponding diagram
+     */
+    protected Diagram getDiagram(String diagramDescriptionName, String diagramName) {
+        Collection<DRepresentation> representations = getRepresentations(diagramDescriptionName);
         for (DRepresentation repr : representations) {
-            if (repr.getName().equals(getRepresentationDescriptionInstanceName())) {
+            if (repr.getName().equals(diagramName)) {
                 dDiagram = (DDiagram) repr;
                 break;
             }
         }
         assertNotNull("DDiagram not found", dDiagram);
 
-        diagram = (Diagram) Iterables.get(session.getServices().getCustomData(CustomDataConstants.GMF_DIAGRAMS, dDiagram), 0);
-
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    protected void tearDown() throws Exception {
-        super.tearDown();
+        return (Diagram) Iterables.get(session.getServices().getCustomData(CustomDataConstants.GMF_DIAGRAMS, dDiagram), 0);
     }
 }
diff --git a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/tools/palette/AbstractPaletteManagerTest.java b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/tools/palette/AbstractPaletteManagerTest.java
index 6c55cbead7..8e61419489 100644
--- a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/tools/palette/AbstractPaletteManagerTest.java
+++ b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/tools/palette/AbstractPaletteManagerTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2014 THALES GLOBAL SERVICES.
+ * Copyright (c) 2010, 2017 THALES GLOBAL SERVICES.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -16,7 +16,6 @@ import java.util.List;
 import java.util.Set;
 import java.util.SortedSet;
 
-import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.gef.DefaultEditDomain;
 import org.eclipse.gef.EditDomain;
 import org.eclipse.gef.palette.PaletteContainer;
@@ -26,13 +25,10 @@ import org.eclipse.gef.palette.PaletteRoot;
 import org.eclipse.gef.palette.PaletteStack;
 import org.eclipse.gef.palette.ToolEntry;
 import org.eclipse.gef.ui.palette.PaletteViewer;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.parts.DiagramDocumentEditor;
 import org.eclipse.gmf.runtime.notation.Diagram;
 import org.eclipse.sirius.diagram.DDiagram;
 import org.eclipse.sirius.tests.support.api.SiriusDiagramTestCase;
 import org.eclipse.sirius.tests.support.api.TestsUtil;
-import org.eclipse.sirius.ui.business.api.dialect.DialectUIManager;
-import org.eclipse.ui.IEditorPart;
 
 import com.google.common.base.Predicate;
 import com.google.common.collect.Iterables;
@@ -40,7 +36,7 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 
 /**
- * Comon code for palette tests
+ * Common code for palette tests.
  * 
  * @author dlecan
  */
@@ -189,27 +185,14 @@ public abstract class AbstractPaletteManagerTest extends SiriusDiagramTestCase {
      */
     protected abstract String getRepresentationDescriptionName();
 
-    protected void doContentPaletteTest(SortedSet<Entry> expected) {
-        SortedSet<Entry> visiblePaletteEntries = getVisiblePaletteEntries(editDomain.getPaletteViewer().getPaletteRoot());
+    protected void doContentPaletteTest(PaletteRoot paletteRoot, SortedSet<Entry> expected) {
+        SortedSet<Entry> visiblePaletteEntries = getVisiblePaletteEntries(paletteRoot);
 
         checkEquality(visiblePaletteEntries, expected);
+    }
 
-        IEditorPart editorPart = null;
-        try {
-            editorPart = DialectUIManager.INSTANCE.openEditor(session, dDiagram, new NullProgressMonitor());
-            TestsUtil.synchronizationWithUIThread();
-            assertTrue("Impossible to open editor part, wrong type: " + editorPart.getClass(), editorPart instanceof DiagramDocumentEditor);
-        } finally {
-            if (editorPart != null) {
-                try {
-                    DialectUIManager.INSTANCE.closeEditor(editorPart, false);
-                    // CHECKSTYLE:OFF
-                } catch (Exception e) {
-                    // CHECKSTYLE:ON
-                    // Nothing
-                }
-            }
-        }
+    protected void doContentPaletteTest(SortedSet<Entry> expected) {
+        doContentPaletteTest(editDomain.getPaletteViewer().getPaletteRoot(), expected);
     }
 
     private void checkEquality(SortedSet<Entry> value, SortedSet<Entry> expected) {
diff --git a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/tools/palette/PaletteManagerWithLayersTest.java b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/tools/palette/PaletteManagerWithLayersTest.java
index f9ce40fa14..4be858a640 100644
--- a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/tools/palette/PaletteManagerWithLayersTest.java
+++ b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/tools/palette/PaletteManagerWithLayersTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2014 THALES GLOBAL SERVICES.
+ * Copyright (c) 2010, 2017 THALES GLOBAL SERVICES.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -13,10 +13,18 @@ package org.eclipse.sirius.tests.unit.diagram.tools.palette;
 import java.util.Arrays;
 import java.util.SortedSet;
 
+import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.emf.common.util.EList;
+import org.eclipse.gmf.runtime.diagram.ui.resources.editor.parts.DiagramDocumentEditor;
+import org.eclipse.jface.action.IAction;
 import org.eclipse.sirius.diagram.description.Layer;
 import org.eclipse.sirius.diagram.ui.tools.api.graphical.edit.palette.PaletteManager;
+import org.eclipse.sirius.diagram.ui.tools.internal.editor.tabbar.actions.LayersActivationAction;
 import org.eclipse.sirius.diagram.ui.tools.internal.palette.PaletteManagerImpl;
+import org.eclipse.sirius.diagram.ui.tools.internal.views.providers.layers.LayersActivationAdapter;
+import org.eclipse.sirius.tests.support.api.TestsUtil;
+import org.eclipse.sirius.ui.business.api.dialect.DialectUIManager;
+import org.eclipse.ui.IEditorPart;
 
 import com.google.common.collect.Sets;
 
@@ -41,6 +49,8 @@ public class PaletteManagerWithLayersTest extends AbstractPaletteManagerSectionT
             //
             createNewEntry("L1EmptySectionButWithReuseTool7", "Tool1-2-1"),
             //
+            createNewEntry("L5", "ToolL5"),
+            //
             createNewEntry("SectionSharedWithOtherLayersA", "ToolL2-A-1")
     //
             ));
@@ -55,10 +65,28 @@ public class PaletteManagerWithLayersTest extends AbstractPaletteManagerSectionT
             //
             createNewEntry("L1EmptySectionButWithReuseTool7", "Tool1-2-1"),
             //
+            createNewEntry("L5", "ToolL5"),
+            //
             createNewEntry("SectionSharedWithOtherLayersA", "PBSWDL3-A-2", "ToolL2-A-1", "ToolL3-A-1")
     //
             ));
 
+    private static final SortedSet<Entry> EXPECTED_ENTRIES_LAYER_L4_SHOWN = Sets.newTreeSet(Arrays.asList(
+            createNewEntry("L1NotEmptySection1", "Tool1-1", "Tool1-2-1", "Tool1-4-1", "ECD1-2-2", "Tool9-1"),
+            //
+            createNewEntry("L1NotEmptySection4", "Tool1-2-1"),
+            //
+            createNewEntry("L1NotEmptySection5", "NCD5-1"),
+            //
+            createNewEntry("L1EmptySectionButWithReuseTool7", "Tool1-2-1"),
+            //
+            createNewEntry("L4", "ToolL4"),
+            //
+            createNewEntry("L5", "ToolL5"),
+            //
+            createNewEntry("SectionSharedWithOtherLayersA", "ToolL2-A-1")
+    ));
+
     private static final SortedSet<Entry> EXPECTED_ENTRIES_LAYER_L2_HIDDEN = Sets.newTreeSet(Arrays.asList(
     //
             createNewEntry("L1NotEmptySection1", "Tool1-1", "Tool1-2-1", "Tool1-4-1", "ECD1-2-2"),
@@ -67,7 +95,9 @@ public class PaletteManagerWithLayersTest extends AbstractPaletteManagerSectionT
             //
             createNewEntry("L1NotEmptySection5", "NCD5-1"),
             //
-            createNewEntry("L1EmptySectionButWithReuseTool7", "Tool1-2-1")
+            createNewEntry("L1EmptySectionButWithReuseTool7", "Tool1-2-1"),
+            //
+            createNewEntry("L5", "ToolL5")
     //
             ));
 
@@ -81,6 +111,8 @@ public class PaletteManagerWithLayersTest extends AbstractPaletteManagerSectionT
             //
             createNewEntry("L1EmptySectionButWithReuseTool7", "Tool1-2-1"),
             //
+            createNewEntry("L5", "ToolL5"),
+            //
             createNewEntry("SectionSharedWithOtherLayersA", "PBSWDL3-A-2", "ToolL3-A-1")
     //
             ));
@@ -89,6 +121,10 @@ public class PaletteManagerWithLayersTest extends AbstractPaletteManagerSectionT
 
     private Layer layerToHideL2;
 
+    private Layer layerL4Transient;
+
+    private IEditorPart editorPart;
+
     /**
      * {@inheritDoc}
      */
@@ -96,11 +132,33 @@ public class PaletteManagerWithLayersTest extends AbstractPaletteManagerSectionT
     protected void setUp() throws Exception {
         super.setUp();
 
-        // Layer L3 to show
-        layerToShowL3 = getLayer("L3");
+        // Open the editor before testing to be sure to have mandatory transient
+        // layer enabled (done in
+        // org.eclipse.sirius.diagram.ui.tools.internal.editor.DDiagramEditorImpl.activateTransientLayers())
+        editorPart = DialectUIManager.INSTANCE.openEditor(session, dDiagram, new NullProgressMonitor());
+        TestsUtil.synchronizationWithUIThread();
+        assertTrue("Impossible to open editor part, wrong type: " + editorPart.getClass(), editorPart instanceof DiagramDocumentEditor);
 
         // Layer L2 to hide
         layerToHideL2 = getLayer("L2");
+        // Layer L3 to show
+        layerToShowL3 = getLayer("L3");
+        // Layer L4 (transient layer)
+        layerL4Transient = getLayer("L4");
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        if (editorPart != null) {
+            try {
+                DialectUIManager.INSTANCE.closeEditor(editorPart, false);
+                // CHECKSTYLE:OFF
+            } catch (Exception e) {
+                // CHECKSTYLE:ON
+                // Nothing
+            }
+        }
+        super.tearDown();
     }
 
     /**
@@ -132,6 +190,27 @@ public class PaletteManagerWithLayersTest extends AbstractPaletteManagerSectionT
     }
 
     /**
+     * Check that layer that is activated and not transient in previous Sirius
+     * version is now not activated at the diagram opening.
+     */
+    public void testCreatePalettWithTransientLayerActivatedInPreviousSiriusVersion() {
+        //Close the previous editor to open a new one
+        if (editorPart != null) {
+            DialectUIManager.INSTANCE.closeEditor(editorPart, false);
+            TestsUtil.synchronizationWithUIThread();
+        }
+        diagram = getDiagram(getRepresentationDescriptionName(), getRepresentationDescriptionInstanceName() + "2");
+        editorPart = DialectUIManager.INSTANCE.openEditor(session, dDiagram, new NullProgressMonitor());
+        TestsUtil.synchronizationWithUIThread();
+        assertTrue("Impossible to open editor part, wrong type: " + editorPart.getClass(), editorPart instanceof DiagramDocumentEditor);
+        PaletteManager paletteManager = new PaletteManagerImpl(editDomain);
+        paletteManager.update(diagram);
+        // Even if L4 was previously selected in previous Sirius version, it
+        // must not be visible now.
+        doContentPaletteTest(EXPECTED_ENTRIES_STD_PALETTE);
+    }
+
+    /**
      * Test method.
      * 
      * @throws Exception
@@ -141,8 +220,24 @@ public class PaletteManagerWithLayersTest extends AbstractPaletteManagerSectionT
         PaletteManager paletteManager = new PaletteManagerImpl(editDomain);
         paletteManager.update(diagram);
         paletteManager.showLayer(layerToShowL3);
-
         doContentPaletteTest(EXPECTED_ENTRIES_LAYER_L3_SHOWN);
+        paletteManager.hideLayer(layerToShowL3);
+
+        // Check transient layer activation directly with PaletteManager
+        paletteManager.showLayer(layerL4Transient);
+        doContentPaletteTest(EXPECTED_ENTRIES_LAYER_L4_SHOWN);
+        paletteManager.hideLayer(layerL4Transient);
+
+        // Check transient layer activation with action (more like end-user)
+        // Add an adapter like it is done when menu is shown
+        LayersActivationAdapter adapter = new LayersActivationAdapter();
+        adapter.setPaletteManager(paletteManager);
+        dDiagram.eAdapters().add(adapter);
+        // Launch the action like with menu
+        IAction action = new LayersActivationAction("L4", IAction.AS_CHECK_BOX, dDiagram, layerL4Transient);
+        action.run();
+        TestsUtil.synchronizationWithUIThread();
+        doContentPaletteTest(EXPECTED_ENTRIES_LAYER_L4_SHOWN);
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/tools/palette/PaletteManagerWithLayersWithExtensionTest.java b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/tools/palette/PaletteManagerWithLayersWithExtensionTest.java
index 95c69e2207..2a6dd587ca 100644
--- a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/tools/palette/PaletteManagerWithLayersWithExtensionTest.java
+++ b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/tools/palette/PaletteManagerWithLayersWithExtensionTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2014 THALES GLOBAL SERVICES.
+ * Copyright (c) 2010, 2017 THALES GLOBAL SERVICES.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,14 +17,25 @@ import java.util.Collections;
 import java.util.List;
 import java.util.SortedSet;
 
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.gef.EditDomain;
+import org.eclipse.gef.palette.PaletteRoot;
+import org.eclipse.gef.ui.palette.PaletteViewer;
+import org.eclipse.gmf.runtime.diagram.ui.resources.editor.parts.DiagramDocumentEditor;
 import org.eclipse.gmf.runtime.notation.Diagram;
 import org.eclipse.sirius.business.api.session.CustomDataConstants;
+import org.eclipse.sirius.common.tools.api.util.ReflectionHelper;
 import org.eclipse.sirius.diagram.DDiagram;
 import org.eclipse.sirius.diagram.description.Layer;
+import org.eclipse.sirius.diagram.ui.tools.api.editor.DDiagramEditor;
 import org.eclipse.sirius.diagram.ui.tools.api.graphical.edit.palette.PaletteManager;
 import org.eclipse.sirius.diagram.ui.tools.internal.palette.PaletteManagerImpl;
+import org.eclipse.sirius.diagram.ui.tools.internal.views.providers.layers.LayersActivationAdapter;
 import org.eclipse.sirius.tests.SiriusTestsPlugin;
+import org.eclipse.sirius.tests.support.api.TestsUtil;
+import org.eclipse.sirius.ui.business.api.dialect.DialectUIManager;
 import org.eclipse.sirius.viewpoint.DRepresentation;
+import org.eclipse.ui.IEditorPart;
 
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Sets;
@@ -57,7 +68,37 @@ public class PaletteManagerWithLayersWithExtensionTest extends AbstractPaletteMa
     private static final String TOOL_SECTION_EXTENSION_VIEWPOINT_NAME = "toolSectionExtension"; //$NON-NLS-1$
 
     private static final SortedSet<Entry> EXPECTED_ENTRIES_STD_PALETTE = Sets.newTreeSet(Arrays.asList(
+            //
+            createNewEntry("L1NotEmptySection1", "Tool1-1", "Tool1-2-1", "Tool1-4-1", "ECD1-2-2", "Tool9-1", "Tool9-1"),
+            //
+            createNewEntry("L1NotEmptySection4", "Tool1-2-1"),
+            //
+            createNewEntry("L1NotEmptySection5", "NCD5-1"),
+            //
+            createNewEntry("L1EmptySectionButWithReuseTool7", "Tool1-2-1"),
+            //
+            createNewEntry("SectionSharedWithOtherLayersA", "ToolL2-A-1", "ToolL4-A-1")
     //
+    ));
+
+    private static final SortedSet<Entry> EXPECTED_ENTRIES_STD_EDITOR_PALETTE = Sets.newTreeSet(Arrays.asList(
+            //
+            createNewEntry("L1NotEmptySection1", "Tool1-1", "Tool1-2-1", "Tool1-4-1", "ECD1-2-2", "Tool9-1", "Tool9-1"),
+            //
+            createNewEntry("L1NotEmptySection4", "Tool1-2-1"),
+            //
+            createNewEntry("L1NotEmptySection5", "NCD5-1"),
+            //
+            createNewEntry("L1EmptySectionButWithReuseTool7", "Tool1-2-1"),
+            //
+            createNewEntry("SectionSharedWithOtherLayersA", "ToolL2-A-1", "ToolL4-A-1"),
+            //
+            createNewEntry("Standard", "Note", "Note Attachment", "Pin", "Select", "Text", "Unpin", "Zoom In", "Zoom Out", "[Separator]")
+            //
+    ));
+
+    private static final SortedSet<Entry> EXPECTED_ENTRIES_VIEWPOINT_EXTENSION_DEACTIVATE = Sets.newTreeSet(Arrays.asList(
+            //
             createNewEntry("L1NotEmptySection1", "Tool1-1", "Tool1-2-1", "Tool1-4-1", "ECD1-2-2", "Tool9-1"),
             //
             createNewEntry("L1NotEmptySection4", "Tool1-2-1"),
@@ -66,13 +107,15 @@ public class PaletteManagerWithLayersWithExtensionTest extends AbstractPaletteMa
             //
             createNewEntry("L1EmptySectionButWithReuseTool7", "Tool1-2-1"),
             //
-            createNewEntry("SectionSharedWithOtherLayersA", "ToolL2-A-1")
+            createNewEntry("SectionSharedWithOtherLayersA", "ToolL2-A-1"),
+            //
+            createNewEntry("Standard", "Note", "Note Attachment", "Pin", "Select", "Text", "Unpin", "Zoom In", "Zoom Out", "[Separator]")
     //
-            ));
+    ));
 
     private static final SortedSet<Entry> EXPECTED_ENTRIES_LAYER_L3_SHOWN = Sets.newTreeSet(Arrays.asList(
-    //
-            createNewEntry("L1NotEmptySection1", "Tool1-1", "Tool1-2-1", "Tool1-4-1", "ECD1-2-2", "Tool9-1"),
+            //
+            createNewEntry("L1NotEmptySection1", "Tool1-1", "Tool1-2-1", "Tool1-4-1", "ECD1-2-2", "Tool9-1", "Tool9-1"),
             //
             createNewEntry("L1NotEmptySection4", "Tool1-2-1"),
             //
@@ -80,25 +123,27 @@ public class PaletteManagerWithLayersWithExtensionTest extends AbstractPaletteMa
             //
             createNewEntry("L1EmptySectionButWithReuseTool7", "Tool1-2-1"),
             //
-            createNewEntry("SectionSharedWithOtherLayersA", "PBSWDL3-A-2", "ToolL2-A-1", "ToolL3-A-1")
+            createNewEntry("SectionSharedWithOtherLayersA", "PBSWDL3-A-2", "ToolL2-A-1", "ToolL3-A-1", "ToolL4-A-1")
     //
-            ));
+    ));
 
     private static final SortedSet<Entry> EXPECTED_ENTRIES_LAYER_L2_HIDDEN = Sets.newTreeSet(Arrays.asList(
-    //
-            createNewEntry("L1NotEmptySection1", "Tool1-1", "Tool1-2-1", "Tool1-4-1", "ECD1-2-2"),
+            //
+            createNewEntry("L1NotEmptySection1", "Tool1-1", "Tool1-2-1", "Tool1-4-1", "ECD1-2-2", "Tool9-1"),
             //
             createNewEntry("L1NotEmptySection4", "Tool1-2-1"),
             //
             createNewEntry("L1NotEmptySection5", "NCD5-1"),
             //
-            createNewEntry("L1EmptySectionButWithReuseTool7", "Tool1-2-1")
+            createNewEntry("L1EmptySectionButWithReuseTool7", "Tool1-2-1"),
+            //
+            createNewEntry("SectionSharedWithOtherLayersA", "ToolL4-A-1")
     //
-            ));
+    ));
 
     private static final SortedSet<Entry> EXPECTED_ENTRIES_LAYER_L2_HIDDEN_L3_SHOWN = Sets.newTreeSet(Arrays.asList(
-    //
-            createNewEntry("L1NotEmptySection1", "Tool1-1", "Tool1-2-1", "Tool1-4-1", "ECD1-2-2"),
+            //
+            createNewEntry("L1NotEmptySection1", "Tool1-1", "Tool1-2-1", "Tool1-4-1", "ECD1-2-2", "Tool9-1"),
             //
             createNewEntry("L1NotEmptySection4", "Tool1-2-1"),
             //
@@ -106,12 +151,12 @@ public class PaletteManagerWithLayersWithExtensionTest extends AbstractPaletteMa
             //
             createNewEntry("L1EmptySectionButWithReuseTool7", "Tool1-2-1"),
             //
-            createNewEntry("SectionSharedWithOtherLayersA", "PBSWDL3-A-2", "ToolL3-A-1")
+            createNewEntry("SectionSharedWithOtherLayersA", "PBSWDL3-A-2", "ToolL3-A-1", "ToolL4-A-1")
     //
-            ));
+    ));
 
     private static final SortedSet<Entry> EXPECTED_ENTRIES_LAYER_L2_L4_SHOWN = Sets.newTreeSet(Arrays.asList(
-    //
+            //
             createNewEntry("L1NotEmptySection1", "Tool1-1", "Tool1-2-1", "Tool1-4-1", "ECD1-2-2", "Tool9-1", "Tool9-1"),
             //
             createNewEntry("L1NotEmptySection4", "Tool1-2-1"),
@@ -122,10 +167,10 @@ public class PaletteManagerWithLayersWithExtensionTest extends AbstractPaletteMa
             //
             createNewEntry("SectionSharedWithOtherLayersA", "ToolL4-A-1", "ToolL2-A-1")
     //
-            ));
+    ));
 
     private static final SortedSet<Entry> EXPECTED_ENTRIES_LAYER_L2_L4_L5_SHOWN = Sets.newTreeSet(Arrays.asList(
-    //
+            //
             createNewEntry("L1NotEmptySection1", "Tool1-1", "Tool1-2-1", "Tool1-4-1", "ECD1-2-2", "Tool9-1", "Tool9-1"),
             //
             createNewEntry("L1NotEmptySection4", "Tool1-2-1"),
@@ -136,10 +181,10 @@ public class PaletteManagerWithLayersWithExtensionTest extends AbstractPaletteMa
             //
             createNewEntry("SectionSharedWithOtherLayersA", "ToolL4-A-1", "ToolL2-A-1", "PBSWDL5-A-2", "ToolL5-A-1")
     //
-            ));
+    ));
 
     private static final SortedSet<Entry> EXPECTED_ENTRIES_LAYER_L2_L4_L5_L6_SHOWN = Sets.newTreeSet(Arrays.asList(
-    //
+            //
             createNewEntry("L1NotEmptySection1", "Tool1-1", "Tool1-2-1", "Tool1-4-1", "ECD1-2-2", "Tool9-1", "Tool9-1"),
             //
             createNewEntry("L1NotEmptySection4", "Tool1-2-1"),
@@ -152,10 +197,10 @@ public class PaletteManagerWithLayersWithExtensionTest extends AbstractPaletteMa
             //
             createNewEntry("L6Section", "ToolL6")
     //
-            ));
+    ));
 
     private static final SortedSet<Entry> EXPECTED_ENTRIES_LAYER_L2_L5_SHOWN = Sets.newTreeSet(Arrays.asList(
-    //
+            //
             createNewEntry("L1NotEmptySection1", "Tool1-1", "Tool1-2-1", "Tool1-4-1", "ECD1-2-2", "Tool9-1"),
             //
             createNewEntry("L1NotEmptySection4", "Tool1-2-1"),
@@ -166,10 +211,10 @@ public class PaletteManagerWithLayersWithExtensionTest extends AbstractPaletteMa
             //
             createNewEntry("SectionSharedWithOtherLayersA", "ToolL2-A-1", "PBSWDL5-A-2", "ToolL5-A-1")
     //
-            ));
+    ));
 
     private static final SortedSet<Entry> EXPECTED_ENTRIES_LAYER_L4_SHOWN = Sets.newTreeSet(Arrays.asList(
-    //
+            //
             createNewEntry("L1NotEmptySection1", "Tool1-1", "Tool1-2-1", "Tool1-4-1", "ECD1-2-2", "Tool9-1"),
             //
             createNewEntry("L1NotEmptySection4", "Tool1-2-1"),
@@ -180,10 +225,10 @@ public class PaletteManagerWithLayersWithExtensionTest extends AbstractPaletteMa
             //
             createNewEntry("SectionSharedWithOtherLayersA", "ToolL4-A-1")
     //
-            ));
+    ));
 
     private static final SortedSet<Entry> EXPECTED_ENTRIES_LAYER_L5_SHOWN = Sets.newTreeSet(Arrays.asList(
-    //
+            //
             createNewEntry("L1NotEmptySection1", "Tool1-1", "Tool1-2-1", "Tool1-4-1", "ECD1-2-2", "Tool9-1"),
             //
             createNewEntry("L1NotEmptySection4", "Tool1-2-1"),
@@ -194,10 +239,10 @@ public class PaletteManagerWithLayersWithExtensionTest extends AbstractPaletteMa
             //
             createNewEntry("SectionSharedWithOtherLayersA", "PBSWDL5-A-2", "ToolL5-A-1", "ToolL4-A-1")
     //
-            ));
+    ));
 
     private static final SortedSet<Entry> EXPECTED_ENTRIES_LAYER_L6_SHOWN = Sets.newTreeSet(Arrays.asList(
-    //
+            //
             createNewEntry("L1NotEmptySection1", "Tool1-1", "Tool1-2-1", "Tool1-4-1", "ECD1-2-2"),
             //
             createNewEntry("L1NotEmptySection4", "Tool1-2-1"),
@@ -208,10 +253,10 @@ public class PaletteManagerWithLayersWithExtensionTest extends AbstractPaletteMa
             //
             createNewEntry("L6Section", "ToolL6")
     //
-            ));
+    ));
 
     private static final SortedSet<Entry> EXPECTED_ENTRIES_LAYER_L2_L3_L4_L5_L6_SHOWN = Sets.newTreeSet(Arrays.asList(
-    //
+            //
             createNewEntry("L1NotEmptySection1", "Tool1-1", "Tool1-2-1", "Tool1-4-1", "ECD1-2-2", "Tool9-1", "Tool9-1"),
             //
             createNewEntry("L1NotEmptySection4", "Tool1-2-1"),
@@ -224,10 +269,10 @@ public class PaletteManagerWithLayersWithExtensionTest extends AbstractPaletteMa
             //
             createNewEntry("L6Section", "ToolL6")
     //
-            ));
+    ));
 
     private static final SortedSet<Entry> EXPECTED_ENTRIES_LAYER_L3_L5_SHOWN = Sets.newTreeSet(Arrays.asList(
-    //
+            //
             createNewEntry("L1NotEmptySection1", "Tool1-1", "Tool1-2-1", "Tool1-4-1", "ECD1-2-2"),
             //
             createNewEntry("L1NotEmptySection4", "Tool1-2-1"),
@@ -238,10 +283,10 @@ public class PaletteManagerWithLayersWithExtensionTest extends AbstractPaletteMa
             //
             createNewEntry("SectionSharedWithOtherLayersA", "PBSWDL5-A-2", "ToolL5-A-1", "PBSWDL3-A-2", "ToolL3-A-1")
     //
-            ));
+    ));
 
     private static final SortedSet<Entry> EXPECTED_ENTRIES_LAYER_L3_L4_SHOWN = Sets.newTreeSet(Arrays.asList(
-    //
+            //
             createNewEntry("L1NotEmptySection1", "Tool1-1", "Tool1-2-1", "Tool1-4-1", "ECD1-2-2", "Tool9-1"),
             //
             createNewEntry("L1NotEmptySection4", "Tool1-2-1"),
@@ -252,7 +297,7 @@ public class PaletteManagerWithLayersWithExtensionTest extends AbstractPaletteMa
             //
             createNewEntry("SectionSharedWithOtherLayersA", "ToolL4-A-1", "PBSWDL3-A-2", "ToolL3-A-1")
     //
-            ));
+    ));
 
     private Layer layerL3;
 
@@ -303,8 +348,6 @@ public class PaletteManagerWithLayersWithExtensionTest extends AbstractPaletteMa
 
         // Layer L6 to show
         layerL6 = getLayer(dDiagram, "L6");
-
-        deactivateLayer(dDiagram, "L4 enabled");
     }
 
     /**
@@ -336,6 +379,49 @@ public class PaletteManagerWithLayersWithExtensionTest extends AbstractPaletteMa
     }
 
     /**
+     * Test that palette is correctly changed after deactivation/activation of a
+     * viewpoint extension containing a transient layer. Here we must check the
+     * palette root of the editor because it is reloaded by the
+     * {@link org.eclipse.sirius.diagram.ui.tools.internal.editor.DDiagramEditorSessionListenerDelegate}.
+     * 
+     * @throws Exception
+     *             Test error.
+     */
+    public void testUpdatePaletteAfterViewpointChange() throws Exception {
+        // Open the editor before testing to be sure to have mandatory transient
+        // layer enabled (done in
+        // org.eclipse.sirius.diagram.ui.tools.internal.editor.DDiagramEditorImpl.activateTransientLayers())
+        IEditorPart dDiagramEditor = DialectUIManager.INSTANCE.openEditor(session, dDiagram, new NullProgressMonitor());
+        try {
+            TestsUtil.synchronizationWithUIThread();
+            assertTrue("Impossible to open editor part, wrong type: " + dDiagramEditor.getClass(), dDiagramEditor instanceof DiagramDocumentEditor);
+            EditDomain editDomain = (EditDomain) ReflectionHelper.invokeMethodWithoutExceptionWithReturn(dDiagramEditor, org.eclipse.gef.ui.parts.GraphicalEditor.class, "getEditDomain",
+                    new Class[] {}, new Object[] {}, true);
+            final PaletteViewer viewer = editDomain.getPaletteViewer();
+            PaletteRoot paletteRoot = viewer.getPaletteRoot();
+
+            doContentPaletteTest(paletteRoot, EXPECTED_ENTRIES_STD_EDITOR_PALETTE);
+
+            // Add an adapter like it is done when menu is shown, otherwise, it is not called and so neither paletteManager.showLayer/hideLayer. 
+            LayersActivationAdapter adapter = new LayersActivationAdapter();
+            adapter.setPaletteManager(((DDiagramEditor) dDiagramEditor).getPaletteManager());
+            dDiagram.eAdapters().add(adapter);
+
+            deactivateViewpoint(TOOL_SECTION_EXTENSION_VIEWPOINT_NAME);
+            TestsUtil.synchronizationWithUIThread();
+            doContentPaletteTest(paletteRoot, EXPECTED_ENTRIES_VIEWPOINT_EXTENSION_DEACTIVATE);
+
+            activateViewpoint(TOOL_SECTION_EXTENSION_VIEWPOINT_NAME);
+            TestsUtil.synchronizationWithUIThread();
+            doContentPaletteTest(paletteRoot, EXPECTED_ENTRIES_STD_EDITOR_PALETTE);
+        } finally {
+            if (dDiagramEditor != null) {
+                DialectUIManager.INSTANCE.closeEditor(dDiagramEditor, false);
+            }
+        }
+    }
+
+    /**
      * Test method.
      * 
      * @throws Exception
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/copyPaste/1894.aird b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/copyPaste/1894.aird
index fac79846ff..9293a6db22 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/copyPaste/1894.aird
+++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/copyPaste/1894.aird
@@ -1,497 +1,529 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<viewpoint:DAnalysis xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:diagram="http://www.eclipse.org/sirius/diagram/1.1.0" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:viewpoint="http://www.eclipse.org/sirius/1.1.0" xsi:schemaLocation="http://www.eclipse.org/sirius/description/1.1.0 http://www.eclipse.org/sirius/1.1.0#//description http://www.eclipse.org/sirius/diagram/description/1.1.0 http://www.eclipse.org/sirius/1.1.0#//diagram/description http://www.eclipse.org/sirius/diagram/1.1.0 http://www.eclipse.org/sirius/1.1.0#//diagram http://www.eclipse.org/sirius/diagram/description/style/1.1.0 http://www.eclipse.org/sirius/1.1.0#//diagram/description/style" xmi:id="_fgqNYIIgEeC0_YxSx7KaSQ" selectedViews="_gbrrMIIgEeC0_YxSx7KaSQ _CFtq8IIjEeC0_YxSx7KaSQ" version="8.0.0">
-  <models xmi:type="ecore:EPackage" href="1894.ecore#/"/>
-  <ownedViews xmi:type="viewpoint:DRepresentationContainer" xmi:id="_gbrrMIIgEeC0_YxSx7KaSQ" initialized="true">
-    <ownedRepresentations xmi:type="diagram:DSemanticDiagram" xmi:id="_LVBIkIIiEeC0_YxSx7KaSQ" name="CustomClipboard">
-      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_LVBvoIIiEeC0_YxSx7KaSQ" source="GMF_DIAGRAMS">
-        <data xmi:type="notation:Diagram" xmi:id="_LVBvoYIiEeC0_YxSx7KaSQ" type="Sirius" element="_LVBIkIIiEeC0_YxSx7KaSQ" measurementUnit="Pixel">
-          <children xmi:type="notation:Node" xmi:id="_LVuTMIIiEeC0_YxSx7KaSQ" type="2003" element="_DkQ78GwoEeGf4vaMnd1X5A">
-            <children xmi:type="notation:Node" xmi:id="_LVuTM4IiEeC0_YxSx7KaSQ" type="5007"/>
-            <children xmi:type="notation:Node" xmi:id="_LVuTNIIiEeC0_YxSx7KaSQ" type="7004">
-              <children xmi:type="notation:Node" xmi:id="_LVzywIIiEeC0_YxSx7KaSQ" type="3010" element="_DmABUGwoEeGf4vaMnd1X5A">
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_LVzywYIiEeC0_YxSx7KaSQ"/>
-              </children>
-              <styles xmi:type="notation:SortingStyle" xmi:id="_LVuTNYIiEeC0_YxSx7KaSQ"/>
-              <styles xmi:type="notation:FilteringStyle" xmi:id="_LVuTNoIiEeC0_YxSx7KaSQ"/>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:diagram="http://www.eclipse.org/sirius/diagram/1.1.0" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:viewpoint="http://www.eclipse.org/sirius/1.1.0" xsi:schemaLocation="http://www.eclipse.org/sirius/description/1.1.0 http://www.eclipse.org/sirius/1.1.0#//description http://www.eclipse.org/sirius/diagram/description/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description http://www.eclipse.org/sirius/diagram/description/style/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description/style">
+  <viewpoint:DAnalysis xmi:id="_fgqNYIIgEeC0_YxSx7KaSQ" selectedViews="_gbrrMIIgEeC0_YxSx7KaSQ _CFtq8IIjEeC0_YxSx7KaSQ" version="12.1.0.201708031200">
+    <semanticResources>1894.ecore</semanticResources>
+    <ownedViews xmi:type="viewpoint:DView" xmi:id="_gbrrMIIgEeC0_YxSx7KaSQ">
+      <viewpoint xmi:type="description:Viewpoint" href="vp-1894.odesign#//@ownedViewpoints[name='vp-1894']"/>
+      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" xmi:id="_X0fDA8VVEeeLR5C8pFZ_lg" name="CustomClipboard" repPath="#_X0XuQMVVEeeLR5C8pFZ_lg">
+        <description xmi:type="description_1:DiagramDescription" href="vp-1894.odesign#//@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']"/>
+        <target xmi:type="ecore:EPackage" href="1894.ecore#/"/>
+      </ownedRepresentationDescriptors>
+    </ownedViews>
+    <ownedViews xmi:type="viewpoint:DView" xmi:id="_CFtq8IIjEeC0_YxSx7KaSQ">
+      <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']"/>
+      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" xmi:id="_X0fDAcVVEeeLR5C8pFZ_lg" name="GenericClipboard" repPath="#_X0cmwMVVEeeLR5C8pFZ_lg">
+        <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>
+        <target xmi:type="ecore:EPackage" href="1894.ecore#/"/>
+      </ownedRepresentationDescriptors>
+    </ownedViews>
+  </viewpoint:DAnalysis>
+  <diagram:DSemanticDiagram xmi:id="_E6ijAIIjEeC0_YxSx7KaSQ" name="GenericClipboard" uid="_X0cmwMVVEeeLR5C8pFZ_lg">
+    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_E6jKEIIjEeC0_YxSx7KaSQ" source="GMF_DIAGRAMS">
+      <data xmi:type="notation:Diagram" xmi:id="_E6jKEYIjEeC0_YxSx7KaSQ" type="Sirius" element="_E6ijAIIjEeC0_YxSx7KaSQ" measurementUnit="Pixel">
+        <children xmi:type="notation:Node" xmi:id="_E7nhEIIjEeC0_YxSx7KaSQ" type="2003" element="_DqVuwGwoEeGf4vaMnd1X5A">
+          <children xmi:type="notation:Node" xmi:id="_E7oIIIIjEeC0_YxSx7KaSQ" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_E7oIIYIjEeC0_YxSx7KaSQ" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_E7rygIIjEeC0_YxSx7KaSQ" type="3010" element="_DqkYQGwoEeGf4vaMnd1X5A">
+              <styles xmi:type="notation:FontStyle" xmi:id="_X0g4NMVVEeeLR5C8pFZ_lg"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_E7rygYIjEeC0_YxSx7KaSQ"/>
             </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_LVuTMYIiEeC0_YxSx7KaSQ" fontName="Segoe UI" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LVuTMoIiEeC0_YxSx7KaSQ" x="175" y="175"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_E7oIIoIjEeC0_YxSx7KaSQ"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_E7oII4IjEeC0_YxSx7KaSQ"/>
           </children>
-          <children xmi:type="notation:Node" xmi:id="_LVu6QIIiEeC0_YxSx7KaSQ" type="2003" element="_Dl4slWwoEeGf4vaMnd1X5A">
-            <children xmi:type="notation:Node" xmi:id="_LVu6Q4IiEeC0_YxSx7KaSQ" type="5007"/>
-            <children xmi:type="notation:Node" xmi:id="_LVvhUIIiEeC0_YxSx7KaSQ" type="7004">
-              <children xmi:type="notation:Node" xmi:id="_LV1A4IIiEeC0_YxSx7KaSQ" type="3010" element="_DmBPcGwoEeGf4vaMnd1X5A">
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_LV1A4YIiEeC0_YxSx7KaSQ"/>
-              </children>
-              <styles xmi:type="notation:SortingStyle" xmi:id="_LVvhUYIiEeC0_YxSx7KaSQ"/>
-              <styles xmi:type="notation:FilteringStyle" xmi:id="_LVvhUoIiEeC0_YxSx7KaSQ"/>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_E7nhEYIjEeC0_YxSx7KaSQ" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_E7nhEoIjEeC0_YxSx7KaSQ" x="95" y="200"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_E7oIJIIjEeC0_YxSx7KaSQ" type="2003" element="_DqW84GwoEeGf4vaMnd1X5A">
+          <children xmi:type="notation:Node" xmi:id="_E7ovMIIjEeC0_YxSx7KaSQ" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_E7ovMYIjEeC0_YxSx7KaSQ" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_E7tAoIIjEeC0_YxSx7KaSQ" type="3010" element="_DqlmYGwoEeGf4vaMnd1X5A">
+              <styles xmi:type="notation:FontStyle" xmi:id="_X0g4NcVVEeeLR5C8pFZ_lg"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_E7tAoYIjEeC0_YxSx7KaSQ"/>
             </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_LVu6QYIiEeC0_YxSx7KaSQ" fontName="Segoe UI" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LVu6QoIiEeC0_YxSx7KaSQ" x="470" y="35"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_E7ovMoIjEeC0_YxSx7KaSQ"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_E7ovM4IjEeC0_YxSx7KaSQ"/>
           </children>
-          <children xmi:type="notation:Node" xmi:id="_LVvhU4IiEeC0_YxSx7KaSQ" type="2003" element="_Dl56sGwoEeGf4vaMnd1X5A">
-            <children xmi:type="notation:Node" xmi:id="_LVwIYIIiEeC0_YxSx7KaSQ" type="5007"/>
-            <children xmi:type="notation:Node" xmi:id="_LVwIYYIiEeC0_YxSx7KaSQ" type="7004">
-              <children xmi:type="notation:Node" xmi:id="_F6npgIIvEeC4F_xeiuKQmQ" type="3010" element="_DmB2gGwoEeGf4vaMnd1X5A">
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_F6npgYIvEeC4F_xeiuKQmQ"/>
-              </children>
-              <styles xmi:type="notation:SortingStyle" xmi:id="_LVwIYoIiEeC0_YxSx7KaSQ"/>
-              <styles xmi:type="notation:FilteringStyle" xmi:id="_LVwIY4IiEeC0_YxSx7KaSQ"/>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_E7oIJYIjEeC0_YxSx7KaSQ" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_E7oIJoIjEeC0_YxSx7KaSQ" x="95" y="90"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_E7ovNIIjEeC0_YxSx7KaSQ" type="2003" element="_DqYLBWwoEeGf4vaMnd1X5A">
+          <children xmi:type="notation:Node" xmi:id="_E7pWQIIjEeC0_YxSx7KaSQ" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_E7pWQYIjEeC0_YxSx7KaSQ" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_Foq94IIvEeC4F_xeiuKQmQ" type="3010" element="_DqnbkGwoEeGf4vaMnd1X5A">
+              <styles xmi:type="notation:FontStyle" xmi:id="_X0g4NsVVEeeLR5C8pFZ_lg"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_Foq94YIvEeC4F_xeiuKQmQ"/>
             </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_LVvhVIIiEeC0_YxSx7KaSQ" fontName="Segoe UI" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LVvhVYIiEeC0_YxSx7KaSQ" x="25" y="60"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_E7pWQoIjEeC0_YxSx7KaSQ"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_E7pWQ4IjEeC0_YxSx7KaSQ"/>
           </children>
-          <children xmi:type="notation:Node" xmi:id="_LVwIZIIiEeC0_YxSx7KaSQ" type="2003" element="_Dl6hwGwoEeGf4vaMnd1X5A">
-            <children xmi:type="notation:Node" xmi:id="_LVwvcIIiEeC0_YxSx7KaSQ" type="5007"/>
-            <children xmi:type="notation:Node" xmi:id="_LVwvcYIiEeC0_YxSx7KaSQ" type="7004">
-              <children xmi:type="notation:Node" xmi:id="_F6o3oIIvEeC4F_xeiuKQmQ" type="3010" element="_DmCdkGwoEeGf4vaMnd1X5A">
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_F6o3oYIvEeC4F_xeiuKQmQ"/>
-              </children>
-              <styles xmi:type="notation:SortingStyle" xmi:id="_LVwvcoIiEeC0_YxSx7KaSQ"/>
-              <styles xmi:type="notation:FilteringStyle" xmi:id="_LVwvc4IiEeC0_YxSx7KaSQ"/>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_E7ovNYIjEeC0_YxSx7KaSQ" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_E7ovNoIjEeC0_YxSx7KaSQ" x="325" y="210"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_E7pWRIIjEeC0_YxSx7KaSQ" type="2003" element="_DqhU8GwoEeGf4vaMnd1X5A">
+          <children xmi:type="notation:Node" xmi:id="_E7p9UIIjEeC0_YxSx7KaSQ" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_E7p9UYIjEeC0_YxSx7KaSQ" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_FotaIIIvEeC4F_xeiuKQmQ" type="3010" element="_DqopsGwoEeGf4vaMnd1X5A">
+              <styles xmi:type="notation:FontStyle" xmi:id="_X0g4N8VVEeeLR5C8pFZ_lg"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_FotaIYIvEeC4F_xeiuKQmQ"/>
             </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_LVwIZYIiEeC0_YxSx7KaSQ" fontName="Segoe UI" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LVwIZoIiEeC0_YxSx7KaSQ" x="25" y="165"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_E7p9UoIjEeC0_YxSx7KaSQ"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_E7p9U4IjEeC0_YxSx7KaSQ"/>
           </children>
-          <children xmi:type="notation:Shape" xmi:id="_UlVDgNJJEeC9V9QVArx9PA" type="Note" fontName="Ubuntu" description="NoteAlone" fillColor="13369343" transparency="0" lineColor="6737151" lineWidth="1">
-            <children xmi:type="notation:BasicDecorationNode" xmi:id="_UlZ8ANJJEeC9V9QVArx9PA" type="DiagramName">
-              <element xsi:nil="true"/>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_E7pWRYIjEeC0_YxSx7KaSQ" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_E7pWRoIjEeC0_YxSx7KaSQ" x="315" y="90"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_7t2SAMVgEee3J_qkXKkjhA" type="2003" element="_7sKP8MVgEee3J_qkXKkjhA">
+          <children xmi:type="notation:Node" xmi:id="_7t9mwMVgEee3J_qkXKkjhA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_7t-04MVgEee3J_qkXKkjhA" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_7uEUcMVgEee3J_qkXKkjhA" type="3010" element="_7sRksMVgEee3J_qkXKkjhA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_7uEUccVgEee3J_qkXKkjhA" fontName="Comic Sans MS" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_7uEUcsVgEee3J_qkXKkjhA"/>
             </children>
-            <children xmi:type="notation:BasicDecorationNode" xmi:id="_UlajENJJEeC9V9QVArx9PA" type="Description">
-              <element xsi:nil="true"/>
-            </children>
-            <styles xmi:type="notation:TextStyle" xmi:id="_UlVDgdJJEeC9V9QVArx9PA"/>
-            <styles xmi:type="notation:LineTypeStyle" xmi:id="_UlVDgtJJEeC9V9QVArx9PA"/>
-            <element xsi:nil="true"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UlVDg9JJEeC9V9QVArx9PA" x="310" y="410"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_7t-04cVgEee3J_qkXKkjhA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_7t-04sVgEee3J_qkXKkjhA"/>
           </children>
-          <children xmi:type="notation:Shape" xmi:id="_WIlmANJJEeC9V9QVArx9PA" type="Note" fontName="Ubuntu" description="NoteLinkedToAnotherNote" fillColor="13369343" transparency="0" lineColor="6737151" lineWidth="1">
-            <children xmi:type="notation:BasicDecorationNode" xmi:id="_WImNENJJEeC9V9QVArx9PA" type="DiagramName">
-              <element xsi:nil="true"/>
-            </children>
-            <children xmi:type="notation:BasicDecorationNode" xmi:id="_WIm0INJJEeC9V9QVArx9PA" type="Description">
-              <element xsi:nil="true"/>
-            </children>
-            <styles xmi:type="notation:TextStyle" xmi:id="_WIlmAdJJEeC9V9QVArx9PA"/>
-            <styles xmi:type="notation:LineTypeStyle" xmi:id="_WIlmAtJJEeC9V9QVArx9PA"/>
-            <element xsi:nil="true"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WIlmA9JJEeC9V9QVArx9PA" x="146" y="316"/>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_7t2SAcVgEee3J_qkXKkjhA" fontName="Comic Sans MS" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7t2SAsVgEee3J_qkXKkjhA" x="315" y="29"/>
+        </children>
+        <styles xmi:type="notation:DiagramStyle" xmi:id="_E6jKEoIjEeC0_YxSx7KaSQ"/>
+        <edges xmi:type="notation:Edge" xmi:id="_E7uOwIIjEeC0_YxSx7KaSQ" type="4001" element="_DquJQGwoEeGf4vaMnd1X5A" source="_E7nhEIIjEeC0_YxSx7KaSQ" target="_E7oIJIIjEeC0_YxSx7KaSQ">
+          <children xmi:type="notation:Node" xmi:id="_E7uOxIIjEeC0_YxSx7KaSQ" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_E7uOxYIjEeC0_YxSx7KaSQ" y="-10"/>
           </children>
-          <children xmi:type="notation:Shape" xmi:id="_aUcicNJJEeC9V9QVArx9PA" type="Note" fontName="Ubuntu" description="NoteLinkedToSemanticElement" fillColor="13369343" transparency="0" lineColor="6737151" lineWidth="1">
-            <children xmi:type="notation:BasicDecorationNode" xmi:id="_aUdwkNJJEeC9V9QVArx9PA" type="DiagramName">
-              <element xsi:nil="true"/>
-            </children>
-            <children xmi:type="notation:BasicDecorationNode" xmi:id="_aUdwkdJJEeC9V9QVArx9PA" type="Description">
-              <element xsi:nil="true"/>
-            </children>
-            <styles xmi:type="notation:TextStyle" xmi:id="_aUdJgNJJEeC9V9QVArx9PA"/>
-            <styles xmi:type="notation:LineTypeStyle" xmi:id="_aUdJgdJJEeC9V9QVArx9PA"/>
-            <element xsi:nil="true"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aUdJgtJJEeC9V9QVArx9PA" x="375" y="315"/>
+          <children xmi:type="notation:Node" xmi:id="_E7u10IIjEeC0_YxSx7KaSQ" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_E7u10YIjEeC0_YxSx7KaSQ" y="10"/>
           </children>
-          <styles xmi:type="notation:DiagramStyle" xmi:id="_LVBvooIiEeC0_YxSx7KaSQ"/>
-          <edges xmi:type="notation:Edge" xmi:id="_LV22EIIiEeC0_YxSx7KaSQ" type="4001" element="_DmESwGwoEeGf4vaMnd1X5A" source="_LVuTMIIiEeC0_YxSx7KaSQ" target="_LVu6QIIiEeC0_YxSx7KaSQ">
-            <children xmi:type="notation:Node" xmi:id="_LV3dIIIiEeC0_YxSx7KaSQ" type="6001">
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LV3dIYIiEeC0_YxSx7KaSQ" y="-10"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_LV3dIoIiEeC0_YxSx7KaSQ" type="6002">
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LV4EMIIiEeC0_YxSx7KaSQ" y="10"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_LV4EMYIiEeC0_YxSx7KaSQ" type="6003">
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LV4EMoIiEeC0_YxSx7KaSQ" y="10"/>
-            </children>
-            <styles xmi:type="notation:ConnectorStyle" xmi:id="_LV22EYIiEeC0_YxSx7KaSQ"/>
-            <styles xmi:type="notation:FontStyle" xmi:id="_LV22EoIiEeC0_YxSx7KaSQ" fontName="Segoe UI"/>
-            <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_LV22E4IiEeC0_YxSx7KaSQ" points="[0, 0, 0, 60]$[0, -60, 0, 0]"/>
-            <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LWIi4IIiEeC0_YxSx7KaSQ" id="(0.5,0.0)"/>
-            <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LWIi4YIiEeC0_YxSx7KaSQ" id="(0.5,1.0)"/>
-          </edges>
-          <edges xmi:type="notation:Edge" xmi:id="_9Q6F4IInEeCOpoH1PGlTZA" type="4001" element="_DmNcsGwoEeGf4vaMnd1X5A" source="_LVuTMIIiEeC0_YxSx7KaSQ" target="_LVu6QIIiEeC0_YxSx7KaSQ">
-            <children xmi:type="notation:Node" xmi:id="_9Q6s8IInEeCOpoH1PGlTZA" type="6001">
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9Q6s8YInEeCOpoH1PGlTZA" y="-10"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_9Q6s8oInEeCOpoH1PGlTZA" type="6002">
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9Q6s84InEeCOpoH1PGlTZA" y="10"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_9Q6s9IInEeCOpoH1PGlTZA" type="6003">
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9Q6s9YInEeCOpoH1PGlTZA" y="10"/>
-            </children>
-            <styles xmi:type="notation:ConnectorStyle" xmi:id="_9Q6F4YInEeCOpoH1PGlTZA"/>
-            <styles xmi:type="notation:FontStyle" xmi:id="_9Q6F4oInEeCOpoH1PGlTZA" fontName="Segoe UI"/>
-            <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_9Q6F44InEeCOpoH1PGlTZA" points="[0, 0, 0, 60]$[0, -60, 0, 0]"/>
-            <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JCHAQNL_EeCZasn0Uzdtcw" id="(0.5,0.0)"/>
-            <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JCKDkNL_EeCZasn0Uzdtcw" id="(0.5,1.0)"/>
-          </edges>
-          <edges xmi:type="notation:Connector" xmi:id="_dOBXoNJJEeC9V9QVArx9PA" type="NoteAttachment" source="_LVu6QIIiEeC0_YxSx7KaSQ" target="_aUcicNJJEeC9V9QVArx9PA" lineWidth="1">
-            <styles xmi:type="notation:ArrowStyle" xmi:id="_dOBXodJJEeC9V9QVArx9PA"/>
-            <styles xmi:type="notation:LineTypeStyle" xmi:id="_dOBXotJJEeC9V9QVArx9PA"/>
-            <element xsi:nil="true"/>
-            <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_dOBXo9JJEeC9V9QVArx9PA" points="[0, 0, 0, 60]$[0, -60, 0, 0]"/>
-            <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JCVpwNL_EeCZasn0Uzdtcw" id="(0.5,0.0)"/>
-            <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dOOL8NJJEeC9V9QVArx9PA" id="(0.5,1.0)"/>
-          </edges>
-          <edges xmi:type="notation:Connector" xmi:id="_du0XkNJJEeC9V9QVArx9PA" type="NoteAttachment" source="_aUcicNJJEeC9V9QVArx9PA" target="_WIlmANJJEeC9V9QVArx9PA" lineWidth="1">
-            <styles xmi:type="notation:ArrowStyle" xmi:id="_du0XkdJJEeC9V9QVArx9PA"/>
-            <styles xmi:type="notation:LineTypeStyle" xmi:id="_du0XktJJEeC9V9QVArx9PA"/>
-            <element xsi:nil="true"/>
-            <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_du0Xk9JJEeC9V9QVArx9PA" points="[0, 0, 0, 60]$[0, -60, 0, 0]"/>
-            <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JCTNgNL_EeCZasn0Uzdtcw" id="(0.5,0.0)"/>
-            <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JCT0kNL_EeCZasn0Uzdtcw" id="(0.5,1.0)"/>
-          </edges>
-        </data>
-      </ownedAnnotationEntries>
-      <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_DkQ78GwoEeGf4vaMnd1X5A" name="Class1" outgoingEdges="_DmESwGwoEeGf4vaMnd1X5A _DmNcsGwoEeGf4vaMnd1X5A">
-        <target xmi:type="ecore:EClass" href="1894.ecore#//Class1"/>
-        <semanticElements xmi:type="ecore:EClass" href="1894.ecore#//Class1"/>
-        <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
-        <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
-        <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_Dl4skGwoEeGf4vaMnd1X5A">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Dl4skWwoEeGf4vaMnd1X5A"/>
-          <description xmi:type="style:FlatContainerStyleDescription" href="vp-1894.odesign#//@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@containerMappings[name='Class']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Dl4skmwoEeGf4vaMnd1X5A"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_Dl4sk2woEeGf4vaMnd1X5A" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_Dl4slGwoEeGf4vaMnd1X5A" red="209" green="209" blue="209"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:ContainerMapping" href="vp-1894.odesign#//@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@containerMappings[name='Class']"/>
-        <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_DmABUGwoEeGf4vaMnd1X5A" name="attributee1">
-          <target xmi:type="ecore:EAttribute" href="1894.ecore#//Class1/attributee1"/>
-          <semanticElements xmi:type="ecore:EAttribute" href="1894.ecore#//Class1/attributee1"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_DmAoYGwoEeGf4vaMnd1X5A" labelAlignment="LEFT">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_DmAoYWwoEeGf4vaMnd1X5A"/>
-            <description xmi:type="style:BundledImageDescription" href="vp-1894.odesign#//@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@containerMappings[name='Class']/@subNodeMappings[name='Attribute']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_DmAoYmwoEeGf4vaMnd1X5A"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_DmAoY2woEeGf4vaMnd1X5A"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="vp-1894.odesign#//@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@containerMappings[name='Class']/@subNodeMappings[name='Attribute']"/>
-        </ownedElements>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_Dl4slWwoEeGf4vaMnd1X5A" name="Class2" incomingEdges="_DmESwGwoEeGf4vaMnd1X5A _DmNcsGwoEeGf4vaMnd1X5A">
-        <target xmi:type="ecore:EClass" href="1894.ecore#//Class2"/>
-        <semanticElements xmi:type="ecore:EClass" href="1894.ecore#//Class2"/>
-        <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
-        <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
-        <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_Dl5ToGwoEeGf4vaMnd1X5A">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Dl5ToWwoEeGf4vaMnd1X5A"/>
-          <description xmi:type="style:FlatContainerStyleDescription" href="vp-1894.odesign#//@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@containerMappings[name='Class']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Dl5TomwoEeGf4vaMnd1X5A"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_Dl5To2woEeGf4vaMnd1X5A" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_Dl5TpGwoEeGf4vaMnd1X5A" red="209" green="209" blue="209"/>
+          <children xmi:type="notation:Node" xmi:id="_E7u10oIjEeC0_YxSx7KaSQ" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_E7u104IjEeC0_YxSx7KaSQ" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_E7uOwYIjEeC0_YxSx7KaSQ"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_E7uOwoIjEeC0_YxSx7KaSQ" fontName="Segoe UI"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_E7uOw4IjEeC0_YxSx7KaSQ" points="[40, 0, 40, 65]$[110, 0, 110, 65]$[110, -75, 110, -10]$[75, -95, 75, -30]$[40, -81, 40, -16]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_E8Dl8IIjEeC0_YxSx7KaSQ" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_E8Dl8YIjEeC0_YxSx7KaSQ" id="(0.5,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_1NuSkIInEeCOpoH1PGlTZA" type="4001" element="_DqyasGwoEeGf4vaMnd1X5A" source="_E7nhEIIjEeC0_YxSx7KaSQ" target="_E7oIJIIjEeC0_YxSx7KaSQ">
+          <children xmi:type="notation:Node" xmi:id="_1N0ZMIInEeCOpoH1PGlTZA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1N0ZMYInEeCOpoH1PGlTZA" x="-4" y="-29"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_1N7t8IInEeCOpoH1PGlTZA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1N7t8YInEeCOpoH1PGlTZA" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_1N8VAIInEeCOpoH1PGlTZA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1N8VAYInEeCOpoH1PGlTZA" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_1NuSkYInEeCOpoH1PGlTZA" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_1NuSkoInEeCOpoH1PGlTZA" fontName="Segoe UI"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1NuSk4InEeCOpoH1PGlTZA" points="[0, -22, 5, 83]$[0, -64, 5, 41]$[-4, -64, 1, 41]$[-4, -82, 1, 23]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8GFL0MVgEee3J_qkXKkjhA" id="(0.5,0.5)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8GCvkMVgEee3J_qkXKkjhA" id="(0.5,0.5)"/>
+        </edges>
+      </data>
+    </ownedAnnotationEntries>
+    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_X0fqEsVVEeeLR5C8pFZ_lg" source="DANNOTATION_CUSTOMIZATION_KEY">
+      <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_X0fqE8VVEeeLR5C8pFZ_lg"/>
+    </ownedAnnotationEntries>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_DqVuwGwoEeGf4vaMnd1X5A" name="Class1" tooltipText="package.Class1" outgoingEdges="_DquJQGwoEeGf4vaMnd1X5A _DqyasGwoEeGf4vaMnd1X5A">
+      <target xmi:type="ecore:EClass" href="1894.ecore#//Class1"/>
+      <semanticElements xmi:type="ecore:EClass" href="1894.ecore#//Class1"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_DqWV0GwoEeGf4vaMnd1X5A" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_DqkYQGwoEeGf4vaMnd1X5A" name="attributee1">
+        <target xmi:type="ecore:EAttribute" href="1894.ecore#//Class1/attributee1"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="1894.ecore#//Class1/attributee1"/>
+        <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_DqkYQWwoEeGf4vaMnd1X5A" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
         </ownedStyle>
-        <actualMapping xmi:type="description_1:ContainerMapping" href="vp-1894.odesign#//@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@containerMappings[name='Class']"/>
-        <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_DmBPcGwoEeGf4vaMnd1X5A" name="attributee2">
-          <target xmi:type="ecore:EAttribute" href="1894.ecore#//Class2/attributee2"/>
-          <semanticElements xmi:type="ecore:EAttribute" href="1894.ecore#//Class2/attributee2"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_DmBPcWwoEeGf4vaMnd1X5A" labelAlignment="LEFT">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_DmBPcmwoEeGf4vaMnd1X5A"/>
-            <description xmi:type="style:BundledImageDescription" href="vp-1894.odesign#//@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@containerMappings[name='Class']/@subNodeMappings[name='Attribute']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_DmBPc2woEeGf4vaMnd1X5A"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_DmBPdGwoEeGf4vaMnd1X5A"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="vp-1894.odesign#//@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@containerMappings[name='Class']/@subNodeMappings[name='Attribute']"/>
-        </ownedElements>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_Dl56sGwoEeGf4vaMnd1X5A" name="nodelete_Class">
-        <target xmi:type="ecore:EClass" href="1894.ecore#//nodelete_Class"/>
-        <semanticElements xmi:type="ecore:EClass" href="1894.ecore#//nodelete_Class"/>
-        <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
-        <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
-        <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_Dl56sWwoEeGf4vaMnd1X5A">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Dl56smwoEeGf4vaMnd1X5A"/>
-          <description xmi:type="style:FlatContainerStyleDescription" href="vp-1894.odesign#//@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@containerMappings[name='Class']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Dl56s2woEeGf4vaMnd1X5A"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_Dl56tGwoEeGf4vaMnd1X5A" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_Dl56tWwoEeGf4vaMnd1X5A" red="209" green="209" blue="209"/>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_DqW84GwoEeGf4vaMnd1X5A" name="Class2" tooltipText="package.Class2" incomingEdges="_DquJQGwoEeGf4vaMnd1X5A _DqyasGwoEeGf4vaMnd1X5A">
+      <target xmi:type="ecore:EClass" href="1894.ecore#//Class2"/>
+      <semanticElements xmi:type="ecore:EClass" href="1894.ecore#//Class2"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_DqYLAGwoEeGf4vaMnd1X5A" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_DqlmYGwoEeGf4vaMnd1X5A" name="attributee2">
+        <target xmi:type="ecore:EAttribute" href="1894.ecore#//Class2/attributee2"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="1894.ecore#//Class2/attributee2"/>
+        <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_DqmNcGwoEeGf4vaMnd1X5A" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
         </ownedStyle>
-        <actualMapping xmi:type="description_1:ContainerMapping" href="vp-1894.odesign#//@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@containerMappings[name='Class']"/>
-        <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_DmB2gGwoEeGf4vaMnd1X5A" name="attributee2">
-          <target xmi:type="ecore:EAttribute" href="1894.ecore#//nodelete_Class/attributee2"/>
-          <semanticElements xmi:type="ecore:EAttribute" href="1894.ecore#//nodelete_Class/attributee2"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_DmB2gWwoEeGf4vaMnd1X5A" labelAlignment="LEFT">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_DmB2gmwoEeGf4vaMnd1X5A"/>
-            <description xmi:type="style:BundledImageDescription" href="vp-1894.odesign#//@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@containerMappings[name='Class']/@subNodeMappings[name='Attribute']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_DmB2g2woEeGf4vaMnd1X5A"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_DmB2hGwoEeGf4vaMnd1X5A"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="vp-1894.odesign#//@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@containerMappings[name='Class']/@subNodeMappings[name='Attribute']"/>
-        </ownedElements>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_Dl6hwGwoEeGf4vaMnd1X5A" name="pastable_Class">
-        <target xmi:type="ecore:EClass" href="1894.ecore#//pastable_Class"/>
-        <semanticElements xmi:type="ecore:EClass" href="1894.ecore#//pastable_Class"/>
-        <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
-        <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
-        <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_Dl6hwWwoEeGf4vaMnd1X5A">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Dl6hwmwoEeGf4vaMnd1X5A"/>
-          <description xmi:type="style:FlatContainerStyleDescription" href="vp-1894.odesign#//@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@containerMappings[name='Class']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Dl6hw2woEeGf4vaMnd1X5A"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_Dl6hxGwoEeGf4vaMnd1X5A" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_Dl6hxWwoEeGf4vaMnd1X5A" red="209" green="209" blue="209"/>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_DqYLBWwoEeGf4vaMnd1X5A" name="nodelete_Class" tooltipText="package.nodelete_Class">
+      <target xmi:type="ecore:EClass" href="1894.ecore#//nodelete_Class"/>
+      <semanticElements xmi:type="ecore:EClass" href="1894.ecore#//nodelete_Class"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_Dqgt4GwoEeGf4vaMnd1X5A" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_DqnbkGwoEeGf4vaMnd1X5A" name="attributee2">
+        <target xmi:type="ecore:EAttribute" href="1894.ecore#//nodelete_Class/attributee2"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="1894.ecore#//nodelete_Class/attributee2"/>
+        <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_DqnbkWwoEeGf4vaMnd1X5A" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
         </ownedStyle>
-        <actualMapping xmi:type="description_1:ContainerMapping" href="vp-1894.odesign#//@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@containerMappings[name='Class']"/>
-        <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_DmCdkGwoEeGf4vaMnd1X5A" name="attributee2">
-          <target xmi:type="ecore:EAttribute" href="1894.ecore#//pastable_Class/attributee2"/>
-          <semanticElements xmi:type="ecore:EAttribute" href="1894.ecore#//pastable_Class/attributee2"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_DmDEoGwoEeGf4vaMnd1X5A" labelAlignment="LEFT">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_DmDEoWwoEeGf4vaMnd1X5A"/>
-            <description xmi:type="style:BundledImageDescription" href="vp-1894.odesign#//@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@containerMappings[name='Class']/@subNodeMappings[name='Attribute']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_DmDEomwoEeGf4vaMnd1X5A"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_DmDEo2woEeGf4vaMnd1X5A"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="vp-1894.odesign#//@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@containerMappings[name='Class']/@subNodeMappings[name='Attribute']"/>
-        </ownedElements>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_DmESwGwoEeGf4vaMnd1X5A" name="ref1" sourceNode="_DkQ78GwoEeGf4vaMnd1X5A" targetNode="_Dl4slWwoEeGf4vaMnd1X5A">
-        <target xmi:type="ecore:EReference" href="1894.ecore#//Class1/ref1"/>
-        <semanticElements xmi:type="ecore:EReference" href="1894.ecore#//Class1/ref1"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_LVozoYIiEeC0_YxSx7KaSQ" sourceArrow="FillDiamond">
-          <description xmi:type="style:EdgeStyleDescription" href="vp-1894.odesign#//@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@edgeMappings[name='Reference']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_LVozooIiEeC0_YxSx7KaSQ" red="136" green="136" blue="136"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_LVozo4IiEeC0_YxSx7KaSQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_LVozpIIiEeC0_YxSx7KaSQ"/>
-          </centerLabelStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_DqhU8GwoEeGf4vaMnd1X5A" name="pastable_Class" tooltipText="package.pastable_Class">
+      <target xmi:type="ecore:EClass" href="1894.ecore#//pastable_Class"/>
+      <semanticElements xmi:type="ecore:EClass" href="1894.ecore#//pastable_Class"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_Dqh8AGwoEeGf4vaMnd1X5A" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_DqopsGwoEeGf4vaMnd1X5A" name="attributee2">
+        <target xmi:type="ecore:EAttribute" href="1894.ecore#//pastable_Class/attributee2"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="1894.ecore#//pastable_Class/attributee2"/>
+        <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_DqopsWwoEeGf4vaMnd1X5A" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
         </ownedStyle>
-        <actualMapping xmi:type="description_1:EdgeMapping" href="vp-1894.odesign#//@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@edgeMappings[name='Reference']"/>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_DmNcsGwoEeGf4vaMnd1X5A" name="super type of Class1" sourceNode="_DkQ78GwoEeGf4vaMnd1X5A" targetNode="_Dl4slWwoEeGf4vaMnd1X5A">
-        <target xmi:type="ecore:EClass" href="1894.ecore#//Class1"/>
-        <semanticElements xmi:type="ecore:EClass" href="1894.ecore#//Class1"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_9QyKEYInEeCOpoH1PGlTZA" lineStyle="dash" targetArrow="InputClosedArrow">
-          <description xmi:type="style:EdgeStyleDescription" href="vp-1894.odesign#//@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@edgeMappings[name='SuperType']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_9QyKEoInEeCOpoH1PGlTZA" red="136" green="136" blue="136"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_9QyKE4InEeCOpoH1PGlTZA" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_9QyKFIInEeCOpoH1PGlTZA"/>
-          </centerLabelStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_DquJQGwoEeGf4vaMnd1X5A" name="[0..1] ref1" sourceNode="_DqVuwGwoEeGf4vaMnd1X5A" targetNode="_DqW84GwoEeGf4vaMnd1X5A">
+      <target xmi:type="ecore:EReference" href="1894.ecore#//Class1/ref1"/>
+      <semanticElements xmi:type="ecore:EReference" href="1894.ecore#//Class1/ref1"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_E7jPoYIjEeC0_YxSx7KaSQ">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']/@style"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_E7jPo4IjEeC0_YxSx7KaSQ" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_DqyasGwoEeGf4vaMnd1X5A" sourceNode="_DqVuwGwoEeGf4vaMnd1X5A" targetNode="_DqW84GwoEeGf4vaMnd1X5A">
+      <target xmi:type="ecore:EClass" href="1894.ecore#//Class1"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_1LxKwYInEeCOpoH1PGlTZA" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_1LxKw4InEeCOpoH1PGlTZA" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_7sKP8MVgEee3J_qkXKkjhA" name="pastable2_Class" tooltipText="package.pastable2_Class">
+      <target xmi:type="ecore:EClass" href="1894.ecore#//pastable2_Class"/>
+      <semanticElements xmi:type="ecore:EClass" href="1894.ecore#//pastable2_Class"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_7sOhYMVgEee3J_qkXKkjhA" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_7sRksMVgEee3J_qkXKkjhA" name="attributee2">
+        <target xmi:type="ecore:EAttribute" href="1894.ecore#//pastable2_Class/attributee2"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="1894.ecore#//pastable2_Class/attributee2"/>
+        <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7sgOMMVgEee3J_qkXKkjhA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
         </ownedStyle>
-        <actualMapping xmi:type="description_1:EdgeMapping" href="vp-1894.odesign#//@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@edgeMappings[name='SuperType']"/>
-      </ownedDiagramElements>
-      <description xmi:type="description_1:DiagramDescription" href="vp-1894.odesign#//@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']"/>
-      <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_LVBIkYIiEeC0_YxSx7KaSQ"/>
-      <target xmi:type="ecore:EPackage" href="1894.ecore#/"/>
-    </ownedRepresentations>
-    <viewpoint xmi:type="description:Viewpoint" href="vp-1894.odesign#//@ownedViewpoints[name='vp-1894']"/>
-  </ownedViews>
-  <ownedViews xmi:type="viewpoint:DRepresentationContainer" xmi:id="_CFtq8IIjEeC0_YxSx7KaSQ" initialized="true">
-    <ownedRepresentations xmi:type="diagram:DSemanticDiagram" xmi:id="_E6ijAIIjEeC0_YxSx7KaSQ" name="GenericClipboard">
-      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_E6jKEIIjEeC0_YxSx7KaSQ" source="GMF_DIAGRAMS">
-        <data xmi:type="notation:Diagram" xmi:id="_E6jKEYIjEeC0_YxSx7KaSQ" type="Sirius" element="_E6ijAIIjEeC0_YxSx7KaSQ" measurementUnit="Pixel">
-          <children xmi:type="notation:Node" xmi:id="_E7nhEIIjEeC0_YxSx7KaSQ" type="2003" element="_DqVuwGwoEeGf4vaMnd1X5A">
-            <children xmi:type="notation:Node" xmi:id="_E7oIIIIjEeC0_YxSx7KaSQ" type="5007"/>
-            <children xmi:type="notation:Node" xmi:id="_E7oIIYIjEeC0_YxSx7KaSQ" type="7004">
-              <children xmi:type="notation:Node" xmi:id="_E7rygIIjEeC0_YxSx7KaSQ" type="3010" element="_DqkYQGwoEeGf4vaMnd1X5A">
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_E7rygYIjEeC0_YxSx7KaSQ"/>
-              </children>
-              <styles xmi:type="notation:SortingStyle" xmi:id="_E7oIIoIjEeC0_YxSx7KaSQ"/>
-              <styles xmi:type="notation:FilteringStyle" xmi:id="_E7oII4IjEeC0_YxSx7KaSQ"/>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>
+    <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_E6ijAYIjEeC0_YxSx7KaSQ"/>
+    <activatedLayers xmi:type="description_1:Layer" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer"/>
+    <activatedLayers xmi:type="description_1:AdditionalLayer" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']"/>
+    <target xmi:type="ecore:EPackage" href="1894.ecore#/"/>
+  </diagram:DSemanticDiagram>
+  <diagram:DSemanticDiagram xmi:id="_LVBIkIIiEeC0_YxSx7KaSQ" name="CustomClipboard" uid="_X0XuQMVVEeeLR5C8pFZ_lg">
+    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_LVBvoIIiEeC0_YxSx7KaSQ" source="GMF_DIAGRAMS">
+      <data xmi:type="notation:Diagram" xmi:id="_LVBvoYIiEeC0_YxSx7KaSQ" type="Sirius" element="_LVBIkIIiEeC0_YxSx7KaSQ" measurementUnit="Pixel">
+        <children xmi:type="notation:Node" xmi:id="_LVuTMIIiEeC0_YxSx7KaSQ" type="2003" element="_DkQ78GwoEeGf4vaMnd1X5A">
+          <children xmi:type="notation:Node" xmi:id="_LVuTM4IiEeC0_YxSx7KaSQ" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_LVuTNIIiEeC0_YxSx7KaSQ" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_LVzywIIiEeC0_YxSx7KaSQ" type="3010" element="_DmABUGwoEeGf4vaMnd1X5A">
+              <styles xmi:type="notation:FontStyle" xmi:id="_X0g4MMVVEeeLR5C8pFZ_lg"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_LVzywYIiEeC0_YxSx7KaSQ"/>
             </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_E7nhEYIjEeC0_YxSx7KaSQ" fontName="Segoe UI" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_E7nhEoIjEeC0_YxSx7KaSQ" x="95" y="200"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_LVuTNYIiEeC0_YxSx7KaSQ"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_LVuTNoIiEeC0_YxSx7KaSQ"/>
           </children>
-          <children xmi:type="notation:Node" xmi:id="_E7oIJIIjEeC0_YxSx7KaSQ" type="2003" element="_DqW84GwoEeGf4vaMnd1X5A">
-            <children xmi:type="notation:Node" xmi:id="_E7ovMIIjEeC0_YxSx7KaSQ" type="5007"/>
-            <children xmi:type="notation:Node" xmi:id="_E7ovMYIjEeC0_YxSx7KaSQ" type="7004">
-              <children xmi:type="notation:Node" xmi:id="_E7tAoIIjEeC0_YxSx7KaSQ" type="3010" element="_DqlmYGwoEeGf4vaMnd1X5A">
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_E7tAoYIjEeC0_YxSx7KaSQ"/>
-              </children>
-              <styles xmi:type="notation:SortingStyle" xmi:id="_E7ovMoIjEeC0_YxSx7KaSQ"/>
-              <styles xmi:type="notation:FilteringStyle" xmi:id="_E7ovM4IjEeC0_YxSx7KaSQ"/>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_LVuTMYIiEeC0_YxSx7KaSQ" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LVuTMoIiEeC0_YxSx7KaSQ" x="175" y="175"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_LVu6QIIiEeC0_YxSx7KaSQ" type="2003" element="_Dl4slWwoEeGf4vaMnd1X5A">
+          <children xmi:type="notation:Node" xmi:id="_LVu6Q4IiEeC0_YxSx7KaSQ" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_LVvhUIIiEeC0_YxSx7KaSQ" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_LV1A4IIiEeC0_YxSx7KaSQ" type="3010" element="_DmBPcGwoEeGf4vaMnd1X5A">
+              <styles xmi:type="notation:FontStyle" xmi:id="_X0g4McVVEeeLR5C8pFZ_lg"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_LV1A4YIiEeC0_YxSx7KaSQ"/>
             </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_E7oIJYIjEeC0_YxSx7KaSQ" fontName="Segoe UI" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_E7oIJoIjEeC0_YxSx7KaSQ" x="95" y="90"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_LVvhUYIiEeC0_YxSx7KaSQ"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_LVvhUoIiEeC0_YxSx7KaSQ"/>
           </children>
-          <children xmi:type="notation:Node" xmi:id="_E7ovNIIjEeC0_YxSx7KaSQ" type="2003" element="_DqYLBWwoEeGf4vaMnd1X5A">
-            <children xmi:type="notation:Node" xmi:id="_E7pWQIIjEeC0_YxSx7KaSQ" type="5007"/>
-            <children xmi:type="notation:Node" xmi:id="_E7pWQYIjEeC0_YxSx7KaSQ" type="7004">
-              <children xmi:type="notation:Node" xmi:id="_Foq94IIvEeC4F_xeiuKQmQ" type="3010" element="_DqnbkGwoEeGf4vaMnd1X5A">
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_Foq94YIvEeC4F_xeiuKQmQ"/>
-              </children>
-              <styles xmi:type="notation:SortingStyle" xmi:id="_E7pWQoIjEeC0_YxSx7KaSQ"/>
-              <styles xmi:type="notation:FilteringStyle" xmi:id="_E7pWQ4IjEeC0_YxSx7KaSQ"/>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_LVu6QYIiEeC0_YxSx7KaSQ" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LVu6QoIiEeC0_YxSx7KaSQ" x="470" y="35"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_LVvhU4IiEeC0_YxSx7KaSQ" type="2003" element="_Dl56sGwoEeGf4vaMnd1X5A">
+          <children xmi:type="notation:Node" xmi:id="_LVwIYIIiEeC0_YxSx7KaSQ" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_LVwIYYIiEeC0_YxSx7KaSQ" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_F6npgIIvEeC4F_xeiuKQmQ" type="3010" element="_DmB2gGwoEeGf4vaMnd1X5A">
+              <styles xmi:type="notation:FontStyle" xmi:id="_X0g4MsVVEeeLR5C8pFZ_lg"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_F6npgYIvEeC4F_xeiuKQmQ"/>
             </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_E7ovNYIjEeC0_YxSx7KaSQ" fontName="Segoe UI" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_E7ovNoIjEeC0_YxSx7KaSQ" x="325" y="210"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_LVwIYoIiEeC0_YxSx7KaSQ"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_LVwIY4IiEeC0_YxSx7KaSQ"/>
           </children>
-          <children xmi:type="notation:Node" xmi:id="_E7pWRIIjEeC0_YxSx7KaSQ" type="2003" element="_DqhU8GwoEeGf4vaMnd1X5A">
-            <children xmi:type="notation:Node" xmi:id="_E7p9UIIjEeC0_YxSx7KaSQ" type="5007"/>
-            <children xmi:type="notation:Node" xmi:id="_E7p9UYIjEeC0_YxSx7KaSQ" type="7004">
-              <children xmi:type="notation:Node" xmi:id="_FotaIIIvEeC4F_xeiuKQmQ" type="3010" element="_DqopsGwoEeGf4vaMnd1X5A">
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_FotaIYIvEeC4F_xeiuKQmQ"/>
-              </children>
-              <styles xmi:type="notation:SortingStyle" xmi:id="_E7p9UoIjEeC0_YxSx7KaSQ"/>
-              <styles xmi:type="notation:FilteringStyle" xmi:id="_E7p9U4IjEeC0_YxSx7KaSQ"/>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_LVvhVIIiEeC0_YxSx7KaSQ" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LVvhVYIiEeC0_YxSx7KaSQ" x="25" y="60"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_LVwIZIIiEeC0_YxSx7KaSQ" type="2003" element="_Dl6hwGwoEeGf4vaMnd1X5A">
+          <children xmi:type="notation:Node" xmi:id="_LVwvcIIiEeC0_YxSx7KaSQ" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_LVwvcYIiEeC0_YxSx7KaSQ" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_F6o3oIIvEeC4F_xeiuKQmQ" type="3010" element="_DmCdkGwoEeGf4vaMnd1X5A">
+              <styles xmi:type="notation:FontStyle" xmi:id="_X0g4M8VVEeeLR5C8pFZ_lg"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_F6o3oYIvEeC4F_xeiuKQmQ"/>
             </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_E7pWRYIjEeC0_YxSx7KaSQ" fontName="Segoe UI" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_E7pWRoIjEeC0_YxSx7KaSQ" x="315" y="90"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_LVwvcoIiEeC0_YxSx7KaSQ"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_LVwvc4IiEeC0_YxSx7KaSQ"/>
           </children>
-          <styles xmi:type="notation:DiagramStyle" xmi:id="_E6jKEoIjEeC0_YxSx7KaSQ"/>
-          <edges xmi:type="notation:Edge" xmi:id="_E7uOwIIjEeC0_YxSx7KaSQ" type="4001" element="_DquJQGwoEeGf4vaMnd1X5A" source="_E7nhEIIjEeC0_YxSx7KaSQ" target="_E7oIJIIjEeC0_YxSx7KaSQ">
-            <children xmi:type="notation:Node" xmi:id="_E7uOxIIjEeC0_YxSx7KaSQ" type="6001">
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_E7uOxYIjEeC0_YxSx7KaSQ" y="-10"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_E7u10IIjEeC0_YxSx7KaSQ" type="6002">
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_E7u10YIjEeC0_YxSx7KaSQ" y="10"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_E7u10oIjEeC0_YxSx7KaSQ" type="6003">
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_E7u104IjEeC0_YxSx7KaSQ" y="10"/>
-            </children>
-            <styles xmi:type="notation:ConnectorStyle" xmi:id="_E7uOwYIjEeC0_YxSx7KaSQ"/>
-            <styles xmi:type="notation:FontStyle" xmi:id="_E7uOwoIjEeC0_YxSx7KaSQ" fontName="Segoe UI"/>
-            <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_E7uOw4IjEeC0_YxSx7KaSQ" points="[40, 0, 40, 65]$[110, 0, 110, 65]$[110, -75, 110, -10]$[75, -95, 75, -30]$[40, -81, 40, -16]"/>
-            <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_E8Dl8IIjEeC0_YxSx7KaSQ" id="(0.5,0.0)"/>
-            <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_E8Dl8YIjEeC0_YxSx7KaSQ" id="(0.5,1.0)"/>
-          </edges>
-          <edges xmi:type="notation:Edge" xmi:id="_1NuSkIInEeCOpoH1PGlTZA" type="4001" element="_DqyasGwoEeGf4vaMnd1X5A" source="_E7nhEIIjEeC0_YxSx7KaSQ" target="_E7oIJIIjEeC0_YxSx7KaSQ">
-            <children xmi:type="notation:Node" xmi:id="_1N0ZMIInEeCOpoH1PGlTZA" type="6001">
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1N0ZMYInEeCOpoH1PGlTZA" x="-4" y="-29"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_1N7t8IInEeCOpoH1PGlTZA" type="6002">
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1N7t8YInEeCOpoH1PGlTZA" y="10"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_1N8VAIInEeCOpoH1PGlTZA" type="6003">
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1N8VAYInEeCOpoH1PGlTZA" y="10"/>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_LVwIZYIiEeC0_YxSx7KaSQ" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LVwIZoIiEeC0_YxSx7KaSQ" x="25" y="165"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_UlVDgNJJEeC9V9QVArx9PA" type="Note" fontName="Ubuntu" description="NoteAlone" fillColor="13369343" transparency="0" lineColor="6737151" lineWidth="1">
+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_X0iGUsVVEeeLR5C8pFZ_lg" source="specificStyles">
+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_X0iGU8VVEeeLR5C8pFZ_lg" key="verticalAlignment" value="8"/>
+          </eAnnotations>
+          <children xmi:type="notation:BasicDecorationNode" xmi:id="_UlZ8ANJJEeC9V9QVArx9PA" type="DiagramName">
+            <element xsi:nil="true"/>
+          </children>
+          <children xmi:type="notation:BasicDecorationNode" xmi:id="_UlajENJJEeC9V9QVArx9PA" type="Description">
+            <element xsi:nil="true"/>
+          </children>
+          <styles xmi:type="notation:TextStyle" xmi:id="_UlVDgdJJEeC9V9QVArx9PA" textAlignment="Center"/>
+          <styles xmi:type="notation:LineTypeStyle" xmi:id="_UlVDgtJJEeC9V9QVArx9PA"/>
+          <element xsi:nil="true"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UlVDg9JJEeC9V9QVArx9PA" x="310" y="410"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_WIlmANJJEeC9V9QVArx9PA" type="Note" fontName="Ubuntu" description="NoteLinkedToAnotherNote" fillColor="13369343" transparency="0" lineColor="6737151" lineWidth="1">
+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_X0iGUMVVEeeLR5C8pFZ_lg" source="specificStyles">
+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_X0iGUcVVEeeLR5C8pFZ_lg" key="verticalAlignment" value="8"/>
+          </eAnnotations>
+          <children xmi:type="notation:BasicDecorationNode" xmi:id="_WImNENJJEeC9V9QVArx9PA" type="DiagramName">
+            <element xsi:nil="true"/>
+          </children>
+          <children xmi:type="notation:BasicDecorationNode" xmi:id="_WIm0INJJEeC9V9QVArx9PA" type="Description">
+            <element xsi:nil="true"/>
+          </children>
+          <styles xmi:type="notation:TextStyle" xmi:id="_WIlmAdJJEeC9V9QVArx9PA" textAlignment="Center"/>
+          <styles xmi:type="notation:LineTypeStyle" xmi:id="_WIlmAtJJEeC9V9QVArx9PA"/>
+          <element xsi:nil="true"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WIlmA9JJEeC9V9QVArx9PA" x="146" y="316"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_aUcicNJJEeC9V9QVArx9PA" type="Note" fontName="Ubuntu" description="NoteLinkedToSemanticElement" fillColor="13369343" transparency="0" lineColor="6737151" lineWidth="1">
+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_X0iGVMVVEeeLR5C8pFZ_lg" source="specificStyles">
+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_X0iGVcVVEeeLR5C8pFZ_lg" key="verticalAlignment" value="8"/>
+          </eAnnotations>
+          <children xmi:type="notation:BasicDecorationNode" xmi:id="_aUdwkNJJEeC9V9QVArx9PA" type="DiagramName">
+            <element xsi:nil="true"/>
+          </children>
+          <children xmi:type="notation:BasicDecorationNode" xmi:id="_aUdwkdJJEeC9V9QVArx9PA" type="Description">
+            <element xsi:nil="true"/>
+          </children>
+          <styles xmi:type="notation:TextStyle" xmi:id="_aUdJgNJJEeC9V9QVArx9PA" textAlignment="Center"/>
+          <styles xmi:type="notation:LineTypeStyle" xmi:id="_aUdJgdJJEeC9V9QVArx9PA"/>
+          <element xsi:nil="true"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aUdJgtJJEeC9V9QVArx9PA" x="375" y="315"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_b5fJgMVVEeeLR5C8pFZ_lg" type="2003" element="_b5a4EMVVEeeLR5C8pFZ_lg">
+          <children xmi:type="notation:Node" xmi:id="_b5fJg8VVEeeLR5C8pFZ_lg" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_b5fwkMVVEeeLR5C8pFZ_lg" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_b5fwk8VVEeeLR5C8pFZ_lg" type="3010" element="_b5bfIMVVEeeLR5C8pFZ_lg">
+              <styles xmi:type="notation:FontStyle" xmi:id="_b5fwlMVVEeeLR5C8pFZ_lg" fontName="Comic Sans MS" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_b5fwlcVVEeeLR5C8pFZ_lg"/>
             </children>
-            <styles xmi:type="notation:ConnectorStyle" xmi:id="_1NuSkYInEeCOpoH1PGlTZA" routing="Tree"/>
-            <styles xmi:type="notation:FontStyle" xmi:id="_1NuSkoInEeCOpoH1PGlTZA" fontName="Segoe UI"/>
-            <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1NuSk4InEeCOpoH1PGlTZA" points="[0, -22, 5, 83]$[0, -64, 5, 41]$[-4, -64, 1, 41]$[-4, -82, 1, 23]"/>
-          </edges>
-        </data>
-      </ownedAnnotationEntries>
-      <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_DqVuwGwoEeGf4vaMnd1X5A" name="Class1" tooltipText="package.Class1" outgoingEdges="_DquJQGwoEeGf4vaMnd1X5A _DqyasGwoEeGf4vaMnd1X5A">
-        <target xmi:type="ecore:EClass" href="1894.ecore#//Class1"/>
-        <semanticElements xmi:type="ecore:EClass" href="1894.ecore#//Class1"/>
-        <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
-        <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
-        <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_DqWV0GwoEeGf4vaMnd1X5A" backgroundStyle="GradientTopToBottom">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_DqWV0WwoEeGf4vaMnd1X5A"/>
-          <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_DqWV0mwoEeGf4vaMnd1X5A"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_DqWV02woEeGf4vaMnd1X5A" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_DqWV1GwoEeGf4vaMnd1X5A" red="209" green="209" blue="209"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
-        <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_DqkYQGwoEeGf4vaMnd1X5A" name="attributee1">
-          <target xmi:type="ecore:EAttribute" href="1894.ecore#//Class1/attributee1"/>
-          <semanticElements xmi:type="ecore:EAttribute" href="1894.ecore#//Class1/attributee1"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_DqkYQWwoEeGf4vaMnd1X5A" labelAlignment="LEFT">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_DqkYQmwoEeGf4vaMnd1X5A"/>
-            <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_DqkYQ2woEeGf4vaMnd1X5A"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_DqkYRGwoEeGf4vaMnd1X5A"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-        </ownedElements>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_DqW84GwoEeGf4vaMnd1X5A" name="Class2" tooltipText="package.Class2" incomingEdges="_DquJQGwoEeGf4vaMnd1X5A _DqyasGwoEeGf4vaMnd1X5A">
-        <target xmi:type="ecore:EClass" href="1894.ecore#//Class2"/>
-        <semanticElements xmi:type="ecore:EClass" href="1894.ecore#//Class2"/>
-        <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
-        <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
-        <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_DqYLAGwoEeGf4vaMnd1X5A" backgroundStyle="GradientTopToBottom">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_DqYLAWwoEeGf4vaMnd1X5A"/>
-          <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_DqYLAmwoEeGf4vaMnd1X5A"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_DqYLA2woEeGf4vaMnd1X5A" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_DqYLBGwoEeGf4vaMnd1X5A" red="209" green="209" blue="209"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_b5fwkcVVEeeLR5C8pFZ_lg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_b5fwksVVEeeLR5C8pFZ_lg"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_b5fJgcVVEeeLR5C8pFZ_lg" fontName="Comic Sans MS" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b5fJgsVVEeeLR5C8pFZ_lg" x="20" y="254"/>
+        </children>
+        <styles xmi:type="notation:DiagramStyle" xmi:id="_LVBvooIiEeC0_YxSx7KaSQ"/>
+        <edges xmi:type="notation:Edge" xmi:id="_LV22EIIiEeC0_YxSx7KaSQ" type="4001" element="_DmESwGwoEeGf4vaMnd1X5A" source="_LVuTMIIiEeC0_YxSx7KaSQ" target="_LVu6QIIiEeC0_YxSx7KaSQ">
+          <children xmi:type="notation:Node" xmi:id="_LV3dIIIiEeC0_YxSx7KaSQ" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LV3dIYIiEeC0_YxSx7KaSQ" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_LV3dIoIiEeC0_YxSx7KaSQ" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LV4EMIIiEeC0_YxSx7KaSQ" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_LV4EMYIiEeC0_YxSx7KaSQ" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LV4EMoIiEeC0_YxSx7KaSQ" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_LV22EYIiEeC0_YxSx7KaSQ"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_LV22EoIiEeC0_YxSx7KaSQ" fontName="Segoe UI"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_LV22E4IiEeC0_YxSx7KaSQ" points="[0, 0, 0, 60]$[0, -60, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LWIi4IIiEeC0_YxSx7KaSQ" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LWIi4YIiEeC0_YxSx7KaSQ" id="(0.5,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_9Q6F4IInEeCOpoH1PGlTZA" type="4001" element="_DmNcsGwoEeGf4vaMnd1X5A" source="_LVuTMIIiEeC0_YxSx7KaSQ" target="_LVu6QIIiEeC0_YxSx7KaSQ">
+          <children xmi:type="notation:Node" xmi:id="_9Q6s8IInEeCOpoH1PGlTZA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9Q6s8YInEeCOpoH1PGlTZA" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_9Q6s8oInEeCOpoH1PGlTZA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9Q6s84InEeCOpoH1PGlTZA" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_9Q6s9IInEeCOpoH1PGlTZA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9Q6s9YInEeCOpoH1PGlTZA" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_9Q6F4YInEeCOpoH1PGlTZA"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_9Q6F4oInEeCOpoH1PGlTZA" fontName="Segoe UI"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_9Q6F44InEeCOpoH1PGlTZA" points="[0, 0, 0, 60]$[0, -60, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JCHAQNL_EeCZasn0Uzdtcw" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JCKDkNL_EeCZasn0Uzdtcw" id="(0.5,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Connector" xmi:id="_dOBXoNJJEeC9V9QVArx9PA" type="NoteAttachment" source="_LVu6QIIiEeC0_YxSx7KaSQ" target="_aUcicNJJEeC9V9QVArx9PA" lineWidth="1">
+          <styles xmi:type="notation:ArrowStyle" xmi:id="_dOBXodJJEeC9V9QVArx9PA"/>
+          <styles xmi:type="notation:LineTypeStyle" xmi:id="_dOBXotJJEeC9V9QVArx9PA"/>
+          <element xsi:nil="true"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_dOBXo9JJEeC9V9QVArx9PA" points="[-1, 0, 0, 60]$[-1, -60, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JCVpwNL_EeCZasn0Uzdtcw" id="(0.5060240963855421,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dOOL8NJJEeC9V9QVArx9PA" id="(0.5,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Connector" xmi:id="_du0XkNJJEeC9V9QVArx9PA" type="NoteAttachment" source="_aUcicNJJEeC9V9QVArx9PA" target="_WIlmANJJEeC9V9QVArx9PA" lineWidth="1">
+          <styles xmi:type="notation:ArrowStyle" xmi:id="_du0XkdJJEeC9V9QVArx9PA"/>
+          <styles xmi:type="notation:LineTypeStyle" xmi:id="_du0XktJJEeC9V9QVArx9PA"/>
+          <element xsi:nil="true"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_du0Xk9JJEeC9V9QVArx9PA" points="[0, 0, 0, 60]$[0, -60, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JCTNgNL_EeCZasn0Uzdtcw" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JCT0kNL_EeCZasn0Uzdtcw" id="(0.49696969696969695,1.0)"/>
+        </edges>
+      </data>
+    </ownedAnnotationEntries>
+    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_X0fqEMVVEeeLR5C8pFZ_lg" source="DANNOTATION_CUSTOMIZATION_KEY">
+      <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_X0fqEcVVEeeLR5C8pFZ_lg"/>
+    </ownedAnnotationEntries>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_DkQ78GwoEeGf4vaMnd1X5A" name="Class1" outgoingEdges="_DmESwGwoEeGf4vaMnd1X5A _DmNcsGwoEeGf4vaMnd1X5A">
+      <target xmi:type="ecore:EClass" href="1894.ecore#//Class1"/>
+      <semanticElements xmi:type="ecore:EClass" href="1894.ecore#//Class1"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_Dl4skGwoEeGf4vaMnd1X5A" borderSize="1" borderSizeComputationExpression="1">
+        <description xmi:type="style:FlatContainerStyleDescription" href="vp-1894.odesign#//@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@defaultLayer/@containerMappings[name='Class']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="vp-1894.odesign#//@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@defaultLayer/@containerMappings[name='Class']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_DmABUGwoEeGf4vaMnd1X5A" name="attributee1">
+        <target xmi:type="ecore:EAttribute" href="1894.ecore#//Class1/attributee1"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="1894.ecore#//Class1/attributee1"/>
+        <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_DmAoYGwoEeGf4vaMnd1X5A" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="vp-1894.odesign#//@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@defaultLayer/@containerMappings[name='Class']/@subNodeMappings[name='Attribute']/@style"/>
         </ownedStyle>
-        <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
-        <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_DqlmYGwoEeGf4vaMnd1X5A" name="attributee2">
-          <target xmi:type="ecore:EAttribute" href="1894.ecore#//Class2/attributee2"/>
-          <semanticElements xmi:type="ecore:EAttribute" href="1894.ecore#//Class2/attributee2"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_DqmNcGwoEeGf4vaMnd1X5A" labelAlignment="LEFT">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_DqmNcWwoEeGf4vaMnd1X5A"/>
-            <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_DqmNcmwoEeGf4vaMnd1X5A"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_DqmNc2woEeGf4vaMnd1X5A"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-        </ownedElements>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_DqYLBWwoEeGf4vaMnd1X5A" name="nodelete_Class" tooltipText="package.nodelete_Class">
-        <target xmi:type="ecore:EClass" href="1894.ecore#//nodelete_Class"/>
-        <semanticElements xmi:type="ecore:EClass" href="1894.ecore#//nodelete_Class"/>
-        <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
-        <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
-        <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_Dqgt4GwoEeGf4vaMnd1X5A" backgroundStyle="GradientTopToBottom">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Dqgt4WwoEeGf4vaMnd1X5A"/>
-          <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Dqgt4mwoEeGf4vaMnd1X5A"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_Dqgt42woEeGf4vaMnd1X5A" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_Dqgt5GwoEeGf4vaMnd1X5A" red="209" green="209" blue="209"/>
+        <actualMapping xmi:type="description_1:NodeMapping" href="vp-1894.odesign#//@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@defaultLayer/@containerMappings[name='Class']/@subNodeMappings[name='Attribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_Dl4slWwoEeGf4vaMnd1X5A" name="Class2" incomingEdges="_DmESwGwoEeGf4vaMnd1X5A _DmNcsGwoEeGf4vaMnd1X5A">
+      <target xmi:type="ecore:EClass" href="1894.ecore#//Class2"/>
+      <semanticElements xmi:type="ecore:EClass" href="1894.ecore#//Class2"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_Dl5ToGwoEeGf4vaMnd1X5A" borderSize="1" borderSizeComputationExpression="1">
+        <description xmi:type="style:FlatContainerStyleDescription" href="vp-1894.odesign#//@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@defaultLayer/@containerMappings[name='Class']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="vp-1894.odesign#//@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@defaultLayer/@containerMappings[name='Class']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_DmBPcGwoEeGf4vaMnd1X5A" name="attributee2">
+        <target xmi:type="ecore:EAttribute" href="1894.ecore#//Class2/attributee2"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="1894.ecore#//Class2/attributee2"/>
+        <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_DmBPcWwoEeGf4vaMnd1X5A" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="vp-1894.odesign#//@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@defaultLayer/@containerMappings[name='Class']/@subNodeMappings[name='Attribute']/@style"/>
         </ownedStyle>
-        <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
-        <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_DqnbkGwoEeGf4vaMnd1X5A" name="attributee2">
-          <target xmi:type="ecore:EAttribute" href="1894.ecore#//nodelete_Class/attributee2"/>
-          <semanticElements xmi:type="ecore:EAttribute" href="1894.ecore#//nodelete_Class/attributee2"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_DqnbkWwoEeGf4vaMnd1X5A" labelAlignment="LEFT">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_DqnbkmwoEeGf4vaMnd1X5A"/>
-            <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Dqnbk2woEeGf4vaMnd1X5A"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_DqnblGwoEeGf4vaMnd1X5A"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-        </ownedElements>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_DqhU8GwoEeGf4vaMnd1X5A" name="pastable_Class" tooltipText="package.pastable_Class">
-        <target xmi:type="ecore:EClass" href="1894.ecore#//pastable_Class"/>
-        <semanticElements xmi:type="ecore:EClass" href="1894.ecore#//pastable_Class"/>
-        <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
-        <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
-        <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_Dqh8AGwoEeGf4vaMnd1X5A" backgroundStyle="GradientTopToBottom">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Dqh8AWwoEeGf4vaMnd1X5A"/>
-          <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Dqh8AmwoEeGf4vaMnd1X5A"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_Dqh8A2woEeGf4vaMnd1X5A" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_Dqh8BGwoEeGf4vaMnd1X5A" red="209" green="209" blue="209"/>
+        <actualMapping xmi:type="description_1:NodeMapping" href="vp-1894.odesign#//@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@defaultLayer/@containerMappings[name='Class']/@subNodeMappings[name='Attribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_Dl56sGwoEeGf4vaMnd1X5A" name="nodelete_Class">
+      <target xmi:type="ecore:EClass" href="1894.ecore#//nodelete_Class"/>
+      <semanticElements xmi:type="ecore:EClass" href="1894.ecore#//nodelete_Class"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_Dl56sWwoEeGf4vaMnd1X5A" borderSize="1" borderSizeComputationExpression="1">
+        <description xmi:type="style:FlatContainerStyleDescription" href="vp-1894.odesign#//@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@defaultLayer/@containerMappings[name='Class']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="vp-1894.odesign#//@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@defaultLayer/@containerMappings[name='Class']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_DmB2gGwoEeGf4vaMnd1X5A" name="attributee2">
+        <target xmi:type="ecore:EAttribute" href="1894.ecore#//nodelete_Class/attributee2"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="1894.ecore#//nodelete_Class/attributee2"/>
+        <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_DmB2gWwoEeGf4vaMnd1X5A" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="vp-1894.odesign#//@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@defaultLayer/@containerMappings[name='Class']/@subNodeMappings[name='Attribute']/@style"/>
         </ownedStyle>
-        <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
-        <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_DqopsGwoEeGf4vaMnd1X5A" name="attributee2">
-          <target xmi:type="ecore:EAttribute" href="1894.ecore#//pastable_Class/attributee2"/>
-          <semanticElements xmi:type="ecore:EAttribute" href="1894.ecore#//pastable_Class/attributee2"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_DqopsWwoEeGf4vaMnd1X5A" labelAlignment="LEFT">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_DqopsmwoEeGf4vaMnd1X5A"/>
-            <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_DqpQwGwoEeGf4vaMnd1X5A"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_DqpQwWwoEeGf4vaMnd1X5A"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-        </ownedElements>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_DquJQGwoEeGf4vaMnd1X5A" name="[0..1] ref1" sourceNode="_DqVuwGwoEeGf4vaMnd1X5A" targetNode="_DqW84GwoEeGf4vaMnd1X5A">
-        <target xmi:type="ecore:EReference" href="1894.ecore#//Class1/ref1"/>
-        <semanticElements xmi:type="ecore:EReference" href="1894.ecore#//Class1/ref1"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_E7jPoYIjEeC0_YxSx7KaSQ">
-          <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_E7jPooIjEeC0_YxSx7KaSQ" red="136" green="136" blue="136"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_E7jPo4IjEeC0_YxSx7KaSQ" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_E7jPpIIjEeC0_YxSx7KaSQ"/>
-          </centerLabelStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="vp-1894.odesign#//@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@defaultLayer/@containerMappings[name='Class']/@subNodeMappings[name='Attribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_Dl6hwGwoEeGf4vaMnd1X5A" name="pastable_Class">
+      <target xmi:type="ecore:EClass" href="1894.ecore#//pastable_Class"/>
+      <semanticElements xmi:type="ecore:EClass" href="1894.ecore#//pastable_Class"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_Dl6hwWwoEeGf4vaMnd1X5A" borderSize="1" borderSizeComputationExpression="1">
+        <description xmi:type="style:FlatContainerStyleDescription" href="vp-1894.odesign#//@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@defaultLayer/@containerMappings[name='Class']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="vp-1894.odesign#//@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@defaultLayer/@containerMappings[name='Class']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_DmCdkGwoEeGf4vaMnd1X5A" name="attributee2">
+        <target xmi:type="ecore:EAttribute" href="1894.ecore#//pastable_Class/attributee2"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="1894.ecore#//pastable_Class/attributee2"/>
+        <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_DmDEoGwoEeGf4vaMnd1X5A" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="vp-1894.odesign#//@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@defaultLayer/@containerMappings[name='Class']/@subNodeMappings[name='Attribute']/@style"/>
         </ownedStyle>
-        <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_DqyasGwoEeGf4vaMnd1X5A" sourceNode="_DqVuwGwoEeGf4vaMnd1X5A" targetNode="_DqW84GwoEeGf4vaMnd1X5A">
-        <target xmi:type="ecore:EClass" href="1894.ecore#//Class1"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_1LxKwYInEeCOpoH1PGlTZA" targetArrow="InputClosedArrow" routingStyle="tree">
-          <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_1LxKwoInEeCOpoH1PGlTZA" red="136" green="136" blue="136"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_1LxKw4InEeCOpoH1PGlTZA" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_1LxKxIInEeCOpoH1PGlTZA"/>
-          </centerLabelStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="vp-1894.odesign#//@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@defaultLayer/@containerMappings[name='Class']/@subNodeMappings[name='Attribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_DmESwGwoEeGf4vaMnd1X5A" name="ref1" sourceNode="_DkQ78GwoEeGf4vaMnd1X5A" targetNode="_Dl4slWwoEeGf4vaMnd1X5A">
+      <target xmi:type="ecore:EReference" href="1894.ecore#//Class1/ref1"/>
+      <semanticElements xmi:type="ecore:EReference" href="1894.ecore#//Class1/ref1"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_LVozoYIiEeC0_YxSx7KaSQ" sourceArrow="FillDiamond">
+        <description xmi:type="style:EdgeStyleDescription" href="vp-1894.odesign#//@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@defaultLayer/@edgeMappings[name='Reference']/@style"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_LVozo4IiEeC0_YxSx7KaSQ" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="vp-1894.odesign#//@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@defaultLayer/@edgeMappings[name='Reference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_DmNcsGwoEeGf4vaMnd1X5A" name="super type of Class1" sourceNode="_DkQ78GwoEeGf4vaMnd1X5A" targetNode="_Dl4slWwoEeGf4vaMnd1X5A">
+      <target xmi:type="ecore:EClass" href="1894.ecore#//Class1"/>
+      <semanticElements xmi:type="ecore:EClass" href="1894.ecore#//Class1"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_9QyKEYInEeCOpoH1PGlTZA" lineStyle="dash" targetArrow="InputClosedArrow">
+        <description xmi:type="style:EdgeStyleDescription" href="vp-1894.odesign#//@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@defaultLayer/@edgeMappings[name='SuperType']/@style"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_9QyKE4InEeCOpoH1PGlTZA" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="vp-1894.odesign#//@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@defaultLayer/@edgeMappings[name='SuperType']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_b5a4EMVVEeeLR5C8pFZ_lg" name="pastable2_Class">
+      <target xmi:type="ecore:EClass" href="1894.ecore#//pastable2_Class"/>
+      <semanticElements xmi:type="ecore:EClass" href="1894.ecore#//pastable2_Class"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_b5a4EcVVEeeLR5C8pFZ_lg" borderSize="1" borderSizeComputationExpression="1">
+        <description xmi:type="style:FlatContainerStyleDescription" href="vp-1894.odesign#//@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@defaultLayer/@containerMappings[name='Class']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="vp-1894.odesign#//@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@defaultLayer/@containerMappings[name='Class']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_b5bfIMVVEeeLR5C8pFZ_lg" name="attributee2">
+        <target xmi:type="ecore:EAttribute" href="1894.ecore#//pastable2_Class/attributee2"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="1894.ecore#//pastable2_Class/attributee2"/>
+        <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_b5cGMMVVEeeLR5C8pFZ_lg" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="vp-1894.odesign#//@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@defaultLayer/@containerMappings[name='Class']/@subNodeMappings[name='Attribute']/@style"/>
         </ownedStyle>
-        <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
-      </ownedDiagramElements>
-      <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>
-      <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_E6ijAYIjEeC0_YxSx7KaSQ"/>
-      <activatedLayers xmi:type="description_1:Layer" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer"/>
-      <activatedLayers xmi:type="description_1:AdditionalLayer" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']"/>
-      <target xmi:type="ecore:EPackage" href="1894.ecore#/"/>
-    </ownedRepresentations>
-    <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']"/>
-  </ownedViews>
-</viewpoint:DAnalysis>
+        <actualMapping xmi:type="description_1:NodeMapping" href="vp-1894.odesign#//@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@defaultLayer/@containerMappings[name='Class']/@subNodeMappings[name='Attribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <description xmi:type="description_1:DiagramDescription" href="vp-1894.odesign#//@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']"/>
+    <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_LVBIkYIiEeC0_YxSx7KaSQ"/>
+    <activatedLayers xmi:type="description_1:Layer" href="vp-1894.odesign#//@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@defaultLayer"/>
+    <target xmi:type="ecore:EPackage" href="1894.ecore#/"/>
+  </diagram:DSemanticDiagram>
+</xmi:XMI>
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/copyPaste/1894.ecore b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/copyPaste/1894.ecore
index c4dbfc4b76..7fe04e06c3 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/copyPaste/1894.ecore
+++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/copyPaste/1894.ecore
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="package">
   <eClassifiers xsi:type="ecore:EClass" name="Class1" eSuperTypes="#//Class2">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="attributee1"/>
@@ -15,4 +14,7 @@
   <eClassifiers xsi:type="ecore:EClass" name="pastable_Class">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="attributee2"/>
   </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="pastable2_Class">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="attributee2"/>
+  </eClassifiers>
 </ecore:EPackage>
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/copyPaste/vp-1894.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/copyPaste/vp-1894.odesign
index 065a6f47aa..95795f6872 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/copyPaste/vp-1894.odesign
+++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/copyPaste/vp-1894.odesign
@@ -1,71 +1,91 @@
 <?xml version="1.0" encoding="ASCII"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" 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/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" version="12.0.0.2017041100">
   <ownedViewpoints name="vp-1894" modelFileExtension="*.ecore">
-    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="diagramWithCustomClipboard" pasteDescriptions="//@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@toolSection/@ownedTools[name='NoPaste'] //@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@toolSection/@ownedTools[name='PasteClass2InParentPackage']" domainClass="EPackage">
-      <edgeMappings name="Reference" pasteDescriptions="//@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@toolSection/@ownedTools[name='NoPaste'] //@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@toolSection/@ownedTools[name='PasteClass2InParentPackage']" semanticElements="var:self" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@containerMappings[name='Class']" targetMapping="//@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@containerMappings[name='Class']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true">
-        <style sourceArrow="FillDiamond">
-          <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
-          <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.name">
-            <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-          </centerLabelStyleDescription>
-        </style>
-      </edgeMappings>
-      <edgeMappings name="SuperType" pasteDescriptions="//@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@toolSection/@ownedTools[name='NoPaste'] //@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@toolSection/@ownedTools[name='PasteClass2InParentPackage']" semanticElements="var:self" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@containerMappings[name='Class']" targetMapping="//@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@containerMappings[name='Class']" targetFinderExpression="aql:self.eSuperTypes">
-        <style lineStyle="dash" targetArrow="InputClosedArrow">
-          <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
-          <centerLabelStyleDescription showIcon="false" labelExpression="aql:'super type of ' + self.name">
-            <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-          </centerLabelStyleDescription>
-        </style>
-      </edgeMappings>
-      <containerMappings name="Class" pasteDescriptions="//@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@toolSection/@ownedTools[name='NoPaste'] //@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@toolSection/@ownedTools[name='PasteClass2InParentPackage']" deletionDescription="//@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@toolSection/@ownedTools[name='No%20delete%20']" domainClass="EClass" childrenPresentation="List">
-        <subNodeMappings name="Attribute" pasteDescriptions="//@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@toolSection/@ownedTools[name='NoPaste'] //@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@toolSection/@ownedTools[name='PasteClass2InParentPackage']" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute">
-          <style xsi:type="style:BundledImageDescription" labelAlignment="LEFT">
+    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="diagramWithCustomClipboard" pasteDescriptions="//@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@defaultLayer/@toolSections.0/@ownedTools[name='NoPaste'] //@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@defaultLayer/@toolSections.0/@ownedTools[name='PasteClass2InParentPackage'] //@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@additionalLayers[name='transientLayer']/@toolSections.0/@ownedTools[name='PasteClass2InParentPackage']" domainClass="EPackage">
+      <defaultLayer name="Default">
+        <edgeMappings name="Reference" pasteDescriptions="//@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@defaultLayer/@toolSections.0/@ownedTools[name='NoPaste'] //@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@defaultLayer/@toolSections.0/@ownedTools[name='PasteClass2InParentPackage']" semanticElements="var:self" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@defaultLayer/@containerMappings[name='Class']" targetMapping="//@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@defaultLayer/@containerMappings[name='Class']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true">
+          <style sourceArrow="FillDiamond">
+            <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
+            <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.name">
+              <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+            </centerLabelStyleDescription>
+          </style>
+        </edgeMappings>
+        <edgeMappings name="SuperType" pasteDescriptions="//@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@defaultLayer/@toolSections.0/@ownedTools[name='NoPaste'] //@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@defaultLayer/@toolSections.0/@ownedTools[name='PasteClass2InParentPackage']" semanticElements="var:self" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@defaultLayer/@containerMappings[name='Class']" targetMapping="//@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@defaultLayer/@containerMappings[name='Class']" targetFinderExpression="aql:self.eSuperTypes">
+          <style lineStyle="dash" targetArrow="InputClosedArrow">
+            <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
+            <centerLabelStyleDescription showIcon="false" labelExpression="aql:'super type of ' + self.name">
+              <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+            </centerLabelStyleDescription>
+          </style>
+        </edgeMappings>
+        <containerMappings name="Class" pasteDescriptions="//@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@defaultLayer/@toolSections.0/@ownedTools[name='NoPaste'] //@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@defaultLayer/@toolSections.0/@ownedTools[name='PasteClass2InParentPackage']" deletionDescription="//@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@defaultLayer/@toolSections.0/@ownedTools[name='No%20delete%20']" domainClass="EClass" childrenPresentation="List">
+          <subNodeMappings name="Attribute" pasteDescriptions="//@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@defaultLayer/@toolSections.0/@ownedTools[name='NoPaste'] //@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@defaultLayer/@toolSections.0/@ownedTools[name='PasteClass2InParentPackage']" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute">
+            <style xsi:type="style:BundledImageDescription" labelAlignment="LEFT">
+              <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="1" arcHeight="1" borderSizeComputationExpression="1">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+            <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
+            <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
           </style>
-        </subNodeMappings>
-        <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1">
-          <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-          <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-          <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
-          <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
-        </style>
-      </containerMappings>
-      <toolSection>
-        <ownedTools xsi:type="tool:DeleteElementDescription" name="No delete " precondition="aql:not element.name.startsWith('nodelete_')">
-          <element name="element"/>
-          <elementView name="elementView"/>
-          <containerView name="containerView"/>
-          <initialOperation>
-            <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element"/>
-          </initialOperation>
-        </ownedTools>
-        <ownedTools xsi:type="tool_1:PasteDescription" name="NoPaste" precondition="aql:false" forceRefresh="true">
-          <container name="container"/>
-          <containerView name="containerView"/>
-          <copiedView name="copiedView"/>
-          <copiedElement name="copiedElement"/>
-          <initialOperation>
-            <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:container"/>
-          </initialOperation>
-        </ownedTools>
-        <ownedTools xsi:type="tool_1:PasteDescription" documentation="Dummy paste tool." name="PasteClass2InParentPackage" precondition="aql:copiedElement.name.startsWith('pastable_')" forceRefresh="true">
-          <container name="container"/>
-          <containerView name="containerView"/>
-          <copiedView name="copiedView"/>
-          <copiedElement name="copiedElement"/>
-          <initialOperation>
-            <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:container.eContainerOrSelf(ecore::EPackage)">
-              <subModelOperations xsi:type="tool_1:SetValue" featureName="eClassifiers" valueExpression="var:copiedElement"/>
-              <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:copiedElement">
-                <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'pasted_' + self.name"/>
-              </subModelOperations>
-            </firstModelOperations>
-          </initialOperation>
-        </ownedTools>
-      </toolSection>
+        </containerMappings>
+        <toolSections>
+          <ownedTools xsi:type="tool:DeleteElementDescription" name="No delete " precondition="aql:not element.name.startsWith('nodelete_')">
+            <element name="element"/>
+            <elementView name="elementView"/>
+            <containerView name="containerView"/>
+            <initialOperation>
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element"/>
+            </initialOperation>
+          </ownedTools>
+          <ownedTools xsi:type="tool_1:PasteDescription" name="NoPaste" precondition="aql:false" forceRefresh="true">
+            <container name="container"/>
+            <containerView name="containerView"/>
+            <copiedView name="copiedView"/>
+            <copiedElement name="copiedElement"/>
+            <initialOperation>
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:container"/>
+            </initialOperation>
+          </ownedTools>
+          <ownedTools xsi:type="tool_1:PasteDescription" documentation="Dummy paste tool." name="PasteClass2InParentPackage" precondition="aql:copiedElement.name.startsWith('pastable_')" forceRefresh="true">
+            <container name="container"/>
+            <containerView name="containerView"/>
+            <copiedView name="copiedView"/>
+            <copiedElement name="copiedElement"/>
+            <initialOperation>
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:container.eContainerOrSelf(ecore::EPackage)">
+                <subModelOperations xsi:type="tool_1:SetValue" featureName="eClassifiers" valueExpression="var:copiedElement"/>
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:copiedElement">
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'pasted_' + self.name"/>
+                </subModelOperations>
+              </firstModelOperations>
+            </initialOperation>
+          </ownedTools>
+        </toolSections>
+      </defaultLayer>
+      <additionalLayers name="transientLayer" activeByDefault="true">
+        <toolSections name="transientSection">
+          <ownedTools xsi:type="tool_1:PasteDescription" documentation="Dummy paste tool." name="PasteClass2InParentPackage" precondition="aql:copiedElement.name.startsWith('pastable2_')" forceRefresh="true">
+            <container name="container"/>
+            <containerView name="containerView"/>
+            <copiedView name="copiedView"/>
+            <copiedElement name="copiedElement"/>
+            <initialOperation>
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:container.eContainerOrSelf(ecore::EPackage)">
+                <subModelOperations xsi:type="tool_1:SetValue" featureName="eClassifiers" valueExpression="var:copiedElement"/>
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:copiedElement">
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'pasted_' + self.name"/>
+                </subModelOperations>
+              </firstModelOperations>
+            </initialOperation>
+          </ownedTools>
+        </toolSections>
+      </additionalLayers>
     </ownedRepresentations>
   </ownedViewpoints>
 </description:Group>
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/dragAndDrop/tc-1041/tc1041.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/dragAndDrop/tc-1041/tc1041.odesign
index b1c79e32d7..1a595e991f 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/dragAndDrop/tc-1041/tc1041.odesign
+++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/dragAndDrop/tc-1041/tc1041.odesign
@@ -142,16 +142,16 @@
         </toolSections>
       </defaultLayer>
     </ownedRepresentations>
-    <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231041']/@ownedRepresentations[name='TC1041%20representation%205%20Blank']/@defaultLayer/@toolSections.0/@ownedTools[name='Drag%20%26%20Drop%20EPackage%20R5']" name="TC1041 representation 5 Blank" domainClass="EPackage" enablePopupBars="true">
+    <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231041']/@ownedRepresentations[name='TC1041%20representation%205%20Blank']/@defaultLayer/@toolSections.0/@ownedTools[name='Drag%20%26%20Drop%20EPackage%20R5'] //@ownedViewpoints[name='Test%20case%20for%20ticket%20%231041']/@ownedRepresentations[name='TC1041%20representation%205%20Blank']/@additionalLayers[name='transientLayer']/@toolSections.0/@ownedTools[name='Drag%20%26%20Drop%20EClass%20R5-transient']" name="TC1041 representation 5 Blank" domainClass="EPackage" enablePopupBars="true">
       <defaultLayer name="Default">
-        <containerMappings name="Container EPackage R5" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" createElements="false" domainClass="EPackage" dropDescriptions="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231041']/@ownedRepresentations[name='TC1041%20representation%205%20Blank']/@defaultLayer/@toolSections.0/@ownedTools[name='Drag%20%26%20Drop%20EClass%20R5']">
-          <subNodeMappings name="Node EClass R5" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" createElements="false" domainClass="EClass">
-            <style xsi:type="style:SquareDescription">
-              <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='purple']"/>
-            </style>
-          </subNodeMappings>
+        <nodeMappings name="Node EClass R5" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" createElements="false" domainClass="EClass">
+          <style xsi:type="style:SquareDescription">
+            <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='purple']"/>
+          </style>
+        </nodeMappings>
+        <containerMappings name="Container EPackage R5" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" createElements="false" domainClass="EPackage" dropDescriptions="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231041']/@ownedRepresentations[name='TC1041%20representation%205%20Blank']/@defaultLayer/@toolSections.0/@ownedTools[name='Drag%20%26%20Drop%20EClass%20R5']" reusedNodeMappings="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231041']/@ownedRepresentations[name='TC1041%20representation%205%20Blank']/@defaultLayer/@nodeMappings[name='Node%20EClass%20R5']">
           <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_purple']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -173,7 +173,7 @@
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
-          <ownedTools xsi:type="tool:ContainerDropDescription" name="Drag &amp; Drop EClass R5" forceRefresh="true" mappings="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231041']/@ownedRepresentations[name='TC1041%20representation%205%20Blank']/@defaultLayer/@containerMappings[name='Container%20EPackage%20R5']/@subNodeMappings[name='Node%20EClass%20R5']" dragSource="BOTH">
+          <ownedTools xsi:type="tool:ContainerDropDescription" name="Drag &amp; Drop EClass R5" forceRefresh="true" mappings="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231041']/@ownedRepresentations[name='TC1041%20representation%205%20Blank']/@defaultLayer/@nodeMappings[name='Node%20EClass%20R5']" dragSource="BOTH">
             <oldContainer name="oldSemanticContainer"/>
             <newContainer name="newSemanticContainer"/>
             <element name="element"/>
@@ -188,6 +188,23 @@
           </ownedTools>
         </toolSections>
       </defaultLayer>
+      <additionalLayers name="transientLayer" activeByDefault="true">
+        <toolSections name="tools">
+          <ownedTools xsi:type="tool:ContainerDropDescription" name="Drag &amp; Drop EClass R5-transient" forceRefresh="true" mappings="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231041']/@ownedRepresentations[name='TC1041%20representation%205%20Blank']/@defaultLayer/@nodeMappings[name='Node%20EClass%20R5']" dragSource="BOTH">
+            <oldContainer name="oldSemanticContainer"/>
+            <newContainer name="newSemanticContainer"/>
+            <element name="element"/>
+            <newViewContainer name="newContainerView"/>
+            <initialOperation>
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:element.oclIsTypeOf(ecore::EClass)">
+                  <subModelOperations xsi:type="tool_1:MoveElement" newContainerExpression="var:newSemanticContainer" featureName="eClassifiers"/>
+                </subModelOperations>
+              </firstModelOperations>
+            </initialOperation>
+          </ownedTools>
+        </toolSections>
+      </additionalLayers>
     </ownedRepresentations>
   </ownedViewpoints>
 </description:Group>
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/tools/creation/popupMenu/VP-1859/vp-1859.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/tools/creation/popupMenu/VP-1859/vp-1859.odesign
index 59aba5ecbd..9fde69b780 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/tools/creation/popupMenu/VP-1859/vp-1859.odesign
+++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/tools/creation/popupMenu/VP-1859/vp-1859.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="VP-1859" 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="VP-1859" version="12.0.0.2017041100">
   <ownedViewpoints name="VP-1859" modelFileExtension="ecore">
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="VP-1859" domainClass="EPackage">
       <defaultLayer name="Default">
@@ -88,6 +88,22 @@
           </ownedTools>
         </toolSections>
       </defaultLayer>
+      <additionalLayers name="transient" activeByDefault="true">
+        <toolSections name="transient">
+          <ownedTools xsi:type="tool:PopupMenu" name="Create">
+            <menuItemDescription xsi:type="tool:OperationAction" name="Transient-1 EClass">
+              <view name="views"/>
+              <initialOperation>
+                <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:self">
+                  <subModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers">
+                    <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'Class' + self.eContainer().eContents()->filter(ecore::EClass)->size()"/>
+                  </subModelOperations>
+                </firstModelOperations>
+              </initialOperation>
+            </menuItemDescription>
+          </ownedTools>
+        </toolSections>
+      </additionalLayers>
     </ownedRepresentations>
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="VP-1859-RealCase" domainClass="EPackage">
       <defaultLayer name="Default">
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/DragNDropTest.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/DragNDropTest.java
index bf7e726d08..57808f13e1 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/DragNDropTest.java
+++ b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/DragNDropTest.java
@@ -701,9 +701,45 @@ public class DragNDropTest extends AbstractSiriusSwtBotGefTestCase {
     }
 
     /**
+     * Test the drag&drop of C1(EClass) from the Model Content view to the
+     * diagram. This move should be allowed (as it is in a transient layer
+     * enabled by default) and no error message should be generated.
+     * 
+     * @throws Exception
+     *             In case of problem
+     */
+    @Test
+    public void test_DnDClassFromMC2DiagramBlank5FromATransientLayerTool() throws Exception {
+
+        openRepresentation5();
+
+        try {
+            openErrorLogViewByAPI();
+            SWTBot errorLogBot = bot.viewByTitle("Error Log").bot();
+            int rowCount = errorLogBot.tree().rowCount();
+
+            DndUtil util = new DndUtil(bot.getDisplay());
+
+            // DnD P1(EPackage) from the Model Content view to the diagram
+            final SWTBotTreeItem ecoreTreeItem = semanticResourceNode.expandNode(ROOTPACKAGE_NAME).expandNode(CONTAINER_TO_DRAG_P1).getNode(CLASS_TO_DRAG_C1);
+            util.dragAndDrop(ecoreTreeItem, editor.getCanvas());
+
+            // Asserts that C1 graphical element was created on the diagram and
+            // no error message was generated
+            List<SWTBotGefEditPart> allEditParts = editor.mainEditPart().children();
+
+            assertEquals("Bad number of elements!", 1, allEditParts.size());
+            assertEquals("An error message was generated !", rowCount, errorLogBot.tree().rowCount());
+        } finally {
+            closeErrorLogView();
+        }
+    }
+
+    /**
      * @throws Exception
-     *             Test the drag&drop of P2 from the Model Content view to P1 previously created. This move should not
-     *             be allowed and no error message should be generated.
+     *             Test the drag&drop of P2 from the Model Content view to P1
+     *             previously created. This move should not be allowed and no
+     *             error message should be generated.
      */
     @Test
     public void test_DnDPackageFromMC2ContainerBlank5() throws Exception {
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/ElementCreationWithPopupMenuTests.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/ElementCreationWithPopupMenuTests.java
index 48d0ded507..90244542a3 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/ElementCreationWithPopupMenuTests.java
+++ b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/ElementCreationWithPopupMenuTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2014 THALES GLOBAL SERVICES.
+ * Copyright (c) 2010, 2017 THALES GLOBAL SERVICES.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -64,6 +64,8 @@ public class ElementCreationWithPopupMenuTests extends AbstractSiriusSwtBotGefTe
 
     private static final String TOOL_NAME = "1 EClass";
 
+    private static final String TOOL_NAME_IN_TRANSIENT_LAYER = "Transient-1 EClass";
+
     private static final String TOOL_NAME_ON_EDGE = "EClass On Edge";
 
     private UIResource sessionAirdResource;
@@ -184,6 +186,35 @@ public class ElementCreationWithPopupMenuTests extends AbstractSiriusSwtBotGefTe
     }
 
     /**
+     * Test that one EClass creation on DiagramEditPart via the tool from a
+     * transient layer in the popup menu creates the View at the clicked
+     * position.
+     */
+    public void testOneEClassCreationOnDiagramEditPartViaPopupMenuToolFromTransientLayer() {
+        IGraphicalEditPart class3Part = (IGraphicalEditPart) class3ChildOfDiagramBot.part();
+
+        editor.reveal(class3Part);
+        // 1. Create a new EClass
+        // The creation location in logical coordinates (not in screen
+        // coordinates)
+        Point absoluteCreationLocation = editor.getAbsoluteLocation(class3Part).getCopy().translate(-100, 0);
+        // The creation location in screen coordinates
+        Point screenCreationLocation = absoluteCreationLocation.getCopy();
+        GraphicalHelper.logical2screen(screenCreationLocation, (IGraphicalEditPart) diagramEditPartBot.part());
+
+        editor.clickContextMenu(screenCreationLocation, TOOL_NAME_IN_TRANSIENT_LAYER);
+        SWTBotUtils.waitAllUiEvents();
+
+        // 2. Assert the location of the created EClass
+        SWTBotGefEditPart newClassBot = editor.getEditPart("Class6", DNodeEditPart.class);
+        assertNotNull("No class has been created for this location", newClassBot);
+
+        Point absoluteNewClassBotLocation = editor.getAbsoluteLocation((IGraphicalEditPart) newClassBot.part()).getCopy();
+
+        assertEquals("Creation with contextual menu is not at the correct location", absoluteCreationLocation, absoluteNewClassBotLocation);
+    }
+
+    /**
      * Test that one EClass creation on the ContainerEditPart's view named 'A'
      * with scroll via the tool in the palette creates the View at the clicked
      * position.
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/clipboard/CustomClipboardSupportTest.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/clipboard/CustomClipboardSupportTest.java
index 5a0429f28c..0c25828d03 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/clipboard/CustomClipboardSupportTest.java
+++ b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/clipboard/CustomClipboardSupportTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010-2015 THALES GLOBAL SERVICES.
+ * Copyright (c) 2010, 2017 THALES GLOBAL SERVICES.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -59,6 +59,14 @@ public class CustomClipboardSupportTest extends AbstractClipboardSupportTest {
     }
 
     /**
+     * Test copy and paste for menu on Edit Part from a transient layer.
+     */
+    public void testCopyPasteFromEditMenuWithAlwaysPasteClassToolFromTransientLayer() {
+        editor2 = (SWTBotSiriusDiagramEditor) openRepresentation(localSession.getOpenedSession(), CUSTOM_DESCRIPTION, REPRESENTATION_WITH_CUSTOM_PASTE, DDiagram.class);
+        checkCopyPaste(editor2, editor2.getSelectableEditPart("pastable2_Class"), editor2, true, (SWTBotGefEditPart) null, "pasted_pastable2_Class", 1);
+    }
+
+    /**
      * Test copy and paste for menu on Edit Part without Clipboard.
      */
     public void testCopyPasteInClassFromEditMenuWithAlwaysPasteClassTool() {
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/clipboard/GenericClipboardSupportTest.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/clipboard/GenericClipboardSupportTest.java
index 0cbfcde954..001fdca44d 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/clipboard/GenericClipboardSupportTest.java
+++ b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/clipboard/GenericClipboardSupportTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010-2015 THALES GLOBAL SERVICES.
+ * Copyright (c) 2010, 2017 THALES GLOBAL SERVICES.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -275,7 +275,7 @@ public class GenericClipboardSupportTest extends AbstractClipboardSupportTest {
         listElementCopy.add(editor2.getEditPart("attributee2"));
         Map<String, Integer> pasteElements = new Hashtable<String, Integer>();
         pasteElements.put("attributee1", 2);
-        pasteElements.put("attributee2", 4);
+        pasteElements.put("attributee2", 5);
         checkCopyPaste(editor2, listElementCopy, editor2, true, editor2.getEditPart("pastable_Class", AbstractBorderedShapeEditPart.class), pasteElements);
     }
author	Laurent Redor	2017-11-08 13:25:39 +0000
committer	Laurent Redor	2017-11-16 09:40:47 +0000
commit	641c44b9275f78ce9ed31b72fabe0bdf44ff100e (patch)
tree	ed66808178881b8210bad53fca364561dab1b1dd
parent	e58a294cab81c59681037339d6d6f958e4d0653d (diff)
download	org.eclipse.sirius-641c44b9275f78ce9ed31b72fabe0bdf44ff100e.tar.gz org.eclipse.sirius-641c44b9275f78ce9ed31b72fabe0bdf44ff100e.tar.xz org.eclipse.sirius-641c44b9275f78ce9ed31b72fabe0bdf44ff100e.zip