[572828] Update participant to unset originalStyle featurev6.5.0rc1

Before this commit, only dangling originalStyle features were unset. Now
all originalStyle features are unset.

Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=572828
Change-Id: Ie9aa87ba47cd57d8a34511cda6897fee681995a9
Signed-off-by: Laurent Fasani <laurent.fasani@obeo.fr>

5 files changed, 160 insertions, 16 deletions

diff --git a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/migration/UnsetOriginalStyleFeatureMigrationParticipant.java b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/migration/UnsetOriginalStyleFeatureMigrationParticipant.java
index 017add79dd..8eed5c1ab5 100644
--- a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/migration/UnsetOriginalStyleFeatureMigrationParticipant.java
+++ b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/migration/UnsetOriginalStyleFeatureMigrationParticipant.java
@@ -25,9 +25,17 @@ import org.eclipse.emf.ecore.resource.Resource.Diagnostic;
 import org.eclipse.emf.ecore.xmi.UnresolvedReferenceException;
 import org.eclipse.emf.ecore.xmi.XMLResource;
 import org.eclipse.sirius.business.api.migration.AbstractRepresentationsFileMigrationParticipant;
+import org.eclipse.sirius.business.api.query.DViewQuery;
+import org.eclipse.sirius.diagram.DDiagram;
+import org.eclipse.sirius.diagram.DDiagramElementContainer;
+import org.eclipse.sirius.diagram.DEdge;
+import org.eclipse.sirius.diagram.DNode;
+import org.eclipse.sirius.diagram.DNodeListElement;
 import org.eclipse.sirius.diagram.DiagramPackage;
 import org.eclipse.sirius.diagram.DiagramPlugin;
 import org.eclipse.sirius.diagram.Messages;
+import org.eclipse.sirius.diagram.business.api.query.DDiagramQuery;
+import org.eclipse.sirius.viewpoint.DAnalysis;
 import org.osgi.framework.Version;
 
 /**
@@ -66,6 +74,37 @@ public class UnsetOriginalStyleFeatureMigrationParticipant extends AbstractRepre
         return super.getValue(object, feature, value, loadedVersion);
     }
 
+    /**
+     * This method is overridden to unset originalStyle features.<br/>
+     * It is not sufficient to implement {@code getValue(EObject , EStructuralFeature , Object , String )} method for
+     * not dangling features.
+     * 
+     * @see org.eclipse.sirius.business.api.migration.AbstractRepresentationsFileMigrationParticipant#postLoad(org.eclipse.sirius.viewpoint.DAnalysis,
+     *      org.osgi.framework.Version)
+     */
+    @Override
+    protected void postLoad(DAnalysis dAnalysis, Version loadedVersion) {
+        if (loadedVersion.compareTo(MIGRATION_VERSION) < 0) {
+            //@formatter:off 
+            dAnalysis.getOwnedViews().stream()
+                .flatMap(dView -> new DViewQuery(dView).getLoadedRepresentations().stream())
+                .filter(DDiagram.class::isInstance)
+                .flatMap(diagram -> new DDiagramQuery((DDiagram) diagram).getAllDiagramElements().stream())
+                .forEach(diagElement -> {
+                    if (diagElement instanceof DNode) {
+                        ((DNode) diagElement).setOriginalStyle(null);
+                    } else if (diagElement instanceof DEdge) {
+                        ((DEdge) diagElement).setOriginalStyle(null);
+                    } else if (diagElement instanceof DDiagramElementContainer) {
+                        ((DDiagramElementContainer) diagElement).setOriginalStyle(null);
+                    } else if (diagElement instanceof DNodeListElement) {
+                        ((DNodeListElement) diagElement).setOriginalStyle(null);
+                    }
+                });
+            //@formatter:on
+        }
+    }
+
     @Override
     public void postLoad(XMLResource resource, String loadedVersion) {
         Iterator<Diagnostic> iterator = resource.getErrors().iterator();
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/migration/do_not_migrate/originalStyle/originalStyleTest.aird b/plugins/org.eclipse.sirius.tests.junit/data/unit/migration/do_not_migrate/originalStyle/originalStyleTest.aird
index f0f37fbf8c..e73e0131cd 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/migration/do_not_migrate/originalStyle/originalStyleTest.aird
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/migration/do_not_migrate/originalStyle/originalStyleTest.aird
@@ -4,7 +4,7 @@
     <semanticResources>originalStyleTest.ecore</semanticResources>
     <ownedViews xmi:type="viewpoint:DView" uid="_mTUXAJ0rEeugL65UAh4HhA">
       <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" uid="_maNpMJ0rEeugL65UAh4HhA" name=" package entities" repPath="#_mZt58J0rEeugL65UAh4HhA" changeId="27d61ef1-df72-4b02-b106-73660552111e">
+      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_maNpMJ0rEeugL65UAh4HhA" name=" package entities" repPath="#_mZt58J0rEeugL65UAh4HhA" changeId="861733d3-7cf0-4d1b-aee0-4a7a44586886">
         <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="originalStyleTest.ecore#/"/>
       </ownedRepresentationDescriptors>
@@ -27,7 +27,7 @@
                 <styles xmi:type="notation:FilteringStyle" xmi:id="_pXc2Yp0rEeugL65UAh4HhA"/>
               </children>
               <styles xmi:type="notation:ShapeStyle" xmi:id="_pXbBMZ0rEeugL65UAh4HhA" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pXbBMp0rEeugL65UAh4HhA" x="50" y="49"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pXbBMp0rEeugL65UAh4HhA" x="195" y="26"/>
             </children>
             <children xmi:type="notation:Node" xmi:id="_qrLvIZ0rEeugL65UAh4HhA" type="3009" element="_qrIEwJ0rEeugL65UAh4HhA">
               <children xmi:type="notation:Node" xmi:id="_qrLvJJ0rEeugL65UAh4HhA" type="5004"/>
@@ -36,30 +36,77 @@
                 <styles xmi:type="notation:FilteringStyle" xmi:id="_qrLvJ50rEeugL65UAh4HhA"/>
               </children>
               <styles xmi:type="notation:ShapeStyle" xmi:id="_qrLvIp0rEeugL65UAh4HhA" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qrLvI50rEeugL65UAh4HhA" x="240" y="54"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qrLvI50rEeugL65UAh4HhA" x="5" y="29"/>
             </children>
             <styles xmi:type="notation:SortingStyle" xmi:id="_pGiFgZ0rEeugL65UAh4HhA"/>
             <styles xmi:type="notation:FilteringStyle" xmi:id="_pGiFgp0rEeugL65UAh4HhA"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_pGawwZ0rEeugL65UAh4HhA" fontName="Segoe UI" fontHeight="10"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pGawwp0rEeugL65UAh4HhA" x="120" y="120" width="441" height="211"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pGawwp0rEeugL65UAh4HhA" x="160" y="110" width="441" height="211"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_infbgKddEeupuKtKIEaEbg" type="2002" element="_x4syAKcsEeumkdQGTN9vLA">
+          <children xmi:type="notation:Node" xmi:id="_infbg6ddEeupuKtKIEaEbg" type="5006"/>
+          <children xmi:type="notation:Node" xmi:id="_infbhKddEeupuKtKIEaEbg" type="7001">
+            <children xmi:type="notation:Node" xmi:id="_ingpoKddEeupuKtKIEaEbg" type="3009" element="_20QGAKcsEeumkdQGTN9vLA">
+              <children xmi:type="notation:Node" xmi:id="_ingpo6ddEeupuKtKIEaEbg" type="5004"/>
+              <children xmi:type="notation:Node" xmi:id="_ingppKddEeupuKtKIEaEbg" type="7003">
+                <styles xmi:type="notation:SortingStyle" xmi:id="_ingppaddEeupuKtKIEaEbg"/>
+                <styles xmi:type="notation:FilteringStyle" xmi:id="_ingppqddEeupuKtKIEaEbg"/>
+              </children>
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_ingpoaddEeupuKtKIEaEbg" fontName="Segoe UI" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ingpoqddEeupuKtKIEaEbg" x="165" y="20"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_7W0NQKdjEeuuKKqQHOHgDQ" type="3009" element="_7VglsKdjEeuuKKqQHOHgDQ">
+              <children xmi:type="notation:Node" xmi:id="_7W9-QKdjEeuuKKqQHOHgDQ" type="5004"/>
+              <children xmi:type="notation:Node" xmi:id="_7W_zcKdjEeuuKKqQHOHgDQ" type="7003">
+                <children xmi:type="notation:Node" xmi:id="_AC1QcKdkEeuuKKqQHOHgDQ" type="3010" element="_AChHYKdkEeuuKKqQHOHgDQ">
+                  <styles xmi:type="notation:FontStyle" xmi:id="_AC1QcadkEeuuKKqQHOHgDQ" fontName="Segoe UI" fontHeight="8"/>
+                  <layoutConstraint xmi:type="notation:Location" xmi:id="_AC1QcqdkEeuuKKqQHOHgDQ"/>
+                </children>
+                <styles xmi:type="notation:SortingStyle" xmi:id="_7W_zcadjEeuuKKqQHOHgDQ"/>
+                <styles xmi:type="notation:FilteringStyle" xmi:id="_7W_zcqdjEeuuKKqQHOHgDQ"/>
+              </children>
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_7W0NQadjEeuuKKqQHOHgDQ" fontName="Segoe UI" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7W0NQqdjEeuuKKqQHOHgDQ" x="20" y="20"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_infbhaddEeupuKtKIEaEbg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_infbhqddEeupuKtKIEaEbg"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_infbgaddEeupuKtKIEaEbg" fontName="Segoe UI" fontHeight="10"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_infbgqddEeupuKtKIEaEbg" x="625" y="110" width="263" height="108"/>
         </children>
         <styles xmi:type="notation:DiagramStyle" xmi:id="_mamDsp0rEeugL65UAh4HhA"/>
         <edges xmi:type="notation:Edge" xmi:id="_thCh8J0rEeugL65UAh4HhA" type="4001" element="_tgZowJ0rEeugL65UAh4HhA" source="_pXbBMJ0rEeugL65UAh4HhA" target="_qrLvIZ0rEeugL65UAh4HhA">
           <children xmi:type="notation:Node" xmi:id="_thEXIJ0rEeugL65UAh4HhA" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_thEXIZ0rEeugL65UAh4HhA" x="13" y="16"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_thEXIZ0rEeugL65UAh4HhA" y="10"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_thFlQJ0rEeugL65UAh4HhA" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_thFlQZ0rEeugL65UAh4HhA" x="2" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_thFlQZ0rEeugL65UAh4HhA" y="-10"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_thGzYJ0rEeugL65UAh4HhA" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_thGzYZ0rEeugL65UAh4HhA" x="-2" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_thGzYZ0rEeugL65UAh4HhA" y="-10"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_thCh8Z0rEeugL65UAh4HhA" routing="Rectilinear"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_thCh8p0rEeugL65UAh4HhA" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_thCh850rEeugL65UAh4HhA" points="[0, 10, -93, 0]$[93, 10, 0, 0]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_thJ2sJ0rEeugL65UAh4HhA" id="(1.0,0.1111111111111111)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_thJ2sZ0rEeugL65UAh4HhA" id="(0.0,0.2564102564102564)"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_thCh850rEeugL65UAh4HhA" points="[-45, 22, 151, -20]$[-158, 22, 38, -20]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_thJ2sJ0rEeugL65UAh4HhA" id="(0.5056179775280899,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_thJ2sZ0rEeugL65UAh4HhA" id="(0.5064935064935064,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_8DPOYKdjEeuuKKqQHOHgDQ" type="4001" element="_8C2M0KdjEeuuKKqQHOHgDQ" source="_7W0NQKdjEeuuKKqQHOHgDQ" target="_ingpoKddEeupuKtKIEaEbg">
+          <children xmi:type="notation:Node" xmi:id="_8DRqoKdjEeuuKKqQHOHgDQ" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8DRqoadjEeuuKKqQHOHgDQ" x="-28" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_8DS4wKdjEeuuKKqQHOHgDQ" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8DS4wadjEeuuKKqQHOHgDQ" x="-8" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_8DUG4KdjEeuuKKqQHOHgDQ" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8DUG4adjEeuuKKqQHOHgDQ" x="-47" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_8DPOYadjEeuuKKqQHOHgDQ" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_8DPOYqdjEeuuKKqQHOHgDQ" fontName="Segoe UI" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_8DPOY6djEeuuKKqQHOHgDQ" points="[0, -2, -56, 0]$[56, -2, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8DY_YKdjEeuuKKqQHOHgDQ" id="(1.0,0.48717948717948717)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8DZmcKdjEeuuKKqQHOHgDQ" id="(0.0,0.48717948717948717)"/>
         </edges>
       </data>
     </ownedAnnotationEntries>
@@ -69,6 +116,9 @@
     <ownedDiagramElements xmi:type="diagram:DNodeContainer" uid="_pF5zYJ0rEeugL65UAh4HhA" name="newPackage1" originalStyle="_UnknownStyleId">
       <target xmi:type="ecore:EPackage" href="originalStyleTest.ecore#//newPackage1"/>
       <semanticElements xmi:type="ecore:EPackage" href="originalStyleTest.ecore#//newPackage1"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
       <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_pGBvMJ0rEeugL65UAh4HhA" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom" backgroundColor="255,245,181" foregroundColor="255,255,255">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@containerMappings[name='Design%20Package']/@style"/>
       </ownedStyle>
@@ -76,6 +126,9 @@
       <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_pXIGQJ0rEeugL65UAh4HhA" name="NewEClass1" tooltipText="newPackage1.NewEClass1" outgoingEdges="_tgZowJ0rEeugL65UAh4HhA">
         <target xmi:type="ecore:EClass" href="originalStyleTest.ecore#//newPackage1/NewEClass1"/>
         <semanticElements xmi:type="ecore:EClass" href="originalStyleTest.ecore#//newPackage1/NewEClass1"/>
+        <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+        <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+        <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
         <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_pXVhoJ0rEeugL65UAh4HhA" 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>
@@ -107,6 +160,53 @@
       </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:DNodeContainer" uid="_x4syAKcsEeumkdQGTN9vLA" name="newPackage2" originalStyle="_x4uAIKcsEeumkdQGTN9vLA">
+      <target xmi:type="ecore:EPackage" href="originalStyleTest.ecore#//newPackage2"/>
+      <semanticElements xmi:type="ecore:EPackage" href="originalStyleTest.ecore#//newPackage2"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_x4uAIKcsEeumkdQGTN9vLA" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom" backgroundColor="255,245,181" foregroundColor="255,255,255">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@containerMappings[name='Design%20Package']/@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']/@additionalLayers[name='Package']/@containerMappings[name='Design%20Package']"/>
+      <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_20QGAKcsEeumkdQGTN9vLA" name="NewEClass1" tooltipText="newPackage2.NewEClass1" originalStyle="_20hy0KcsEeumkdQGTN9vLA">
+        <target xmi:type="ecore:EClass" href="originalStyleTest.ecore#//newPackage2/NewEClass1"/>
+        <semanticElements xmi:type="ecore:EClass" href="originalStyleTest.ecore#//newPackage2/NewEClass1"/>
+        <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+        <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+        <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_20hy0KcsEeumkdQGTN9vLA" 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']"/>
+      </ownedDiagramElements>
+      <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_7VglsKdjEeuuKKqQHOHgDQ" name="NewEClass2" tooltipText="newPackage2.NewEClass2" outgoingEdges="_8C2M0KdjEeuuKKqQHOHgDQ">
+        <target xmi:type="ecore:EClass" href="originalStyleTest.ecore#//newPackage2/NewEClass2"/>
+        <semanticElements xmi:type="ecore:EClass" href="originalStyleTest.ecore#//newPackage2/NewEClass2"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_7V94sKdjEeuuKKqQHOHgDQ" 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" uid="_AChHYKdkEeuuKKqQHOHgDQ" name="newAttribute" originalStyle="_ACmm8KdkEeuuKKqQHOHgDQ">
+          <target xmi:type="ecore:EAttribute" href="originalStyleTest.ecore#//newPackage2/NewEClass2/newAttribute"/>
+          <semanticElements xmi:type="ecore:EAttribute" href="originalStyleTest.ecore#//newPackage2/NewEClass2/newAttribute"/>
+          <ownedStyle xmi:type="diagram:BundledImage" uid="_ACmm8KdkEeuuKKqQHOHgDQ" 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: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>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_8C2M0KdjEeuuKKqQHOHgDQ" name="[0..1] newEReference1" sourceNode="_7VglsKdjEeuuKKqQHOHgDQ" targetNode="_20QGAKcsEeumkdQGTN9vLA" originalStyle="_8C4CAKdjEeuuKKqQHOHgDQ">
+      <target xmi:type="ecore:EReference" href="originalStyleTest.ecore#//newPackage2/NewEClass2/newEReference1"/>
+      <semanticElements xmi:type="ecore:EReference" href="originalStyleTest.ecore#//newPackage2/NewEClass2/newEReference1"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_8C4CAKdjEeuuKKqQHOHgDQ">
+        <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" uid="_8C4CAadjEeuuKKqQHOHgDQ" 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>
     <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" uid="_maBb8J0rEeugL65UAh4HhA"/>
     <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"/>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/migration/do_not_migrate/originalStyle/originalStyleTest.ecore b/plugins/org.eclipse.sirius.tests.junit/data/unit/migration/do_not_migrate/originalStyle/originalStyleTest.ecore
index e9c29d7856..0c9bd5e3c0 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/migration/do_not_migrate/originalStyle/originalStyleTest.ecore
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/migration/do_not_migrate/originalStyle/originalStyleTest.ecore
@@ -8,4 +8,7 @@
     </eClassifiers>
     <eClassifiers xsi:type="ecore:EClass" name="NewEClass2"/>
   </eSubpackages>
+  <eSubpackages name="newPackage2">
+    <eClassifiers xsi:type="ecore:EClass" name="NewEClass1"/>
+  </eSubpackages>
 </ecore:EPackage>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/representation/invalid/split/Entities__U3uZsPSPEeiJ46Q2guFOWw.srm b/plugins/org.eclipse.sirius.tests.junit/data/unit/representation/invalid/split/Entities__U3uZsPSPEeiJ46Q2guFOWw.srm
index 8c0c2b26cb..563e161aea 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/representation/invalid/split/Entities__U3uZsPSPEeiJ46Q2guFOWw.srm
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/representation/invalid/split/Entities__U3uZsPSPEeiJ46Q2guFOWw.srm
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<diagram:DSemanticDiagram 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" xsi:schemaLocation="http://www.eclipse.org/sirius/description/1.1.0 http://www.eclipse.org/sirius/1.1.0#//description http://www.eclipse.org/sirius/diagram/description/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description http://www.eclipse.org/sirius/diagram/description/style/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description/style" xmi:id="_U6idIPSPEeiJ46Q2guFOWw" uid="_U3uZsPSPEeiJ46Q2guFOWw" name="P0 package entities Correct">
+<diagram:DSemanticDiagram 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.3/notation" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xsi:schemaLocation="http://www.eclipse.org/sirius/description/1.1.0 http://www.eclipse.org/sirius/1.1.0#//description http://www.eclipse.org/sirius/diagram/description/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description http://www.eclipse.org/sirius/diagram/description/style/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description/style" xmi:id="_U6idIPSPEeiJ46Q2guFOWw" uid="_U3uZsPSPEeiJ46Q2guFOWw">
   <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_U6idIfSPEeiJ46Q2guFOWw" uid="_U6h2EPSPEeiJ46Q2guFOWw" source="DANNOTATION_CUSTOMIZATION_KEY">
     <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_U6idIvSPEeiJ46Q2guFOWw" uid="_U6h2EfSPEeiJ46Q2guFOWw"/>
   </ownedAnnotationEntries>
@@ -12,7 +12,7 @@
           <styles xmi:type="notation:FilteringStyle" xmi:id="_U6mHgvSPEeiJ46Q2guFOWw"/>
         </children>
         <styles xmi:type="notation:ShapeStyle" xmi:id="_U6jrQfSPEeiJ46Q2guFOWw" fontName="Segoe UI" fontHeight="8"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_U6jrQvSPEeiJ46Q2guFOWw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_U6jrQvSPEeiJ46Q2guFOWw" x="5" y="-5"/>
       </children>
       <styles xmi:type="notation:DiagramStyle" xmi:id="_U6jEM_SPEeiJ46Q2guFOWw"/>
     </data>
@@ -20,6 +20,9 @@
   <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_U6idJPSPEeiJ46Q2guFOWw" uid="_U5zdUPSPEeiJ46Q2guFOWw" name="NewEClass1" tooltipText="P0.NewEClass1">
     <target xmi:type="ecore:EClass" href="My.ecore#//NewEClass1"/>
     <semanticElements xmi:type="ecore:EClass" href="My.ecore#//NewEClass1"/>
+    <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+    <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+    <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
     <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_U6idJfSPEeiJ46Q2guFOWw" uid="_U6ARoPSPEeiJ46Q2guFOWw" 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>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/representation/invalid/split/representations.aird b/plugins/org.eclipse.sirius.tests.junit/data/unit/representation/invalid/split/representations.aird
index 5ad8b1c518..676f27964d 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/representation/invalid/split/representations.aird
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/representation/invalid/split/representations.aird
@@ -1,9 +1,9 @@
 <?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:ecore="http://www.eclipse.org/emf/2002/Ecore" 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" uid="_P5RisPSPEeiJ46Q2guFOWw" selectedViews="_Uyq6kPSPEeiJ46Q2guFOWw" version="14.1.0.201810161215">
+<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:ecore="http://www.eclipse.org/emf/2002/Ecore" 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" uid="_P5RisPSPEeiJ46Q2guFOWw" selectedViews="_Uyq6kPSPEeiJ46Q2guFOWw" version="14.5.0.202104161500">
   <semanticResources>My.ecore</semanticResources>
   <ownedViews xmi:type="viewpoint:DView" uid="_Uyq6kPSPEeiJ46Q2guFOWw">
     <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" uid="_U6idJ_SPEeiJ46Q2guFOWw" name="P0 package entities Correct" repPath="Entities__U3uZsPSPEeiJ46Q2guFOWw.srm#_U3uZsPSPEeiJ46Q2guFOWw">
+    <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_U6idJ_SPEeiJ46Q2guFOWw" name="P0 package entities Correct" repPath="Entities__U3uZsPSPEeiJ46Q2guFOWw.srm#_U3uZsPSPEeiJ46Q2guFOWw" changeId="efd28496-f3c5-44fc-9fff-e8105e21628b">
       <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="My.ecore#/"/>
     </ownedRepresentationDescriptors>
@@ -23,9 +23,8 @@
       <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="My.ecore#/"/>
     </ownedRepresentationDescriptors>
-    <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_wR-vcfSPEeiJ46Q2guFOWw" name="newPackage1 package entities with NULL target" repPath="Entities__wR-IUPSPEeiJ46Q2guFOWw.srm#_wR-IUPSPEeiJ46Q2guFOWw">
+    <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_wR-vcfSPEeiJ46Q2guFOWw" name="newPackage1 package entities with NULL target" repPath="Entities__wR-IUPSPEeiJ46Q2guFOWw.srm#_wR-IUPSPEeiJ46Q2guFOWw" changeId="794f8997-f7b7-4360-a603-5bf15ea6517d">
       <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"/>
     </ownedRepresentationDescriptors>
   </ownedViews>
 </viewpoint:DAnalysis>