diff options
| author | Laurent Redor | 2021-02-19 09:12:12 +0000 |
|---|---|---|
| committer | Laurent Redor | 2021-02-19 11:53:08 +0000 |
| commit | e3e28b46d18eb1d30b4ac01c50b4a5c374b9eb77 (patch) | |
| tree | 4c5a3678758b1c49540f0aa9cb165331163732b7 | |
| parent | 0e4b2362e18f6729ad676ec1e1ad6d7ffeea6bd9 (diff) | |
| download | org.eclipse.sirius-e3e28b46d18eb1d30b4ac01c50b4a5c374b9eb77.tar.gz org.eclipse.sirius-e3e28b46d18eb1d30b4ac01c50b4a5c374b9eb77.tar.xz org.eclipse.sirius-e3e28b46d18eb1d30b4ac01c50b4a5c374b9eb77.zip | |
[571249] Add corresponding tests
The representation ""DiagType2 with notes of MyPackage"" has been
updated and is now used in
org.eclipse.sirius.tests.unit.diagram.format.data.MappingBasedSiriusFormatDataManagerExistingTargetDiagramTest.
For example:
* a Text with same label as a existing Note has been added.
* several Notes have now the same label
The MappingBasedSiriusFormatDataManagerExistingTargetDiagramTest has
also been updated to add specific checks concerning Notes and Texts.
Bug: 571249
Change-Id: I40c1840bbd44c060739bed9d4f0ad3ae24719ac7
Signed-off-by: Laurent Redor <laurent.redor@obeo.fr>
33 files changed, 2656 insertions, 521 deletions
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.aird b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.aird index 7ebc8938cf..47322b5583 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.aird +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.aird @@ -88,7 +88,7 @@ <description xmi:type="description_1:DiagramDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_unsync_edge']"/> <target xmi:type="ecore:EPackage" href="My.ecore#/"/> </ownedRepresentationDescriptors> - <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_m33CsNMxEeqvXqHJhM0T5Q" name="DiagType2 with notes of MyPackage" repPath="#_m3wVANMxEeqvXqHJhM0T5Q" changeId="41e1a13d-5676-4be7-bff4-49a261a38873"> + <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_m33CsNMxEeqvXqHJhM0T5Q" name="DiagType2 with notes of MyPackage" repPath="#_m3wVANMxEeqvXqHJhM0T5Q" changeId="4b050bfa-f980-4376-a73c-280dbb42e819"> <description xmi:type="description_1:DiagramDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']"/> <target xmi:type="ecore:EPackage" href="My.ecore#/"/> </ownedRepresentationDescriptors> @@ -116,6 +116,10 @@ <description xmi:type="description_1:DiagramDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8_unsync_onlyBN']"/> <target xmi:type="ecore:EPackage" href="MyTarget.ecore#/"/> </ownedRepresentationDescriptors> + <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_oobVQHKOEeu5xZikdim1pw" name="DiagType2 Raw of targetMyPackage" repPath="#_ooRkQHKOEeu5xZikdim1pw" changeId="b9c9e584-5b56-4619-b824-feb8ca16c7b2"> + <description xmi:type="description_1:DiagramDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']"/> + <target xmi:type="ecore:EPackage" href="MyTarget.ecore#/"/> + </ownedRepresentationDescriptors> </ownedViews> </viewpoint:DAnalysis> <diagram:DSemanticDiagram uid="_5zhU8M4UEd6bS_KBCUv05A"> @@ -5039,7 +5043,7 @@ <styles xmi:type="notation:FilteringStyle" xmi:id="_m31NiNMxEeqvXqHJhM0T5Q"/> </children> <styles xmi:type="notation:ShapeStyle" xmi:id="_m31NidMxEeqvXqHJhM0T5Q" fontName="Sans" fontHeight="8"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_m31NitMxEeqvXqHJhM0T5Q" x="485" y="101" width="96" height="42"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_m31NitMxEeqvXqHJhM0T5Q" x="485" y="101" width="134" height="42"/> </children> <children xmi:type="notation:Node" xmi:id="_m31Ni9MxEeqvXqHJhM0T5Q" type="3009" element="_m3xjJtMxEeqvXqHJhM0T5Q"> <children xmi:type="notation:Node" xmi:id="_m31NjNMxEeqvXqHJhM0T5Q" type="5004"/> @@ -5048,7 +5052,7 @@ <styles xmi:type="notation:FilteringStyle" xmi:id="_m31Nj9MxEeqvXqHJhM0T5Q"/> </children> <styles xmi:type="notation:ShapeStyle" xmi:id="_m31NkNMxEeqvXqHJhM0T5Q" fontName="Sans" fontHeight="8"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_m31NkdMxEeqvXqHJhM0T5Q" x="495" y="6" width="89" height="38"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_m31NkdMxEeqvXqHJhM0T5Q" x="495" y="6" width="115" height="38"/> </children> <children xmi:type="notation:Node" xmi:id="_m31NktMxEeqvXqHJhM0T5Q" type="3009" element="_m3xjKNMxEeqvXqHJhM0T5Q"> <children xmi:type="notation:Node" xmi:id="_m31Nk9MxEeqvXqHJhM0T5Q" type="5004"/> @@ -5061,7 +5065,7 @@ <styles xmi:type="notation:FilteringStyle" xmi:id="_m31NmdMxEeqvXqHJhM0T5Q"/> </children> <styles xmi:type="notation:ShapeStyle" xmi:id="_m31NmtMxEeqvXqHJhM0T5Q" fontName="Sans" fontHeight="8"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_m31Nm9MxEeqvXqHJhM0T5Q" y="12" width="111" height="63"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_m31Nm9MxEeqvXqHJhM0T5Q" y="12" width="141" height="63"/> </children> <children xmi:type="notation:Node" xmi:id="_m31NnNMxEeqvXqHJhM0T5Q" type="3008" element="_m3xjLNMxEeqvXqHJhM0T5Q"> <children xmi:type="notation:Node" xmi:id="_m31NndMxEeqvXqHJhM0T5Q" type="5005"/> @@ -5077,7 +5081,7 @@ <styles xmi:type="notation:FilteringStyle" xmi:id="_m31NptMxEeqvXqHJhM0T5Q"/> </children> <styles xmi:type="notation:ShapeStyle" xmi:id="_m31Np9MxEeqvXqHJhM0T5Q" fontName="Sans" fontHeight="8"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_m31NqNMxEeqvXqHJhM0T5Q" x="60" y="60" width="74" height="47"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_m31NqNMxEeqvXqHJhM0T5Q" x="8" y="60" width="126" height="47"/> </children> <children xmi:type="notation:Node" xmi:id="_m31NqdMxEeqvXqHJhM0T5Q" type="3009" element="_m3xjMtMxEeqvXqHJhM0T5Q"> <children xmi:type="notation:Node" xmi:id="_m31NqtMxEeqvXqHJhM0T5Q" type="5004"/> @@ -5086,7 +5090,7 @@ <styles xmi:type="notation:FilteringStyle" xmi:id="_m31NrdMxEeqvXqHJhM0T5Q"/> </children> <styles xmi:type="notation:ShapeStyle" xmi:id="_m31NrtMxEeqvXqHJhM0T5Q" fontName="Sans" fontHeight="8"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_m31Nr9MxEeqvXqHJhM0T5Q" x="203" y="324" width="58" height="40"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_m31Nr9MxEeqvXqHJhM0T5Q" x="104" y="324" width="157" height="40"/> </children> <styles xmi:type="notation:SortingStyle" xmi:id="_m31NsNMxEeqvXqHJhM0T5Q"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_m31NsdMxEeqvXqHJhM0T5Q"/> @@ -5104,7 +5108,7 @@ <styles xmi:type="notation:FilteringStyle" xmi:id="_m31Nu9MxEeqvXqHJhM0T5Q"/> </children> <styles xmi:type="notation:ShapeStyle" xmi:id="_m31NvNMxEeqvXqHJhM0T5Q" fontName="Sans" fontHeight="8"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_m31NvdMxEeqvXqHJhM0T5Q" x="190" y="72" width="58" height="40"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_m31NvdMxEeqvXqHJhM0T5Q" x="64" y="72" width="184" height="40"/> </children> <styles xmi:type="notation:SortingStyle" xmi:id="_m31NvtMxEeqvXqHJhM0T5Q"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_m31Nv9MxEeqvXqHJhM0T5Q"/> @@ -5175,7 +5179,7 @@ <styles xmi:type="notation:FilteringStyle" xmi:id="_m31N3tMxEeqvXqHJhM0T5Q"/> </children> <styles xmi:type="notation:ShapeStyle" xmi:id="_m31N39MxEeqvXqHJhM0T5Q" fontName="Sans" fontHeight="10"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_m31N4NMxEeqvXqHJhM0T5Q" x="15" y="23" width="178" height="77"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_m31N4NMxEeqvXqHJhM0T5Q" x="15" y="23" width="206" height="77"/> </children> <children xmi:type="notation:Node" xmi:id="_m31N4dMxEeqvXqHJhM0T5Q" type="3008" element="_m3xjQtMxEeqvXqHJhM0T5Q"> <children xmi:type="notation:Node" xmi:id="_m31N4tMxEeqvXqHJhM0T5Q" type="5005"/> @@ -5199,7 +5203,7 @@ <styles xmi:type="notation:FilteringStyle" xmi:id="_m31N8NMxEeqvXqHJhM0T5Q"/> </children> <styles xmi:type="notation:ShapeStyle" xmi:id="_m31N8dMxEeqvXqHJhM0T5Q" fontName="Sans" fontHeight="10"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_m31N8tMxEeqvXqHJhM0T5Q" x="30" y="400" width="150" height="70"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_m31N8tMxEeqvXqHJhM0T5Q" x="27" y="456" width="171" height="70"/> </children> <children xmi:type="notation:Node" xmi:id="_m31N89MxEeqvXqHJhM0T5Q" type="2002" element="_m3xjRtMxEeqvXqHJhM0T5Q"> <children xmi:type="notation:Node" xmi:id="_m31N9NMxEeqvXqHJhM0T5Q" type="5006"/> @@ -5208,7 +5212,7 @@ <styles xmi:type="notation:FilteringStyle" xmi:id="_m31N99MxEeqvXqHJhM0T5Q"/> </children> <styles xmi:type="notation:ShapeStyle" xmi:id="_m31N-NMxEeqvXqHJhM0T5Q" fontName="Sans" fontHeight="10"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_m31N-dMxEeqvXqHJhM0T5Q" x="1644" y="30" width="150" height="70"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_m31N-dMxEeqvXqHJhM0T5Q" x="997" y="72" width="196" height="92"/> </children> <children xmi:type="notation:Shape" xmi:id="_oNsNMNMxEeqvXqHJhM0T5Q" type="Note" fontColor="10265827" fontName="Segoe UI" description="Nice" fillColor="13369343" transparency="0" lineColor="6737151" lineWidth="1"> <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_oNsNMdMxEeqvXqHJhM0T5Q" source="specificStyles"> @@ -5255,6 +5259,31 @@ <element xsi:nil="true"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pGh5tdMxEeqvXqHJhM0T5Q" x="270" y="410" width="271" height="96"/> </children> + <children xmi:type="notation:Shape" xmi:id="_dZy5oHKOEeu5xZikdim1pw" type="Note" fontName="Segoe UI" description="Nice" fillColor="15053796" transparency="0" lineColor="6737151" lineWidth="1"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_dZy5oXKOEeu5xZikdim1pw" source="specificStyles"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_dZy5onKOEeu5xZikdim1pw" key="verticalAlignment" value="8"/> + </eAnnotations> + <children xmi:type="notation:BasicDecorationNode" xmi:id="_dZ0HwHKOEeu5xZikdim1pw" type="DiagramName"> + <element xsi:nil="true"/> + </children> + <children xmi:type="notation:BasicDecorationNode" xmi:id="_dZ0HwXKOEeu5xZikdim1pw" type="Description"> + <element xsi:nil="true"/> + </children> + <styles xmi:type="notation:TextStyle" xmi:id="_dZy5o3KOEeu5xZikdim1pw" textAlignment="Center"/> + <styles xmi:type="notation:LineTypeStyle" xmi:id="_dZy5pHKOEeu5xZikdim1pw"/> + <element xsi:nil="true"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dZy5pXKOEeu5xZikdim1pw" x="811" y="362" width="124" height="120"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_ufQOoHKiEeuK-9B8t7T2zQ" type="Text" fontColor="10265827" fontName="Segoe UI" description="Nicer"> + <children xmi:type="notation:BasicDecorationNode" xmi:id="_ufQ1sHKiEeuK-9B8t7T2zQ" type="DiagramName"> + <element xsi:nil="true"/> + </children> + <children xmi:type="notation:BasicDecorationNode" xmi:id="_ufSD0HKiEeuK-9B8t7T2zQ" type="Description"> + <element xsi:nil="true"/> + </children> + <element xsi:nil="true"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ufQOoXKiEeuK-9B8t7T2zQ" x="801" y="224" width="114" height="106"/> + </children> <styles xmi:type="notation:DiagramStyle" xmi:id="_m31N-tMxEeqvXqHJhM0T5Q"/> <edges xmi:type="notation:Edge" xmi:id="_m31N-9MxEeqvXqHJhM0T5Q" type="4001" element="_m3xjSNMxEeqvXqHJhM0T5Q" source="_m31NhNMxEeqvXqHJhM0T5Q" target="_m31Ni9MxEeqvXqHJhM0T5Q"> <children xmi:type="notation:Node" xmi:id="_m31N_NMxEeqvXqHJhM0T5Q" type="6001"> @@ -5269,8 +5298,8 @@ <styles xmi:type="notation:ConnectorStyle" xmi:id="_m31OAtMxEeqvXqHJhM0T5Q"/> <styles xmi:type="notation:FontStyle" xmi:id="_m31OA9MxEeqvXqHJhM0T5Q" fontName="Sans" fontHeight="8"/> <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_m31OBNMxEeqvXqHJhM0T5Q" points="[68, 33, -269, -37]$[168, 160, 1, 170]$[266, -19, 154, 21]$[65, -59, -17, -9]"/> - <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_m31OBdMxEeqvXqHJhM0T5Q" id="(0.41666666,0.057142857)"/> - <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_m31OBtMxEeqvXqHJhM0T5Q" id="(0.57894737,0.94285715)"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_m31OBdMxEeqvXqHJhM0T5Q" id="(0.29671716696969697,0.057142857000000005)"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_m31OBtMxEeqvXqHJhM0T5Q" id="(0.44573824061946904,0.94285715)"/> </edges> <edges xmi:type="notation:Edge" xmi:id="_m31OB9MxEeqvXqHJhM0T5Q" type="4001" element="_m3yKMNMxEeqvXqHJhM0T5Q" source="_m31NhNMxEeqvXqHJhM0T5Q" target="_m31Nn9MxEeqvXqHJhM0T5Q"> <children xmi:type="notation:Node" xmi:id="_m31OCNMxEeqvXqHJhM0T5Q" type="6001"> @@ -5286,7 +5315,7 @@ <styles xmi:type="notation:FontStyle" xmi:id="_m31OD9MxEeqvXqHJhM0T5Q" fontName="Sans" fontHeight="8"/> <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_m31OENMxEeqvXqHJhM0T5Q" points="[5, 6, 220, 16]$[-124, 18, 101, 40]$[-229, -28, -2, -2]"/> <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_m31OEdMxEeqvXqHJhM0T5Q" id="(0.0,0.0)"/> - <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_m31OEtMxEeqvXqHJhM0T5Q" id="(0.0,0.0)"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_m31OEtMxEeqvXqHJhM0T5Q" id="(0.41935483870967744,0.0)"/> </edges> <edges xmi:type="notation:Connector" xmi:id="_t68q8NMxEeqvXqHJhM0T5Q" type="NoteAttachment" source="_pGh5sNMxEeqvXqHJhM0T5Q" target="_m31N09MxEeqvXqHJhM0T5Q" lineWidth="1"> <styles xmi:type="notation:ArrowStyle" xmi:id="_t68q8dMxEeqvXqHJhM0T5Q"/> @@ -7805,4 +7834,544 @@ <activatedLayers xmi:type="description_1:Layer" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8_unsync_onlyBN']/@defaultLayer"/> <target xmi:type="ecore:EPackage" href="MyTarget.ecore#/"/> </diagram:DSemanticDiagram> + <diagram:DSemanticDiagram uid="_ooRkQHKOEeu5xZikdim1pw"> + <ownedAnnotationEntries xmi:type="description:AnnotationEntry" uid="_oosbAHKOEeu5xZikdim1pw" source="GMF_DIAGRAMS"> + <data xmi:type="notation:Diagram" xmi:id="_oosbAXKOEeu5xZikdim1pw" type="Sirius" element="_ooRkQHKOEeu5xZikdim1pw" measurementUnit="Pixel"> + <children xmi:type="notation:Node" xmi:id="_opSQ4HKOEeu5xZikdim1pw" type="2002" element="_oozvwHKOEeu5xZikdim1pw"> + <children xmi:type="notation:Node" xmi:id="_opUGEHKOEeu5xZikdim1pw" type="5006"/> + <children xmi:type="notation:Node" xmi:id="_opUGEXKOEeu5xZikdim1pw" type="7001"> + <children xmi:type="notation:Node" xmi:id="_opXwcHKOEeu5xZikdim1pw" type="3009" element="_oo52YHKOEeu5xZikdim1pw"> + <children xmi:type="notation:Node" xmi:id="_opXwc3KOEeu5xZikdim1pw" type="5004"/> + <children xmi:type="notation:Node" xmi:id="_opYXgHKOEeu5xZikdim1pw" type="7003"> + <styles xmi:type="notation:SortingStyle" xmi:id="_opYXgXKOEeu5xZikdim1pw"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_opYXgnKOEeu5xZikdim1pw"/> + </children> + <styles xmi:type="notation:ShapeStyle" xmi:id="_opXwcXKOEeu5xZikdim1pw" fontName="Sans" fontHeight="8"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_orEZkHKOEeu5xZikdim1pw" x="565" y="138" width="121" height="71"/> + </children> + <children xmi:type="notation:Node" xmi:id="_opYXg3KOEeu5xZikdim1pw" type="3009" element="_oo7EgnKOEeu5xZikdim1pw"> + <children xmi:type="notation:Node" xmi:id="_opY-kHKOEeu5xZikdim1pw" type="5004"/> + <children xmi:type="notation:Node" xmi:id="_opY-kXKOEeu5xZikdim1pw" type="7003"> + <styles xmi:type="notation:SortingStyle" xmi:id="_opY-knKOEeu5xZikdim1pw"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_opY-k3KOEeu5xZikdim1pw"/> + </children> + <styles xmi:type="notation:ShapeStyle" xmi:id="_opYXhHKOEeu5xZikdim1pw" fontName="Sans" fontHeight="8"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_orFAoXKOEeu5xZikdim1pw" x="247" y="29" width="121" height="71"/> + </children> + <children xmi:type="notation:Node" xmi:id="_opY-lHKOEeu5xZikdim1pw" type="3009" element="_oo7rkXKOEeu5xZikdim1pw"> + <children xmi:type="notation:Node" xmi:id="_opY-l3KOEeu5xZikdim1pw" type="5004"/> + <children xmi:type="notation:Node" xmi:id="_opZloHKOEeu5xZikdim1pw" type="7003"> + <children xmi:type="notation:Node" xmi:id="_opco8HKOEeu5xZikdim1pw" type="3010" element="_oo8SoHKOEeu5xZikdim1pw"> + <styles xmi:type="notation:FontStyle" xmi:id="_opco8XKOEeu5xZikdim1pw"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_opco8nKOEeu5xZikdim1pw"/> + </children> + <styles xmi:type="notation:SortingStyle" xmi:id="_opZloXKOEeu5xZikdim1pw"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_opZlonKOEeu5xZikdim1pw"/> + </children> + <styles xmi:type="notation:ShapeStyle" xmi:id="_opY-lXKOEeu5xZikdim1pw" fontName="Sans" fontHeight="8"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_orFAo3KOEeu5xZikdim1pw" x="56" y="29" width="121" height="71"/> + </children> + <children xmi:type="notation:Node" xmi:id="_opaMsHKOEeu5xZikdim1pw" type="3008" element="_oo9gwHKOEeu5xZikdim1pw"> + <children xmi:type="notation:Node" xmi:id="_opaMs3KOEeu5xZikdim1pw" type="5005"/> + <children xmi:type="notation:Node" xmi:id="_opazwHKOEeu5xZikdim1pw" type="7002"> + <children xmi:type="notation:Node" xmi:id="_opco83KOEeu5xZikdim1pw" type="3009" element="_oo-H0nKOEeu5xZikdim1pw"> + <children xmi:type="notation:Node" xmi:id="_opdQAHKOEeu5xZikdim1pw" type="5004"/> + <children xmi:type="notation:Node" xmi:id="_opdQAXKOEeu5xZikdim1pw" type="7003"> + <children xmi:type="notation:Node" xmi:id="_opd3FHKOEeu5xZikdim1pw" type="3010" element="_oo-u4nKOEeu5xZikdim1pw"> + <styles xmi:type="notation:FontStyle" xmi:id="_opd3FXKOEeu5xZikdim1pw"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_opd3FnKOEeu5xZikdim1pw"/> + </children> + <styles xmi:type="notation:SortingStyle" xmi:id="_opdQAnKOEeu5xZikdim1pw"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_opdQA3KOEeu5xZikdim1pw"/> + </children> + <styles xmi:type="notation:ShapeStyle" xmi:id="_opco9HKOEeu5xZikdim1pw" fontName="Sans" fontHeight="8"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_orFAp3KOEeu5xZikdim1pw" x="60" y="60" width="121" height="71"/> + </children> + <children xmi:type="notation:Node" xmi:id="_opdQBHKOEeu5xZikdim1pw" type="3009" element="_oo-H1XKOEeu5xZikdim1pw"> + <children xmi:type="notation:Node" xmi:id="_opd3EHKOEeu5xZikdim1pw" type="5004"/> + <children xmi:type="notation:Node" xmi:id="_opd3EXKOEeu5xZikdim1pw" type="7003"> + <styles xmi:type="notation:SortingStyle" xmi:id="_opd3EnKOEeu5xZikdim1pw"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_opd3E3KOEeu5xZikdim1pw"/> + </children> + <styles xmi:type="notation:ShapeStyle" xmi:id="_opdQBXKOEeu5xZikdim1pw" fontName="Sans" fontHeight="8"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_orFnsXKOEeu5xZikdim1pw" x="203" y="324" width="121" height="71"/> + </children> + <styles xmi:type="notation:SortingStyle" xmi:id="_opazwXKOEeu5xZikdim1pw"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_opazwnKOEeu5xZikdim1pw"/> + </children> + <styles xmi:type="notation:ShapeStyle" xmi:id="_opaMsXKOEeu5xZikdim1pw" fontName="Sans" fontHeight="10"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_orFApXKOEeu5xZikdim1pw" x="967" y="6"/> + </children> + <children xmi:type="notation:Node" xmi:id="_opazw3KOEeu5xZikdim1pw" type="3008" element="_oo9gw3KOEeu5xZikdim1pw"> + <children xmi:type="notation:Node" xmi:id="_opba0HKOEeu5xZikdim1pw" type="5005"/> + <children xmi:type="notation:Node" xmi:id="_opba0XKOEeu5xZikdim1pw" type="7002"> + <children xmi:type="notation:Node" xmi:id="_opd3F3KOEeu5xZikdim1pw" type="3009" element="_oo-u5HKOEeu5xZikdim1pw"> + <children xmi:type="notation:Node" xmi:id="_opd3GnKOEeu5xZikdim1pw" type="5004"/> + <children xmi:type="notation:Node" xmi:id="_opd3G3KOEeu5xZikdim1pw" type="7003"> + <styles xmi:type="notation:SortingStyle" xmi:id="_opd3HHKOEeu5xZikdim1pw"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_opd3HXKOEeu5xZikdim1pw"/> + </children> + <styles xmi:type="notation:ShapeStyle" xmi:id="_opd3GHKOEeu5xZikdim1pw" fontName="Sans" fontHeight="8"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_orFntXKOEeu5xZikdim1pw" x="12" y="33" width="121" height="71"/> + </children> + <styles xmi:type="notation:SortingStyle" xmi:id="_opba0nKOEeu5xZikdim1pw"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_opba03KOEeu5xZikdim1pw"/> + </children> + <styles xmi:type="notation:ShapeStyle" xmi:id="_opazxHKOEeu5xZikdim1pw" fontName="Sans" fontHeight="10"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_orFns3KOEeu5xZikdim1pw" x="85" y="162" width="273" height="139"/> + </children> + <children xmi:type="notation:Node" xmi:id="_opba1HKOEeu5xZikdim1pw" type="3008" element="_oo9gxnKOEeu5xZikdim1pw"> + <children xmi:type="notation:Node" xmi:id="_opba13KOEeu5xZikdim1pw" type="5005"/> + <children xmi:type="notation:Node" xmi:id="_opba2HKOEeu5xZikdim1pw" type="7002"> + <styles xmi:type="notation:SortingStyle" xmi:id="_opba2XKOEeu5xZikdim1pw"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_opba2nKOEeu5xZikdim1pw"/> + </children> + <styles xmi:type="notation:ShapeStyle" xmi:id="_opba1XKOEeu5xZikdim1pw" fontName="Sans" fontHeight="10"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_orFnt3KOEeu5xZikdim1pw" x="296" y="164" width="172" height="84"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_orP_wHKOEeu5xZikdim1pw" type="Text" fontName="Segoe UI" description="Interesting"> + <children xmi:type="notation:BasicDecorationNode" xmi:id="_orP_wnKOEeu5xZikdim1pw" type="DiagramName"> + <element xsi:nil="true"/> + </children> + <children xmi:type="notation:BasicDecorationNode" xmi:id="_orP_w3KOEeu5xZikdim1pw" type="Description"> + <element xsi:nil="true"/> + </children> + <element xsi:nil="true"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_orP_xHKOEeu5xZikdim1pw" x="1405" y="171"/> + </children> + <styles xmi:type="notation:SortingStyle" xmi:id="_opUtIHKOEeu5xZikdim1pw"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_opUtIXKOEeu5xZikdim1pw"/> + </children> + <styles xmi:type="notation:ShapeStyle" xmi:id="_opSQ4XKOEeu5xZikdim1pw" fontName="Sans" fontHeight="10"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_orDLcHKOEeu5xZikdim1pw" x="30" y="30" width="653" height="173"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_orNjgHKOEeu5xZikdim1pw" type="Note" fontName="Segoe UI" description="Great" fillColor="13369343" transparency="0" lineColor="6737151" lineWidth="1"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_orNjgXKOEeu5xZikdim1pw" source="specificStyles"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_orNjgnKOEeu5xZikdim1pw" key="verticalAlignment" value="8"/> + </eAnnotations> + <children xmi:type="notation:BasicDecorationNode" xmi:id="_orOKkHKOEeu5xZikdim1pw" type="DiagramName"> + <element xsi:nil="true"/> + </children> + <children xmi:type="notation:BasicDecorationNode" xmi:id="_orOKkXKOEeu5xZikdim1pw" type="Description"> + <element xsi:nil="true"/> + </children> + <styles xmi:type="notation:TextStyle" xmi:id="_orNjg3KOEeu5xZikdim1pw" textAlignment="Center"/> + <styles xmi:type="notation:LineTypeStyle" xmi:id="_orNjhHKOEeu5xZikdim1pw"/> + <element xsi:nil="true"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_orOKknKOEeu5xZikdim1pw" x="335" y="300" width="141" height="86"/> + </children> + <children xmi:type="notation:Node" xmi:id="_opUtInKOEeu5xZikdim1pw" type="2002" element="_oo5PUHKOEeu5xZikdim1pw"> + <children xmi:type="notation:Node" xmi:id="_opVUMHKOEeu5xZikdim1pw" type="5006"/> + <children xmi:type="notation:Node" xmi:id="_opVUMXKOEeu5xZikdim1pw" type="7001"> + <children xmi:type="notation:Node" xmi:id="_opeeIHKOEeu5xZikdim1pw" type="3008" element="_oo_V8nKOEeu5xZikdim1pw"> + <children xmi:type="notation:Node" xmi:id="_opeeI3KOEeu5xZikdim1pw" type="5005"/> + <children xmi:type="notation:Node" xmi:id="_opeeJHKOEeu5xZikdim1pw" type="7002"> + <children xmi:type="notation:Node" xmi:id="_opeeLnKOEeu5xZikdim1pw" type="3009" element="_oo_9AXKOEeu5xZikdim1pw"> + <children xmi:type="notation:Node" xmi:id="_opfsQHKOEeu5xZikdim1pw" type="5004"/> + <children xmi:type="notation:Node" xmi:id="_opfsQXKOEeu5xZikdim1pw" type="7003"> + <children xmi:type="notation:Node" xmi:id="_opfsRHKOEeu5xZikdim1pw" type="3010" element="_oo_9BHKOEeu5xZikdim1pw"> + <styles xmi:type="notation:FontStyle" xmi:id="_opfsRXKOEeu5xZikdim1pw"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_opfsRnKOEeu5xZikdim1pw"/> + </children> + <styles xmi:type="notation:SortingStyle" xmi:id="_opfsQnKOEeu5xZikdim1pw"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_opfsQ3KOEeu5xZikdim1pw"/> + </children> + <styles xmi:type="notation:ShapeStyle" xmi:id="_opeeL3KOEeu5xZikdim1pw" fontName="Sans" fontHeight="8"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_orGOwnKOEeu5xZikdim1pw" x="10" y="34" width="137" height="71"/> + </children> + <styles xmi:type="notation:SortingStyle" xmi:id="_opeeJXKOEeu5xZikdim1pw"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_opeeJnKOEeu5xZikdim1pw"/> + </children> + <styles xmi:type="notation:ShapeStyle" xmi:id="_opeeIXKOEeu5xZikdim1pw" fontName="Sans" fontHeight="10"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_orGOwHKOEeu5xZikdim1pw" x="15" y="23" width="178"/> + </children> + <children xmi:type="notation:Node" xmi:id="_opeeJ3KOEeu5xZikdim1pw" type="3008" element="_oo_V9XKOEeu5xZikdim1pw"> + <children xmi:type="notation:Node" xmi:id="_opeeKnKOEeu5xZikdim1pw" type="5005"/> + <children xmi:type="notation:Node" xmi:id="_opeeK3KOEeu5xZikdim1pw" type="7002"> + <styles xmi:type="notation:SortingStyle" xmi:id="_opeeLHKOEeu5xZikdim1pw"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_opeeLXKOEeu5xZikdim1pw"/> + </children> + <styles xmi:type="notation:ShapeStyle" xmi:id="_opeeKHKOEeu5xZikdim1pw" fontName="Sans" fontHeight="10"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_orGOxHKOEeu5xZikdim1pw" x="211" y="45" width="168"/> + </children> + <styles xmi:type="notation:SortingStyle" xmi:id="_opVUMnKOEeu5xZikdim1pw"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_opVUM3KOEeu5xZikdim1pw"/> + </children> + <styles xmi:type="notation:ShapeStyle" xmi:id="_opUtI3KOEeu5xZikdim1pw" fontName="Sans" fontHeight="10"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_orFnuXKOEeu5xZikdim1pw" x="48" y="543"/> + </children> + <children xmi:type="notation:Node" xmi:id="_opVUNHKOEeu5xZikdim1pw" type="2002" element="_oo5PU3KOEeu5xZikdim1pw"> + <children xmi:type="notation:Node" xmi:id="_opV7QHKOEeu5xZikdim1pw" type="5006"/> + <children xmi:type="notation:Node" xmi:id="_opV7QXKOEeu5xZikdim1pw" type="7001"> + <styles xmi:type="notation:SortingStyle" xmi:id="_opV7QnKOEeu5xZikdim1pw"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_opV7Q3KOEeu5xZikdim1pw"/> + </children> + <styles xmi:type="notation:ShapeStyle" xmi:id="_opVUNXKOEeu5xZikdim1pw" fontName="Sans" fontHeight="10"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_orGOxnKOEeu5xZikdim1pw" x="491" y="492"/> + </children> + <children xmi:type="notation:Node" xmi:id="_opV7RHKOEeu5xZikdim1pw" type="2002" element="_oo5PVnKOEeu5xZikdim1pw"> + <children xmi:type="notation:Node" xmi:id="_opV7R3KOEeu5xZikdim1pw" type="5006"/> + <children xmi:type="notation:Node" xmi:id="_opV7SHKOEeu5xZikdim1pw" type="7001"> + <styles xmi:type="notation:SortingStyle" xmi:id="_opV7SXKOEeu5xZikdim1pw"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_opV7SnKOEeu5xZikdim1pw"/> + </children> + <styles xmi:type="notation:ShapeStyle" xmi:id="_opV7RXKOEeu5xZikdim1pw" fontName="Sans" fontHeight="10"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_orGOyHKOEeu5xZikdim1pw" x="1622" y="30" width="172"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_orOKk3KOEeu5xZikdim1pw" type="Note" fontColor="10265827" fontName="Segoe UI" description="Nice" fillColor="13369343" transparency="0" lineColor="6737151" lineWidth="1"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_orOKlHKOEeu5xZikdim1pw" source="specificStyles"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_orOKlXKOEeu5xZikdim1pw" key="verticalAlignment" value="8"/> + </eAnnotations> + <children xmi:type="notation:BasicDecorationNode" xmi:id="_orOKmXKOEeu5xZikdim1pw" type="DiagramName"> + <element xsi:nil="true"/> + </children> + <children xmi:type="notation:BasicDecorationNode" xmi:id="_orOKmnKOEeu5xZikdim1pw" type="Description"> + <element xsi:nil="true"/> + </children> + <styles xmi:type="notation:TextStyle" xmi:id="_orOKlnKOEeu5xZikdim1pw" textAlignment="Center"/> + <styles xmi:type="notation:LineTypeStyle" xmi:id="_orOKl3KOEeu5xZikdim1pw"/> + <element xsi:nil="true"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_orOKm3KOEeu5xZikdim1pw" x="860" y="187" width="86" height="106"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_orOKnHKOEeu5xZikdim1pw" type="Note" fontName="Segoe UI" description="Nicer" fillColor="12560536" transparency="0" lineColor="6737151" lineWidth="1"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_orOKnXKOEeu5xZikdim1pw" source="specificStyles"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_orOKnnKOEeu5xZikdim1pw" key="verticalAlignment" value="8"/> + </eAnnotations> + <children xmi:type="notation:BasicDecorationNode" xmi:id="_orOxoHKOEeu5xZikdim1pw" type="DiagramName"> + <element xsi:nil="true"/> + </children> + <children xmi:type="notation:BasicDecorationNode" xmi:id="_orOxoXKOEeu5xZikdim1pw" type="Description"> + <element xsi:nil="true"/> + </children> + <styles xmi:type="notation:TextStyle" xmi:id="_orOKn3KOEeu5xZikdim1pw" textAlignment="Center"/> + <styles xmi:type="notation:LineTypeStyle" xmi:id="_orOKoHKOEeu5xZikdim1pw"/> + <element xsi:nil="true"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_orOxonKOEeu5xZikdim1pw" x="616" y="311" width="86" height="116"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_orOxo3KOEeu5xZikdim1pw" type="Note" fontName="Segoe UI" description="Good" fillColor="13369343" transparency="0" lineColor="6737151" lineWidth="1"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_orOxpHKOEeu5xZikdim1pw" source="specificStyles"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_orOxpXKOEeu5xZikdim1pw" key="verticalAlignment" value="8"/> + </eAnnotations> + <children xmi:type="notation:BasicDecorationNode" xmi:id="_orOxqXKOEeu5xZikdim1pw" type="DiagramName"> + <element xsi:nil="true"/> + </children> + <children xmi:type="notation:BasicDecorationNode" xmi:id="_orOxqnKOEeu5xZikdim1pw" type="Description"> + <element xsi:nil="true"/> + </children> + <styles xmi:type="notation:TextStyle" xmi:id="_orOxpnKOEeu5xZikdim1pw" textAlignment="Center"/> + <styles xmi:type="notation:LineTypeStyle" xmi:id="_orOxp3KOEeu5xZikdim1pw" lineType="Dash"/> + <element xsi:nil="true"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_orOxq3KOEeu5xZikdim1pw" x="125" y="726" width="271" height="96"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_orOxrHKOEeu5xZikdim1pw" type="Note" fontName="Segoe UI" description="Nice" fillColor="15053796" transparency="0" lineColor="6737151" lineWidth="1"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_orOxrXKOEeu5xZikdim1pw" source="specificStyles"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_orOxrnKOEeu5xZikdim1pw" key="verticalAlignment" value="8"/> + </eAnnotations> + <children xmi:type="notation:BasicDecorationNode" xmi:id="_orPYsHKOEeu5xZikdim1pw" type="DiagramName"> + <element xsi:nil="true"/> + </children> + <children xmi:type="notation:BasicDecorationNode" xmi:id="_orPYsXKOEeu5xZikdim1pw" type="Description"> + <element xsi:nil="true"/> + </children> + <styles xmi:type="notation:TextStyle" xmi:id="_orOxr3KOEeu5xZikdim1pw" textAlignment="Center"/> + <styles xmi:type="notation:LineTypeStyle" xmi:id="_orOxsHKOEeu5xZikdim1pw"/> + <element xsi:nil="true"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_orPYsnKOEeu5xZikdim1pw" x="777" y="528" width="124" height="120"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_CpIeEHKPEeu5xZikdim1pw" type="Note" fontName="Segoe UI" description="Great" fillColor="10265827" transparency="0" lineColor="6737151" lineWidth="1"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CpIeEXKPEeu5xZikdim1pw" source="specificStyles"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CpIeEnKPEeu5xZikdim1pw" key="verticalAlignment" value="8"/> + </eAnnotations> + <children xmi:type="notation:BasicDecorationNode" xmi:id="_CpJFIHKPEeu5xZikdim1pw" type="DiagramName"> + <element xsi:nil="true"/> + </children> + <children xmi:type="notation:BasicDecorationNode" xmi:id="_CpJFIXKPEeu5xZikdim1pw" type="Description"> + <element xsi:nil="true"/> + </children> + <styles xmi:type="notation:TextStyle" xmi:id="_CpIeE3KPEeu5xZikdim1pw" textAlignment="Center"/> + <styles xmi:type="notation:LineTypeStyle" xmi:id="_CpIeFHKPEeu5xZikdim1pw"/> + <element xsi:nil="true"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CpIeFXKPEeu5xZikdim1pw" x="1591" y="225" height="88"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_0k1s0HKiEeuK-9B8t7T2zQ" type="Text" fontName="Segoe UI" description="Nicer"> + <children xmi:type="notation:BasicDecorationNode" xmi:id="_0k1s0nKiEeuK-9B8t7T2zQ" type="DiagramName"> + <element xsi:nil="true"/> + </children> + <children xmi:type="notation:BasicDecorationNode" xmi:id="_0k2T4HKiEeuK-9B8t7T2zQ" type="Description"> + <element xsi:nil="true"/> + </children> + <element xsi:nil="true"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0k1s0XKiEeuK-9B8t7T2zQ" x="1454" y="398" width="159" height="117"/> + </children> + <styles xmi:type="notation:DiagramStyle" xmi:id="_oosbAnKOEeu5xZikdim1pw"/> + <edges xmi:type="notation:Edge" xmi:id="_opiIgHKOEeu5xZikdim1pw" type="4001" element="_opJG8HKOEeu5xZikdim1pw" source="_opXwcHKOEeu5xZikdim1pw" target="_opYXg3KOEeu5xZikdim1pw"> + <children xmi:type="notation:Node" xmi:id="_opivkHKOEeu5xZikdim1pw" type="6001"> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_orEZlHKOEeu5xZikdim1pw" x="36" y="-1"/> + </children> + <children xmi:type="notation:Node" xmi:id="_opjWoHKOEeu5xZikdim1pw" type="6002"> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_opjWoXKOEeu5xZikdim1pw" x="-23" y="-165"/> + </children> + <children xmi:type="notation:Node" xmi:id="_opj9sHKOEeu5xZikdim1pw" type="6003"> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_opj9sXKOEeu5xZikdim1pw" x="-22" y="11"/> + </children> + <styles xmi:type="notation:ConnectorStyle" xmi:id="_opiIgXKOEeu5xZikdim1pw"/> + <styles xmi:type="notation:FontStyle" xmi:id="_opiIgnKOEeu5xZikdim1pw" fontName="Sans" fontHeight="8"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_opiIg3KOEeu5xZikdim1pw" points="[2, -3, 301, 44]$[39, -87, 338, -40]$[-85, -114, 214, -67]$[-248, -63, 51, -16]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_opo2MHKOEeu5xZikdim1pw" id="(0.41666666,0.057142857)"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_opo2MXKOEeu5xZikdim1pw" id="(0.57894737,0.94285715)"/> + </edges> + <edges xmi:type="notation:Edge" xmi:id="_oppdQHKOEeu5xZikdim1pw" type="4001" element="_opKVEHKOEeu5xZikdim1pw" source="_opXwcHKOEeu5xZikdim1pw" target="_opco83KOEeu5xZikdim1pw"> + <children xmi:type="notation:Node" xmi:id="_oppdRHKOEeu5xZikdim1pw" type="6001"> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_orFAoHKOEeu5xZikdim1pw" x="-119" y="-12"/> + </children> + <children xmi:type="notation:Node" xmi:id="_oppdRnKOEeu5xZikdim1pw" type="6002"> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oppdR3KOEeu5xZikdim1pw" x="-34" y="-12"/> + </children> + <children xmi:type="notation:Node" xmi:id="_oppdSHKOEeu5xZikdim1pw" type="6003"> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oppdSXKOEeu5xZikdim1pw" x="-285" y="-20"/> + </children> + <styles xmi:type="notation:ConnectorStyle" xmi:id="_oppdQXKOEeu5xZikdim1pw"/> + <styles xmi:type="notation:FontStyle" xmi:id="_oppdQnKOEeu5xZikdim1pw" fontName="Sans" fontHeight="8"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_oppdQ3KOEeu5xZikdim1pw" points="[60, -4, -348, 96]$[160, -11, -248, 89]$[408, -100, 0, 0]"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_opqEUXKOEeu5xZikdim1pw" id="(0.0,0.0)"/> + </edges> + <edges xmi:type="notation:Connector" xmi:id="_orQm0HKOEeu5xZikdim1pw" type="NoteAttachment" source="_orOxo3KOEeu5xZikdim1pw" target="_opeeLnKOEeu5xZikdim1pw" lineWidth="1"> + <styles xmi:type="notation:ArrowStyle" xmi:id="_orQm0XKOEeu5xZikdim1pw"/> + <styles xmi:type="notation:LineTypeStyle" xmi:id="_orQm0nKOEeu5xZikdim1pw"/> + <element xsi:nil="true"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_orQm03KOEeu5xZikdim1pw" points="[9, -40, -16, 63]$[20, -85, -5, 18]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_orQm1HKOEeu5xZikdim1pw" id="(0.13284132841328414,0.4166666666666667)"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_orQm1XKOEeu5xZikdim1pw" id="(0.7682119205298014,0.7450980392156863)"/> + </edges> + <edges xmi:type="notation:Connector" xmi:id="_orQm1nKOEeu5xZikdim1pw" type="NoteAttachment" source="_opeeJ3KOEeu5xZikdim1pw" target="_orOxo3KOEeu5xZikdim1pw" lineWidth="1"> + <styles xmi:type="notation:ArrowStyle" xmi:id="_orQm13KOEeu5xZikdim1pw"/> + <styles xmi:type="notation:LineTypeStyle" xmi:id="_orQm2HKOEeu5xZikdim1pw"/> + <element xsi:nil="true"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_orQm2XKOEeu5xZikdim1pw" points="[-7, 34, 155, -92]$[-7, 41, 155, -85]$[-111, 98, 51, -28]"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_orQm2nKOEeu5xZikdim1pw" id="(0.22140221402214022,0.2916666666666667)"/> + </edges> + <edges xmi:type="notation:Connector" xmi:id="_orRN4HKOEeu5xZikdim1pw" type="NoteAttachment" source="_orOKnHKOEeu5xZikdim1pw" target="_opiIgHKOEeu5xZikdim1pw" lineWidth="1"> + <styles xmi:type="notation:ArrowStyle" xmi:id="_orRN4XKOEeu5xZikdim1pw"/> + <styles xmi:type="notation:LineTypeStyle" xmi:id="_orRN4nKOEeu5xZikdim1pw"/> + <element xsi:nil="true"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_orRN43KOEeu5xZikdim1pw" points="[-37, -58, 98, 154]$[-116, -181, 19, 31]"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_orRN5HKOEeu5xZikdim1pw" id="(0.4292682926829268,0.8418803418803419)"/> + </edges> + <edges xmi:type="notation:Connector" xmi:id="_orRN5XKOEeu5xZikdim1pw" type="NoteAttachment" source="_orOKk3KOEeu5xZikdim1pw" target="_oppdQHKOEeu5xZikdim1pw" lineWidth="1"> + <styles xmi:type="notation:ArrowStyle" xmi:id="_orRN5nKOEeu5xZikdim1pw"/> + <styles xmi:type="notation:LineTypeStyle" xmi:id="_orRN53KOEeu5xZikdim1pw"/> + <element xsi:nil="true"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_orRN6HKOEeu5xZikdim1pw" points="[-38, -53, 39, 55]$[-45, -63, 32, 45]"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_orRN6XKOEeu5xZikdim1pw" id="(0.6417112299465241,0.43859649122807015)"/> + </edges> + <edges xmi:type="notation:Connector" xmi:id="_orRN6nKOEeu5xZikdim1pw" type="NoteAttachment" source="_orNjgHKOEeu5xZikdim1pw" target="_orOKnHKOEeu5xZikdim1pw" lineWidth="1"> + <styles xmi:type="notation:ArrowStyle" xmi:id="_orRN63KOEeu5xZikdim1pw"/> + <styles xmi:type="notation:LineTypeStyle" xmi:id="_orRN7HKOEeu5xZikdim1pw"/> + <element xsi:nil="true"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_orRN7XKOEeu5xZikdim1pw" points="[68, -33, -186, -59]$[107, -51, -147, -77]$[145, 1, -109, -25]$[211, 16, -43, -10]"/> + </edges> + <edges xmi:type="notation:Connector" xmi:id="_orRN7nKOEeu5xZikdim1pw" type="NoteAttachment" source="_orP_wHKOEeu5xZikdim1pw" target="_opaMsHKOEeu5xZikdim1pw" lineWidth="1"> + <styles xmi:type="notation:ArrowStyle" xmi:id="_orRN73KOEeu5xZikdim1pw"/> + <styles xmi:type="notation:LineTypeStyle" xmi:id="_orRN8HKOEeu5xZikdim1pw"/> + <element xsi:nil="true"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_orRN8XKOEeu5xZikdim1pw" points="[-22, -7, 425, 137]$[-153, -50, 294, 94]"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_orR08HKOEeu5xZikdim1pw" id="(0.125,0.06896551724137931)"/> + </edges> + </data> + </ownedAnnotationEntries> + <ownedAnnotationEntries xmi:type="description:AnnotationEntry" uid="_opK8IHKOEeu5xZikdim1pw" source="DANNOTATION_CUSTOMIZATION_KEY"> + <data xmi:type="diagram:ComputedStyleDescriptionRegistry" uid="_opK8IXKOEeu5xZikdim1pw"/> + </ownedAnnotationEntries> + <ownedDiagramElements xmi:type="diagram:DNodeContainer" uid="_oozvwHKOEeu5xZikdim1pw" name="Container targetp1"> + <target xmi:type="ecore:EPackage" href="MyTarget.ecore#//targetp1"/> + <semanticElements xmi:type="ecore:EPackage" href="MyTarget.ecore#//targetp1"/> + <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_orDLcXKOEeu5xZikdim1pw" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <customFeatures>uid</customFeatures> + <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@style"/> + </ownedStyle> + <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']"/> + <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_oo52YHKOEeu5xZikdim1pw" name="targetC1-1" tooltipText="targetp1.targetC1-1" outgoingEdges="_opJG8HKOEeu5xZikdim1pw _opKVEHKOEeu5xZikdim1pw"> + <target xmi:type="ecore:EClass" href="MyTarget.ecore#//targetp1/targetC1-1"/> + <semanticElements xmi:type="ecore:EClass" href="MyTarget.ecore#//targetp1/targetC1-1"/> + <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_orEZkXKOEeu5xZikdim1pw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <customFeatures>uid</customFeatures> + <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/> + </ownedStyle> + <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']"/> + </ownedDiagramElements> + <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_oo7EgnKOEeu5xZikdim1pw" name="targetC1-2" tooltipText="targetp1.targetC1-2" incomingEdges="_opJG8HKOEeu5xZikdim1pw"> + <target xmi:type="ecore:EClass" href="MyTarget.ecore#//targetp1/targetC1-2"/> + <semanticElements xmi:type="ecore:EClass" href="MyTarget.ecore#//targetp1/targetC1-2"/> + <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_orFAonKOEeu5xZikdim1pw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <customFeatures>uid</customFeatures> + <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/> + </ownedStyle> + <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']"/> + </ownedDiagramElements> + <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_oo7rkXKOEeu5xZikdim1pw" name="targetC1-3" tooltipText="targetp1.targetC1-3"> + <target xmi:type="ecore:EClass" href="MyTarget.ecore#//targetp1/targetC1-3"/> + <semanticElements xmi:type="ecore:EClass" href="MyTarget.ecore#//targetp1/targetC1-3"/> + <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_orFApHKOEeu5xZikdim1pw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <customFeatures>uid</customFeatures> + <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/> + </ownedStyle> + <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']"/> + <ownedElements xmi:type="diagram:DNodeListElement" uid="_oo8SoHKOEeu5xZikdim1pw" name="targetm1" tooltipText="targetm1(): "> + <target xmi:type="ecore:EOperation" href="MyTarget.ecore#//targetp1/targetC1-3/targetm1"/> + <semanticElements xmi:type="ecore:EOperation" href="MyTarget.ecore#//targetp1/targetC1-3/targetm1"/> + <ownedStyle xmi:type="diagram:BundledImage" uid="_oo85sHKOEeu5xZikdim1pw" labelSize="10" labelAlignment="LEFT"> + <description xmi:type="style:BundledImageDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@subNodeMappings[name='DT2_Operation']/@style"/> + </ownedStyle> + <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@subNodeMappings[name='DT2_Operation']"/> + </ownedElements> + </ownedDiagramElements> + <ownedDiagramElements xmi:type="diagram:DNodeContainer" uid="_oo9gwHKOEeu5xZikdim1pw" name="Container targetp1-1"> + <target xmi:type="ecore:EPackage" href="MyTarget.ecore#//targetp1/targetp1-1"/> + <semanticElements xmi:type="ecore:EPackage" href="MyTarget.ecore#//targetp1/targetp1-1"/> + <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_orFApnKOEeu5xZikdim1pw" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <customFeatures>uid</customFeatures> + <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@style"/> + </ownedStyle> + <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']"/> + <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_oo-H0nKOEeu5xZikdim1pw" name="targetC1-1-1" tooltipText="targetp1-1.targetC1-1-1" incomingEdges="_opKVEHKOEeu5xZikdim1pw"> + <target xmi:type="ecore:EClass" href="MyTarget.ecore#//targetp1/targetp1-1/targetC1-1-1"/> + <semanticElements xmi:type="ecore:EClass" href="MyTarget.ecore#//targetp1/targetp1-1/targetC1-1-1"/> + <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_orFnsHKOEeu5xZikdim1pw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <customFeatures>uid</customFeatures> + <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/> + </ownedStyle> + <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']"/> + <ownedElements xmi:type="diagram:DNodeListElement" uid="_oo-u4nKOEeu5xZikdim1pw" name="targetm1" tooltipText="targetm1(): "> + <target xmi:type="ecore:EOperation" href="MyTarget.ecore#//targetp1/targetp1-1/targetC1-1-1/targetm1"/> + <semanticElements xmi:type="ecore:EOperation" href="MyTarget.ecore#//targetp1/targetp1-1/targetC1-1-1/targetm1"/> + <ownedStyle xmi:type="diagram:BundledImage" uid="_oo-u43KOEeu5xZikdim1pw" labelSize="10" labelAlignment="LEFT"> + <description xmi:type="style:BundledImageDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@subNodeMappings[name='DT2_Operation']/@style"/> + </ownedStyle> + <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@subNodeMappings[name='DT2_Operation']"/> + </ownedElements> + </ownedDiagramElements> + <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_oo-H1XKOEeu5xZikdim1pw" name="targetC1-1-2" tooltipText="targetp1-1.targetC1-1-2"> + <target xmi:type="ecore:EClass" href="MyTarget.ecore#//targetp1/targetp1-1/targetC1-1-2"/> + <semanticElements xmi:type="ecore:EClass" href="MyTarget.ecore#//targetp1/targetp1-1/targetC1-1-2"/> + <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_orFnsnKOEeu5xZikdim1pw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <customFeatures>uid</customFeatures> + <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/> + </ownedStyle> + <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']"/> + </ownedDiagramElements> + </ownedDiagramElements> + <ownedDiagramElements xmi:type="diagram:DNodeContainer" uid="_oo9gw3KOEeu5xZikdim1pw" name="Container targetp1-2"> + <target xmi:type="ecore:EPackage" href="MyTarget.ecore#//targetp1/targetp1-2"/> + <semanticElements xmi:type="ecore:EPackage" href="MyTarget.ecore#//targetp1/targetp1-2"/> + <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_orFntHKOEeu5xZikdim1pw" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <customFeatures>uid</customFeatures> + <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@style"/> + </ownedStyle> + <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']"/> + <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_oo-u5HKOEeu5xZikdim1pw" name="targetC1-2-1" tooltipText="targetp1-2.targetC1-2-1"> + <target xmi:type="ecore:EClass" href="MyTarget.ecore#//targetp1/targetp1-2/targetC1-2-1"/> + <semanticElements xmi:type="ecore:EClass" href="MyTarget.ecore#//targetp1/targetp1-2/targetC1-2-1"/> + <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_orFntnKOEeu5xZikdim1pw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <customFeatures>uid</customFeatures> + <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/> + </ownedStyle> + <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']"/> + </ownedDiagramElements> + </ownedDiagramElements> + <ownedDiagramElements xmi:type="diagram:DNodeContainer" uid="_oo9gxnKOEeu5xZikdim1pw" name="Container targetp1-3"> + <target xmi:type="ecore:EPackage" href="MyTarget.ecore#//targetp1/targetp1-3"/> + <semanticElements xmi:type="ecore:EPackage" href="MyTarget.ecore#//targetp1/targetp1-3"/> + <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_orFnuHKOEeu5xZikdim1pw" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <customFeatures>uid</customFeatures> + <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@style"/> + </ownedStyle> + <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']"/> + </ownedDiagramElements> + </ownedDiagramElements> + <ownedDiagramElements xmi:type="diagram:DNodeContainer" uid="_oo5PUHKOEeu5xZikdim1pw" name="Container targetp2"> + <target xmi:type="ecore:EPackage" href="MyTarget.ecore#//targetp2"/> + <semanticElements xmi:type="ecore:EPackage" href="MyTarget.ecore#//targetp2"/> + <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_orFnunKOEeu5xZikdim1pw" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <customFeatures>uid</customFeatures> + <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@style"/> + </ownedStyle> + <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']"/> + <ownedDiagramElements xmi:type="diagram:DNodeContainer" uid="_oo_V8nKOEeu5xZikdim1pw" name="Container targetp2-1"> + <target xmi:type="ecore:EPackage" href="MyTarget.ecore#//targetp2/targetp2-1"/> + <semanticElements xmi:type="ecore:EPackage" href="MyTarget.ecore#//targetp2/targetp2-1"/> + <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_orGOwXKOEeu5xZikdim1pw" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <customFeatures>uid</customFeatures> + <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@style"/> + </ownedStyle> + <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']"/> + <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_oo_9AXKOEeu5xZikdim1pw" name="targetnew EClass 1" tooltipText="targetp2-1.targetnew EClass 1"> + <target xmi:type="ecore:EClass" href="MyTarget.ecore#//targetp2/targetp2-1/targetnew%20EClass%201"/> + <semanticElements xmi:type="ecore:EClass" href="MyTarget.ecore#//targetp2/targetp2-1/targetnew%20EClass%201"/> + <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_orGOw3KOEeu5xZikdim1pw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <customFeatures>uid</customFeatures> + <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/> + </ownedStyle> + <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']"/> + <ownedElements xmi:type="diagram:DNodeListElement" uid="_oo_9BHKOEeu5xZikdim1pw" name="targetm1" tooltipText="targetm1(): "> + <target xmi:type="ecore:EOperation" href="MyTarget.ecore#//targetp2/targetp2-1/targetnew%20EClass%201/targetm1"/> + <semanticElements xmi:type="ecore:EOperation" href="MyTarget.ecore#//targetp2/targetp2-1/targetnew%20EClass%201/targetm1"/> + <ownedStyle xmi:type="diagram:BundledImage" uid="_opAkEHKOEeu5xZikdim1pw" labelSize="10" labelAlignment="LEFT"> + <description xmi:type="style:BundledImageDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@subNodeMappings[name='DT2_Operation']/@style"/> + </ownedStyle> + <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@subNodeMappings[name='DT2_Operation']"/> + </ownedElements> + </ownedDiagramElements> + </ownedDiagramElements> + <ownedDiagramElements xmi:type="diagram:DNodeContainer" uid="_oo_V9XKOEeu5xZikdim1pw" name="Container targetp2-2"> + <target xmi:type="ecore:EPackage" href="MyTarget.ecore#//targetp2/targetp2-2"/> + <semanticElements xmi:type="ecore:EPackage" href="MyTarget.ecore#//targetp2/targetp2-2"/> + <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_orGOxXKOEeu5xZikdim1pw" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <customFeatures>uid</customFeatures> + <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@style"/> + </ownedStyle> + <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']"/> + </ownedDiagramElements> + </ownedDiagramElements> + <ownedDiagramElements xmi:type="diagram:DNodeContainer" uid="_oo5PU3KOEeu5xZikdim1pw" name="Container targetp3"> + <target xmi:type="ecore:EPackage" href="MyTarget.ecore#//targetp3"/> + <semanticElements xmi:type="ecore:EPackage" href="MyTarget.ecore#//targetp3"/> + <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_orGOx3KOEeu5xZikdim1pw" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <customFeatures>uid</customFeatures> + <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@style"/> + </ownedStyle> + <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']"/> + </ownedDiagramElements> + <ownedDiagramElements xmi:type="diagram:DNodeContainer" uid="_oo5PVnKOEeu5xZikdim1pw" name="Container targetp4"> + <target xmi:type="ecore:EPackage" href="MyTarget.ecore#//targetp4"/> + <semanticElements xmi:type="ecore:EPackage" href="MyTarget.ecore#//targetp4"/> + <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_orG10HKOEeu5xZikdim1pw" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <customFeatures>uid</customFeatures> + <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@style"/> + </ownedStyle> + <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']"/> + </ownedDiagramElements> + <ownedDiagramElements xmi:type="diagram:DEdge" uid="_opJG8HKOEeu5xZikdim1pw" name="targetaC1-2" sourceNode="_oo52YHKOEeu5xZikdim1pw" targetNode="_oo7EgnKOEeu5xZikdim1pw"> + <target xmi:type="ecore:EReference" href="MyTarget.ecore#//targetp1/targetC1-1/targetaC1-2"/> + <semanticElements xmi:type="ecore:EReference" href="MyTarget.ecore#//targetp1/targetC1-1/targetaC1-2"/> + <ownedStyle xmi:type="diagram:EdgeStyle" uid="_orEZknKOEeu5xZikdim1pw"> + <customFeatures>uid</customFeatures> + <description xmi:type="style:EdgeStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@edgeMappings[name='DT2_EReference']/@style"/> + <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_orEZk3KOEeu5xZikdim1pw" showIcon="false"/> + </ownedStyle> + <actualMapping xmi:type="description_1:EdgeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@edgeMappings[name='DT2_EReference']"/> + </ownedDiagramElements> + <ownedDiagramElements xmi:type="diagram:DEdge" uid="_opKVEHKOEeu5xZikdim1pw" name="targetaC1-1-1" sourceNode="_oo52YHKOEeu5xZikdim1pw" targetNode="_oo-H0nKOEeu5xZikdim1pw"> + <target xmi:type="ecore:EReference" href="MyTarget.ecore#//targetp1/targetC1-1/targetaC1-1-1"/> + <semanticElements xmi:type="ecore:EReference" href="MyTarget.ecore#//targetp1/targetC1-1/targetaC1-1-1"/> + <ownedStyle xmi:type="diagram:EdgeStyle" uid="_orEZlXKOEeu5xZikdim1pw"> + <customFeatures>uid</customFeatures> + <description xmi:type="style:EdgeStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@edgeMappings[name='DT2_EReference']/@style"/> + <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_orEZlnKOEeu5xZikdim1pw" showIcon="false"/> + </ownedStyle> + <actualMapping xmi:type="description_1:EdgeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@edgeMappings[name='DT2_EReference']"/> + </ownedDiagramElements> + <description xmi:type="description_1:DiagramDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']"/> + <filterVariableHistory xmi:type="diagram:FilterVariableHistory" uid="_ooYR8HKOEeu5xZikdim1pw"/> + <target xmi:type="ecore:EPackage" href="MyTarget.ecore#/"/> + </diagram:DSemanticDiagram> </xmi:XMI> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My2.aird b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My2.aird index 117bb63b53..2db29d7e3a 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My2.aird +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My2.aird @@ -20,6 +20,10 @@ <description xmi:type="description_1:DiagramDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8_unsync_onlyBN']"/> <target xmi:type="ecore:EPackage" href="MyTarget.ecore#/"/> </ownedRepresentationDescriptors> + <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_oobVQHKOEeu5xZikdim1pw" name="DiagType2 Raw of targetMyPackage" repPath="#_ooRkQHKOEeu5xZikdim1pw" changeId="bffc027d-bcb5-43de-a6c3-c70930303bb5"> + <description xmi:type="description_1:DiagramDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']"/> + <target xmi:type="ecore:EPackage" href="MyTarget.ecore#/"/> + </ownedRepresentationDescriptors> </ownedViews> </viewpoint:DAnalysis> <diagram:DSemanticDiagram uid="_Hhj20GxTEeurr66EFLwyiQ"> @@ -1131,4 +1135,544 @@ <activatedLayers xmi:type="description_1:Layer" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8_unsync_onlyBN']/@defaultLayer"/> <target xmi:type="ecore:EPackage" href="MyTarget.ecore#/"/> </diagram:DSemanticDiagram> + <diagram:DSemanticDiagram uid="_ooRkQHKOEeu5xZikdim1pw"> + <ownedAnnotationEntries xmi:type="description:AnnotationEntry" uid="_oosbAHKOEeu5xZikdim1pw" source="GMF_DIAGRAMS"> + <data xmi:type="notation:Diagram" xmi:id="_oosbAXKOEeu5xZikdim1pw" type="Sirius" element="_ooRkQHKOEeu5xZikdim1pw" measurementUnit="Pixel"> + <children xmi:type="notation:Node" xmi:id="_opSQ4HKOEeu5xZikdim1pw" type="2002" element="_oozvwHKOEeu5xZikdim1pw"> + <children xmi:type="notation:Node" xmi:id="_opUGEHKOEeu5xZikdim1pw" type="5006"/> + <children xmi:type="notation:Node" xmi:id="_opUGEXKOEeu5xZikdim1pw" type="7001"> + <children xmi:type="notation:Node" xmi:id="_opXwcHKOEeu5xZikdim1pw" type="3009" element="_oo52YHKOEeu5xZikdim1pw"> + <children xmi:type="notation:Node" xmi:id="_opXwc3KOEeu5xZikdim1pw" type="5004"/> + <children xmi:type="notation:Node" xmi:id="_opYXgHKOEeu5xZikdim1pw" type="7003"> + <styles xmi:type="notation:SortingStyle" xmi:id="_opYXgXKOEeu5xZikdim1pw"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_opYXgnKOEeu5xZikdim1pw"/> + </children> + <styles xmi:type="notation:ShapeStyle" xmi:id="_opXwcXKOEeu5xZikdim1pw" fontName="Sans" fontHeight="8"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_orEZkHKOEeu5xZikdim1pw" x="565" y="138" width="121" height="71"/> + </children> + <children xmi:type="notation:Node" xmi:id="_opYXg3KOEeu5xZikdim1pw" type="3009" element="_oo7EgnKOEeu5xZikdim1pw"> + <children xmi:type="notation:Node" xmi:id="_opY-kHKOEeu5xZikdim1pw" type="5004"/> + <children xmi:type="notation:Node" xmi:id="_opY-kXKOEeu5xZikdim1pw" type="7003"> + <styles xmi:type="notation:SortingStyle" xmi:id="_opY-knKOEeu5xZikdim1pw"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_opY-k3KOEeu5xZikdim1pw"/> + </children> + <styles xmi:type="notation:ShapeStyle" xmi:id="_opYXhHKOEeu5xZikdim1pw" fontName="Sans" fontHeight="8"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_orFAoXKOEeu5xZikdim1pw" x="247" y="29" width="121" height="71"/> + </children> + <children xmi:type="notation:Node" xmi:id="_opY-lHKOEeu5xZikdim1pw" type="3009" element="_oo7rkXKOEeu5xZikdim1pw"> + <children xmi:type="notation:Node" xmi:id="_opY-l3KOEeu5xZikdim1pw" type="5004"/> + <children xmi:type="notation:Node" xmi:id="_opZloHKOEeu5xZikdim1pw" type="7003"> + <children xmi:type="notation:Node" xmi:id="_opco8HKOEeu5xZikdim1pw" type="3010" element="_oo8SoHKOEeu5xZikdim1pw"> + <styles xmi:type="notation:FontStyle" xmi:id="_opco8XKOEeu5xZikdim1pw"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_opco8nKOEeu5xZikdim1pw"/> + </children> + <styles xmi:type="notation:SortingStyle" xmi:id="_opZloXKOEeu5xZikdim1pw"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_opZlonKOEeu5xZikdim1pw"/> + </children> + <styles xmi:type="notation:ShapeStyle" xmi:id="_opY-lXKOEeu5xZikdim1pw" fontName="Sans" fontHeight="8"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_orFAo3KOEeu5xZikdim1pw" x="56" y="29" width="121" height="71"/> + </children> + <children xmi:type="notation:Node" xmi:id="_opaMsHKOEeu5xZikdim1pw" type="3008" element="_oo9gwHKOEeu5xZikdim1pw"> + <children xmi:type="notation:Node" xmi:id="_opaMs3KOEeu5xZikdim1pw" type="5005"/> + <children xmi:type="notation:Node" xmi:id="_opazwHKOEeu5xZikdim1pw" type="7002"> + <children xmi:type="notation:Node" xmi:id="_opco83KOEeu5xZikdim1pw" type="3009" element="_oo-H0nKOEeu5xZikdim1pw"> + <children xmi:type="notation:Node" xmi:id="_opdQAHKOEeu5xZikdim1pw" type="5004"/> + <children xmi:type="notation:Node" xmi:id="_opdQAXKOEeu5xZikdim1pw" type="7003"> + <children xmi:type="notation:Node" xmi:id="_opd3FHKOEeu5xZikdim1pw" type="3010" element="_oo-u4nKOEeu5xZikdim1pw"> + <styles xmi:type="notation:FontStyle" xmi:id="_opd3FXKOEeu5xZikdim1pw"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_opd3FnKOEeu5xZikdim1pw"/> + </children> + <styles xmi:type="notation:SortingStyle" xmi:id="_opdQAnKOEeu5xZikdim1pw"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_opdQA3KOEeu5xZikdim1pw"/> + </children> + <styles xmi:type="notation:ShapeStyle" xmi:id="_opco9HKOEeu5xZikdim1pw" fontName="Sans" fontHeight="8"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_orFAp3KOEeu5xZikdim1pw" x="60" y="60" width="121" height="71"/> + </children> + <children xmi:type="notation:Node" xmi:id="_opdQBHKOEeu5xZikdim1pw" type="3009" element="_oo-H1XKOEeu5xZikdim1pw"> + <children xmi:type="notation:Node" xmi:id="_opd3EHKOEeu5xZikdim1pw" type="5004"/> + <children xmi:type="notation:Node" xmi:id="_opd3EXKOEeu5xZikdim1pw" type="7003"> + <styles xmi:type="notation:SortingStyle" xmi:id="_opd3EnKOEeu5xZikdim1pw"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_opd3E3KOEeu5xZikdim1pw"/> + </children> + <styles xmi:type="notation:ShapeStyle" xmi:id="_opdQBXKOEeu5xZikdim1pw" fontName="Sans" fontHeight="8"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_orFnsXKOEeu5xZikdim1pw" x="203" y="324" width="121" height="71"/> + </children> + <styles xmi:type="notation:SortingStyle" xmi:id="_opazwXKOEeu5xZikdim1pw"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_opazwnKOEeu5xZikdim1pw"/> + </children> + <styles xmi:type="notation:ShapeStyle" xmi:id="_opaMsXKOEeu5xZikdim1pw" fontName="Sans" fontHeight="10"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_orFApXKOEeu5xZikdim1pw" x="967" y="6"/> + </children> + <children xmi:type="notation:Node" xmi:id="_opazw3KOEeu5xZikdim1pw" type="3008" element="_oo9gw3KOEeu5xZikdim1pw"> + <children xmi:type="notation:Node" xmi:id="_opba0HKOEeu5xZikdim1pw" type="5005"/> + <children xmi:type="notation:Node" xmi:id="_opba0XKOEeu5xZikdim1pw" type="7002"> + <children xmi:type="notation:Node" xmi:id="_opd3F3KOEeu5xZikdim1pw" type="3009" element="_oo-u5HKOEeu5xZikdim1pw"> + <children xmi:type="notation:Node" xmi:id="_opd3GnKOEeu5xZikdim1pw" type="5004"/> + <children xmi:type="notation:Node" xmi:id="_opd3G3KOEeu5xZikdim1pw" type="7003"> + <styles xmi:type="notation:SortingStyle" xmi:id="_opd3HHKOEeu5xZikdim1pw"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_opd3HXKOEeu5xZikdim1pw"/> + </children> + <styles xmi:type="notation:ShapeStyle" xmi:id="_opd3GHKOEeu5xZikdim1pw" fontName="Sans" fontHeight="8"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_orFntXKOEeu5xZikdim1pw" x="12" y="33" width="121" height="71"/> + </children> + <styles xmi:type="notation:SortingStyle" xmi:id="_opba0nKOEeu5xZikdim1pw"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_opba03KOEeu5xZikdim1pw"/> + </children> + <styles xmi:type="notation:ShapeStyle" xmi:id="_opazxHKOEeu5xZikdim1pw" fontName="Sans" fontHeight="10"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_orFns3KOEeu5xZikdim1pw" x="85" y="162" width="273" height="139"/> + </children> + <children xmi:type="notation:Node" xmi:id="_opba1HKOEeu5xZikdim1pw" type="3008" element="_oo9gxnKOEeu5xZikdim1pw"> + <children xmi:type="notation:Node" xmi:id="_opba13KOEeu5xZikdim1pw" type="5005"/> + <children xmi:type="notation:Node" xmi:id="_opba2HKOEeu5xZikdim1pw" type="7002"> + <styles xmi:type="notation:SortingStyle" xmi:id="_opba2XKOEeu5xZikdim1pw"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_opba2nKOEeu5xZikdim1pw"/> + </children> + <styles xmi:type="notation:ShapeStyle" xmi:id="_opba1XKOEeu5xZikdim1pw" fontName="Sans" fontHeight="10"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_orFnt3KOEeu5xZikdim1pw" x="296" y="164" width="172" height="84"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_orP_wHKOEeu5xZikdim1pw" type="Text" fontName="Segoe UI" description="Interesting"> + <children xmi:type="notation:BasicDecorationNode" xmi:id="_orP_wnKOEeu5xZikdim1pw" type="DiagramName"> + <element xsi:nil="true"/> + </children> + <children xmi:type="notation:BasicDecorationNode" xmi:id="_orP_w3KOEeu5xZikdim1pw" type="Description"> + <element xsi:nil="true"/> + </children> + <element xsi:nil="true"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_orP_xHKOEeu5xZikdim1pw" x="1405" y="171"/> + </children> + <styles xmi:type="notation:SortingStyle" xmi:id="_opUtIHKOEeu5xZikdim1pw"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_opUtIXKOEeu5xZikdim1pw"/> + </children> + <styles xmi:type="notation:ShapeStyle" xmi:id="_opSQ4XKOEeu5xZikdim1pw" fontName="Sans" fontHeight="10"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_orDLcHKOEeu5xZikdim1pw" x="30" y="30" width="653" height="173"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_orNjgHKOEeu5xZikdim1pw" type="Note" fontName="Segoe UI" description="Great" fillColor="13369343" transparency="0" lineColor="6737151" lineWidth="1"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_orNjgXKOEeu5xZikdim1pw" source="specificStyles"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_orNjgnKOEeu5xZikdim1pw" key="verticalAlignment" value="8"/> + </eAnnotations> + <children xmi:type="notation:BasicDecorationNode" xmi:id="_orOKkHKOEeu5xZikdim1pw" type="DiagramName"> + <element xsi:nil="true"/> + </children> + <children xmi:type="notation:BasicDecorationNode" xmi:id="_orOKkXKOEeu5xZikdim1pw" type="Description"> + <element xsi:nil="true"/> + </children> + <styles xmi:type="notation:TextStyle" xmi:id="_orNjg3KOEeu5xZikdim1pw" textAlignment="Center"/> + <styles xmi:type="notation:LineTypeStyle" xmi:id="_orNjhHKOEeu5xZikdim1pw"/> + <element xsi:nil="true"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_orOKknKOEeu5xZikdim1pw" x="335" y="300" width="141" height="86"/> + </children> + <children xmi:type="notation:Node" xmi:id="_opUtInKOEeu5xZikdim1pw" type="2002" element="_oo5PUHKOEeu5xZikdim1pw"> + <children xmi:type="notation:Node" xmi:id="_opVUMHKOEeu5xZikdim1pw" type="5006"/> + <children xmi:type="notation:Node" xmi:id="_opVUMXKOEeu5xZikdim1pw" type="7001"> + <children xmi:type="notation:Node" xmi:id="_opeeIHKOEeu5xZikdim1pw" type="3008" element="_oo_V8nKOEeu5xZikdim1pw"> + <children xmi:type="notation:Node" xmi:id="_opeeI3KOEeu5xZikdim1pw" type="5005"/> + <children xmi:type="notation:Node" xmi:id="_opeeJHKOEeu5xZikdim1pw" type="7002"> + <children xmi:type="notation:Node" xmi:id="_opeeLnKOEeu5xZikdim1pw" type="3009" element="_oo_9AXKOEeu5xZikdim1pw"> + <children xmi:type="notation:Node" xmi:id="_opfsQHKOEeu5xZikdim1pw" type="5004"/> + <children xmi:type="notation:Node" xmi:id="_opfsQXKOEeu5xZikdim1pw" type="7003"> + <children xmi:type="notation:Node" xmi:id="_opfsRHKOEeu5xZikdim1pw" type="3010" element="_oo_9BHKOEeu5xZikdim1pw"> + <styles xmi:type="notation:FontStyle" xmi:id="_opfsRXKOEeu5xZikdim1pw"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_opfsRnKOEeu5xZikdim1pw"/> + </children> + <styles xmi:type="notation:SortingStyle" xmi:id="_opfsQnKOEeu5xZikdim1pw"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_opfsQ3KOEeu5xZikdim1pw"/> + </children> + <styles xmi:type="notation:ShapeStyle" xmi:id="_opeeL3KOEeu5xZikdim1pw" fontName="Sans" fontHeight="8"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_orGOwnKOEeu5xZikdim1pw" x="10" y="34" width="137" height="71"/> + </children> + <styles xmi:type="notation:SortingStyle" xmi:id="_opeeJXKOEeu5xZikdim1pw"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_opeeJnKOEeu5xZikdim1pw"/> + </children> + <styles xmi:type="notation:ShapeStyle" xmi:id="_opeeIXKOEeu5xZikdim1pw" fontName="Sans" fontHeight="10"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_orGOwHKOEeu5xZikdim1pw" x="15" y="23" width="178"/> + </children> + <children xmi:type="notation:Node" xmi:id="_opeeJ3KOEeu5xZikdim1pw" type="3008" element="_oo_V9XKOEeu5xZikdim1pw"> + <children xmi:type="notation:Node" xmi:id="_opeeKnKOEeu5xZikdim1pw" type="5005"/> + <children xmi:type="notation:Node" xmi:id="_opeeK3KOEeu5xZikdim1pw" type="7002"> + <styles xmi:type="notation:SortingStyle" xmi:id="_opeeLHKOEeu5xZikdim1pw"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_opeeLXKOEeu5xZikdim1pw"/> + </children> + <styles xmi:type="notation:ShapeStyle" xmi:id="_opeeKHKOEeu5xZikdim1pw" fontName="Sans" fontHeight="10"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_orGOxHKOEeu5xZikdim1pw" x="211" y="45" width="168"/> + </children> + <styles xmi:type="notation:SortingStyle" xmi:id="_opVUMnKOEeu5xZikdim1pw"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_opVUM3KOEeu5xZikdim1pw"/> + </children> + <styles xmi:type="notation:ShapeStyle" xmi:id="_opUtI3KOEeu5xZikdim1pw" fontName="Sans" fontHeight="10"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_orFnuXKOEeu5xZikdim1pw" x="48" y="543"/> + </children> + <children xmi:type="notation:Node" xmi:id="_opVUNHKOEeu5xZikdim1pw" type="2002" element="_oo5PU3KOEeu5xZikdim1pw"> + <children xmi:type="notation:Node" xmi:id="_opV7QHKOEeu5xZikdim1pw" type="5006"/> + <children xmi:type="notation:Node" xmi:id="_opV7QXKOEeu5xZikdim1pw" type="7001"> + <styles xmi:type="notation:SortingStyle" xmi:id="_opV7QnKOEeu5xZikdim1pw"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_opV7Q3KOEeu5xZikdim1pw"/> + </children> + <styles xmi:type="notation:ShapeStyle" xmi:id="_opVUNXKOEeu5xZikdim1pw" fontName="Sans" fontHeight="10"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_orGOxnKOEeu5xZikdim1pw" x="491" y="492"/> + </children> + <children xmi:type="notation:Node" xmi:id="_opV7RHKOEeu5xZikdim1pw" type="2002" element="_oo5PVnKOEeu5xZikdim1pw"> + <children xmi:type="notation:Node" xmi:id="_opV7R3KOEeu5xZikdim1pw" type="5006"/> + <children xmi:type="notation:Node" xmi:id="_opV7SHKOEeu5xZikdim1pw" type="7001"> + <styles xmi:type="notation:SortingStyle" xmi:id="_opV7SXKOEeu5xZikdim1pw"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_opV7SnKOEeu5xZikdim1pw"/> + </children> + <styles xmi:type="notation:ShapeStyle" xmi:id="_opV7RXKOEeu5xZikdim1pw" fontName="Sans" fontHeight="10"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_orGOyHKOEeu5xZikdim1pw" x="1622" y="30" width="172"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_orOKk3KOEeu5xZikdim1pw" type="Note" fontColor="10265827" fontName="Segoe UI" description="Nice" fillColor="13369343" transparency="0" lineColor="6737151" lineWidth="1"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_orOKlHKOEeu5xZikdim1pw" source="specificStyles"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_orOKlXKOEeu5xZikdim1pw" key="verticalAlignment" value="8"/> + </eAnnotations> + <children xmi:type="notation:BasicDecorationNode" xmi:id="_orOKmXKOEeu5xZikdim1pw" type="DiagramName"> + <element xsi:nil="true"/> + </children> + <children xmi:type="notation:BasicDecorationNode" xmi:id="_orOKmnKOEeu5xZikdim1pw" type="Description"> + <element xsi:nil="true"/> + </children> + <styles xmi:type="notation:TextStyle" xmi:id="_orOKlnKOEeu5xZikdim1pw" textAlignment="Center"/> + <styles xmi:type="notation:LineTypeStyle" xmi:id="_orOKl3KOEeu5xZikdim1pw"/> + <element xsi:nil="true"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_orOKm3KOEeu5xZikdim1pw" x="860" y="187" width="86" height="106"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_orOKnHKOEeu5xZikdim1pw" type="Note" fontName="Segoe UI" description="Nicer" fillColor="12560536" transparency="0" lineColor="6737151" lineWidth="1"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_orOKnXKOEeu5xZikdim1pw" source="specificStyles"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_orOKnnKOEeu5xZikdim1pw" key="verticalAlignment" value="8"/> + </eAnnotations> + <children xmi:type="notation:BasicDecorationNode" xmi:id="_orOxoHKOEeu5xZikdim1pw" type="DiagramName"> + <element xsi:nil="true"/> + </children> + <children xmi:type="notation:BasicDecorationNode" xmi:id="_orOxoXKOEeu5xZikdim1pw" type="Description"> + <element xsi:nil="true"/> + </children> + <styles xmi:type="notation:TextStyle" xmi:id="_orOKn3KOEeu5xZikdim1pw" textAlignment="Center"/> + <styles xmi:type="notation:LineTypeStyle" xmi:id="_orOKoHKOEeu5xZikdim1pw"/> + <element xsi:nil="true"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_orOxonKOEeu5xZikdim1pw" x="616" y="311" width="86" height="116"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_orOxo3KOEeu5xZikdim1pw" type="Note" fontName="Segoe UI" description="Good" fillColor="13369343" transparency="0" lineColor="6737151" lineWidth="1"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_orOxpHKOEeu5xZikdim1pw" source="specificStyles"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_orOxpXKOEeu5xZikdim1pw" key="verticalAlignment" value="8"/> + </eAnnotations> + <children xmi:type="notation:BasicDecorationNode" xmi:id="_orOxqXKOEeu5xZikdim1pw" type="DiagramName"> + <element xsi:nil="true"/> + </children> + <children xmi:type="notation:BasicDecorationNode" xmi:id="_orOxqnKOEeu5xZikdim1pw" type="Description"> + <element xsi:nil="true"/> + </children> + <styles xmi:type="notation:TextStyle" xmi:id="_orOxpnKOEeu5xZikdim1pw" textAlignment="Center"/> + <styles xmi:type="notation:LineTypeStyle" xmi:id="_orOxp3KOEeu5xZikdim1pw" lineType="Dash"/> + <element xsi:nil="true"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_orOxq3KOEeu5xZikdim1pw" x="125" y="726" width="271" height="96"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_orOxrHKOEeu5xZikdim1pw" type="Note" fontName="Segoe UI" description="Nice" fillColor="15053796" transparency="0" lineColor="6737151" lineWidth="1"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_orOxrXKOEeu5xZikdim1pw" source="specificStyles"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_orOxrnKOEeu5xZikdim1pw" key="verticalAlignment" value="8"/> + </eAnnotations> + <children xmi:type="notation:BasicDecorationNode" xmi:id="_orPYsHKOEeu5xZikdim1pw" type="DiagramName"> + <element xsi:nil="true"/> + </children> + <children xmi:type="notation:BasicDecorationNode" xmi:id="_orPYsXKOEeu5xZikdim1pw" type="Description"> + <element xsi:nil="true"/> + </children> + <styles xmi:type="notation:TextStyle" xmi:id="_orOxr3KOEeu5xZikdim1pw" textAlignment="Center"/> + <styles xmi:type="notation:LineTypeStyle" xmi:id="_orOxsHKOEeu5xZikdim1pw"/> + <element xsi:nil="true"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_orPYsnKOEeu5xZikdim1pw" x="777" y="528" width="124" height="120"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_CpIeEHKPEeu5xZikdim1pw" type="Note" fontName="Segoe UI" description="Great" fillColor="10265827" transparency="0" lineColor="6737151" lineWidth="1"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CpIeEXKPEeu5xZikdim1pw" source="specificStyles"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CpIeEnKPEeu5xZikdim1pw" key="verticalAlignment" value="8"/> + </eAnnotations> + <children xmi:type="notation:BasicDecorationNode" xmi:id="_CpJFIHKPEeu5xZikdim1pw" type="DiagramName"> + <element xsi:nil="true"/> + </children> + <children xmi:type="notation:BasicDecorationNode" xmi:id="_CpJFIXKPEeu5xZikdim1pw" type="Description"> + <element xsi:nil="true"/> + </children> + <styles xmi:type="notation:TextStyle" xmi:id="_CpIeE3KPEeu5xZikdim1pw" textAlignment="Center"/> + <styles xmi:type="notation:LineTypeStyle" xmi:id="_CpIeFHKPEeu5xZikdim1pw"/> + <element xsi:nil="true"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CpIeFXKPEeu5xZikdim1pw" x="1591" y="225" height="88"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_4RdIgHKiEeuK-9B8t7T2zQ" type="Text" fontName="Segoe UI" description="Nicer"> + <children xmi:type="notation:BasicDecorationNode" xmi:id="_4RdIgnKiEeuK-9B8t7T2zQ" type="DiagramName"> + <element xsi:nil="true"/> + </children> + <children xmi:type="notation:BasicDecorationNode" xmi:id="_4RdIg3KiEeuK-9B8t7T2zQ" type="Description"> + <element xsi:nil="true"/> + </children> + <element xsi:nil="true"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4RdIgXKiEeuK-9B8t7T2zQ" x="1397" y="430" height="43"/> + </children> + <styles xmi:type="notation:DiagramStyle" xmi:id="_oosbAnKOEeu5xZikdim1pw"/> + <edges xmi:type="notation:Edge" xmi:id="_opiIgHKOEeu5xZikdim1pw" type="4001" element="_opJG8HKOEeu5xZikdim1pw" source="_opXwcHKOEeu5xZikdim1pw" target="_opYXg3KOEeu5xZikdim1pw"> + <children xmi:type="notation:Node" xmi:id="_opivkHKOEeu5xZikdim1pw" type="6001"> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_orEZlHKOEeu5xZikdim1pw" x="36" y="-1"/> + </children> + <children xmi:type="notation:Node" xmi:id="_opjWoHKOEeu5xZikdim1pw" type="6002"> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_opjWoXKOEeu5xZikdim1pw" x="-23" y="-165"/> + </children> + <children xmi:type="notation:Node" xmi:id="_opj9sHKOEeu5xZikdim1pw" type="6003"> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_opj9sXKOEeu5xZikdim1pw" x="-22" y="11"/> + </children> + <styles xmi:type="notation:ConnectorStyle" xmi:id="_opiIgXKOEeu5xZikdim1pw"/> + <styles xmi:type="notation:FontStyle" xmi:id="_opiIgnKOEeu5xZikdim1pw" fontName="Sans" fontHeight="8"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_opiIg3KOEeu5xZikdim1pw" points="[2, -3, 301, 44]$[39, -87, 338, -40]$[-85, -114, 214, -67]$[-248, -63, 51, -16]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_opo2MHKOEeu5xZikdim1pw" id="(0.41666666,0.057142857)"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_opo2MXKOEeu5xZikdim1pw" id="(0.57894737,0.94285715)"/> + </edges> + <edges xmi:type="notation:Edge" xmi:id="_oppdQHKOEeu5xZikdim1pw" type="4001" element="_opKVEHKOEeu5xZikdim1pw" source="_opXwcHKOEeu5xZikdim1pw" target="_opco83KOEeu5xZikdim1pw"> + <children xmi:type="notation:Node" xmi:id="_oppdRHKOEeu5xZikdim1pw" type="6001"> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_orFAoHKOEeu5xZikdim1pw" x="-119" y="-12"/> + </children> + <children xmi:type="notation:Node" xmi:id="_oppdRnKOEeu5xZikdim1pw" type="6002"> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oppdR3KOEeu5xZikdim1pw" x="-34" y="-12"/> + </children> + <children xmi:type="notation:Node" xmi:id="_oppdSHKOEeu5xZikdim1pw" type="6003"> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oppdSXKOEeu5xZikdim1pw" x="-285" y="-20"/> + </children> + <styles xmi:type="notation:ConnectorStyle" xmi:id="_oppdQXKOEeu5xZikdim1pw"/> + <styles xmi:type="notation:FontStyle" xmi:id="_oppdQnKOEeu5xZikdim1pw" fontName="Sans" fontHeight="8"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_oppdQ3KOEeu5xZikdim1pw" points="[60, -4, -348, 96]$[160, -11, -248, 89]$[408, -100, 0, 0]"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_opqEUXKOEeu5xZikdim1pw" id="(0.0,0.0)"/> + </edges> + <edges xmi:type="notation:Connector" xmi:id="_orQm0HKOEeu5xZikdim1pw" type="NoteAttachment" source="_orOxo3KOEeu5xZikdim1pw" target="_opeeLnKOEeu5xZikdim1pw" lineWidth="1"> + <styles xmi:type="notation:ArrowStyle" xmi:id="_orQm0XKOEeu5xZikdim1pw"/> + <styles xmi:type="notation:LineTypeStyle" xmi:id="_orQm0nKOEeu5xZikdim1pw"/> + <element xsi:nil="true"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_orQm03KOEeu5xZikdim1pw" points="[9, -40, -16, 63]$[20, -85, -5, 18]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_orQm1HKOEeu5xZikdim1pw" id="(0.13284132841328414,0.4166666666666667)"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_orQm1XKOEeu5xZikdim1pw" id="(0.7682119205298014,0.7450980392156863)"/> + </edges> + <edges xmi:type="notation:Connector" xmi:id="_orQm1nKOEeu5xZikdim1pw" type="NoteAttachment" source="_opeeJ3KOEeu5xZikdim1pw" target="_orOxo3KOEeu5xZikdim1pw" lineWidth="1"> + <styles xmi:type="notation:ArrowStyle" xmi:id="_orQm13KOEeu5xZikdim1pw"/> + <styles xmi:type="notation:LineTypeStyle" xmi:id="_orQm2HKOEeu5xZikdim1pw"/> + <element xsi:nil="true"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_orQm2XKOEeu5xZikdim1pw" points="[-7, 34, 155, -92]$[-7, 41, 155, -85]$[-111, 98, 51, -28]"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_orQm2nKOEeu5xZikdim1pw" id="(0.22140221402214022,0.2916666666666667)"/> + </edges> + <edges xmi:type="notation:Connector" xmi:id="_orRN4HKOEeu5xZikdim1pw" type="NoteAttachment" source="_orOKnHKOEeu5xZikdim1pw" target="_opiIgHKOEeu5xZikdim1pw" lineWidth="1"> + <styles xmi:type="notation:ArrowStyle" xmi:id="_orRN4XKOEeu5xZikdim1pw"/> + <styles xmi:type="notation:LineTypeStyle" xmi:id="_orRN4nKOEeu5xZikdim1pw"/> + <element xsi:nil="true"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_orRN43KOEeu5xZikdim1pw" points="[-37, -58, 98, 154]$[-116, -181, 19, 31]"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_orRN5HKOEeu5xZikdim1pw" id="(0.4292682926829268,0.8418803418803419)"/> + </edges> + <edges xmi:type="notation:Connector" xmi:id="_orRN5XKOEeu5xZikdim1pw" type="NoteAttachment" source="_orOKk3KOEeu5xZikdim1pw" target="_oppdQHKOEeu5xZikdim1pw" lineWidth="1"> + <styles xmi:type="notation:ArrowStyle" xmi:id="_orRN5nKOEeu5xZikdim1pw"/> + <styles xmi:type="notation:LineTypeStyle" xmi:id="_orRN53KOEeu5xZikdim1pw"/> + <element xsi:nil="true"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_orRN6HKOEeu5xZikdim1pw" points="[-38, -53, 39, 55]$[-45, -63, 32, 45]"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_orRN6XKOEeu5xZikdim1pw" id="(0.6417112299465241,0.43859649122807015)"/> + </edges> + <edges xmi:type="notation:Connector" xmi:id="_orRN6nKOEeu5xZikdim1pw" type="NoteAttachment" source="_orNjgHKOEeu5xZikdim1pw" target="_orOKnHKOEeu5xZikdim1pw" lineWidth="1"> + <styles xmi:type="notation:ArrowStyle" xmi:id="_orRN63KOEeu5xZikdim1pw"/> + <styles xmi:type="notation:LineTypeStyle" xmi:id="_orRN7HKOEeu5xZikdim1pw"/> + <element xsi:nil="true"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_orRN7XKOEeu5xZikdim1pw" points="[68, -33, -186, -59]$[107, -51, -147, -77]$[145, 1, -109, -25]$[211, 16, -43, -10]"/> + </edges> + <edges xmi:type="notation:Connector" xmi:id="_orRN7nKOEeu5xZikdim1pw" type="NoteAttachment" source="_orP_wHKOEeu5xZikdim1pw" target="_opaMsHKOEeu5xZikdim1pw" lineWidth="1"> + <styles xmi:type="notation:ArrowStyle" xmi:id="_orRN73KOEeu5xZikdim1pw"/> + <styles xmi:type="notation:LineTypeStyle" xmi:id="_orRN8HKOEeu5xZikdim1pw"/> + <element xsi:nil="true"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_orRN8XKOEeu5xZikdim1pw" points="[-22, -7, 425, 137]$[-153, -50, 294, 94]"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_orR08HKOEeu5xZikdim1pw" id="(0.125,0.06896551724137931)"/> + </edges> + </data> + </ownedAnnotationEntries> + <ownedAnnotationEntries xmi:type="description:AnnotationEntry" uid="_opK8IHKOEeu5xZikdim1pw" source="DANNOTATION_CUSTOMIZATION_KEY"> + <data xmi:type="diagram:ComputedStyleDescriptionRegistry" uid="_opK8IXKOEeu5xZikdim1pw"/> + </ownedAnnotationEntries> + <ownedDiagramElements xmi:type="diagram:DNodeContainer" uid="_oozvwHKOEeu5xZikdim1pw" name="Container targetp1"> + <target xmi:type="ecore:EPackage" href="MyTarget.ecore#//targetp1"/> + <semanticElements xmi:type="ecore:EPackage" href="MyTarget.ecore#//targetp1"/> + <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_orDLcXKOEeu5xZikdim1pw" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <customFeatures>uid</customFeatures> + <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@style"/> + </ownedStyle> + <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']"/> + <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_oo52YHKOEeu5xZikdim1pw" name="targetC1-1" tooltipText="targetp1.targetC1-1" outgoingEdges="_opJG8HKOEeu5xZikdim1pw _opKVEHKOEeu5xZikdim1pw"> + <target xmi:type="ecore:EClass" href="MyTarget.ecore#//targetp1/targetC1-1"/> + <semanticElements xmi:type="ecore:EClass" href="MyTarget.ecore#//targetp1/targetC1-1"/> + <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_orEZkXKOEeu5xZikdim1pw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <customFeatures>uid</customFeatures> + <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/> + </ownedStyle> + <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']"/> + </ownedDiagramElements> + <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_oo7EgnKOEeu5xZikdim1pw" name="targetC1-2" tooltipText="targetp1.targetC1-2" incomingEdges="_opJG8HKOEeu5xZikdim1pw"> + <target xmi:type="ecore:EClass" href="MyTarget.ecore#//targetp1/targetC1-2"/> + <semanticElements xmi:type="ecore:EClass" href="MyTarget.ecore#//targetp1/targetC1-2"/> + <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_orFAonKOEeu5xZikdim1pw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <customFeatures>uid</customFeatures> + <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/> + </ownedStyle> + <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']"/> + </ownedDiagramElements> + <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_oo7rkXKOEeu5xZikdim1pw" name="targetC1-3" tooltipText="targetp1.targetC1-3"> + <target xmi:type="ecore:EClass" href="MyTarget.ecore#//targetp1/targetC1-3"/> + <semanticElements xmi:type="ecore:EClass" href="MyTarget.ecore#//targetp1/targetC1-3"/> + <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_orFApHKOEeu5xZikdim1pw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <customFeatures>uid</customFeatures> + <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/> + </ownedStyle> + <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']"/> + <ownedElements xmi:type="diagram:DNodeListElement" uid="_oo8SoHKOEeu5xZikdim1pw" name="targetm1" tooltipText="targetm1(): "> + <target xmi:type="ecore:EOperation" href="MyTarget.ecore#//targetp1/targetC1-3/targetm1"/> + <semanticElements xmi:type="ecore:EOperation" href="MyTarget.ecore#//targetp1/targetC1-3/targetm1"/> + <ownedStyle xmi:type="diagram:BundledImage" uid="_oo85sHKOEeu5xZikdim1pw" labelSize="10" labelAlignment="LEFT"> + <description xmi:type="style:BundledImageDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@subNodeMappings[name='DT2_Operation']/@style"/> + </ownedStyle> + <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@subNodeMappings[name='DT2_Operation']"/> + </ownedElements> + </ownedDiagramElements> + <ownedDiagramElements xmi:type="diagram:DNodeContainer" uid="_oo9gwHKOEeu5xZikdim1pw" name="Container targetp1-1"> + <target xmi:type="ecore:EPackage" href="MyTarget.ecore#//targetp1/targetp1-1"/> + <semanticElements xmi:type="ecore:EPackage" href="MyTarget.ecore#//targetp1/targetp1-1"/> + <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_orFApnKOEeu5xZikdim1pw" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <customFeatures>uid</customFeatures> + <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@style"/> + </ownedStyle> + <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']"/> + <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_oo-H0nKOEeu5xZikdim1pw" name="targetC1-1-1" tooltipText="targetp1-1.targetC1-1-1" incomingEdges="_opKVEHKOEeu5xZikdim1pw"> + <target xmi:type="ecore:EClass" href="MyTarget.ecore#//targetp1/targetp1-1/targetC1-1-1"/> + <semanticElements xmi:type="ecore:EClass" href="MyTarget.ecore#//targetp1/targetp1-1/targetC1-1-1"/> + <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_orFnsHKOEeu5xZikdim1pw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <customFeatures>uid</customFeatures> + <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/> + </ownedStyle> + <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']"/> + <ownedElements xmi:type="diagram:DNodeListElement" uid="_oo-u4nKOEeu5xZikdim1pw" name="targetm1" tooltipText="targetm1(): "> + <target xmi:type="ecore:EOperation" href="MyTarget.ecore#//targetp1/targetp1-1/targetC1-1-1/targetm1"/> + <semanticElements xmi:type="ecore:EOperation" href="MyTarget.ecore#//targetp1/targetp1-1/targetC1-1-1/targetm1"/> + <ownedStyle xmi:type="diagram:BundledImage" uid="_oo-u43KOEeu5xZikdim1pw" labelSize="10" labelAlignment="LEFT"> + <description xmi:type="style:BundledImageDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@subNodeMappings[name='DT2_Operation']/@style"/> + </ownedStyle> + <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@subNodeMappings[name='DT2_Operation']"/> + </ownedElements> + </ownedDiagramElements> + <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_oo-H1XKOEeu5xZikdim1pw" name="targetC1-1-2" tooltipText="targetp1-1.targetC1-1-2"> + <target xmi:type="ecore:EClass" href="MyTarget.ecore#//targetp1/targetp1-1/targetC1-1-2"/> + <semanticElements xmi:type="ecore:EClass" href="MyTarget.ecore#//targetp1/targetp1-1/targetC1-1-2"/> + <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_orFnsnKOEeu5xZikdim1pw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <customFeatures>uid</customFeatures> + <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/> + </ownedStyle> + <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']"/> + </ownedDiagramElements> + </ownedDiagramElements> + <ownedDiagramElements xmi:type="diagram:DNodeContainer" uid="_oo9gw3KOEeu5xZikdim1pw" name="Container targetp1-2"> + <target xmi:type="ecore:EPackage" href="MyTarget.ecore#//targetp1/targetp1-2"/> + <semanticElements xmi:type="ecore:EPackage" href="MyTarget.ecore#//targetp1/targetp1-2"/> + <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_orFntHKOEeu5xZikdim1pw" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <customFeatures>uid</customFeatures> + <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@style"/> + </ownedStyle> + <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']"/> + <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_oo-u5HKOEeu5xZikdim1pw" name="targetC1-2-1" tooltipText="targetp1-2.targetC1-2-1"> + <target xmi:type="ecore:EClass" href="MyTarget.ecore#//targetp1/targetp1-2/targetC1-2-1"/> + <semanticElements xmi:type="ecore:EClass" href="MyTarget.ecore#//targetp1/targetp1-2/targetC1-2-1"/> + <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_orFntnKOEeu5xZikdim1pw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <customFeatures>uid</customFeatures> + <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/> + </ownedStyle> + <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']"/> + </ownedDiagramElements> + </ownedDiagramElements> + <ownedDiagramElements xmi:type="diagram:DNodeContainer" uid="_oo9gxnKOEeu5xZikdim1pw" name="Container targetp1-3"> + <target xmi:type="ecore:EPackage" href="MyTarget.ecore#//targetp1/targetp1-3"/> + <semanticElements xmi:type="ecore:EPackage" href="MyTarget.ecore#//targetp1/targetp1-3"/> + <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_orFnuHKOEeu5xZikdim1pw" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <customFeatures>uid</customFeatures> + <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@style"/> + </ownedStyle> + <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']"/> + </ownedDiagramElements> + </ownedDiagramElements> + <ownedDiagramElements xmi:type="diagram:DNodeContainer" uid="_oo5PUHKOEeu5xZikdim1pw" name="Container targetp2"> + <target xmi:type="ecore:EPackage" href="MyTarget.ecore#//targetp2"/> + <semanticElements xmi:type="ecore:EPackage" href="MyTarget.ecore#//targetp2"/> + <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_orFnunKOEeu5xZikdim1pw" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <customFeatures>uid</customFeatures> + <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@style"/> + </ownedStyle> + <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']"/> + <ownedDiagramElements xmi:type="diagram:DNodeContainer" uid="_oo_V8nKOEeu5xZikdim1pw" name="Container targetp2-1"> + <target xmi:type="ecore:EPackage" href="MyTarget.ecore#//targetp2/targetp2-1"/> + <semanticElements xmi:type="ecore:EPackage" href="MyTarget.ecore#//targetp2/targetp2-1"/> + <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_orGOwXKOEeu5xZikdim1pw" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <customFeatures>uid</customFeatures> + <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@style"/> + </ownedStyle> + <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']"/> + <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_oo_9AXKOEeu5xZikdim1pw" name="targetnew EClass 1" tooltipText="targetp2-1.targetnew EClass 1"> + <target xmi:type="ecore:EClass" href="MyTarget.ecore#//targetp2/targetp2-1/targetnew%20EClass%201"/> + <semanticElements xmi:type="ecore:EClass" href="MyTarget.ecore#//targetp2/targetp2-1/targetnew%20EClass%201"/> + <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_orGOw3KOEeu5xZikdim1pw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <customFeatures>uid</customFeatures> + <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/> + </ownedStyle> + <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']"/> + <ownedElements xmi:type="diagram:DNodeListElement" uid="_oo_9BHKOEeu5xZikdim1pw" name="targetm1" tooltipText="targetm1(): "> + <target xmi:type="ecore:EOperation" href="MyTarget.ecore#//targetp2/targetp2-1/targetnew%20EClass%201/targetm1"/> + <semanticElements xmi:type="ecore:EOperation" href="MyTarget.ecore#//targetp2/targetp2-1/targetnew%20EClass%201/targetm1"/> + <ownedStyle xmi:type="diagram:BundledImage" uid="_opAkEHKOEeu5xZikdim1pw" labelSize="10" labelAlignment="LEFT"> + <description xmi:type="style:BundledImageDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@subNodeMappings[name='DT2_Operation']/@style"/> + </ownedStyle> + <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@subNodeMappings[name='DT2_Operation']"/> + </ownedElements> + </ownedDiagramElements> + </ownedDiagramElements> + <ownedDiagramElements xmi:type="diagram:DNodeContainer" uid="_oo_V9XKOEeu5xZikdim1pw" name="Container targetp2-2"> + <target xmi:type="ecore:EPackage" href="MyTarget.ecore#//targetp2/targetp2-2"/> + <semanticElements xmi:type="ecore:EPackage" href="MyTarget.ecore#//targetp2/targetp2-2"/> + <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_orGOxXKOEeu5xZikdim1pw" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <customFeatures>uid</customFeatures> + <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@style"/> + </ownedStyle> + <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']"/> + </ownedDiagramElements> + </ownedDiagramElements> + <ownedDiagramElements xmi:type="diagram:DNodeContainer" uid="_oo5PU3KOEeu5xZikdim1pw" name="Container targetp3"> + <target xmi:type="ecore:EPackage" href="MyTarget.ecore#//targetp3"/> + <semanticElements xmi:type="ecore:EPackage" href="MyTarget.ecore#//targetp3"/> + <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_orGOx3KOEeu5xZikdim1pw" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <customFeatures>uid</customFeatures> + <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@style"/> + </ownedStyle> + <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']"/> + </ownedDiagramElements> + <ownedDiagramElements xmi:type="diagram:DNodeContainer" uid="_oo5PVnKOEeu5xZikdim1pw" name="Container targetp4"> + <target xmi:type="ecore:EPackage" href="MyTarget.ecore#//targetp4"/> + <semanticElements xmi:type="ecore:EPackage" href="MyTarget.ecore#//targetp4"/> + <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_orG10HKOEeu5xZikdim1pw" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <customFeatures>uid</customFeatures> + <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@style"/> + </ownedStyle> + <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']"/> + </ownedDiagramElements> + <ownedDiagramElements xmi:type="diagram:DEdge" uid="_opJG8HKOEeu5xZikdim1pw" name="targetaC1-2" sourceNode="_oo52YHKOEeu5xZikdim1pw" targetNode="_oo7EgnKOEeu5xZikdim1pw"> + <target xmi:type="ecore:EReference" href="MyTarget.ecore#//targetp1/targetC1-1/targetaC1-2"/> + <semanticElements xmi:type="ecore:EReference" href="MyTarget.ecore#//targetp1/targetC1-1/targetaC1-2"/> + <ownedStyle xmi:type="diagram:EdgeStyle" uid="_orEZknKOEeu5xZikdim1pw"> + <customFeatures>uid</customFeatures> + <description xmi:type="style:EdgeStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@edgeMappings[name='DT2_EReference']/@style"/> + <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_orEZk3KOEeu5xZikdim1pw" showIcon="false"/> + </ownedStyle> + <actualMapping xmi:type="description_1:EdgeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@edgeMappings[name='DT2_EReference']"/> + </ownedDiagramElements> + <ownedDiagramElements xmi:type="diagram:DEdge" uid="_opKVEHKOEeu5xZikdim1pw" name="targetaC1-1-1" sourceNode="_oo52YHKOEeu5xZikdim1pw" targetNode="_oo-H0nKOEeu5xZikdim1pw"> + <target xmi:type="ecore:EReference" href="MyTarget.ecore#//targetp1/targetC1-1/targetaC1-1-1"/> + <semanticElements xmi:type="ecore:EReference" href="MyTarget.ecore#//targetp1/targetC1-1/targetaC1-1-1"/> + <ownedStyle xmi:type="diagram:EdgeStyle" uid="_orEZlXKOEeu5xZikdim1pw"> + <customFeatures>uid</customFeatures> + <description xmi:type="style:EdgeStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@edgeMappings[name='DT2_EReference']/@style"/> + <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_orEZlnKOEeu5xZikdim1pw" showIcon="false"/> + </ownedStyle> + <actualMapping xmi:type="description_1:EdgeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@edgeMappings[name='DT2_EReference']"/> + </ownedDiagramElements> + <description xmi:type="description_1:DiagramDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']"/> + <filterVariableHistory xmi:type="diagram:FilterVariableHistory" uid="_ooYR8HKOEeu5xZikdim1pw"/> + <target xmi:type="ecore:EPackage" href="MyTarget.ecore#/"/> + </diagram:DSemanticDiagram> </xmi:XMI> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/from___storedFormat-DiagType11__of__MyPackage___to___storedFormat-DiagType11__of__MyPackage__full__New.xmi b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/from___storedFormat-DiagType11__of__MyPackage___to___storedFormat-DiagType11__of__MyPackage__full__New.xmi index 3a445dd012..4caf341949 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/from___storedFormat-DiagType11__of__MyPackage___to___storedFormat-DiagType11__of__MyPackage__full__New.xmi +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/from___storedFormat-DiagType11__of__MyPackage___to___storedFormat-DiagType11__of__MyPackage__full__New.xmi @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="ASCII"?> <xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:diagram="http://www.eclipse.org/sirius/diagram/1.1.0" xmlns:formatdata="http://www.eclipse.org/sirius/dsl/formatdata/1.1.0" 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"> <formatdata:NodeFormatData id="//targetp1" width="943" height="238"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hvnqEGyeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_zB2qYXKSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType11']/@defaultLayer/@containerMappings[name='DT2_Package']/@style"/> </siriusStyle> @@ -106,7 +106,7 @@ <location/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetC1-1" width="133" height="63"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hvnqHmyeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_zB3RcHKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType11']/@defaultLayer/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/> </siriusStyle> @@ -123,10 +123,10 @@ <label id="//targetp1/targetC1-1/targetaC1-2" width="-1" height="-1"> <location x="1" y="-9"/> </label> - <siriusStyle xsi:type="diagram:EdgeStyle" uid="_hvnqH2yeEeuXco3AXfG1Yg"> + <siriusStyle xsi:type="diagram:EdgeStyle" uid="_zB3RcXKSEeu2Yf-vWkXYRg"> <customFeatures>uid</customFeatures> <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType11']/@defaultLayer/@edgeMappings[name='DT2_EReference']/@style"/> - <centerLabelStyle uid="_hvnqIGyeEeuXco3AXfG1Yg" showIcon="false"/> + <centerLabelStyle uid="_zB3RcnKSEeu2Yf-vWkXYRg" showIcon="false"/> </siriusStyle> <gmfView xsi:type="notation:Edge" type="4001"> <children type="6001"> @@ -153,10 +153,10 @@ <label id="//targetp1/targetC1-1/targetaC1-1-1" width="-1" height="-1"> <location x="-6" y="-8"/> </label> - <siriusStyle xsi:type="diagram:EdgeStyle" uid="_hvnqIWyeEeuXco3AXfG1Yg"> + <siriusStyle xsi:type="diagram:EdgeStyle" uid="_zB3Rc3KSEeu2Yf-vWkXYRg"> <customFeatures>uid</customFeatures> <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType11']/@defaultLayer/@edgeMappings[name='DT2_EReference']/@style"/> - <centerLabelStyle uid="_hvnqImyeEeuXco3AXfG1Yg" showIcon="false"/> + <centerLabelStyle uid="_zB3RdHKSEeu2Yf-vWkXYRg" showIcon="false"/> </siriusStyle> <gmfView xsi:type="notation:Edge" type="4001"> <children type="6001"> @@ -185,10 +185,10 @@ <label id="//targetp1/targetC1-1/targetaC1-1-1" width="-1" height="-1"> <location x="-6" y="-8"/> </label> - <siriusStyle xsi:type="diagram:EdgeStyle" uid="_hvoRKWyeEeuXco3AXfG1Yg"> + <siriusStyle xsi:type="diagram:EdgeStyle" uid="_zB34hnKSEeu2Yf-vWkXYRg"> <customFeatures>uid</customFeatures> <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType11']/@defaultLayer/@edgeMappings[name='DT2_EReference']/@style"/> - <centerLabelStyle uid="_hvoRKmyeEeuXco3AXfG1Yg" showIcon="false"/> + <centerLabelStyle uid="_zB34h3KSEeu2Yf-vWkXYRg" showIcon="false"/> </siriusStyle> <gmfView xsi:type="notation:Edge" type="4001"> <children type="6001"> @@ -215,10 +215,10 @@ <label id="//targetp1/targetC1-1/targetaC1-2" width="-1" height="-1"> <location x="1" y="-9"/> </label> - <siriusStyle xsi:type="diagram:EdgeStyle" uid="_hvoRK2yeEeuXco3AXfG1Yg"> + <siriusStyle xsi:type="diagram:EdgeStyle" uid="_zB34iHKSEeu2Yf-vWkXYRg"> <customFeatures>uid</customFeatures> <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType11']/@defaultLayer/@edgeMappings[name='DT2_EReference']/@style"/> - <centerLabelStyle uid="_hvoRLGyeEeuXco3AXfG1Yg" showIcon="false"/> + <centerLabelStyle uid="_zB34iXKSEeu2Yf-vWkXYRg" showIcon="false"/> </siriusStyle> <gmfView xsi:type="notation:Edge" type="4001"> <children type="6001"> @@ -242,7 +242,7 @@ <targetRefPoint x="558" y="74"/> </formatdata:EdgeFormatData> <formatdata:NodeFormatData id="//targetp1/targetC1-2" width="128" height="41"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hvnqI2yeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_zB3RdXKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType11']/@defaultLayer/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/> </siriusStyle> @@ -258,7 +258,7 @@ <location x="480" y="35"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetC1-3" width="153" height="48"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hvnqJGyeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_zB3RdnKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType11']/@defaultLayer/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/> </siriusStyle> @@ -278,7 +278,7 @@ <location x="20" y="145"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetp1-1" width="293" height="100"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hvnqJWyeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_zB3Rd3KSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType11']/@defaultLayer/@containerMappings[name='DT2_Package']/@style"/> </siriusStyle> @@ -316,7 +316,7 @@ <location x="625" y="38"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetp1-1/targetC1-1-1" width="128" height="48"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hvnqKGyeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_zB3RenKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType11']/@defaultLayer/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/> </siriusStyle> @@ -336,7 +336,7 @@ <location x="10" y="34"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetp1-1/targetC1-1-2" width="126" height="41"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hvnqKWyeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_zB3Re3KSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType11']/@defaultLayer/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/> </siriusStyle> @@ -352,7 +352,7 @@ <location x="150" y="37"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetp1-2" width="210" height="83"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hvnqKmyeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_zB3RfHKSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType11']/@defaultLayer/@containerMappings[name='DT2_Package']/@style"/> </siriusStyle> @@ -377,7 +377,7 @@ <location x="55" y="36"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetp1-2/targetC1-2-1" width="143" height="41"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hvnqLGyeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_zB3RfnKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType11']/@defaultLayer/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/> </siriusStyle> @@ -393,7 +393,7 @@ <location x="40" y="34"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetp1-3" width="150" height="70"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hvnqLWyeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_zB3Rf3KSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType11']/@defaultLayer/@containerMappings[name='DT2_Package']/@style"/> </siriusStyle> @@ -409,7 +409,7 @@ <location x="325" y="35"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2" width="443" height="158"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hvnqLmyeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_zB3RgHKSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType11']/@defaultLayer/@containerMappings[name='DT2_Package']/@style"/> </siriusStyle> @@ -456,7 +456,7 @@ <location x="560" y="360"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2/targetp2-1" width="213" height="95"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hvoRIGyeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_zB3RhnKSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType11']/@defaultLayer/@containerMappings[name='DT2_Package']/@style"/> </siriusStyle> @@ -488,11 +488,11 @@ <label id="//targetp2/targetp2-1/targetnew%20EClass%201" width="-1" height="-1"> <location x="10"/> </label> - <siriusStyle xsi:type="diagram:EdgeStyle" uid="_hvoRLWyeEeuXco3AXfG1Yg" size="2" strokeColor="252,175,62"> + <siriusStyle xsi:type="diagram:EdgeStyle" uid="_zB34inKSEeu2Yf-vWkXYRg" size="2" strokeColor="252,175,62"> <customFeatures>routingStyle</customFeatures> <customFeatures>uid</customFeatures> <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType11']/@defaultLayer/@edgeMappings[name='RBE_SuperType']/@style"/> - <centerLabelStyle uid="_hvoRLmyeEeuXco3AXfG1Yg" labelSize="12" labelColor="239,41,41"/> + <centerLabelStyle uid="_zB34i3KSEeu2Yf-vWkXYRg" labelSize="12" labelColor="239,41,41"/> </siriusStyle> <gmfView xsi:type="notation:Edge" type="4001"> <children type="6001"> @@ -516,7 +516,7 @@ <targetRefPoint x="673" y="179"/> </formatdata:EdgeFormatData> <formatdata:NodeFormatData id="//targetp2/targetp2-1/targetnew%20EClass%201" width="158" height="63"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hvoRJGyeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_zB34gXKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType11']/@defaultLayer/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/> </siriusStyle> @@ -537,11 +537,11 @@ <label id="//targetp2/targetp2-1/targetnew%20EClass%201" width="-1" height="-1"> <location x="10"/> </label> - <siriusStyle xsi:type="diagram:EdgeStyle" uid="_hvoRJWyeEeuXco3AXfG1Yg" size="2" strokeColor="252,175,62"> + <siriusStyle xsi:type="diagram:EdgeStyle" uid="_zB34gnKSEeu2Yf-vWkXYRg" size="2" strokeColor="252,175,62"> <customFeatures>routingStyle</customFeatures> <customFeatures>uid</customFeatures> <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType11']/@defaultLayer/@edgeMappings[name='RBE_SuperType']/@style"/> - <centerLabelStyle uid="_hvoRJmyeEeuXco3AXfG1Yg" labelSize="12" labelColor="239,41,41"/> + <centerLabelStyle uid="_zB34g3KSEeu2Yf-vWkXYRg" labelSize="12" labelColor="239,41,41"/> </siriusStyle> <gmfView xsi:type="notation:Edge" type="4001"> <children type="6001"> @@ -567,7 +567,7 @@ <location x="40" y="25"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2/targetp2-2" width="150" height="70"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hvoRJ2yeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_zB34hHKSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType11']/@defaultLayer/@containerMappings[name='DT2_Package']/@style"/> </siriusStyle> @@ -583,7 +583,7 @@ <location x="265" y="40"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp3" width="150" height="70"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hvoRKGyeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_zB34hXKSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType11']/@defaultLayer/@containerMappings[name='DT2_Package']/@style"/> </siriusStyle> @@ -599,7 +599,7 @@ <location x="1375"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp4" width="150" height="70"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hvnDAGyeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_zB2qYHKSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType11']/@defaultLayer/@containerMappings[name='DT2_Package']/@style"/> </siriusStyle> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/from___storedFormat-DiagType11__of__MyPackage___to___storedFormat-DiagType11__of__MyPackage__subset__New.xmi b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/from___storedFormat-DiagType11__of__MyPackage___to___storedFormat-DiagType11__of__MyPackage__subset__New.xmi index 2207da3c02..b68590c953 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/from___storedFormat-DiagType11__of__MyPackage___to___storedFormat-DiagType11__of__MyPackage__subset__New.xmi +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/from___storedFormat-DiagType11__of__MyPackage___to___storedFormat-DiagType11__of__MyPackage__subset__New.xmi @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="ASCII"?> <xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:diagram="http://www.eclipse.org/sirius/diagram/1.1.0" xmlns:formatdata="http://www.eclipse.org/sirius/dsl/formatdata/1.1.0" 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"> <formatdata:NodeFormatData id="//targetp1" width="943" height="238"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hsPl8WyeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_y-miEXKSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType11']/@defaultLayer/@containerMappings[name='DT2_Package']/@style"/> </siriusStyle> @@ -106,7 +106,7 @@ <location/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetC1-1" width="133" height="63"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hsPl_2yeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_y-miH3KSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType11']/@defaultLayer/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/> </siriusStyle> @@ -123,9 +123,9 @@ <label id="//targetp1/targetC1-1/targetaC1-2" width="-1" height="-1"> <location y="-10"/> </label> - <siriusStyle xsi:type="diagram:EdgeStyle" uid="_hsPmAGyeEeuXco3AXfG1Yg"> + <siriusStyle xsi:type="diagram:EdgeStyle" uid="_y-miIHKSEeu2Yf-vWkXYRg"> <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType11']/@defaultLayer/@edgeMappings[name='DT2_EReference']/@style"/> - <centerLabelStyle uid="_hsPmAWyeEeuXco3AXfG1Yg" showIcon="false"/> + <centerLabelStyle uid="_y-miIXKSEeu2Yf-vWkXYRg" showIcon="false"/> </siriusStyle> <gmfView xsi:type="notation:Edge" type="4001"> <children type="6001"> @@ -152,10 +152,10 @@ <label id="//targetp1/targetC1-1/targetaC1-1-1" width="-1" height="-1"> <location x="-6" y="-8"/> </label> - <siriusStyle xsi:type="diagram:EdgeStyle" uid="_hsPmAmyeEeuXco3AXfG1Yg"> + <siriusStyle xsi:type="diagram:EdgeStyle" uid="_y-nJIHKSEeu2Yf-vWkXYRg"> <customFeatures>uid</customFeatures> <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType11']/@defaultLayer/@edgeMappings[name='DT2_EReference']/@style"/> - <centerLabelStyle uid="_hsPmA2yeEeuXco3AXfG1Yg" showIcon="false"/> + <centerLabelStyle uid="_y-nJIXKSEeu2Yf-vWkXYRg" showIcon="false"/> </siriusStyle> <gmfView xsi:type="notation:Edge" type="4001"> <children type="6001"> @@ -184,10 +184,10 @@ <label id="//targetp1/targetC1-1/targetaC1-1-1" width="-1" height="-1"> <location x="-6" y="-8"/> </label> - <siriusStyle xsi:type="diagram:EdgeStyle" uid="_hsQNE2yeEeuXco3AXfG1Yg"> + <siriusStyle xsi:type="diagram:EdgeStyle" uid="_y-nJNXKSEeu2Yf-vWkXYRg"> <customFeatures>uid</customFeatures> <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType11']/@defaultLayer/@edgeMappings[name='DT2_EReference']/@style"/> - <centerLabelStyle uid="_hsQNFGyeEeuXco3AXfG1Yg" showIcon="false"/> + <centerLabelStyle uid="_y-nJNnKSEeu2Yf-vWkXYRg" showIcon="false"/> </siriusStyle> <gmfView xsi:type="notation:Edge" type="4001"> <children type="6001"> @@ -211,7 +211,7 @@ <targetRefPoint x="687" y="95"/> </formatdata:EdgeFormatData> <formatdata:NodeFormatData id="//targetp1/targetC1-2" width="128" height="41"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hsQNAGyeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_y-nJInKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType11']/@defaultLayer/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/> </siriusStyle> @@ -227,7 +227,7 @@ <location x="480" y="35"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetp1-1" width="293" height="100"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hsQNAWyeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_y-nJI3KSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType11']/@defaultLayer/@containerMappings[name='DT2_Package']/@style"/> </siriusStyle> @@ -265,7 +265,7 @@ <location x="625" y="38"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetp1-1/targetC1-1-1" width="128" height="48"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hsQNBGyeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_y-nJJnKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType11']/@defaultLayer/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/> </siriusStyle> @@ -285,7 +285,7 @@ <location x="10" y="34"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2" width="443" height="158"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hsQNBWyeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_y-nJJ3KSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType11']/@defaultLayer/@containerMappings[name='DT2_Package']/@style"/> </siriusStyle> @@ -332,7 +332,7 @@ <location x="560" y="360"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2/targetp2-1" width="213" height="95"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hsQNC2yeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_y-nJLXKSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType11']/@defaultLayer/@containerMappings[name='DT2_Package']/@style"/> </siriusStyle> @@ -364,11 +364,11 @@ <label id="//targetp2/targetp2-1/targetnew%20EClass%201" width="-1" height="-1"> <location x="10"/> </label> - <siriusStyle xsi:type="diagram:EdgeStyle" uid="_hsQNFWyeEeuXco3AXfG1Yg" size="2" strokeColor="252,175,62"> + <siriusStyle xsi:type="diagram:EdgeStyle" uid="_y-nJN3KSEeu2Yf-vWkXYRg" size="2" strokeColor="252,175,62"> <customFeatures>routingStyle</customFeatures> <customFeatures>uid</customFeatures> <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType11']/@defaultLayer/@edgeMappings[name='RBE_SuperType']/@style"/> - <centerLabelStyle uid="_hsQNFmyeEeuXco3AXfG1Yg" labelSize="12" labelColor="239,41,41"/> + <centerLabelStyle uid="_y-nJOHKSEeu2Yf-vWkXYRg" labelSize="12" labelColor="239,41,41"/> </siriusStyle> <gmfView xsi:type="notation:Edge" type="4001"> <children type="6001"> @@ -392,7 +392,7 @@ <targetRefPoint x="673" y="179"/> </formatdata:EdgeFormatData> <formatdata:NodeFormatData id="//targetp2/targetp2-1/targetnew%20EClass%201" width="158" height="63"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hsQND2yeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_y-nJMXKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType11']/@defaultLayer/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/> </siriusStyle> @@ -413,11 +413,11 @@ <label id="//targetp2/targetp2-1/targetnew%20EClass%201" width="-1" height="-1"> <location x="10"/> </label> - <siriusStyle xsi:type="diagram:EdgeStyle" uid="_hsQNEGyeEeuXco3AXfG1Yg" size="2" strokeColor="252,175,62"> + <siriusStyle xsi:type="diagram:EdgeStyle" uid="_y-nJMnKSEeu2Yf-vWkXYRg" size="2" strokeColor="252,175,62"> <customFeatures>routingStyle</customFeatures> <customFeatures>uid</customFeatures> <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType11']/@defaultLayer/@edgeMappings[name='RBE_SuperType']/@style"/> - <centerLabelStyle uid="_hsQNEWyeEeuXco3AXfG1Yg" labelSize="12" labelColor="239,41,41"/> + <centerLabelStyle uid="_y-nJM3KSEeu2Yf-vWkXYRg" labelSize="12" labelColor="239,41,41"/> </siriusStyle> <gmfView xsi:type="notation:Edge" type="4001"> <children type="6001"> @@ -443,7 +443,7 @@ <location x="40" y="25"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2/targetp2-2" width="150" height="70"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hsQNEmyeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_y-nJNHKSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType11']/@defaultLayer/@containerMappings[name='DT2_Package']/@style"/> </siriusStyle> @@ -459,7 +459,7 @@ <location x="265" y="40"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp4" width="150" height="70"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hsPl8GyeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_y-miEHKSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType11']/@defaultLayer/@containerMappings[name='DT2_Package']/@style"/> </siriusStyle> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/from___storedFormat-DiagType2__filters__and__layers__of__MyPackage___to___storedFormat-DiagType2__filters__and__layers__of__MyPackage__full__New.xmi b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/from___storedFormat-DiagType2__filters__and__layers__of__MyPackage___to___storedFormat-DiagType2__filters__and__layers__of__MyPackage__full__New.xmi index d996f46c5a..cb6401baec 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/from___storedFormat-DiagType2__filters__and__layers__of__MyPackage___to___storedFormat-DiagType2__filters__and__layers__of__MyPackage__full__New.xmi +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/from___storedFormat-DiagType2__filters__and__layers__of__MyPackage___to___storedFormat-DiagType2__filters__and__layers__of__MyPackage__full__New.xmi @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="ASCII"?> <xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:diagram="http://www.eclipse.org/sirius/diagram/1.1.0" xmlns:formatdata="http://www.eclipse.org/sirius/dsl/formatdata/1.1.0" 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"> <formatdata:NodeFormatData id="//targetp1" width="853" height="188"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hCxyMGyeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yP8FQXKSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_filters_layers']/@additionalLayers[name='Operations']/@containerMappings[name='EPackage_import']/@style"/> </siriusStyle> @@ -106,7 +106,7 @@ <location/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetC1-1" width="63" height="54"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hCxyPmyeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yP8sUnKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_filters_layers']/@additionalLayers[name='Operations']/@containerMappings[name='EPackage_import']/@subContainerMappings[name='EClass_import']/@style"/> </siriusStyle> @@ -123,10 +123,10 @@ <label id="//targetp1/targetC1-1/targetaC1-2" width="-1" height="-1"> <location x="-122" y="21"/> </label> - <siriusStyle xsi:type="diagram:EdgeStyle" uid="_hCxyP2yeEeuXco3AXfG1Yg"> + <siriusStyle xsi:type="diagram:EdgeStyle" uid="_yP8sU3KSEeu2Yf-vWkXYRg"> <customFeatures>uid</customFeatures> <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_filters_layers']/@defaultLayer/@edgeMappings[name='DT2_EReference']/@style"/> - <centerLabelStyle uid="_hCxyQGyeEeuXco3AXfG1Yg" showIcon="false"/> + <centerLabelStyle uid="_yP8sVHKSEeu2Yf-vWkXYRg" showIcon="false"/> </siriusStyle> <gmfView xsi:type="notation:Edge" visible="false" type="4001"> <children type="6001"> @@ -149,10 +149,10 @@ <label id="//targetp1/targetC1-1/targetaC1-1-1" width="-1" height="-1"> <location x="-30" y="-13"/> </label> - <siriusStyle xsi:type="diagram:EdgeStyle" uid="_hCxyQWyeEeuXco3AXfG1Yg"> + <siriusStyle xsi:type="diagram:EdgeStyle" uid="_yP8sVXKSEeu2Yf-vWkXYRg"> <customFeatures>uid</customFeatures> <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_filters_layers']/@defaultLayer/@edgeMappings[name='DT2_EReference']/@style"/> - <centerLabelStyle uid="_hCxyQmyeEeuXco3AXfG1Yg" showIcon="false"/> + <centerLabelStyle uid="_yP8sVnKSEeu2Yf-vWkXYRg" showIcon="false"/> </siriusStyle> <gmfView xsi:type="notation:Edge" visible="false" type="4001"> <children type="6001"> @@ -177,10 +177,10 @@ <label id="//targetp1/targetC1-1/targetaC1-1-1" width="-1" height="-1"> <location x="-30" y="-13"/> </label> - <siriusStyle xsi:type="diagram:EdgeStyle" uid="_hCyZQGyeEeuXco3AXfG1Yg"> + <siriusStyle xsi:type="diagram:EdgeStyle" uid="_yP9TZ3KSEeu2Yf-vWkXYRg"> <customFeatures>uid</customFeatures> <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_filters_layers']/@defaultLayer/@edgeMappings[name='DT2_EReference']/@style"/> - <centerLabelStyle uid="_hCyZQWyeEeuXco3AXfG1Yg" showIcon="false"/> + <centerLabelStyle uid="_yP9TaHKSEeu2Yf-vWkXYRg" showIcon="false"/> </siriusStyle> <gmfView xsi:type="notation:Edge" visible="false" type="4001"> <children type="6001"> @@ -203,10 +203,10 @@ <label id="//targetp1/targetC1-1/targetaC1-2" width="-1" height="-1"> <location x="-122" y="21"/> </label> - <siriusStyle xsi:type="diagram:EdgeStyle" uid="_hCyZQmyeEeuXco3AXfG1Yg"> + <siriusStyle xsi:type="diagram:EdgeStyle" uid="_yP9TaXKSEeu2Yf-vWkXYRg"> <customFeatures>uid</customFeatures> <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_filters_layers']/@defaultLayer/@edgeMappings[name='DT2_EReference']/@style"/> - <centerLabelStyle uid="_hCyZQ2yeEeuXco3AXfG1Yg" showIcon="false"/> + <centerLabelStyle uid="_yP9TanKSEeu2Yf-vWkXYRg" showIcon="false"/> </siriusStyle> <gmfView xsi:type="notation:Edge" visible="false" type="4001"> <children type="6001"> @@ -226,7 +226,7 @@ </gmfView> </formatdata:EdgeFormatData> <formatdata:NodeFormatData id="//targetp1/targetC1-2" width="66" height="41"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hCxyQ2yeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yP8sV3KSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_filters_layers']/@additionalLayers[name='Operations']/@containerMappings[name='EPackage_import']/@subContainerMappings[name='EClass_import']/@style"/> </siriusStyle> @@ -242,7 +242,7 @@ <location x="545" y="40"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetC1-3" width="63" height="48"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hCxyRGyeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yP8sWHKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_filters_layers']/@additionalLayers[name='Operations']/@containerMappings[name='EPackage_import']/@subContainerMappings[name='EClass_import']/@style"/> </siriusStyle> @@ -262,7 +262,7 @@ <location x="535" y="96"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetp1-1" width="198" height="108"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hCxyRWyeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yP8sWXKSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_filters_layers']/@additionalLayers[name='Operations']/@containerMappings[name='EPackage_import']/@style"/> </siriusStyle> @@ -300,7 +300,7 @@ <location x="635" y="35"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetp1-1/targetC1-1-1" width="73" height="53"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hCxySGyeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yP8sXHKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_filters_layers']/@additionalLayers[name='Operations']/@containerMappings[name='EPackage_import']/@subContainerMappings[name='EClass_import']/@style"/> </siriusStyle> @@ -320,7 +320,7 @@ <location x="30" y="35"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetp1-1/targetC1-1-2" width="68" height="47"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hCxySWyeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yP8sXXKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_filters_layers']/@additionalLayers[name='Operations']/@containerMappings[name='EPackage_import']/@subContainerMappings[name='EClass_import']/@style"/> </siriusStyle> @@ -336,7 +336,7 @@ <location x="120" y="35"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetp1-2" width="150" height="84"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hCxySmyeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yP8sXnKSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_filters_layers']/@additionalLayers[name='Operations']/@containerMappings[name='EPackage_import']/@style"/> </siriusStyle> @@ -361,7 +361,7 @@ <location x="70" y="78"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetp1-2/targetC1-2-1" width="73" height="41"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hCxyTGyeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yP8sYHKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_filters_layers']/@additionalLayers[name='Operations']/@containerMappings[name='EPackage_import']/@subContainerMappings[name='EClass_import']/@style"/> </siriusStyle> @@ -377,7 +377,7 @@ <location x="35" y="35"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetp1-3" width="150" height="70"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hCxyTWyeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yP8sYXKSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_filters_layers']/@additionalLayers[name='Operations']/@containerMappings[name='EPackage_import']/@style"/> </siriusStyle> @@ -393,7 +393,7 @@ <location x="320" y="35"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2" width="413" height="243"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hCxyTmyeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yP8sYnKSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_filters_layers']/@additionalLayers[name='Operations']/@containerMappings[name='EPackage_import']/@style"/> </siriusStyle> @@ -440,7 +440,7 @@ <location x="30" y="205"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2/targetp2-1" width="158" height="98"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hCxyUmyeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yP9TYnKSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_filters_layers']/@additionalLayers[name='Operations']/@containerMappings[name='EPackage_import']/@style"/> </siriusStyle> @@ -469,7 +469,7 @@ <location x="30" y="115"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2/targetp2-1/targetnew%20EClass%201" width="108" height="58"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hCxyVGyeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yP9TZHKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_filters_layers']/@additionalLayers[name='Operations']/@containerMappings[name='EPackage_import']/@subContainerMappings[name='EClass_import']/@style"/> </siriusStyle> @@ -489,7 +489,7 @@ <location x="30" y="25"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2/targetp2-2" width="158" height="83"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hCxyVWyeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yP9TZXKSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_filters_layers']/@additionalLayers[name='Operations']/@containerMappings[name='EPackage_import']/@style"/> </siriusStyle> @@ -505,7 +505,7 @@ <location x="215" y="35"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp3" width="163" height="88"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hCxyVmyeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yP9TZnKSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_filters_layers']/@additionalLayers[name='Operations']/@containerMappings[name='EPackage_import']/@style"/> </siriusStyle> @@ -521,7 +521,7 @@ <location x="585" y="310"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp4" width="158" height="73"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hCxLIGyeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yP8FQHKSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_filters_layers']/@additionalLayers[name='Operations']/@containerMappings[name='EPackage_import']/@style"/> </siriusStyle> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/from___storedFormat-DiagType2__filters__and__layers__of__MyPackage___to___storedFormat-DiagType2__filters__and__layers__of__MyPackage__subset__New.xmi b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/from___storedFormat-DiagType2__filters__and__layers__of__MyPackage___to___storedFormat-DiagType2__filters__and__layers__of__MyPackage__subset__New.xmi index db0e4dd495..d413a10e74 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/from___storedFormat-DiagType2__filters__and__layers__of__MyPackage___to___storedFormat-DiagType2__filters__and__layers__of__MyPackage__subset__New.xmi +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/from___storedFormat-DiagType2__filters__and__layers__of__MyPackage___to___storedFormat-DiagType2__filters__and__layers__of__MyPackage__subset__New.xmi @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="ASCII"?> <xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:diagram="http://www.eclipse.org/sirius/diagram/1.1.0" xmlns:formatdata="http://www.eclipse.org/sirius/dsl/formatdata/1.1.0" 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"> <formatdata:NodeFormatData id="//targetp1" width="853" height="188"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_g_ChsWyeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yLSOwXKSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_filters_layers']/@additionalLayers[name='Operations']/@containerMappings[name='EPackage_import']/@style"/> </siriusStyle> @@ -106,7 +106,7 @@ <location/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetC1-1" width="63" height="54"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_g_DIymyeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yLS13HKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_filters_layers']/@additionalLayers[name='Operations']/@containerMappings[name='EPackage_import']/@subContainerMappings[name='EClass_import']/@style"/> </siriusStyle> @@ -123,9 +123,9 @@ <label id="//targetp1/targetC1-1/targetaC1-2" width="-1" height="-1"> <location y="-10"/> </label> - <siriusStyle xsi:type="diagram:EdgeStyle" uid="_g_DIy2yeEeuXco3AXfG1Yg"> + <siriusStyle xsi:type="diagram:EdgeStyle" uid="_yLS13XKSEeu2Yf-vWkXYRg"> <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_filters_layers']/@defaultLayer/@edgeMappings[name='DT2_EReference']/@style"/> - <centerLabelStyle uid="_g_DIzGyeEeuXco3AXfG1Yg" showIcon="false"/> + <centerLabelStyle uid="_yLS13nKSEeu2Yf-vWkXYRg" showIcon="false"/> </siriusStyle> <gmfView xsi:type="notation:Edge" type="4001"> <children type="6001"> @@ -148,10 +148,10 @@ <label id="//targetp1/targetC1-1/targetaC1-1-1" width="-1" height="-1"> <location x="-30" y="-13"/> </label> - <siriusStyle xsi:type="diagram:EdgeStyle" uid="_g_DIzWyeEeuXco3AXfG1Yg"> + <siriusStyle xsi:type="diagram:EdgeStyle" uid="_yLS133KSEeu2Yf-vWkXYRg"> <customFeatures>uid</customFeatures> <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_filters_layers']/@defaultLayer/@edgeMappings[name='DT2_EReference']/@style"/> - <centerLabelStyle uid="_g_DIzmyeEeuXco3AXfG1Yg" showIcon="false"/> + <centerLabelStyle uid="_yLS14HKSEeu2Yf-vWkXYRg" showIcon="false"/> </siriusStyle> <gmfView xsi:type="notation:Edge" visible="false" type="4001"> <children type="6001"> @@ -176,10 +176,10 @@ <label id="//targetp1/targetC1-1/targetaC1-1-1" width="-1" height="-1"> <location x="-30" y="-13"/> </label> - <siriusStyle xsi:type="diagram:EdgeStyle" uid="_g_Dv1GyeEeuXco3AXfG1Yg"> + <siriusStyle xsi:type="diagram:EdgeStyle" uid="_yLTc53KSEeu2Yf-vWkXYRg"> <customFeatures>uid</customFeatures> <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_filters_layers']/@defaultLayer/@edgeMappings[name='DT2_EReference']/@style"/> - <centerLabelStyle uid="_g_Dv1WyeEeuXco3AXfG1Yg" showIcon="false"/> + <centerLabelStyle uid="_yLTc6HKSEeu2Yf-vWkXYRg" showIcon="false"/> </siriusStyle> <gmfView xsi:type="notation:Edge" visible="false" type="4001"> <children type="6001"> @@ -199,7 +199,7 @@ </gmfView> </formatdata:EdgeFormatData> <formatdata:NodeFormatData id="//targetp1/targetC1-2" width="66" height="41"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_g_DIz2yeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yLS14XKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_filters_layers']/@additionalLayers[name='Operations']/@containerMappings[name='EPackage_import']/@subContainerMappings[name='EClass_import']/@style"/> </siriusStyle> @@ -215,7 +215,7 @@ <location x="545" y="40"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetp1-1" width="198" height="108"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_g_DI0GyeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yLS14nKSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_filters_layers']/@additionalLayers[name='Operations']/@containerMappings[name='EPackage_import']/@style"/> </siriusStyle> @@ -253,7 +253,7 @@ <location x="635" y="35"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetp1-1/targetC1-1-1" width="73" height="53"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_g_DI02yeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yLS15XKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_filters_layers']/@additionalLayers[name='Operations']/@containerMappings[name='EPackage_import']/@subContainerMappings[name='EClass_import']/@style"/> </siriusStyle> @@ -273,7 +273,7 @@ <location x="30" y="35"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2" width="413" height="243"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_g_DI1GyeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yLS15nKSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_filters_layers']/@additionalLayers[name='Operations']/@containerMappings[name='EPackage_import']/@style"/> </siriusStyle> @@ -320,7 +320,7 @@ <location x="30" y="205"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2/targetp2-1" width="158" height="98"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_g_Dv0GyeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yLTc43KSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_filters_layers']/@additionalLayers[name='Operations']/@containerMappings[name='EPackage_import']/@style"/> </siriusStyle> @@ -349,7 +349,7 @@ <location x="30" y="115"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2/targetp2-1/targetnew%20EClass%201" width="108" height="58"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_g_Dv0myeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yLTc5XKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_filters_layers']/@additionalLayers[name='Operations']/@containerMappings[name='EPackage_import']/@subContainerMappings[name='EClass_import']/@style"/> </siriusStyle> @@ -369,7 +369,7 @@ <location x="30" y="25"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2/targetp2-2" width="158" height="83"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_g_Dv02yeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yLTc5nKSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_filters_layers']/@additionalLayers[name='Operations']/@containerMappings[name='EPackage_import']/@style"/> </siriusStyle> @@ -385,7 +385,7 @@ <location x="215" y="35"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp4" width="158" height="73"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_g_ChsGyeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yLSOwHKSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_filters_layers']/@additionalLayers[name='Operations']/@containerMappings[name='EPackage_import']/@style"/> </siriusStyle> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/from___storedFormat-DiagType2__of__MyPackage___to___storedFormat-DiagType2__of__MyPackage__full__New.xmi b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/from___storedFormat-DiagType2__of__MyPackage___to___storedFormat-DiagType2__of__MyPackage__full__New.xmi index 97e6e9b0a7..4b571d023b 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/from___storedFormat-DiagType2__of__MyPackage___to___storedFormat-DiagType2__of__MyPackage__full__New.xmi +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/from___storedFormat-DiagType2__of__MyPackage___to___storedFormat-DiagType2__of__MyPackage__full__New.xmi @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="ASCII"?> <xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:diagram="http://www.eclipse.org/sirius/diagram/1.1.0" xmlns:formatdata="http://www.eclipse.org/sirius/dsl/formatdata/1.1.0" 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"> <formatdata:NodeFormatData id="//targetp1" width="653" height="173"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_g7jI0WyeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yF9C0HKSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@style"/> </siriusStyle> @@ -106,7 +106,7 @@ <location x="30" y="30"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetC1-1" width="96" height="42"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_g7jv4GyeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yF9p4HKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/> </siriusStyle> @@ -123,10 +123,10 @@ <label id="//targetp1/targetC1-1/targetaC1-2" width="-1" height="-1"> <location x="-50" y="48"/> </label> - <siriusStyle xsi:type="diagram:EdgeStyle" uid="_g7jv4WyeEeuXco3AXfG1Yg"> + <siriusStyle xsi:type="diagram:EdgeStyle" uid="_yF9p4XKSEeu2Yf-vWkXYRg"> <customFeatures>uid</customFeatures> <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@edgeMappings[name='DT2_EReference']/@style"/> - <centerLabelStyle uid="_g7jv4myeEeuXco3AXfG1Yg" showIcon="false"/> + <centerLabelStyle uid="_yF9p4nKSEeu2Yf-vWkXYRg" showIcon="false"/> </siriusStyle> <gmfView xsi:type="notation:Edge" type="4001"> <children type="6001"> @@ -155,10 +155,10 @@ <label id="//targetp1/targetC1-1/targetaC1-1-1" width="-1" height="-1"> <location x="6"/> </label> - <siriusStyle xsi:type="diagram:EdgeStyle" uid="_g7jv42yeEeuXco3AXfG1Yg"> + <siriusStyle xsi:type="diagram:EdgeStyle" uid="_yF9p43KSEeu2Yf-vWkXYRg"> <customFeatures>uid</customFeatures> <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@edgeMappings[name='DT2_EReference']/@style"/> - <centerLabelStyle uid="_g7jv5GyeEeuXco3AXfG1Yg" showIcon="false"/> + <centerLabelStyle uid="_yF9p5HKSEeu2Yf-vWkXYRg" showIcon="false"/> </siriusStyle> <gmfView xsi:type="notation:Edge" type="4001"> <children type="6001"> @@ -188,10 +188,10 @@ <label id="//targetp1/targetC1-1/targetaC1-1-1" width="-1" height="-1"> <location x="6"/> </label> - <siriusStyle xsi:type="diagram:EdgeStyle" uid="_g7jv-WyeEeuXco3AXfG1Yg"> + <siriusStyle xsi:type="diagram:EdgeStyle" uid="_yF-4AHKSEeu2Yf-vWkXYRg"> <customFeatures>uid</customFeatures> <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@edgeMappings[name='DT2_EReference']/@style"/> - <centerLabelStyle uid="_g7jv-myeEeuXco3AXfG1Yg" showIcon="false"/> + <centerLabelStyle uid="_yF-4AXKSEeu2Yf-vWkXYRg" showIcon="false"/> </siriusStyle> <gmfView xsi:type="notation:Edge" type="4001"> <children type="6001"> @@ -219,10 +219,10 @@ <label id="//targetp1/targetC1-1/targetaC1-2" width="-1" height="-1"> <location x="-50" y="48"/> </label> - <siriusStyle xsi:type="diagram:EdgeStyle" uid="_g7jv-2yeEeuXco3AXfG1Yg"> + <siriusStyle xsi:type="diagram:EdgeStyle" uid="_yF-4AnKSEeu2Yf-vWkXYRg"> <customFeatures>uid</customFeatures> <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@edgeMappings[name='DT2_EReference']/@style"/> - <centerLabelStyle uid="_g7jv_GyeEeuXco3AXfG1Yg" showIcon="false"/> + <centerLabelStyle uid="_yF-4A3KSEeu2Yf-vWkXYRg" showIcon="false"/> </siriusStyle> <gmfView xsi:type="notation:Edge" type="4001"> <children type="6001"> @@ -248,7 +248,7 @@ <targetRefPoint x="580" y="78"/> </formatdata:EdgeFormatData> <formatdata:NodeFormatData id="//targetp1/targetC1-2" width="89" height="38"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_g7jv5WyeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yF9p5XKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/> </siriusStyle> @@ -264,7 +264,7 @@ <location x="500" y="12"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetC1-3" width="111" height="63"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_g7jv5myeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yF9p5nKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/> </siriusStyle> @@ -284,7 +284,7 @@ <location x="5" y="18"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetp1-1" width="291" height="396"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_g7jv52yeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yF9p53KSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@style"/> </siriusStyle> @@ -322,7 +322,7 @@ <location x="197" y="36"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetp1-1/targetC1-1-1" width="74" height="47"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_g7jv6myeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yF9p6nKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/> </siriusStyle> @@ -342,7 +342,7 @@ <location x="65" y="66"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetp1-1/targetC1-1-2" width="58" height="40"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_g7jv62yeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yF-Q8HKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/> </siriusStyle> @@ -358,7 +358,7 @@ <location x="208" y="330"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetp1-2" width="273" height="134"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_g7jv7GyeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yF-Q8XKSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@style"/> </siriusStyle> @@ -383,7 +383,7 @@ <location x="90" y="168"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetp1-2/targetC1-2-1" width="58" height="40"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_g7jv7myeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yF-Q83KSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/> </siriusStyle> @@ -399,7 +399,7 @@ <location x="195" y="78"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetp1-3" width="163" height="79"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_g7jv72yeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yF-Q9HKSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@style"/> </siriusStyle> @@ -415,7 +415,7 @@ <location x="310" y="170"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2" width="413" height="128"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_g7jv8GyeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yF-Q9XKSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@style"/> </siriusStyle> @@ -462,7 +462,7 @@ <location x="30" y="260"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2/targetp2-1" width="178" height="78"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_g7jv9GyeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yF-Q-XKSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@style"/> </siriusStyle> @@ -491,7 +491,7 @@ <location x="40" y="40"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2/targetp2-1/targetnew%20EClass%201" width="163" height="62"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_g7jv9myeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yF-Q-3KSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/> </siriusStyle> @@ -511,7 +511,7 @@ <location x="5" y="6"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2/targetp2-2" width="155" height="77"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_g7jv92yeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yF-Q_HKSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@style"/> </siriusStyle> @@ -527,7 +527,7 @@ <location x="243" y="36"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp3" width="150" height="70"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_g7jv-GyeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yF-Q_XKSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@style"/> </siriusStyle> @@ -543,7 +543,7 @@ <location x="30" y="400"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp4" width="150" height="70"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_g7jI0GyeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yF8bwHKSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@style"/> </siriusStyle> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/from___storedFormat-DiagType2__of__MyPackage___to___storedFormat-DiagType2__of__MyPackage__subset__New.xmi b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/from___storedFormat-DiagType2__of__MyPackage___to___storedFormat-DiagType2__of__MyPackage__subset__New.xmi index 6e10d8d3d1..82595b545c 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/from___storedFormat-DiagType2__of__MyPackage___to___storedFormat-DiagType2__of__MyPackage__subset__New.xmi +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/from___storedFormat-DiagType2__of__MyPackage___to___storedFormat-DiagType2__of__MyPackage__subset__New.xmi @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="ASCII"?> <xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:diagram="http://www.eclipse.org/sirius/diagram/1.1.0" xmlns:formatdata="http://www.eclipse.org/sirius/dsl/formatdata/1.1.0" 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"> <formatdata:NodeFormatData id="//targetp1" width="653" height="173"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_g3TiAGyeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_x_ZH0XKSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@style"/> </siriusStyle> @@ -106,7 +106,7 @@ <location x="30" y="30"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetC1-1" width="96" height="42"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_g3TiDmyeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_x_aV8XKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/> </siriusStyle> @@ -123,9 +123,9 @@ <label id="//targetp1/targetC1-1/targetaC1-2" width="-1" height="-1"> <location y="-10"/> </label> - <siriusStyle xsi:type="diagram:EdgeStyle" uid="_g3TiD2yeEeuXco3AXfG1Yg"> + <siriusStyle xsi:type="diagram:EdgeStyle" uid="_x_aV8nKSEeu2Yf-vWkXYRg"> <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@edgeMappings[name='DT2_EReference']/@style"/> - <centerLabelStyle uid="_g3TiEGyeEeuXco3AXfG1Yg" showIcon="false"/> + <centerLabelStyle uid="_x_aV83KSEeu2Yf-vWkXYRg" showIcon="false"/> </siriusStyle> <gmfView xsi:type="notation:Edge" type="4001"> <children type="6001"> @@ -152,10 +152,10 @@ <label id="//targetp1/targetC1-1/targetaC1-1-1" width="-1" height="-1"> <location x="6"/> </label> - <siriusStyle xsi:type="diagram:EdgeStyle" uid="_g3TiEWyeEeuXco3AXfG1Yg"> + <siriusStyle xsi:type="diagram:EdgeStyle" uid="_x_aV9HKSEeu2Yf-vWkXYRg"> <customFeatures>uid</customFeatures> <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@edgeMappings[name='DT2_EReference']/@style"/> - <centerLabelStyle uid="_g3TiEmyeEeuXco3AXfG1Yg" showIcon="false"/> + <centerLabelStyle uid="_x_aV9XKSEeu2Yf-vWkXYRg" showIcon="false"/> </siriusStyle> <gmfView xsi:type="notation:Edge" type="4001"> <children type="6001"> @@ -185,10 +185,10 @@ <label id="//targetp1/targetC1-1/targetaC1-1-1" width="-1" height="-1"> <location x="6"/> </label> - <siriusStyle xsi:type="diagram:EdgeStyle" uid="_g3TiIGyeEeuXco3AXfG1Yg"> + <siriusStyle xsi:type="diagram:EdgeStyle" uid="_x_cyMHKSEeu2Yf-vWkXYRg"> <customFeatures>uid</customFeatures> <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@edgeMappings[name='DT2_EReference']/@style"/> - <centerLabelStyle uid="_g3TiIWyeEeuXco3AXfG1Yg" showIcon="false"/> + <centerLabelStyle uid="_x_cyMXKSEeu2Yf-vWkXYRg" showIcon="false"/> </siriusStyle> <gmfView xsi:type="notation:Edge" type="4001"> <children type="6001"> @@ -213,7 +213,7 @@ <targetRefPoint x="292" y="132"/> </formatdata:EdgeFormatData> <formatdata:NodeFormatData id="//targetp1/targetC1-2" width="89" height="38"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_g3TiE2yeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_x_aV9nKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/> </siriusStyle> @@ -229,7 +229,7 @@ <location x="500" y="12"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetp1-1" width="291" height="396"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_g3TiFGyeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_x_a9AHKSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@style"/> </siriusStyle> @@ -267,7 +267,7 @@ <location x="197" y="36"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetp1-1/targetC1-1-1" width="74" height="47"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_g3TiF2yeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_x_a9A3KSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/> </siriusStyle> @@ -287,7 +287,7 @@ <location x="65" y="66"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2" width="413" height="128"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_g3TiGGyeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_x_a9BHKSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@style"/> </siriusStyle> @@ -334,7 +334,7 @@ <location x="30" y="260"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2/targetp2-1" width="178" height="78"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_g3TiHGyeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_x_bkEnKSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@style"/> </siriusStyle> @@ -363,7 +363,7 @@ <location x="40" y="40"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2/targetp2-1/targetnew%20EClass%201" width="163" height="62"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_g3TiHmyeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_x_bkFHKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/> </siriusStyle> @@ -383,7 +383,7 @@ <location x="5" y="6"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2/targetp2-2" width="155" height="77"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_g3TiH2yeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_x_bkFXKSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@style"/> </siriusStyle> @@ -399,7 +399,7 @@ <location x="243" y="36"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp4" width="150" height="70"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_g3S68GyeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_x_ZH0HKSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@style"/> </siriusStyle> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/from___storedFormat-DiagType2__with__notes__of__MyPackage___to___storedFormat-DiagType2__with__notes__of__MyPackage__full__New__notes.xmi b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/from___storedFormat-DiagType2__with__notes__of__MyPackage___to___storedFormat-DiagType2__with__notes__of__MyPackage__full__New__notes.xmi index c905d1e268..1ae4652c28 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/from___storedFormat-DiagType2__with__notes__of__MyPackage___to___storedFormat-DiagType2__with__notes__of__MyPackage__full__New__notes.xmi +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/from___storedFormat-DiagType2__with__notes__of__MyPackage___to___storedFormat-DiagType2__with__notes__of__MyPackage__full__New__notes.xmi @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="ASCII"?> <xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:diagram="http://www.eclipse.org/sirius/diagram/1.1.0" xmlns:formatdata="http://www.eclipse.org/sirius/dsl/formatdata/1.1.0" 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"> <formatdata:NodeFormatData id="//targetp1" width="653" height="173"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hoK-QWyeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_y61cYXKSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@style"/> </siriusStyle> @@ -15,7 +15,7 @@ <styles xsi:type="notation:FilteringStyle"/> </children> <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="8"/> - <layoutConstraint xsi:type="notation:Bounds" x="485" y="101" width="96" height="42"/> + <layoutConstraint xsi:type="notation:Bounds" x="485" y="101" width="134" height="42"/> </children> <children type="3009"> <children type="5004"/> @@ -24,7 +24,7 @@ <styles xsi:type="notation:FilteringStyle"/> </children> <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="8"/> - <layoutConstraint xsi:type="notation:Bounds" x="495" y="6" width="89" height="38"/> + <layoutConstraint xsi:type="notation:Bounds" x="495" y="6" width="115" height="38"/> </children> <children type="3009"> <children type="5004"/> @@ -37,7 +37,7 @@ <styles xsi:type="notation:FilteringStyle"/> </children> <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="8"/> - <layoutConstraint xsi:type="notation:Bounds" y="12" width="111" height="63"/> + <layoutConstraint xsi:type="notation:Bounds" y="12" width="141" height="63"/> </children> <children type="3008"> <children type="5005"/> @@ -53,7 +53,7 @@ <styles xsi:type="notation:FilteringStyle"/> </children> <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="8"/> - <layoutConstraint xsi:type="notation:Bounds" x="60" y="60" width="74" height="47"/> + <layoutConstraint xsi:type="notation:Bounds" x="8" y="60" width="126" height="47"/> </children> <children type="3009"> <children type="5004"/> @@ -62,7 +62,7 @@ <styles xsi:type="notation:FilteringStyle"/> </children> <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="8"/> - <layoutConstraint xsi:type="notation:Bounds" x="203" y="324" width="58" height="40"/> + <layoutConstraint xsi:type="notation:Bounds" x="104" y="324" width="157" height="40"/> </children> <styles xsi:type="notation:SortingStyle"/> <styles xsi:type="notation:FilteringStyle"/> @@ -80,7 +80,7 @@ <styles xsi:type="notation:FilteringStyle"/> </children> <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="8"/> - <layoutConstraint xsi:type="notation:Bounds" x="190" y="72" width="58" height="40"/> + <layoutConstraint xsi:type="notation:Bounds" x="64" y="72" width="184" height="40"/> </children> <styles xsi:type="notation:SortingStyle"/> <styles xsi:type="notation:FilteringStyle"/> @@ -110,8 +110,8 @@ </gmfView> <location x="30" y="30"/> </formatdata:NodeFormatData> - <formatdata:NodeFormatData id="//targetp1/targetC1-1" width="96" height="42"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hoK-T2yeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <formatdata:NodeFormatData id="//targetp1/targetC1-1" width="134" height="42"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_y61cb3KSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/> </siriusStyle> @@ -122,16 +122,16 @@ <styles xsi:type="notation:FilteringStyle"/> </children> <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="8"/> - <layoutConstraint xsi:type="notation:Bounds" x="485" y="101" width="96" height="42"/> + <layoutConstraint xsi:type="notation:Bounds" x="485" y="101" width="134" height="42"/> </gmfView> - <outgoingEdges id="//targetp1/targetC1-1/targetaC1-2" sourceTerminal="(0.41666666,0.057142857)" targetTerminal="(0.57894737,0.94285715)"> + <outgoingEdges id="//targetp1/targetC1-1/targetaC1-2" sourceTerminal="(0.29671716696969697,0.057142857000000005)" targetTerminal="(0.44573824061946904,0.94285715)"> <label id="//targetp1/targetC1-1/targetaC1-2" width="-1" height="-1"> <location x="-50" y="48"/> </label> - <siriusStyle xsi:type="diagram:EdgeStyle" uid="_hoK-UGyeEeuXco3AXfG1Yg"> + <siriusStyle xsi:type="diagram:EdgeStyle" uid="_y61ccHKSEeu2Yf-vWkXYRg"> <customFeatures>uid</customFeatures> <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@edgeMappings[name='DT2_EReference']/@style"/> - <centerLabelStyle uid="_hoK-UWyeEeuXco3AXfG1Yg" showIcon="false"/> + <centerLabelStyle uid="_y61ccXKSEeu2Yf-vWkXYRg" showIcon="false"/> </siriusStyle> <gmfView xsi:type="notation:Edge" type="4001"> <children type="6001"> @@ -146,8 +146,8 @@ <styles xsi:type="notation:ConnectorStyle"/> <styles xsi:type="notation:FontStyle" fontName="Sans" fontHeight="8"/> <bendpoints xsi:type="notation:RelativeBendpoints" points="[31, 38, 10, 99]$[119, 143, 98, 204]$[205, -33, 184, 28]$[36, -58, 15, 3]"/> - <sourceAnchor xsi:type="notation:IdentityAnchor" id="(0.41666666,0.057142857)"/> - <targetAnchor xsi:type="notation:IdentityAnchor" id="(0.57894737,0.94285715)"/> + <sourceAnchor xsi:type="notation:IdentityAnchor" id="(0.29671716696969697,0.057142857000000005)"/> + <targetAnchor xsi:type="notation:IdentityAnchor" id="(0.44573824061946904,0.94285715)"/> </gmfView> <pointList x="590" y="177"/> <pointList x="678" y="282"/> @@ -156,14 +156,14 @@ <sourceRefPoint x="559" y="139"/> <targetRefPoint x="580" y="78"/> </outgoingEdges> - <outgoingEdges id="//targetp1/targetC1-1/targetaC1-1-1" sourceTerminal="(0.0,0.0)" targetTerminal="(0.0,0.0)"> + <outgoingEdges id="//targetp1/targetC1-1/targetaC1-1-1" sourceTerminal="(0.0,0.0)" targetTerminal="(0.41935483870967744,0.0)"> <label id="//targetp1/targetC1-1/targetaC1-1-1" width="-1" height="-1"> <location x="6"/> </label> - <siriusStyle xsi:type="diagram:EdgeStyle" uid="_hoK-UmyeEeuXco3AXfG1Yg"> + <siriusStyle xsi:type="diagram:EdgeStyle" uid="_y61ccnKSEeu2Yf-vWkXYRg"> <customFeatures>uid</customFeatures> <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@edgeMappings[name='DT2_EReference']/@style"/> - <centerLabelStyle uid="_hoK-U2yeEeuXco3AXfG1Yg" showIcon="false"/> + <centerLabelStyle uid="_y61cc3KSEeu2Yf-vWkXYRg" showIcon="false"/> </siriusStyle> <gmfView xsi:type="notation:Edge" type="4001"> <children type="6001"> @@ -179,7 +179,7 @@ <styles xsi:type="notation:FontStyle" fontName="Sans" fontHeight="8"/> <bendpoints xsi:type="notation:RelativeBendpoints" points="[0, 0, 228, 5]$[-126, 26, 102, 31]$[-156, 16, 72, 21]"/> <sourceAnchor xsi:type="notation:IdentityAnchor" id="(0.0,0.0)"/> - <targetAnchor xsi:type="notation:IdentityAnchor" id="(0.0,0.0)"/> + <targetAnchor xsi:type="notation:IdentityAnchor" id="(0.41935483870967744,0.0)"/> </gmfView> <pointList x="520" y="137"/> <pointList x="394" y="163"/> @@ -189,14 +189,14 @@ </outgoingEdges> <location x="490" y="107"/> </formatdata:NodeFormatData> - <formatdata:EdgeFormatData id="//targetp1/targetC1-1/targetaC1-1-1" sourceTerminal="(0.0,0.0)" targetTerminal="(0.0,0.0)"> + <formatdata:EdgeFormatData id="//targetp1/targetC1-1/targetaC1-1-1" sourceTerminal="(0.0,0.0)" targetTerminal="(0.41935483870967744,0.0)"> <label id="//targetp1/targetC1-1/targetaC1-1-1" width="-1" height="-1"> <location x="6"/> </label> - <siriusStyle xsi:type="diagram:EdgeStyle" uid="_hoLlYWyeEeuXco3AXfG1Yg"> + <siriusStyle xsi:type="diagram:EdgeStyle" uid="_y62qgHKSEeu2Yf-vWkXYRg"> <customFeatures>uid</customFeatures> <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@edgeMappings[name='DT2_EReference']/@style"/> - <centerLabelStyle uid="_hoLlYmyeEeuXco3AXfG1Yg" showIcon="false"/> + <centerLabelStyle uid="_y62qgXKSEeu2Yf-vWkXYRg" showIcon="false"/> </siriusStyle> <gmfView xsi:type="notation:Edge" type="4001"> <children type="6001"> @@ -212,7 +212,7 @@ <styles xsi:type="notation:FontStyle" fontName="Sans" fontHeight="8"/> <bendpoints xsi:type="notation:RelativeBendpoints" points="[0, 0, 228, 5]$[-126, 26, 102, 31]$[-156, 16, 72, 21]"/> <sourceAnchor xsi:type="notation:IdentityAnchor" id="(0.0,0.0)"/> - <targetAnchor xsi:type="notation:IdentityAnchor" id="(0.0,0.0)"/> + <targetAnchor xsi:type="notation:IdentityAnchor" id="(0.41935483870967744,0.0)"/> </gmfView> <pointList x="520" y="137"/> <pointList x="394" y="163"/> @@ -220,14 +220,14 @@ <sourceRefPoint x="520" y="137"/> <targetRefPoint x="292" y="132"/> </formatdata:EdgeFormatData> - <formatdata:EdgeFormatData id="//targetp1/targetC1-1/targetaC1-2" sourceTerminal="(0.41666666,0.057142857)" targetTerminal="(0.57894737,0.94285715)"> + <formatdata:EdgeFormatData id="//targetp1/targetC1-1/targetaC1-2" sourceTerminal="(0.29671716696969697,0.057142857000000005)" targetTerminal="(0.44573824061946904,0.94285715)"> <label id="//targetp1/targetC1-1/targetaC1-2" width="-1" height="-1"> <location x="-50" y="48"/> </label> - <siriusStyle xsi:type="diagram:EdgeStyle" uid="_hoLlY2yeEeuXco3AXfG1Yg"> + <siriusStyle xsi:type="diagram:EdgeStyle" uid="_y62qgnKSEeu2Yf-vWkXYRg"> <customFeatures>uid</customFeatures> <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@edgeMappings[name='DT2_EReference']/@style"/> - <centerLabelStyle uid="_hoLlZGyeEeuXco3AXfG1Yg" showIcon="false"/> + <centerLabelStyle uid="_y62qg3KSEeu2Yf-vWkXYRg" showIcon="false"/> </siriusStyle> <gmfView xsi:type="notation:Edge" type="4001"> <children type="6001"> @@ -242,8 +242,8 @@ <styles xsi:type="notation:ConnectorStyle"/> <styles xsi:type="notation:FontStyle" fontName="Sans" fontHeight="8"/> <bendpoints xsi:type="notation:RelativeBendpoints" points="[31, 38, 10, 99]$[119, 143, 98, 204]$[205, -33, 184, 28]$[36, -58, 15, 3]"/> - <sourceAnchor xsi:type="notation:IdentityAnchor" id="(0.41666666,0.057142857)"/> - <targetAnchor xsi:type="notation:IdentityAnchor" id="(0.57894737,0.94285715)"/> + <sourceAnchor xsi:type="notation:IdentityAnchor" id="(0.29671716696969697,0.057142857000000005)"/> + <targetAnchor xsi:type="notation:IdentityAnchor" id="(0.44573824061946904,0.94285715)"/> </gmfView> <pointList x="590" y="177"/> <pointList x="678" y="282"/> @@ -252,8 +252,8 @@ <sourceRefPoint x="559" y="139"/> <targetRefPoint x="580" y="78"/> </formatdata:EdgeFormatData> - <formatdata:NodeFormatData id="//targetp1/targetC1-2" width="89" height="38"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hoK-VGyeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <formatdata:NodeFormatData id="//targetp1/targetC1-2" width="115" height="38"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_y61cdHKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/> </siriusStyle> @@ -264,12 +264,12 @@ <styles xsi:type="notation:FilteringStyle"/> </children> <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="8"/> - <layoutConstraint xsi:type="notation:Bounds" x="495" y="6" width="89" height="38"/> + <layoutConstraint xsi:type="notation:Bounds" x="495" y="6" width="115" height="38"/> </gmfView> <location x="500" y="12"/> </formatdata:NodeFormatData> - <formatdata:NodeFormatData id="//targetp1/targetC1-3" width="111" height="63"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hoK-VWyeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <formatdata:NodeFormatData id="//targetp1/targetC1-3" width="141" height="63"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_y61cdXKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/> </siriusStyle> @@ -284,12 +284,12 @@ <styles xsi:type="notation:FilteringStyle"/> </children> <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="8"/> - <layoutConstraint xsi:type="notation:Bounds" y="12" width="111" height="63"/> + <layoutConstraint xsi:type="notation:Bounds" y="12" width="141" height="63"/> </gmfView> <location x="5" y="18"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetp1-1" width="286" height="391"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hoK-VmyeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_y61cdnKSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@style"/> </siriusStyle> @@ -307,7 +307,7 @@ <styles xsi:type="notation:FilteringStyle"/> </children> <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="8"/> - <layoutConstraint xsi:type="notation:Bounds" x="60" y="60" width="74" height="47"/> + <layoutConstraint xsi:type="notation:Bounds" x="8" y="60" width="126" height="47"/> </children> <children type="3009"> <children type="5004"/> @@ -316,7 +316,7 @@ <styles xsi:type="notation:FilteringStyle"/> </children> <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="8"/> - <layoutConstraint xsi:type="notation:Bounds" x="203" y="324" width="58" height="40"/> + <layoutConstraint xsi:type="notation:Bounds" x="104" y="324" width="157" height="40"/> </children> <styles xsi:type="notation:SortingStyle"/> <styles xsi:type="notation:FilteringStyle"/> @@ -326,8 +326,8 @@ </gmfView> <location x="197" y="36"/> </formatdata:NodeFormatData> - <formatdata:NodeFormatData id="//targetp1/targetp1-1/targetC1-1-1" width="74" height="47"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hoLlUmyeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <formatdata:NodeFormatData id="//targetp1/targetp1-1/targetC1-1-1" width="126" height="47"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_y62DcnKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/> </siriusStyle> @@ -342,12 +342,12 @@ <styles xsi:type="notation:FilteringStyle"/> </children> <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="8"/> - <layoutConstraint xsi:type="notation:Bounds" x="60" y="60" width="74" height="47"/> + <layoutConstraint xsi:type="notation:Bounds" x="8" y="60" width="126" height="47"/> </gmfView> - <location x="65" y="66"/> + <location x="13" y="66"/> </formatdata:NodeFormatData> - <formatdata:NodeFormatData id="//targetp1/targetp1-1/targetC1-1-2" width="58" height="40"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hoLlU2yeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <formatdata:NodeFormatData id="//targetp1/targetp1-1/targetC1-1-2" width="157" height="40"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_y62Dc3KSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/> </siriusStyle> @@ -358,12 +358,12 @@ <styles xsi:type="notation:FilteringStyle"/> </children> <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="8"/> - <layoutConstraint xsi:type="notation:Bounds" x="203" y="324" width="58" height="40"/> + <layoutConstraint xsi:type="notation:Bounds" x="104" y="324" width="157" height="40"/> </gmfView> - <location x="208" y="330"/> + <location x="109" y="330"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetp1-2" width="273" height="139"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hoLlVGyeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_y62DdHKSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@style"/> </siriusStyle> @@ -377,7 +377,7 @@ <styles xsi:type="notation:FilteringStyle"/> </children> <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="8"/> - <layoutConstraint xsi:type="notation:Bounds" x="190" y="72" width="58" height="40"/> + <layoutConstraint xsi:type="notation:Bounds" x="64" y="72" width="184" height="40"/> </children> <styles xsi:type="notation:SortingStyle"/> <styles xsi:type="notation:FilteringStyle"/> @@ -387,8 +387,8 @@ </gmfView> <location x="90" y="168"/> </formatdata:NodeFormatData> - <formatdata:NodeFormatData id="//targetp1/targetp1-2/targetC1-2-1" width="58" height="40"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hoLlVmyeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <formatdata:NodeFormatData id="//targetp1/targetp1-2/targetC1-2-1" width="184" height="40"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_y62DdnKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/> </siriusStyle> @@ -399,12 +399,12 @@ <styles xsi:type="notation:FilteringStyle"/> </children> <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="8"/> - <layoutConstraint xsi:type="notation:Bounds" x="190" y="72" width="58" height="40"/> + <layoutConstraint xsi:type="notation:Bounds" x="64" y="72" width="184" height="40"/> </gmfView> - <location x="195" y="78"/> + <location x="69" y="78"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetp1-3" width="150" height="70"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hoLlV2yeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_y62Dd3KSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@style"/> </siriusStyle> @@ -420,7 +420,7 @@ <location x="310" y="170"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2" width="401" height="114"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hoLlWGyeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_y62DeHKSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@style"/> </siriusStyle> @@ -447,7 +447,7 @@ <styles xsi:type="notation:FilteringStyle"/> </children> <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="10"/> - <layoutConstraint xsi:type="notation:Bounds" x="15" y="23" width="178" height="77"/> + <layoutConstraint xsi:type="notation:Bounds" x="15" y="23" width="206" height="77"/> </children> <children type="3008"> <children type="5005"/> @@ -466,8 +466,8 @@ </gmfView> <location x="30" y="260"/> </formatdata:NodeFormatData> - <formatdata:NodeFormatData id="//targetp2/targetp2-1" width="178" height="77"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hoLlXGyeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <formatdata:NodeFormatData id="//targetp2/targetp2-1" width="206" height="77"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_y62DfHKSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@style"/> </siriusStyle> @@ -491,12 +491,12 @@ <styles xsi:type="notation:FilteringStyle"/> </children> <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="10"/> - <layoutConstraint xsi:type="notation:Bounds" x="15" y="23" width="178" height="77"/> + <layoutConstraint xsi:type="notation:Bounds" x="15" y="23" width="206" height="77"/> </gmfView> <location x="20" y="29"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2/targetp2-1/targetnew%20EClass%201" width="153" height="53"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hoLlXmyeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_y62DfnKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/> </siriusStyle> @@ -516,7 +516,7 @@ <location x="5" y="6"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2/targetp2-2" width="155" height="77"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hoLlX2yeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_y62Df3KSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@style"/> </siriusStyle> @@ -531,8 +531,8 @@ </gmfView> <location x="230" y="29"/> </formatdata:NodeFormatData> - <formatdata:NodeFormatData id="//targetp3" width="150" height="70"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hoLlYGyeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <formatdata:NodeFormatData id="//targetp3" width="171" height="70"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_y62DgHKSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@style"/> </siriusStyle> @@ -543,12 +543,12 @@ <styles xsi:type="notation:FilteringStyle"/> </children> <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="10"/> - <layoutConstraint xsi:type="notation:Bounds" x="30" y="400" width="150" height="70"/> + <layoutConstraint xsi:type="notation:Bounds" x="27" y="456" width="171" height="70"/> </gmfView> - <location x="30" y="400"/> + <location x="27" y="456"/> </formatdata:NodeFormatData> - <formatdata:NodeFormatData id="//targetp4" width="150" height="70"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hoK-QGyeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <formatdata:NodeFormatData id="//targetp4" width="196" height="92"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_y61cYHKSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@style"/> </siriusStyle> @@ -559,8 +559,8 @@ <styles xsi:type="notation:FilteringStyle"/> </children> <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="10"/> - <layoutConstraint xsi:type="notation:Bounds" x="1644" y="30" width="150" height="70"/> + <layoutConstraint xsi:type="notation:Bounds" x="997" y="72" width="196" height="92"/> </gmfView> - <location x="1644" y="30"/> + <location x="997" y="72"/> </formatdata:NodeFormatData> </xmi:XMI> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/from___storedFormat-DiagType2__with__notes__of__MyPackage___to___storedFormat-DiagType2__with__notes__of__MyPackage__subset__New__notes.xmi b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/from___storedFormat-DiagType2__with__notes__of__MyPackage___to___storedFormat-DiagType2__with__notes__of__MyPackage__subset__New__notes.xmi index 46d6967ae8..7c17169e8c 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/from___storedFormat-DiagType2__with__notes__of__MyPackage___to___storedFormat-DiagType2__with__notes__of__MyPackage__subset__New__notes.xmi +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/from___storedFormat-DiagType2__with__notes__of__MyPackage___to___storedFormat-DiagType2__with__notes__of__MyPackage__subset__New__notes.xmi @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="ASCII"?> <xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:diagram="http://www.eclipse.org/sirius/diagram/1.1.0" xmlns:formatdata="http://www.eclipse.org/sirius/dsl/formatdata/1.1.0" 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"> <formatdata:NodeFormatData id="//targetp1" width="653" height="173"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hk19cWyeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_y2z4AXKSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@style"/> </siriusStyle> @@ -15,7 +15,7 @@ <styles xsi:type="notation:FilteringStyle"/> </children> <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="8"/> - <layoutConstraint xsi:type="notation:Bounds" x="485" y="101" width="96" height="42"/> + <layoutConstraint xsi:type="notation:Bounds" x="485" y="101" width="134" height="42"/> </children> <children type="3009"> <children type="5004"/> @@ -24,7 +24,7 @@ <styles xsi:type="notation:FilteringStyle"/> </children> <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="8"/> - <layoutConstraint xsi:type="notation:Bounds" x="495" y="6" width="89" height="38"/> + <layoutConstraint xsi:type="notation:Bounds" x="495" y="6" width="115" height="38"/> </children> <children type="3009"> <children type="5004"/> @@ -53,7 +53,7 @@ <styles xsi:type="notation:FilteringStyle"/> </children> <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="8"/> - <layoutConstraint xsi:type="notation:Bounds" x="60" y="60" width="74" height="47"/> + <layoutConstraint xsi:type="notation:Bounds" x="8" y="60" width="126" height="47"/> </children> <children type="3009"> <children type="5004"/> @@ -110,8 +110,8 @@ </gmfView> <location x="30" y="30"/> </formatdata:NodeFormatData> - <formatdata:NodeFormatData id="//targetp1/targetC1-1" width="96" height="42"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hk2kimyeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <formatdata:NodeFormatData id="//targetp1/targetC1-1" width="134" height="42"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_y2z4D3KSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/> </siriusStyle> @@ -122,15 +122,15 @@ <styles xsi:type="notation:FilteringStyle"/> </children> <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="8"/> - <layoutConstraint xsi:type="notation:Bounds" x="485" y="101" width="96" height="42"/> + <layoutConstraint xsi:type="notation:Bounds" x="485" y="101" width="134" height="42"/> </gmfView> <outgoingEdges id="//targetp1/targetC1-1/targetaC1-2" sourceTerminal="(0.5,0.5)" targetTerminal="(0.5,0.5)"> <label id="//targetp1/targetC1-1/targetaC1-2" width="-1" height="-1"> <location y="-10"/> </label> - <siriusStyle xsi:type="diagram:EdgeStyle" uid="_hk2ki2yeEeuXco3AXfG1Yg"> + <siriusStyle xsi:type="diagram:EdgeStyle" uid="_y2z4EHKSEeu2Yf-vWkXYRg"> <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@edgeMappings[name='DT2_EReference']/@style"/> - <centerLabelStyle uid="_hk2kjGyeEeuXco3AXfG1Yg" showIcon="false"/> + <centerLabelStyle uid="_y2z4EXKSEeu2Yf-vWkXYRg" showIcon="false"/> </siriusStyle> <gmfView xsi:type="notation:Edge" type="4001"> <children type="6001"> @@ -148,19 +148,19 @@ <sourceAnchor xsi:type="notation:IdentityAnchor" id="(0.5,0.5)"/> <targetAnchor xsi:type="notation:IdentityAnchor" id="(0.5,0.5)"/> </gmfView> - <pointList x="573" y="137"/> - <pointList x="573" y="81"/> - <sourceRefPoint x="567" y="157"/> - <targetRefPoint x="573" y="61"/> + <pointList x="586" y="137"/> + <pointList x="586" y="81"/> + <sourceRefPoint x="586" y="157"/> + <targetRefPoint x="586" y="61"/> </outgoingEdges> - <outgoingEdges id="//targetp1/targetC1-1/targetaC1-1-1" sourceTerminal="(0.0,0.0)" targetTerminal="(0.0,0.0)"> + <outgoingEdges id="//targetp1/targetC1-1/targetaC1-1-1" sourceTerminal="(0.0,0.0)" targetTerminal="(0.41935483870967744,0.0)"> <label id="//targetp1/targetC1-1/targetaC1-1-1" width="-1" height="-1"> <location x="6"/> </label> - <siriusStyle xsi:type="diagram:EdgeStyle" uid="_hk2kjWyeEeuXco3AXfG1Yg"> + <siriusStyle xsi:type="diagram:EdgeStyle" uid="_y2z4EnKSEeu2Yf-vWkXYRg"> <customFeatures>uid</customFeatures> <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@edgeMappings[name='DT2_EReference']/@style"/> - <centerLabelStyle uid="_hk2kjmyeEeuXco3AXfG1Yg" showIcon="false"/> + <centerLabelStyle uid="_y2z4E3KSEeu2Yf-vWkXYRg" showIcon="false"/> </siriusStyle> <gmfView xsi:type="notation:Edge" type="4001"> <children type="6001"> @@ -176,7 +176,7 @@ <styles xsi:type="notation:FontStyle" fontName="Sans" fontHeight="8"/> <bendpoints xsi:type="notation:RelativeBendpoints" points="[0, 0, 228, 5]$[-126, 26, 102, 31]$[-156, 16, 72, 21]"/> <sourceAnchor xsi:type="notation:IdentityAnchor" id="(0.0,0.0)"/> - <targetAnchor xsi:type="notation:IdentityAnchor" id="(0.0,0.0)"/> + <targetAnchor xsi:type="notation:IdentityAnchor" id="(0.41935483870967744,0.0)"/> </gmfView> <pointList x="520" y="137"/> <pointList x="394" y="163"/> @@ -186,14 +186,14 @@ </outgoingEdges> <location x="490" y="107"/> </formatdata:NodeFormatData> - <formatdata:EdgeFormatData id="//targetp1/targetC1-1/targetaC1-1-1" sourceTerminal="(0.0,0.0)" targetTerminal="(0.0,0.0)"> + <formatdata:EdgeFormatData id="//targetp1/targetC1-1/targetaC1-1-1" sourceTerminal="(0.0,0.0)" targetTerminal="(0.41935483870967744,0.0)"> <label id="//targetp1/targetC1-1/targetaC1-1-1" width="-1" height="-1"> <location x="6"/> </label> - <siriusStyle xsi:type="diagram:EdgeStyle" uid="_hk2knGyeEeuXco3AXfG1Yg"> + <siriusStyle xsi:type="diagram:EdgeStyle" uid="_y20fF3KSEeu2Yf-vWkXYRg"> <customFeatures>uid</customFeatures> <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@edgeMappings[name='DT2_EReference']/@style"/> - <centerLabelStyle uid="_hk2knWyeEeuXco3AXfG1Yg" showIcon="false"/> + <centerLabelStyle uid="_y20fGHKSEeu2Yf-vWkXYRg" showIcon="false"/> </siriusStyle> <gmfView xsi:type="notation:Edge" type="4001"> <children type="6001"> @@ -209,7 +209,7 @@ <styles xsi:type="notation:FontStyle" fontName="Sans" fontHeight="8"/> <bendpoints xsi:type="notation:RelativeBendpoints" points="[0, 0, 228, 5]$[-126, 26, 102, 31]$[-156, 16, 72, 21]"/> <sourceAnchor xsi:type="notation:IdentityAnchor" id="(0.0,0.0)"/> - <targetAnchor xsi:type="notation:IdentityAnchor" id="(0.0,0.0)"/> + <targetAnchor xsi:type="notation:IdentityAnchor" id="(0.41935483870967744,0.0)"/> </gmfView> <pointList x="520" y="137"/> <pointList x="394" y="163"/> @@ -217,8 +217,8 @@ <sourceRefPoint x="520" y="137"/> <targetRefPoint x="292" y="132"/> </formatdata:EdgeFormatData> - <formatdata:NodeFormatData id="//targetp1/targetC1-2" width="89" height="38"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hk2kj2yeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <formatdata:NodeFormatData id="//targetp1/targetC1-2" width="115" height="38"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_y2z4FHKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/> </siriusStyle> @@ -229,12 +229,12 @@ <styles xsi:type="notation:FilteringStyle"/> </children> <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="8"/> - <layoutConstraint xsi:type="notation:Bounds" x="495" y="6" width="89" height="38"/> + <layoutConstraint xsi:type="notation:Bounds" x="495" y="6" width="115" height="38"/> </gmfView> <location x="500" y="12"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetp1-1" width="286" height="391"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hk2kkGyeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_y2z4FXKSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@style"/> </siriusStyle> @@ -252,7 +252,7 @@ <styles xsi:type="notation:FilteringStyle"/> </children> <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="8"/> - <layoutConstraint xsi:type="notation:Bounds" x="60" y="60" width="74" height="47"/> + <layoutConstraint xsi:type="notation:Bounds" x="8" y="60" width="126" height="47"/> </children> <children type="3009"> <children type="5004"/> @@ -271,8 +271,8 @@ </gmfView> <location x="197" y="36"/> </formatdata:NodeFormatData> - <formatdata:NodeFormatData id="//targetp1/targetp1-1/targetC1-1-1" width="74" height="47"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hk2kk2yeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <formatdata:NodeFormatData id="//targetp1/targetp1-1/targetC1-1-1" width="126" height="47"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_y2z4GHKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/> </siriusStyle> @@ -287,12 +287,12 @@ <styles xsi:type="notation:FilteringStyle"/> </children> <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="8"/> - <layoutConstraint xsi:type="notation:Bounds" x="60" y="60" width="74" height="47"/> + <layoutConstraint xsi:type="notation:Bounds" x="8" y="60" width="126" height="47"/> </gmfView> - <location x="65" y="66"/> + <location x="13" y="66"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2" width="401" height="114"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hk2klGyeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_y2z4GXKSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@style"/> </siriusStyle> @@ -319,7 +319,7 @@ <styles xsi:type="notation:FilteringStyle"/> </children> <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="10"/> - <layoutConstraint xsi:type="notation:Bounds" x="15" y="23" width="178" height="77"/> + <layoutConstraint xsi:type="notation:Bounds" x="15" y="23" width="206" height="77"/> </children> <children type="3008"> <children type="5005"/> @@ -338,8 +338,8 @@ </gmfView> <location x="30" y="260"/> </formatdata:NodeFormatData> - <formatdata:NodeFormatData id="//targetp2/targetp2-1" width="178" height="77"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hk2kmGyeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <formatdata:NodeFormatData id="//targetp2/targetp2-1" width="206" height="77"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_y20fE3KSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@style"/> </siriusStyle> @@ -363,12 +363,12 @@ <styles xsi:type="notation:FilteringStyle"/> </children> <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="10"/> - <layoutConstraint xsi:type="notation:Bounds" x="15" y="23" width="178" height="77"/> + <layoutConstraint xsi:type="notation:Bounds" x="15" y="23" width="206" height="77"/> </gmfView> <location x="20" y="29"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2/targetp2-1/targetnew%20EClass%201" width="153" height="53"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hk2kmmyeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_y20fFXKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/> </siriusStyle> @@ -388,7 +388,7 @@ <location x="5" y="6"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2/targetp2-2" width="155" height="77"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hk2km2yeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_y20fFnKSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@style"/> </siriusStyle> @@ -403,8 +403,8 @@ </gmfView> <location x="230" y="29"/> </formatdata:NodeFormatData> - <formatdata:NodeFormatData id="//targetp4" width="150" height="70"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hk19cGyeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <formatdata:NodeFormatData id="//targetp4" width="196" height="92"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_y2z4AHKSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@style"/> </siriusStyle> @@ -415,8 +415,8 @@ <styles xsi:type="notation:FilteringStyle"/> </children> <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="10"/> - <layoutConstraint xsi:type="notation:Bounds" x="1644" y="30" width="150" height="70"/> + <layoutConstraint xsi:type="notation:Bounds" x="997" y="72" width="196" height="92"/> </gmfView> - <location x="1644" y="30"/> + <location x="997" y="72"/> </formatdata:NodeFormatData> </xmi:XMI> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/from___storedFormat-DiagType2_unsync__of__MyPackage___to___storedFormat-DiagType2_unsync__of__MyPackage__full__New.xmi b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/from___storedFormat-DiagType2_unsync__of__MyPackage___to___storedFormat-DiagType2_unsync__of__MyPackage__full__New.xmi index f21169af5e..a497ed69fb 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/from___storedFormat-DiagType2_unsync__of__MyPackage___to___storedFormat-DiagType2_unsync__of__MyPackage__full__New.xmi +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/from___storedFormat-DiagType2_unsync__of__MyPackage___to___storedFormat-DiagType2_unsync__of__MyPackage__full__New.xmi @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="ASCII"?> <xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:diagram="http://www.eclipse.org/sirius/diagram/1.1.0" xmlns:formatdata="http://www.eclipse.org/sirius/dsl/formatdata/1.1.0" 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"> <formatdata:NodeFormatData id="//targetp1" width="913" height="303"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hJTQ8WyeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yYzGUXKSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_unsync']/@containerMappings[name='DT2_Package']/@style"/> </siriusStyle> @@ -106,7 +106,7 @@ <location/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetC1-1" width="58" height="48"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hJTQ_2yeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yYztYHKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_unsync']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/> </siriusStyle> @@ -123,10 +123,10 @@ <label id="//targetp1/targetC1-1/targetaC1-2" width="-1" height="-1"> <location y="-10"/> </label> - <siriusStyle xsi:type="diagram:EdgeStyle" uid="_hJTRAGyeEeuXco3AXfG1Yg"> + <siriusStyle xsi:type="diagram:EdgeStyle" uid="_yYztYXKSEeu2Yf-vWkXYRg"> <customFeatures>uid</customFeatures> <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_unsync']/@edgeMappings[name='DT2_EReference']/@style"/> - <centerLabelStyle uid="_hJTRAWyeEeuXco3AXfG1Yg" showIcon="false"/> + <centerLabelStyle uid="_yYztYnKSEeu2Yf-vWkXYRg" showIcon="false"/> </siriusStyle> <gmfView xsi:type="notation:Edge" type="4001"> <children type="6001"> @@ -153,10 +153,10 @@ <label id="//targetp1/targetC1-1/targetaC1-1-1" width="-1" height="-1"> <location x="3" y="10"/> </label> - <siriusStyle xsi:type="diagram:EdgeStyle" uid="_hJTRAmyeEeuXco3AXfG1Yg"> + <siriusStyle xsi:type="diagram:EdgeStyle" uid="_yYztY3KSEeu2Yf-vWkXYRg"> <customFeatures>uid</customFeatures> <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_unsync']/@edgeMappings[name='DT2_EReference']/@style"/> - <centerLabelStyle uid="_hJTRA2yeEeuXco3AXfG1Yg" showIcon="false"/> + <centerLabelStyle uid="_yYztZHKSEeu2Yf-vWkXYRg" showIcon="false"/> </siriusStyle> <gmfView xsi:type="notation:Edge" type="4001"> <children type="6001"> @@ -186,10 +186,10 @@ <label id="//targetp1/targetC1-1/targetaC1-1-1" width="-1" height="-1"> <location x="3" y="10"/> </label> - <siriusStyle xsi:type="diagram:EdgeStyle" uid="_hJT4B2yeEeuXco3AXfG1Yg"> + <siriusStyle xsi:type="diagram:EdgeStyle" uid="_yY0UeXKSEeu2Yf-vWkXYRg"> <customFeatures>uid</customFeatures> <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_unsync']/@edgeMappings[name='DT2_EReference']/@style"/> - <centerLabelStyle uid="_hJT4CGyeEeuXco3AXfG1Yg" showIcon="false"/> + <centerLabelStyle uid="_yY0UenKSEeu2Yf-vWkXYRg" showIcon="false"/> </siriusStyle> <gmfView xsi:type="notation:Edge" type="4001"> <children type="6001"> @@ -217,10 +217,10 @@ <label id="//targetp1/targetC1-1/targetaC1-2" width="-1" height="-1"> <location y="-10"/> </label> - <siriusStyle xsi:type="diagram:EdgeStyle" uid="_hJT4CWyeEeuXco3AXfG1Yg"> + <siriusStyle xsi:type="diagram:EdgeStyle" uid="_yY0Ue3KSEeu2Yf-vWkXYRg"> <customFeatures>uid</customFeatures> <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_unsync']/@edgeMappings[name='DT2_EReference']/@style"/> - <centerLabelStyle uid="_hJT4CmyeEeuXco3AXfG1Yg" showIcon="false"/> + <centerLabelStyle uid="_yY0UfHKSEeu2Yf-vWkXYRg" showIcon="false"/> </siriusStyle> <gmfView xsi:type="notation:Edge" type="4001"> <children type="6001"> @@ -244,7 +244,7 @@ <targetRefPoint x="558" y="74"/> </formatdata:EdgeFormatData> <formatdata:NodeFormatData id="//targetp1/targetC1-2" width="158" height="70"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hJTRBGyeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yYztZXKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_unsync']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/> </siriusStyle> @@ -260,7 +260,7 @@ <location x="535" y="35"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetC1-3" width="63" height="63"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hJTRBWyeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yYztZnKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_unsync']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/> </siriusStyle> @@ -280,7 +280,7 @@ <location x="35" y="35"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetp1-1" width="251" height="113"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hJTRBmyeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yYztZ3KSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_unsync']/@containerMappings[name='DT2_Package']/@style"/> </siriusStyle> @@ -318,7 +318,7 @@ <location x="397" y="120"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetp1-1/targetC1-1-1" width="110" height="60"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hJTRCWyeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yYztanKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_unsync']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/> </siriusStyle> @@ -338,7 +338,7 @@ <location x="16" y="33"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetp1-1/targetC1-1-2" width="70" height="50"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hJTRCmyeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yYzta3KSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_unsync']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/> </siriusStyle> @@ -354,7 +354,7 @@ <location x="156" y="33"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetp1-2" width="158" height="92"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hJTRC2yeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yYztbHKSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_unsync']/@containerMappings[name='DT2_Package']/@style"/> </siriusStyle> @@ -379,7 +379,7 @@ <location x="115" y="36"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetp1-2/targetC1-2-1" width="73" height="53"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hJTRDWyeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yYztbnKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_unsync']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/> </siriusStyle> @@ -395,7 +395,7 @@ <location x="35" y="24"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetp1-3" width="160" height="78"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hJTRDmyeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yYztb3KSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_unsync']/@containerMappings[name='DT2_Package']/@style"/> </siriusStyle> @@ -411,7 +411,7 @@ <location x="300" y="80"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2" width="388" height="153"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hJTRD2yeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yY0UcHKSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_unsync']/@containerMappings[name='DT2_Package']/@style"/> </siriusStyle> @@ -458,7 +458,7 @@ <location x="55" y="255"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2/targetp2-1" width="163" height="98"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hJT4AmyeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yY0UdHKSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_unsync']/@containerMappings[name='DT2_Package']/@style"/> </siriusStyle> @@ -487,7 +487,7 @@ <location x="35" y="35"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2/targetp2-1/targetnew%20EClass%201" width="103" height="53"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hJT4BGyeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yY0UdnKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_unsync']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/> </siriusStyle> @@ -507,7 +507,7 @@ <location x="35" y="35"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2/targetp2-2" width="160" height="78"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hJT4BWyeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yY0Ud3KSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_unsync']/@containerMappings[name='DT2_Package']/@style"/> </siriusStyle> @@ -523,7 +523,7 @@ <location x="205" y="35"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp3" width="158" height="83"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hJT4BmyeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yY0UeHKSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_unsync']/@containerMappings[name='DT2_Package']/@style"/> </siriusStyle> @@ -539,7 +539,7 @@ <location x="550" y="255"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp4" width="163" height="83"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hJTQ8GyeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yYzGUHKSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_unsync']/@containerMappings[name='DT2_Package']/@style"/> </siriusStyle> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/from___storedFormat-DiagType2_unsync__of__MyPackage___to___storedFormat-DiagType2_unsync__of__MyPackage__subset__New.xmi b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/from___storedFormat-DiagType2_unsync__of__MyPackage___to___storedFormat-DiagType2_unsync__of__MyPackage__subset__New.xmi index 57b0d97ded..59ec96369f 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/from___storedFormat-DiagType2_unsync__of__MyPackage___to___storedFormat-DiagType2_unsync__of__MyPackage__subset__New.xmi +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/from___storedFormat-DiagType2_unsync__of__MyPackage___to___storedFormat-DiagType2_unsync__of__MyPackage__subset__New.xmi @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="ASCII"?> <xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:diagram="http://www.eclipse.org/sirius/diagram/1.1.0" xmlns:formatdata="http://www.eclipse.org/sirius/dsl/formatdata/1.1.0" 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"> <formatdata:NodeFormatData id="//targetp1" width="913" height="303"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hGGzAWyeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yUdY4XKSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_unsync']/@containerMappings[name='DT2_Package']/@style"/> </siriusStyle> @@ -102,7 +102,7 @@ <location/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetC1-1" width="58" height="48"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hGGzD2yeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yUd_-HKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_unsync']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/> </siriusStyle> @@ -119,9 +119,9 @@ <label id="//targetp1/targetC1-1/targetaC1-2" width="-1" height="-1"> <location y="-10"/> </label> - <siriusStyle xsi:type="diagram:EdgeStyle" uid="_hGGzEGyeEeuXco3AXfG1Yg"> + <siriusStyle xsi:type="diagram:EdgeStyle" uid="_yUd_-XKSEeu2Yf-vWkXYRg"> <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_unsync']/@edgeMappings[name='DT2_EReference']/@style"/> - <centerLabelStyle uid="_hGGzEWyeEeuXco3AXfG1Yg" showIcon="false"/> + <centerLabelStyle uid="_yUd_-nKSEeu2Yf-vWkXYRg" showIcon="false"/> </siriusStyle> <gmfView xsi:type="notation:Edge" type="4001"> <children type="6001"> @@ -148,10 +148,10 @@ <label id="//targetp1/targetC1-1/targetaC1-1-1" width="-1" height="-1"> <location x="3" y="10"/> </label> - <siriusStyle xsi:type="diagram:EdgeStyle" uid="_hGGzEmyeEeuXco3AXfG1Yg"> + <siriusStyle xsi:type="diagram:EdgeStyle" uid="_yUd_-3KSEeu2Yf-vWkXYRg"> <customFeatures>uid</customFeatures> <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_unsync']/@edgeMappings[name='DT2_EReference']/@style"/> - <centerLabelStyle uid="_hGGzE2yeEeuXco3AXfG1Yg" showIcon="false"/> + <centerLabelStyle uid="_yUd__HKSEeu2Yf-vWkXYRg" showIcon="false"/> </siriusStyle> <gmfView xsi:type="notation:Edge" type="4001"> <children type="6001"> @@ -181,10 +181,10 @@ <label id="//targetp1/targetC1-1/targetaC1-1-1" width="-1" height="-1"> <location x="3" y="10"/> </label> - <siriusStyle xsi:type="diagram:EdgeStyle" uid="_hGHaG2yeEeuXco3AXfG1Yg"> + <siriusStyle xsi:type="diagram:EdgeStyle" uid="_yUenBXKSEeu2Yf-vWkXYRg"> <customFeatures>uid</customFeatures> <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_unsync']/@edgeMappings[name='DT2_EReference']/@style"/> - <centerLabelStyle uid="_hGHaHGyeEeuXco3AXfG1Yg" showIcon="false"/> + <centerLabelStyle uid="_yUenBnKSEeu2Yf-vWkXYRg" showIcon="false"/> </siriusStyle> <gmfView xsi:type="notation:Edge" type="4001"> <children type="6001"> @@ -209,7 +209,7 @@ <targetRefPoint x="487" y="175"/> </formatdata:EdgeFormatData> <formatdata:NodeFormatData id="//targetp1/targetC1-2" width="158" height="70"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hGGzFGyeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yUd__XKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_unsync']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/> </siriusStyle> @@ -225,7 +225,7 @@ <location x="535" y="35"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetp1-1" width="251" height="113"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hGGzFWyeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yUd__nKSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_unsync']/@containerMappings[name='DT2_Package']/@style"/> </siriusStyle> @@ -263,7 +263,7 @@ <location x="397" y="120"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetp1-1/targetC1-1-1" width="110" height="60"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hGHaEmyeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yUeAAXKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_unsync']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/> </siriusStyle> @@ -283,7 +283,7 @@ <location x="16" y="33"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2" width="388" height="153"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hGHaE2yeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yUeAAnKSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_unsync']/@containerMappings[name='DT2_Package']/@style"/> </siriusStyle> @@ -326,7 +326,7 @@ <location x="55" y="255"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2/targetp2-1" width="163" height="98"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hGHaF2yeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yUenAXKSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_unsync']/@containerMappings[name='DT2_Package']/@style"/> </siriusStyle> @@ -351,7 +351,7 @@ <location x="35" y="35"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2/targetp2-1/targetnew%20EClass%201" width="103" height="53"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hGHaGWyeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yUenA3KSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_unsync']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/> </siriusStyle> @@ -367,7 +367,7 @@ <location x="35" y="35"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2/targetp2-2" width="160" height="78"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hGHaGmyeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yUenBHKSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_unsync']/@containerMappings[name='DT2_Package']/@style"/> </siriusStyle> @@ -383,7 +383,7 @@ <location x="205" y="35"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp4" width="163" height="83"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hGGzAGyeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yUdY4HKSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_unsync']/@containerMappings[name='DT2_Package']/@style"/> </siriusStyle> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/from___storedFormat-DiagType2_unsync_edge__of__MyPackage___to___storedFormat-DiagType2_unsync_edge__of__MyPackage__full__New.xmi b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/from___storedFormat-DiagType2_unsync_edge__of__MyPackage___to___storedFormat-DiagType2_unsync_edge__of__MyPackage__full__New.xmi index 5c957b3a8d..7677717bcf 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/from___storedFormat-DiagType2_unsync_edge__of__MyPackage___to___storedFormat-DiagType2_unsync_edge__of__MyPackage__full__New.xmi +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/from___storedFormat-DiagType2_unsync_edge__of__MyPackage___to___storedFormat-DiagType2_unsync_edge__of__MyPackage__full__New.xmi @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="ASCII"?> <xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:diagram="http://www.eclipse.org/sirius/diagram/1.1.0" xmlns:formatdata="http://www.eclipse.org/sirius/dsl/formatdata/1.1.0" 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"> <formatdata:NodeFormatData id="//targetp1" width="843" height="213"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hPvQIWyeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_ygaxQXKSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_unsync_edge']/@containerMappings[name='DT2_Package']/@style"/> </siriusStyle> @@ -98,7 +98,7 @@ <location/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetC1-1" width="63" height="51"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hPv3NWyeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_ygbYVXKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_unsync_edge']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/> </siriusStyle> @@ -115,10 +115,10 @@ <label id="//targetp1/targetC1-1/targetaC1-2" width="-1" height="-1"> <location y="10"/> </label> - <siriusStyle xsi:type="diagram:EdgeStyle" uid="_hPv3NmyeEeuXco3AXfG1Yg"> + <siriusStyle xsi:type="diagram:EdgeStyle" uid="_ygbYVnKSEeu2Yf-vWkXYRg"> <customFeatures>uid</customFeatures> <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_unsync_edge']/@edgeMappings[name='DT2_EReference']/@style"/> - <centerLabelStyle uid="_hPv3N2yeEeuXco3AXfG1Yg" showIcon="false"/> + <centerLabelStyle uid="_ygbYV3KSEeu2Yf-vWkXYRg" showIcon="false"/> </siriusStyle> <gmfView xsi:type="notation:Edge" type="4001"> <children type="6001"> @@ -146,10 +146,10 @@ <label id="//targetp1/targetC1-1/targetaC1-1-1" width="-1" height="-1"> <location x="5" y="9"/> </label> - <siriusStyle xsi:type="diagram:EdgeStyle" uid="_hPv3OGyeEeuXco3AXfG1Yg"> + <siriusStyle xsi:type="diagram:EdgeStyle" uid="_ygbYWHKSEeu2Yf-vWkXYRg"> <customFeatures>uid</customFeatures> <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_unsync_edge']/@edgeMappings[name='DT2_EReference']/@style"/> - <centerLabelStyle uid="_hPv3OWyeEeuXco3AXfG1Yg" showIcon="false"/> + <centerLabelStyle uid="_ygbYWXKSEeu2Yf-vWkXYRg" showIcon="false"/> </siriusStyle> <gmfView xsi:type="notation:Edge" type="4001"> <children type="6001"> @@ -179,10 +179,10 @@ <label id="//targetp1/targetC1-1/targetaC1-1-1" width="-1" height="-1"> <location x="5" y="9"/> </label> - <siriusStyle xsi:type="diagram:EdgeStyle" uid="_hPv3TmyeEeuXco3AXfG1Yg"> + <siriusStyle xsi:type="diagram:EdgeStyle" uid="_ygb_YHKSEeu2Yf-vWkXYRg"> <customFeatures>uid</customFeatures> <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_unsync_edge']/@edgeMappings[name='DT2_EReference']/@style"/> - <centerLabelStyle uid="_hPv3T2yeEeuXco3AXfG1Yg" showIcon="false"/> + <centerLabelStyle uid="_ygb_YXKSEeu2Yf-vWkXYRg" showIcon="false"/> </siriusStyle> <gmfView xsi:type="notation:Edge" type="4001"> <children type="6001"> @@ -210,10 +210,10 @@ <label id="//targetp1/targetC1-1/targetaC1-2" width="-1" height="-1"> <location y="10"/> </label> - <siriusStyle xsi:type="diagram:EdgeStyle" uid="_hPv3UGyeEeuXco3AXfG1Yg"> + <siriusStyle xsi:type="diagram:EdgeStyle" uid="_ygb_YnKSEeu2Yf-vWkXYRg"> <customFeatures>uid</customFeatures> <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_unsync_edge']/@edgeMappings[name='DT2_EReference']/@style"/> - <centerLabelStyle uid="_hPv3UWyeEeuXco3AXfG1Yg" showIcon="false"/> + <centerLabelStyle uid="_ygb_Y3KSEeu2Yf-vWkXYRg" showIcon="false"/> </siriusStyle> <gmfView xsi:type="notation:Edge" type="4001"> <children type="6001"> @@ -238,7 +238,7 @@ <targetRefPoint x="554" y="74"/> </formatdata:EdgeFormatData> <formatdata:NodeFormatData id="//targetp1/targetC1-2" width="58" height="48"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hPv3OmyeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_ygbYWnKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_unsync_edge']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/> </siriusStyle> @@ -254,7 +254,7 @@ <location x="530" y="35"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetC1-3" width="58" height="53"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hPv3O2yeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_ygbYW3KSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_unsync_edge']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/> </siriusStyle> @@ -270,7 +270,7 @@ <location x="35" y="35"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetp1-1" width="198" height="93"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hPv3PGyeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_ygbYXHKSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_unsync_edge']/@containerMappings[name='DT2_Package']/@style"/> </siriusStyle> @@ -304,7 +304,7 @@ <location x="635" y="35"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetp1-1/targetC1-1-1" width="68" height="48"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hPv3P2yeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_ygbYX3KSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_unsync_edge']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/> </siriusStyle> @@ -320,7 +320,7 @@ <location x="35" y="35"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetp1-1/targetC1-1-2" width="68" height="48"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hPv3QGyeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_ygbYYHKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_unsync_edge']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/> </siriusStyle> @@ -336,7 +336,7 @@ <location x="120" y="35"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetp1-2" width="158" height="98"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hPv3QWyeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_ygbYYXKSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_unsync_edge']/@containerMappings[name='DT2_Package']/@style"/> </siriusStyle> @@ -361,7 +361,7 @@ <location x="110" y="35"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetp1-2/targetC1-2-1" width="73" height="48"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hPv3Q2yeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_ygbYY3KSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_unsync_edge']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/> </siriusStyle> @@ -377,7 +377,7 @@ <location x="35" y="35"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetp1-3" width="158" height="78"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hPv3RGyeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_ygbYZHKSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_unsync_edge']/@containerMappings[name='DT2_Package']/@style"/> </siriusStyle> @@ -393,7 +393,7 @@ <location x="320" y="35"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2" width="393" height="143"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hPv3RWyeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_ygbYZXKSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_unsync_edge']/@containerMappings[name='DT2_Package']/@style"/> </siriusStyle> @@ -436,7 +436,7 @@ <location x="105" y="255"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2/targetp2-1" width="158" height="93"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hPv3SWyeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_ygbYaXKSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_unsync_edge']/@containerMappings[name='DT2_Package']/@style"/> </siriusStyle> @@ -461,7 +461,7 @@ <location x="35" y="35"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2/targetp2-1/targetnew%20EClass%201" width="108" height="48"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hPv3S2yeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_ygbYa3KSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_unsync_edge']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/> </siriusStyle> @@ -477,7 +477,7 @@ <location x="35" y="35"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2/targetp2-2" width="158" height="84"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hPv3TGyeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_ygbYbHKSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_unsync_edge']/@containerMappings[name='DT2_Package']/@style"/> </siriusStyle> @@ -493,7 +493,7 @@ <location x="215" y="35"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp3" width="158" height="78"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hPv3TWyeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_ygbYbXKSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_unsync_edge']/@containerMappings[name='DT2_Package']/@style"/> </siriusStyle> @@ -509,7 +509,7 @@ <location x="505" y="230"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp4" width="168" height="86"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hPvQIGyeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_ygaxQHKSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_unsync_edge']/@containerMappings[name='DT2_Package']/@style"/> </siriusStyle> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/from___storedFormat-DiagType2_unsync_edge__of__MyPackage___to___storedFormat-DiagType2_unsync_edge__of__MyPackage__subset__New.xmi b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/from___storedFormat-DiagType2_unsync_edge__of__MyPackage___to___storedFormat-DiagType2_unsync_edge__of__MyPackage__subset__New.xmi index d76cb66ae9..b58ca6f17b 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/from___storedFormat-DiagType2_unsync_edge__of__MyPackage___to___storedFormat-DiagType2_unsync_edge__of__MyPackage__subset__New.xmi +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/from___storedFormat-DiagType2_unsync_edge__of__MyPackage___to___storedFormat-DiagType2_unsync_edge__of__MyPackage__subset__New.xmi @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="ASCII"?> <xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:diagram="http://www.eclipse.org/sirius/diagram/1.1.0" xmlns:formatdata="http://www.eclipse.org/sirius/dsl/formatdata/1.1.0" 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"> <formatdata:NodeFormatData id="//targetp1" width="843" height="213"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hMXzEWyeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_ycn2YXKSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_unsync_edge']/@containerMappings[name='DT2_Package']/@style"/> </siriusStyle> @@ -98,7 +98,7 @@ <location/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetC1-1" width="63" height="51"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hMXzHWyeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_ycodcHKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_unsync_edge']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/> </siriusStyle> @@ -115,10 +115,10 @@ <label id="//targetp1/targetC1-1/targetaC1-1-1" width="-1" height="-1"> <location x="5" y="9"/> </label> - <siriusStyle xsi:type="diagram:EdgeStyle" uid="_hMXzHmyeEeuXco3AXfG1Yg"> + <siriusStyle xsi:type="diagram:EdgeStyle" uid="_ycodcXKSEeu2Yf-vWkXYRg"> <customFeatures>uid</customFeatures> <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_unsync_edge']/@edgeMappings[name='DT2_EReference']/@style"/> - <centerLabelStyle uid="_hMXzH2yeEeuXco3AXfG1Yg" showIcon="false"/> + <centerLabelStyle uid="_ycodcnKSEeu2Yf-vWkXYRg" showIcon="false"/> </siriusStyle> <gmfView xsi:type="notation:Edge" type="4001"> <children type="6001"> @@ -148,10 +148,10 @@ <label id="//targetp1/targetC1-1/targetaC1-1-1" width="-1" height="-1"> <location x="5" y="9"/> </label> - <siriusStyle xsi:type="diagram:EdgeStyle" uid="_hMYaI2yeEeuXco3AXfG1Yg"> + <siriusStyle xsi:type="diagram:EdgeStyle" uid="_ycodgHKSEeu2Yf-vWkXYRg"> <customFeatures>uid</customFeatures> <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_unsync_edge']/@edgeMappings[name='DT2_EReference']/@style"/> - <centerLabelStyle uid="_hMYaJGyeEeuXco3AXfG1Yg" showIcon="false"/> + <centerLabelStyle uid="_ycodgXKSEeu2Yf-vWkXYRg" showIcon="false"/> </siriusStyle> <gmfView xsi:type="notation:Edge" type="4001"> <children type="6001"> @@ -176,7 +176,7 @@ <targetRefPoint x="699" y="89"/> </formatdata:EdgeFormatData> <formatdata:NodeFormatData id="//targetp1/targetC1-2" width="58" height="48"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hMXzIGyeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_ycodc3KSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_unsync_edge']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/> </siriusStyle> @@ -192,7 +192,7 @@ <location x="530" y="35"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetp1-1" width="198" height="93"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hMXzIWyeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_ycoddHKSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_unsync_edge']/@containerMappings[name='DT2_Package']/@style"/> </siriusStyle> @@ -226,7 +226,7 @@ <location x="635" y="35"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetp1-1/targetC1-1-1" width="68" height="48"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hMXzJGyeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_ycodd3KSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_unsync_edge']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/> </siriusStyle> @@ -242,7 +242,7 @@ <location x="35" y="35"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2" width="393" height="143"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hMXzJWyeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_ycodeHKSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_unsync_edge']/@containerMappings[name='DT2_Package']/@style"/> </siriusStyle> @@ -285,7 +285,7 @@ <location x="105" y="255"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2/targetp2-1" width="158" height="93"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hMXzKWyeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_ycodfHKSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_unsync_edge']/@containerMappings[name='DT2_Package']/@style"/> </siriusStyle> @@ -310,7 +310,7 @@ <location x="35" y="35"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2/targetp2-1/targetnew%20EClass%201" width="108" height="48"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hMYaIWyeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_ycodfnKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_unsync_edge']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/> </siriusStyle> @@ -326,7 +326,7 @@ <location x="35" y="35"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2/targetp2-2" width="158" height="84"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hMYaImyeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_ycodf3KSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_unsync_edge']/@containerMappings[name='DT2_Package']/@style"/> </siriusStyle> @@ -342,7 +342,7 @@ <location x="215" y="35"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp4" width="168" height="86"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hMXzEGyeEeuXco3AXfG1Yg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_ycn2YHKSEeu2Yf-vWkXYRg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2_unsync_edge']/@containerMappings[name='DT2_Package']/@style"/> </siriusStyle> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/from___storedFormat-DiagType8__of__MyPackage___to___storedFormat-DiagType8__of__MyPackage__full__New.xmi b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/from___storedFormat-DiagType8__of__MyPackage___to___storedFormat-DiagType8__of__MyPackage__full__New.xmi index 5a8737447a..f06a394757 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/from___storedFormat-DiagType8__of__MyPackage___to___storedFormat-DiagType8__of__MyPackage__full__New.xmi +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/from___storedFormat-DiagType8__of__MyPackage___to___storedFormat-DiagType8__of__MyPackage__full__New.xmi @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="ASCII"?> <xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:diagram="http://www.eclipse.org/sirius/diagram/1.1.0" xmlns:formatdata="http://www.eclipse.org/sirius/dsl/formatdata/1.1.0" 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"> <formatdata:NodeFormatData id="//targetp1" width="635" height="323"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hWmGEWyeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_ynnlcXKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@style"/> </siriusStyle> @@ -53,7 +53,7 @@ <label id="//targetp1/targetC1-1"> <location x="62" y="2"/> </label> - <siriusStyle xsi:type="diagram:Dot" uid="_hWmGFWyeEeuXco3AXfG1Yg"> + <siriusStyle xsi:type="diagram:Dot" uid="_ynnldXKSEeu2Yf-vWkXYRg"> <customFeatures>uid</customFeatures> <description xsi:type="style:DotDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']/@style"/> </siriusStyle> @@ -74,7 +74,7 @@ <label id="//targetp1/targetC1-2"> <location y="5"/> </label> - <siriusStyle xsi:type="diagram:Dot" uid="_hWmGFmyeEeuXco3AXfG1Yg"> + <siriusStyle xsi:type="diagram:Dot" uid="_ynnldnKSEeu2Yf-vWkXYRg"> <customFeatures>uid</customFeatures> <description xsi:type="style:DotDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']/@style"/> </siriusStyle> @@ -95,7 +95,7 @@ <label id="//targetp1/targetC1-3"> <location y="5"/> </label> - <siriusStyle xsi:type="diagram:Dot" uid="_hWmGF2yeEeuXco3AXfG1Yg"> + <siriusStyle xsi:type="diagram:Dot" uid="_ynnld3KSEeu2Yf-vWkXYRg"> <customFeatures>uid</customFeatures> <description xsi:type="style:DotDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']/@style"/> </siriusStyle> @@ -113,7 +113,7 @@ <location x="-22" y="81"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetp1-1" width="199" height="137"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hWmGIWyeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_ynnlgXKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@style"/> </siriusStyle> @@ -154,7 +154,7 @@ <label id="//targetp1/targetp1-1/targetC1-1-1"> <location y="5"/> </label> - <siriusStyle xsi:type="diagram:Dot" uid="_hWmGJGyeEeuXco3AXfG1Yg"> + <siriusStyle xsi:type="diagram:Dot" uid="_ynnlhHKSEeu2Yf-vWkXYRg"> <customFeatures>uid</customFeatures> <description xsi:type="style:DotDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']/@style"/> </siriusStyle> @@ -175,7 +175,7 @@ <label id="//targetp1/targetp1-1/targetC1-1-2"> <location y="5"/> </label> - <siriusStyle xsi:type="diagram:Dot" uid="_hWmGJWyeEeuXco3AXfG1Yg"> + <siriusStyle xsi:type="diagram:Dot" uid="_ynoMgHKSEeu2Yf-vWkXYRg"> <customFeatures>uid</customFeatures> <description xsi:type="style:DotDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']/@style"/> </siriusStyle> @@ -193,7 +193,7 @@ <location x="-22" y="33"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetp1-2" width="199" height="70"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hWmGHmyeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_ynnlfnKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@style"/> </siriusStyle> @@ -223,7 +223,7 @@ <label id="//targetp1/targetp1-2/targetC1-2-1"> <location y="5"/> </label> - <siriusStyle xsi:type="diagram:Dot" uid="_hWmGIGyeEeuXco3AXfG1Yg"> + <siriusStyle xsi:type="diagram:Dot" uid="_ynnlgHKSEeu2Yf-vWkXYRg"> <customFeatures>uid</customFeatures> <description xsi:type="style:DotDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']/@style"/> </siriusStyle> @@ -241,7 +241,7 @@ <location x="158" y="60"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetp1-3" width="199" height="70"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hWmGJmyeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_ynoMgXKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@style"/> </siriusStyle> @@ -257,7 +257,7 @@ <location x="604" y="59"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2" width="499" height="114"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hWmGGGyeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_ynnleHKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@style"/> </siriusStyle> @@ -273,7 +273,7 @@ <location x="826" y="29"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2/targetp2-1" width="199" height="70"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hWmGGmyeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_ynnlenKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@style"/> </siriusStyle> @@ -303,7 +303,7 @@ <label id="//targetp2/targetp2-1/targetnew%20EClass%201"> <location y="5"/> </label> - <siriusStyle xsi:type="diagram:Dot" uid="_hWmGHGyeEeuXco3AXfG1Yg"> + <siriusStyle xsi:type="diagram:Dot" uid="_ynnlfHKSEeu2Yf-vWkXYRg"> <customFeatures>uid</customFeatures> <description xsi:type="style:DotDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']/@style"/> </siriusStyle> @@ -321,7 +321,7 @@ <location x="-22"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2/targetp2-2" width="199" height="70"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hWmGHWyeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_ynnlfXKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@style"/> </siriusStyle> @@ -337,7 +337,7 @@ <location x="1158" y="113"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp3" width="188" height="70"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hWmGGWyeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_ynnleXKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@style"/> </siriusStyle> @@ -353,7 +353,7 @@ <location x="1370" y="29"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp4" width="188" height="70"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hWmGEGyeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_ynnlcHKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@style"/> </siriusStyle> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/from___storedFormat-DiagType8__of__MyPackage___to___storedFormat-DiagType8__of__MyPackage__subset__New.xmi b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/from___storedFormat-DiagType8__of__MyPackage___to___storedFormat-DiagType8__of__MyPackage__subset__New.xmi index 57f3d8ea74..26aea2846d 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/from___storedFormat-DiagType8__of__MyPackage___to___storedFormat-DiagType8__of__MyPackage__subset__New.xmi +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/from___storedFormat-DiagType8__of__MyPackage___to___storedFormat-DiagType8__of__MyPackage__subset__New.xmi @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="ASCII"?> <xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:diagram="http://www.eclipse.org/sirius/diagram/1.1.0" xmlns:formatdata="http://www.eclipse.org/sirius/dsl/formatdata/1.1.0" 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"> <formatdata:NodeFormatData id="//targetp1" width="635" height="323"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hTg84GyeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_ykeK0XKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@style"/> </siriusStyle> @@ -53,7 +53,7 @@ <label id="//targetp1/targetC1-1"> <location x="62" y="2"/> </label> - <siriusStyle xsi:type="diagram:Dot" uid="_hTg85GyeEeuXco3AXfG1Yg"> + <siriusStyle xsi:type="diagram:Dot" uid="_ykeK1XKSEeu2Yf-vWkXYRg"> <customFeatures>uid</customFeatures> <description xsi:type="style:DotDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']/@style"/> </siriusStyle> @@ -74,7 +74,7 @@ <label id="//targetp1/targetC1-2"> <location y="5"/> </label> - <siriusStyle xsi:type="diagram:Dot" uid="_hTg85WyeEeuXco3AXfG1Yg"> + <siriusStyle xsi:type="diagram:Dot" uid="_ykeK1nKSEeu2Yf-vWkXYRg"> <customFeatures>uid</customFeatures> <description xsi:type="style:DotDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']/@style"/> </siriusStyle> @@ -92,7 +92,7 @@ <location x="432" y="-22"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetp1-1" width="199" height="137"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hTg862yeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_ykeK3HKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@style"/> </siriusStyle> @@ -133,7 +133,7 @@ <label id="//targetp1/targetp1-1/targetC1-1-1"> <location y="5"/> </label> - <siriusStyle xsi:type="diagram:Dot" uid="_hTg87myeEeuXco3AXfG1Yg"> + <siriusStyle xsi:type="diagram:Dot" uid="_ykeK33KSEeu2Yf-vWkXYRg"> <customFeatures>uid</customFeatures> <description xsi:type="style:DotDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']/@style"/> </siriusStyle> @@ -151,7 +151,7 @@ <location x="189" y="33"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2" width="499" height="114"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hTg85myeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_ykeK13KSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@style"/> </siriusStyle> @@ -167,7 +167,7 @@ <location x="826" y="29"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2/targetp2-1" width="199" height="70"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hTg852yeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_ykeK2HKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@style"/> </siriusStyle> @@ -197,7 +197,7 @@ <label id="//targetp2/targetp2-1/targetnew%20EClass%201"> <location y="5"/> </label> - <siriusStyle xsi:type="diagram:Dot" uid="_hTg86WyeEeuXco3AXfG1Yg"> + <siriusStyle xsi:type="diagram:Dot" uid="_ykeK2nKSEeu2Yf-vWkXYRg"> <customFeatures>uid</customFeatures> <description xsi:type="style:DotDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']/@style"/> </siriusStyle> @@ -215,7 +215,7 @@ <location x="-22"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2/targetp2-2" width="199" height="70"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hTg86myeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_ykeK23KSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@style"/> </siriusStyle> @@ -231,7 +231,7 @@ <location x="1158" y="113"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp4" width="188" height="70"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hTgV0GyeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_ykeK0HKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@style"/> </siriusStyle> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/from___storedFormat-DiagType8_unsyncBN__of__MyPackage___to___storedFormat-DiagType8_unsyncBN__of__MyPackage__full__New.xmi b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/from___storedFormat-DiagType8_unsyncBN__of__MyPackage___to___storedFormat-DiagType8_unsyncBN__of__MyPackage__full__New.xmi index c5363cf77e..b001247b9e 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/from___storedFormat-DiagType8_unsyncBN__of__MyPackage___to___storedFormat-DiagType8_unsyncBN__of__MyPackage__full__New.xmi +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/from___storedFormat-DiagType8_unsyncBN__of__MyPackage___to___storedFormat-DiagType8_unsyncBN__of__MyPackage__full__New.xmi @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="ASCII"?> <xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:diagram="http://www.eclipse.org/sirius/diagram/1.1.0" xmlns:formatdata="http://www.eclipse.org/sirius/dsl/formatdata/1.1.0" 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"> <formatdata:NodeFormatData id="//targetp1" width="212" height="99"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hhRsEWyeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yynUgXKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8_unsync_onlyBN']/@defaultLayer/@containerMappings[name='DT8_unsyncBN_Package']/@style"/> </siriusStyle> @@ -42,7 +42,7 @@ <label id="//targetp1/targetC1-1"> <location x="31" y="10"/> </label> - <siriusStyle xsi:type="diagram:Dot" uid="_hhRsFGyeEeuXco3AXfG1Yg"> + <siriusStyle xsi:type="diagram:Dot" uid="_yynUhHKSEeu2Yf-vWkXYRg"> <customFeatures>uid</customFeatures> <description xsi:type="style:DotDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8_unsync_onlyBN']/@defaultLayer/@containerMappings[name='DT8_unsyncBN_Package']/@borderedNodeMappings[name='DT8_unsyncBN_Class']/@style"/> </siriusStyle> @@ -63,7 +63,7 @@ <label id="//targetp1/targetC1-2"> <location x="31" y="9"/> </label> - <siriusStyle xsi:type="diagram:Dot" uid="_hhRsFWyeEeuXco3AXfG1Yg"> + <siriusStyle xsi:type="diagram:Dot" uid="_yynUhXKSEeu2Yf-vWkXYRg"> <customFeatures>uid</customFeatures> <description xsi:type="style:DotDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8_unsync_onlyBN']/@defaultLayer/@containerMappings[name='DT8_unsyncBN_Package']/@borderedNodeMappings[name='DT8_unsyncBN_Class']/@style"/> </siriusStyle> @@ -81,7 +81,7 @@ <location x="202" y="37"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetp1-1" width="212" height="99"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hhRsHWyeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yyn7lnKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8_unsync_onlyBN']/@defaultLayer/@containerMappings[name='DT8_unsyncBN_Package']/@style"/> </siriusStyle> @@ -97,7 +97,7 @@ <location x="62" y="243"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetp1-2" width="212" height="99"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hhRsGmyeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yyn7k3KSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8_unsync_onlyBN']/@defaultLayer/@containerMappings[name='DT8_unsyncBN_Package']/@style"/> </siriusStyle> @@ -127,7 +127,7 @@ <label id="//targetp1/targetp1-2/targetC1-2-1"> <location x="31" y="10"/> </label> - <siriusStyle xsi:type="diagram:Dot" uid="_hhRsHGyeEeuXco3AXfG1Yg"> + <siriusStyle xsi:type="diagram:Dot" uid="_yyn7lXKSEeu2Yf-vWkXYRg"> <customFeatures>uid</customFeatures> <description xsi:type="style:DotDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8_unsync_onlyBN']/@defaultLayer/@containerMappings[name='DT8_unsyncBN_Package']/@borderedNodeMappings[name='DT8_unsyncBN_Class']/@style"/> </siriusStyle> @@ -145,7 +145,7 @@ <location x="19" y="89"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetp1-3" width="212" height="99"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hhRsHmyeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yyn7l3KSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8_unsync_onlyBN']/@defaultLayer/@containerMappings[name='DT8_unsyncBN_Package']/@style"/> </siriusStyle> @@ -161,7 +161,7 @@ <location x="62" y="532"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2" width="212" height="99"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hhRsFmyeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yynUhnKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8_unsync_onlyBN']/@defaultLayer/@containerMappings[name='DT8_unsyncBN_Package']/@style"/> </siriusStyle> @@ -177,7 +177,7 @@ <location x="366" y="175"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2/targetp2-1" width="212" height="99"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hhRsGGyeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yyn7kXKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8_unsync_onlyBN']/@defaultLayer/@containerMappings[name='DT8_unsyncBN_Package']/@style"/> </siriusStyle> @@ -193,7 +193,7 @@ <location x="366" y="302"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2/targetp2-2" width="212" height="99"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hhRsGWyeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yyn7knKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8_unsync_onlyBN']/@defaultLayer/@containerMappings[name='DT8_unsyncBN_Package']/@style"/> </siriusStyle> @@ -209,7 +209,7 @@ <location x="366" y="428"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp3" width="212" height="99"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hhRsF2yeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yyn7kHKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8_unsync_onlyBN']/@defaultLayer/@containerMappings[name='DT8_unsyncBN_Package']/@style"/> </siriusStyle> @@ -225,7 +225,7 @@ <location x="698" y="225"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp4" width="212" height="99"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hhRsEGyeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yynUgHKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8_unsync_onlyBN']/@defaultLayer/@containerMappings[name='DT8_unsyncBN_Package']/@style"/> </siriusStyle> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/from___storedFormat-DiagType8_unsyncBN__of__MyPackage___to___storedFormat-DiagType8_unsyncBN__of__MyPackage__subset__New.xmi b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/from___storedFormat-DiagType8_unsyncBN__of__MyPackage___to___storedFormat-DiagType8_unsyncBN__of__MyPackage__subset__New.xmi index ec735fb61c..5bf76731d5 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/from___storedFormat-DiagType8_unsyncBN__of__MyPackage___to___storedFormat-DiagType8_unsyncBN__of__MyPackage__subset__New.xmi +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/from___storedFormat-DiagType8_unsyncBN__of__MyPackage___to___storedFormat-DiagType8_unsyncBN__of__MyPackage__subset__New.xmi @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="ASCII"?> <xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:diagram="http://www.eclipse.org/sirius/diagram/1.1.0" xmlns:formatdata="http://www.eclipse.org/sirius/dsl/formatdata/1.1.0" 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"> <formatdata:NodeFormatData id="//targetp1" width="212" height="99"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hejIMWyeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_ywJ2YXKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8_unsync_onlyBN']/@defaultLayer/@containerMappings[name='DT8_unsyncBN_Package']/@style"/> </siriusStyle> @@ -42,7 +42,7 @@ <label id="//targetp1/targetC1-1"> <location x="31" y="10"/> </label> - <siriusStyle xsi:type="diagram:Dot" uid="_hejINGyeEeuXco3AXfG1Yg"> + <siriusStyle xsi:type="diagram:Dot" uid="_ywJ2ZHKSEeu2Yf-vWkXYRg"> <customFeatures>uid</customFeatures> <description xsi:type="style:DotDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8_unsync_onlyBN']/@defaultLayer/@containerMappings[name='DT8_unsyncBN_Package']/@borderedNodeMappings[name='DT8_unsyncBN_Class']/@style"/> </siriusStyle> @@ -63,7 +63,7 @@ <label id="//targetp1/targetC1-2"> <location x="31" y="9"/> </label> - <siriusStyle xsi:type="diagram:Dot" uid="_hejINWyeEeuXco3AXfG1Yg"> + <siriusStyle xsi:type="diagram:Dot" uid="_ywJ2ZXKSEeu2Yf-vWkXYRg"> <customFeatures>uid</customFeatures> <description xsi:type="style:DotDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8_unsync_onlyBN']/@defaultLayer/@containerMappings[name='DT8_unsyncBN_Package']/@borderedNodeMappings[name='DT8_unsyncBN_Class']/@style"/> </siriusStyle> @@ -81,7 +81,7 @@ <location x="202" y="37"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetp1-1" width="212" height="99"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hejIOWyeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_ywJ2aXKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8_unsync_onlyBN']/@defaultLayer/@containerMappings[name='DT8_unsyncBN_Package']/@style"/> </siriusStyle> @@ -97,7 +97,7 @@ <location x="62" y="243"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2" width="212" height="99"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hejINmyeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_ywJ2ZnKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8_unsync_onlyBN']/@defaultLayer/@containerMappings[name='DT8_unsyncBN_Package']/@style"/> </siriusStyle> @@ -113,7 +113,7 @@ <location x="366" y="175"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2/targetp2-1" width="212" height="99"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hejIN2yeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_ywJ2Z3KSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8_unsync_onlyBN']/@defaultLayer/@containerMappings[name='DT8_unsyncBN_Package']/@style"/> </siriusStyle> @@ -129,7 +129,7 @@ <location x="366" y="302"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2/targetp2-2" width="212" height="99"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hejIOGyeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_ywJ2aHKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8_unsync_onlyBN']/@defaultLayer/@containerMappings[name='DT8_unsyncBN_Package']/@style"/> </siriusStyle> @@ -145,7 +145,7 @@ <location x="366" y="428"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp4" width="212" height="99"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hejIMGyeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_ywJ2YHKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8_unsync_onlyBN']/@defaultLayer/@containerMappings[name='DT8_unsyncBN_Package']/@style"/> </siriusStyle> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/from___storedFormat-DiagType8_unsync__of__MyPackage___to___storedFormat-DiagType8_unsync__of__MyPackage__full__New.xmi b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/from___storedFormat-DiagType8_unsync__of__MyPackage___to___storedFormat-DiagType8_unsync__of__MyPackage__full__New.xmi index ecdebf4466..9882cac4c8 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/from___storedFormat-DiagType8_unsync__of__MyPackage___to___storedFormat-DiagType8_unsync__of__MyPackage__full__New.xmi +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/from___storedFormat-DiagType8_unsync__of__MyPackage___to___storedFormat-DiagType8_unsync__of__MyPackage__full__New.xmi @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="ASCII"?> <xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:diagram="http://www.eclipse.org/sirius/diagram/1.1.0" xmlns:formatdata="http://www.eclipse.org/sirius/dsl/formatdata/1.1.0" 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"> <formatdata:NodeFormatData id="//targetp1" width="203" height="78"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hb9uQWyeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_ytgLAXKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8_unsync']/@containerMappings[name='DT8_unsync_Package']/@style"/> </siriusStyle> @@ -17,7 +17,7 @@ <location/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetp1-1" width="203" height="78"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hb9uSWyeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_ytgLCXKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8_unsync']/@containerMappings[name='DT8_unsync_Package']/@style"/> </siriusStyle> @@ -47,7 +47,7 @@ <label id="//targetp1/targetp1-1/targetC1-1-1"> <location x="31" y="7"/> </label> - <siriusStyle xsi:type="diagram:Dot" uid="_hb9uS2yeEeuXco3AXfG1Yg"> + <siriusStyle xsi:type="diagram:Dot" uid="_ytgLC3KSEeu2Yf-vWkXYRg"> <customFeatures>uid</customFeatures> <description xsi:type="style:DotDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8_unsync']/@containerMappings[name='DT8_unsync_Package']/@borderedNodeMappings[name='DT8_unsync_Class']/@style"/> </siriusStyle> @@ -65,7 +65,7 @@ <location x="115" y="68"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetp1-2" width="203" height="78"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hb9uRmyeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_ytgLBnKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8_unsync']/@containerMappings[name='DT8_unsync_Package']/@style"/> </siriusStyle> @@ -95,7 +95,7 @@ <label id="//targetp1/targetp1-2/targetC1-2-1"> <location x="31" y="7"/> </label> - <siriusStyle xsi:type="diagram:Dot" uid="_hb9uSGyeEeuXco3AXfG1Yg"> + <siriusStyle xsi:type="diagram:Dot" uid="_ytgLCHKSEeu2Yf-vWkXYRg"> <customFeatures>uid</customFeatures> <description xsi:type="style:DotDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8_unsync']/@containerMappings[name='DT8_unsync_Package']/@borderedNodeMappings[name='DT8_unsync_Class']/@style"/> </siriusStyle> @@ -113,7 +113,7 @@ <location x="65" y="68"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetp1-3" width="203" height="78"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hb9uTGyeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_ytgLDHKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8_unsync']/@containerMappings[name='DT8_unsync_Package']/@style"/> </siriusStyle> @@ -129,7 +129,7 @@ <location x="735"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2" width="203" height="78"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hb9uQmyeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_ytgLAnKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8_unsync']/@containerMappings[name='DT8_unsync_Package']/@style"/> </siriusStyle> @@ -145,7 +145,7 @@ <location x="985"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2/targetp2-1" width="203" height="78"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hb9uRGyeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_ytgLBHKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8_unsync']/@containerMappings[name='DT8_unsync_Package']/@style"/> </siriusStyle> @@ -161,7 +161,7 @@ <location x="1225"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2/targetp2-2" width="203" height="78"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hb9uRWyeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_ytgLBXKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8_unsync']/@containerMappings[name='DT8_unsync_Package']/@style"/> </siriusStyle> @@ -177,7 +177,7 @@ <location x="1475"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp3" width="203" height="78"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hb9uQ2yeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_ytgLA3KSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8_unsync']/@containerMappings[name='DT8_unsync_Package']/@style"/> </siriusStyle> @@ -193,7 +193,7 @@ <location x="1725"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp4" width="203" height="78"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hb9uQGyeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_ytgLAHKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8_unsync']/@containerMappings[name='DT8_unsync_Package']/@style"/> </siriusStyle> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/from___storedFormat-DiagType8_unsync__of__MyPackage___to___storedFormat-DiagType8_unsync__of__MyPackage__subset__New.xmi b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/from___storedFormat-DiagType8_unsync__of__MyPackage___to___storedFormat-DiagType8_unsync__of__MyPackage__subset__New.xmi index 4d8ce55d97..19c1aee1a6 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/from___storedFormat-DiagType8_unsync__of__MyPackage___to___storedFormat-DiagType8_unsync__of__MyPackage__subset__New.xmi +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/from___storedFormat-DiagType8_unsync__of__MyPackage___to___storedFormat-DiagType8_unsync__of__MyPackage__subset__New.xmi @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="ASCII"?> <xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:diagram="http://www.eclipse.org/sirius/diagram/1.1.0" xmlns:formatdata="http://www.eclipse.org/sirius/dsl/formatdata/1.1.0" 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"> <formatdata:NodeFormatData id="//targetp1" width="203" height="78"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hZTb0WyeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yqq5cXKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8_unsync']/@containerMappings[name='DT8_unsync_Package']/@style"/> </siriusStyle> @@ -17,7 +17,7 @@ <location/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetp1-1" width="203" height="78"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hZUC4myeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yqrggnKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8_unsync']/@containerMappings[name='DT8_unsync_Package']/@style"/> </siriusStyle> @@ -47,7 +47,7 @@ <label id="//targetp1/targetp1-1/targetC1-1-1"> <location x="31" y="7"/> </label> - <siriusStyle xsi:type="diagram:Dot" uid="_hZUC5GyeEeuXco3AXfG1Yg"> + <siriusStyle xsi:type="diagram:Dot" uid="_yqrghHKSEeu2Yf-vWkXYRg"> <customFeatures>uid</customFeatures> <description xsi:type="style:DotDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8_unsync']/@containerMappings[name='DT8_unsync_Package']/@borderedNodeMappings[name='DT8_unsync_Class']/@style"/> </siriusStyle> @@ -65,7 +65,7 @@ <location x="115" y="68"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2" width="203" height="78"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hZTb0myeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yqq5cnKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8_unsync']/@containerMappings[name='DT8_unsync_Package']/@style"/> </siriusStyle> @@ -81,7 +81,7 @@ <location x="985"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2/targetp2-1" width="203" height="78"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hZUC4GyeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yqrggHKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8_unsync']/@containerMappings[name='DT8_unsync_Package']/@style"/> </siriusStyle> @@ -97,7 +97,7 @@ <location x="1225"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2/targetp2-2" width="203" height="78"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hZUC4WyeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yqrggXKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8_unsync']/@containerMappings[name='DT8_unsync_Package']/@style"/> </siriusStyle> @@ -113,7 +113,7 @@ <location x="1475"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp4" width="203" height="78"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_hZTb0GyeEeuXco3AXfG1Yg" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_yqq5cHKSEeu2Yf-vWkXYRg" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8_unsync']/@containerMappings[name='DT8_unsync_Package']/@style"/> </siriusStyle> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/mb_ed_from___storedFormat-DiagType10__of__MyPackage___to___storedFormat-DiagType10__Raw__of__targetMyPackage__full.xmi b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/mb_ed_from___storedFormat-DiagType10__of__MyPackage___to___storedFormat-DiagType10__Raw__of__targetMyPackage__full.xmi index 33b74eece9..c9368fa728 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/mb_ed_from___storedFormat-DiagType10__of__MyPackage___to___storedFormat-DiagType10__Raw__of__targetMyPackage__full.xmi +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/mb_ed_from___storedFormat-DiagType10__of__MyPackage___to___storedFormat-DiagType10__Raw__of__targetMyPackage__full.xmi @@ -4,7 +4,7 @@ <label id="//targetp1/targetC1-1"> <location x="31"/> </label> - <siriusStyle xsi:type="diagram:Lozenge" uid="_LjHDR2ysEeuxXtQYUb0q2w" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:Lozenge" uid="_PRhamnKSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>borderSize</customFeatures> <customFeatures>borderSizeComputationExpression</customFeatures> <customFeatures>color</customFeatures> @@ -27,7 +27,7 @@ <label id="//targetp1/targetC1-1"> <location x="31"/> </label> - <siriusStyle xsi:type="diagram:Ellipse" uid="_LjHDSGysEeuxXtQYUb0q2w" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:Ellipse" uid="_PRham3KSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:EllipseNodeDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_Class']/@style"/> </siriusStyle> @@ -46,10 +46,10 @@ <label id="//targetp1/targetC1-1/targetaC1-2" width="-1" height="-1"> <location y="-10"/> </label> - <siriusStyle xsi:type="diagram:EdgeStyle" uid="_LjHDSWysEeuxXtQYUb0q2w"> + <siriusStyle xsi:type="diagram:EdgeStyle" uid="_PRhanHKSEeucccBCuyOcEw"> <customFeatures>uid</customFeatures> <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@edgeMappings[name='DT10_EReference']/@style"/> - <centerLabelStyle uid="_LjHDSmysEeuxXtQYUb0q2w" showIcon="false"/> + <centerLabelStyle uid="_PRhanXKSEeucccBCuyOcEw" showIcon="false"/> </siriusStyle> <gmfView xsi:type="notation:Edge" type="4001"> <children type="6001"> @@ -76,10 +76,10 @@ <label id="//targetp1/targetC1-1/targetaC1-1-1" width="-1" height="-1"> <location y="-10"/> </label> - <siriusStyle xsi:type="diagram:EdgeStyle" uid="_LjHqUGysEeuxXtQYUb0q2w"> + <siriusStyle xsi:type="diagram:EdgeStyle" uid="_PRiBoHKSEeucccBCuyOcEw"> <customFeatures>uid</customFeatures> <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@edgeMappings[name='DT10_EReference']/@style"/> - <centerLabelStyle uid="_LjHqUWysEeuxXtQYUb0q2w" showIcon="false"/> + <centerLabelStyle uid="_PRiBoXKSEeucccBCuyOcEw" showIcon="false"/> </siriusStyle> <gmfView xsi:type="notation:Edge" type="4001"> <children type="6001"> @@ -108,10 +108,10 @@ <label id="//targetp1/targetC1-1/targetaC1-1-1" width="-1" height="-1"> <location y="-10"/> </label> - <siriusStyle xsi:type="diagram:EdgeStyle" uid="_LjHqVGysEeuxXtQYUb0q2w"> + <siriusStyle xsi:type="diagram:EdgeStyle" uid="_PRiBpHKSEeucccBCuyOcEw"> <customFeatures>uid</customFeatures> <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@edgeMappings[name='DT10_EReference']/@style"/> - <centerLabelStyle uid="_LjHqVWysEeuxXtQYUb0q2w" showIcon="false"/> + <centerLabelStyle uid="_PRiBpXKSEeucccBCuyOcEw" showIcon="false"/> </siriusStyle> <gmfView xsi:type="notation:Edge" type="4001"> <children type="6001"> @@ -138,10 +138,10 @@ <label id="//targetp1/targetC1-1/targetaC1-2" width="-1" height="-1"> <location y="-10"/> </label> - <siriusStyle xsi:type="diagram:EdgeStyle" uid="_LjHqVmysEeuxXtQYUb0q2w"> + <siriusStyle xsi:type="diagram:EdgeStyle" uid="_PRiBpnKSEeucccBCuyOcEw"> <customFeatures>uid</customFeatures> <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@edgeMappings[name='DT10_EReference']/@style"/> - <centerLabelStyle uid="_LjHqV2ysEeuxXtQYUb0q2w" showIcon="false"/> + <centerLabelStyle uid="_PRiBp3KSEeucccBCuyOcEw" showIcon="false"/> </siriusStyle> <gmfView xsi:type="notation:Edge" type="4001"> <children type="6001"> @@ -168,7 +168,7 @@ <label id="//targetp1/targetC1-2"> <location x="31"/> </label> - <siriusStyle xsi:type="diagram:Lozenge" uid="_LjGcMGysEeuxXtQYUb0q2w" color="114,73,110"> + <siriusStyle xsi:type="diagram:Lozenge" uid="_PRhakHKSEeucccBCuyOcEw" color="114,73,110"> <customFeatures>uid</customFeatures> <description xsi:type="style:LozengeNodeDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_2_Class']/@style"/> </siriusStyle> @@ -189,7 +189,7 @@ <label id="//targetp1/targetC1-2"> <location x="31"/> </label> - <siriusStyle xsi:type="diagram:Ellipse" uid="_LjGcMWysEeuxXtQYUb0q2w" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:Ellipse" uid="_PRhakXKSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:EllipseNodeDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_Class']/@style"/> </siriusStyle> @@ -210,7 +210,7 @@ <label id="//targetp1/targetC1-3"> <location x="31" y="7"/> </label> - <siriusStyle xsi:type="diagram:Ellipse" uid="_LjHDQmysEeuxXtQYUb0q2w" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:Ellipse" uid="_PRhalXKSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1"> <description xsi:type="style:EllipseNodeDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_Class']/@style"/> </siriusStyle> <gmfView xsi:type="notation:Node" type="2001"> @@ -230,7 +230,7 @@ <label id="//targetp1/targetC1-3"> <location x="31" y="7"/> </label> - <siriusStyle xsi:type="diagram:Lozenge" uid="_LjHDQWysEeuxXtQYUb0q2w" color="114,73,110"> + <siriusStyle xsi:type="diagram:Lozenge" uid="_PRhalHKSEeucccBCuyOcEw" color="114,73,110"> <description xsi:type="style:LozengeNodeDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_2_Class']/@style"/> </siriusStyle> <gmfView xsi:type="notation:Node" type="2001"> @@ -250,7 +250,7 @@ <label id="//targetp1/targetp1-1/targetC1-1-1"> <location x="31"/> </label> - <siriusStyle xsi:type="diagram:Lozenge" uid="_LjGcMmysEeuxXtQYUb0q2w" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:Lozenge" uid="_PRhaknKSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>borderSize</customFeatures> <customFeatures>borderSizeComputationExpression</customFeatures> <customFeatures>color</customFeatures> @@ -273,7 +273,7 @@ <label id="//targetp1/targetp1-1/targetC1-1-1"> <location x="31"/> </label> - <siriusStyle xsi:type="diagram:Ellipse" uid="_LjHDQGysEeuxXtQYUb0q2w" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:Ellipse" uid="_PRhak3KSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:EllipseNodeDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_Class']/@style"/> </siriusStyle> @@ -294,7 +294,7 @@ <label id="//targetp1/targetp1-1/targetC1-1-2"> <location x="31" y="7"/> </label> - <siriusStyle xsi:type="diagram:Ellipse" uid="_LjHDRGysEeuxXtQYUb0q2w" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:Ellipse" uid="_PRhal3KSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1"> <description xsi:type="style:EllipseNodeDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_Class']/@style"/> </siriusStyle> <gmfView xsi:type="notation:Node" type="2001"> @@ -314,7 +314,7 @@ <label id="//targetp1/targetp1-1/targetC1-1-2"> <location x="31" y="7"/> </label> - <siriusStyle xsi:type="diagram:Lozenge" uid="_LjHDQ2ysEeuxXtQYUb0q2w" color="114,73,110"> + <siriusStyle xsi:type="diagram:Lozenge" uid="_PRhalnKSEeucccBCuyOcEw" color="114,73,110"> <description xsi:type="style:LozengeNodeDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_2_Class']/@style"/> </siriusStyle> <gmfView xsi:type="notation:Node" type="2001"> @@ -334,7 +334,7 @@ <label id="//targetp1/targetp1-2/targetC1-2-1"> <location x="31" y="7"/> </label> - <siriusStyle xsi:type="diagram:Ellipse" uid="_LjHDRmysEeuxXtQYUb0q2w" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:Ellipse" uid="_PRhamXKSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1"> <description xsi:type="style:EllipseNodeDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_Class']/@style"/> </siriusStyle> <gmfView xsi:type="notation:Node" type="2001"> @@ -354,7 +354,7 @@ <label id="//targetp1/targetp1-2/targetC1-2-1"> <location x="31" y="7"/> </label> - <siriusStyle xsi:type="diagram:Lozenge" uid="_LjHDRWysEeuxXtQYUb0q2w" color="114,73,110"> + <siriusStyle xsi:type="diagram:Lozenge" uid="_PRhamHKSEeucccBCuyOcEw" color="114,73,110"> <description xsi:type="style:LozengeNodeDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_2_Class']/@style"/> </siriusStyle> <gmfView xsi:type="notation:Node" type="2001"> @@ -374,7 +374,7 @@ <label id="//targetp2/targetp2-1/targetnew%20EClass%201"> <location x="31" y="7"/> </label> - <siriusStyle xsi:type="diagram:Ellipse" uid="_LjHqU2ysEeuxXtQYUb0q2w" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:Ellipse" uid="_PRiBo3KSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1"> <description xsi:type="style:EllipseNodeDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_Class']/@style"/> </siriusStyle> <gmfView xsi:type="notation:Node" type="2001"> @@ -394,7 +394,7 @@ <label id="//targetp2/targetp2-1/targetnew%20EClass%201"> <location x="31" y="7"/> </label> - <siriusStyle xsi:type="diagram:Lozenge" uid="_LjHqUmysEeuxXtQYUb0q2w" color="114,73,110"> + <siriusStyle xsi:type="diagram:Lozenge" uid="_PRiBonKSEeucccBCuyOcEw" color="114,73,110"> <description xsi:type="style:LozengeNodeDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_2_Class']/@style"/> </siriusStyle> <gmfView xsi:type="notation:Node" type="2001"> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/mb_ed_from___storedFormat-DiagType10__of__MyPackage___to___storedFormat-DiagType10__Raw__of__targetMyPackage__subset.xmi b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/mb_ed_from___storedFormat-DiagType10__of__MyPackage___to___storedFormat-DiagType10__Raw__of__targetMyPackage__subset.xmi index 83750888a2..18c4dd58e4 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/mb_ed_from___storedFormat-DiagType10__of__MyPackage___to___storedFormat-DiagType10__Raw__of__targetMyPackage__subset.xmi +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/mb_ed_from___storedFormat-DiagType10__of__MyPackage___to___storedFormat-DiagType10__Raw__of__targetMyPackage__subset.xmi @@ -4,7 +4,7 @@ <label id="//targetp1/targetC1-1"> <location x="31"/> </label> - <siriusStyle xsi:type="diagram:Lozenge" uid="_LgM5NGysEeuxXtQYUb0q2w" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:Lozenge" uid="_POfUtHKSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>borderSize</customFeatures> <customFeatures>borderSizeComputationExpression</customFeatures> <customFeatures>color</customFeatures> @@ -27,7 +27,7 @@ <label id="//targetp1/targetC1-1"> <location x="31"/> </label> - <siriusStyle xsi:type="diagram:Ellipse" uid="_LgM5NWysEeuxXtQYUb0q2w" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:Ellipse" uid="_POfUtXKSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:EllipseNodeDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_Class']/@style"/> </siriusStyle> @@ -46,9 +46,9 @@ <label id="//targetp1/targetC1-1/targetaC1-2" width="-1" height="-1"> <location y="-10"/> </label> - <siriusStyle xsi:type="diagram:EdgeStyle" uid="_LgM5NmysEeuxXtQYUb0q2w"> + <siriusStyle xsi:type="diagram:EdgeStyle" uid="_POfUtnKSEeucccBCuyOcEw"> <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@edgeMappings[name='DT10_EReference']/@style"/> - <centerLabelStyle uid="_LgM5N2ysEeuxXtQYUb0q2w" showIcon="false"/> + <centerLabelStyle uid="_POfUt3KSEeucccBCuyOcEw" showIcon="false"/> </siriusStyle> <gmfView xsi:type="notation:Edge" type="4001"> <children type="6001"> @@ -75,10 +75,10 @@ <label id="//targetp1/targetC1-1/targetaC1-1-1" width="-1" height="-1"> <location y="-10"/> </label> - <siriusStyle xsi:type="diagram:EdgeStyle" uid="_LgM5OGysEeuxXtQYUb0q2w"> + <siriusStyle xsi:type="diagram:EdgeStyle" uid="_POf7wHKSEeucccBCuyOcEw"> <customFeatures>uid</customFeatures> <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@edgeMappings[name='DT10_EReference']/@style"/> - <centerLabelStyle uid="_LgM5OWysEeuxXtQYUb0q2w" showIcon="false"/> + <centerLabelStyle uid="_POf7wXKSEeucccBCuyOcEw" showIcon="false"/> </siriusStyle> <gmfView xsi:type="notation:Edge" type="4001"> <children type="6001"> @@ -107,10 +107,10 @@ <label id="//targetp1/targetC1-1/targetaC1-1-1" width="-1" height="-1"> <location y="-10"/> </label> - <siriusStyle xsi:type="diagram:EdgeStyle" uid="_LgNgQmysEeuxXtQYUb0q2w"> + <siriusStyle xsi:type="diagram:EdgeStyle" uid="_POf7xHKSEeucccBCuyOcEw"> <customFeatures>uid</customFeatures> <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@edgeMappings[name='DT10_EReference']/@style"/> - <centerLabelStyle uid="_LgNgQ2ysEeuxXtQYUb0q2w" showIcon="false"/> + <centerLabelStyle uid="_POf7xXKSEeucccBCuyOcEw" showIcon="false"/> </siriusStyle> <gmfView xsi:type="notation:Edge" type="4001"> <children type="6001"> @@ -137,7 +137,7 @@ <label id="//targetp1/targetC1-2"> <location x="31"/> </label> - <siriusStyle xsi:type="diagram:Lozenge" uid="_LgM5MGysEeuxXtQYUb0q2w" color="114,73,110"> + <siriusStyle xsi:type="diagram:Lozenge" uid="_POfUsHKSEeucccBCuyOcEw" color="114,73,110"> <customFeatures>uid</customFeatures> <description xsi:type="style:LozengeNodeDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_2_Class']/@style"/> </siriusStyle> @@ -158,7 +158,7 @@ <label id="//targetp1/targetC1-2"> <location x="31"/> </label> - <siriusStyle xsi:type="diagram:Ellipse" uid="_LgM5MWysEeuxXtQYUb0q2w" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:Ellipse" uid="_POfUsXKSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:EllipseNodeDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_Class']/@style"/> </siriusStyle> @@ -179,7 +179,7 @@ <label id="//targetp1/targetp1-1/targetC1-1-1"> <location x="31"/> </label> - <siriusStyle xsi:type="diagram:Lozenge" uid="_LgM5MmysEeuxXtQYUb0q2w" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:Lozenge" uid="_POfUsnKSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>borderSize</customFeatures> <customFeatures>borderSizeComputationExpression</customFeatures> <customFeatures>color</customFeatures> @@ -202,7 +202,7 @@ <label id="//targetp1/targetp1-1/targetC1-1-1"> <location x="31"/> </label> - <siriusStyle xsi:type="diagram:Ellipse" uid="_LgM5M2ysEeuxXtQYUb0q2w" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:Ellipse" uid="_POfUs3KSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:EllipseNodeDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_Class']/@style"/> </siriusStyle> @@ -223,7 +223,7 @@ <label id="//targetp2/targetp2-1/targetnew%20EClass%201"> <location x="31" y="7"/> </label> - <siriusStyle xsi:type="diagram:Ellipse" uid="_LgNgQWysEeuxXtQYUb0q2w" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:Ellipse" uid="_POf7w3KSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1"> <description xsi:type="style:EllipseNodeDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_Class']/@style"/> </siriusStyle> <gmfView xsi:type="notation:Node" type="2001"> @@ -243,7 +243,7 @@ <label id="//targetp2/targetp2-1/targetnew%20EClass%201"> <location x="31" y="7"/> </label> - <siriusStyle xsi:type="diagram:Lozenge" uid="_LgNgQGysEeuxXtQYUb0q2w" color="114,73,110"> + <siriusStyle xsi:type="diagram:Lozenge" uid="_POf7wnKSEeucccBCuyOcEw" color="114,73,110"> <description xsi:type="style:LozengeNodeDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_2_Class']/@style"/> </siriusStyle> <gmfView xsi:type="notation:Node" type="2001"> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/mb_ed_from___storedFormat-DiagType2__with__notes__of__MyPackage___to___storedFormat-DiagType2__Raw__of__targetMyPackage__full.xmi b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/mb_ed_from___storedFormat-DiagType2__with__notes__of__MyPackage___to___storedFormat-DiagType2__Raw__of__targetMyPackage__full.xmi new file mode 100644 index 0000000000..4d2db85182 --- /dev/null +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/mb_ed_from___storedFormat-DiagType2__with__notes__of__MyPackage___to___storedFormat-DiagType2__Raw__of__targetMyPackage__full.xmi @@ -0,0 +1,566 @@ +<?xml version="1.0" encoding="ASCII"?> +<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:diagram="http://www.eclipse.org/sirius/diagram/1.1.0" xmlns:formatdata="http://www.eclipse.org/sirius/dsl/formatdata/1.1.0" 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"> + <formatdata:NodeFormatData id="//targetp1" width="653" height="173"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_PaphYXKSEeucccBCuyOcEw" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <customFeatures>uid</customFeatures> + <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="2002"> + <children type="5006"/> + <children type="7001"> + <children type="3009"> + <children type="5004"/> + <children type="7003"> + <styles xsi:type="notation:SortingStyle"/> + <styles xsi:type="notation:FilteringStyle"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="485" y="101" width="134" height="42"/> + </children> + <children type="3009"> + <children type="5004"/> + <children type="7003"> + <styles xsi:type="notation:SortingStyle"/> + <styles xsi:type="notation:FilteringStyle"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="495" y="6" width="115" height="38"/> + </children> + <children type="3009"> + <children type="5004"/> + <children type="7003"> + <children type="3010"> + <styles xsi:type="notation:FontStyle"/> + <layoutConstraint xsi:type="notation:Location"/> + </children> + <styles xsi:type="notation:SortingStyle"/> + <styles xsi:type="notation:FilteringStyle"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" y="12" width="141" height="63"/> + </children> + <children type="3008"> + <children type="5005"/> + <children type="7002"> + <children type="3009"> + <children type="5004"/> + <children type="7003"> + <children type="3010"> + <styles xsi:type="notation:FontStyle"/> + <layoutConstraint xsi:type="notation:Location"/> + </children> + <styles xsi:type="notation:SortingStyle"/> + <styles xsi:type="notation:FilteringStyle"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="8" y="60" width="126" height="47"/> + </children> + <children type="3009"> + <children type="5004"/> + <children type="7003"> + <styles xsi:type="notation:SortingStyle"/> + <styles xsi:type="notation:FilteringStyle"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="104" y="324" width="157" height="40"/> + </children> + <styles xsi:type="notation:SortingStyle"/> + <styles xsi:type="notation:FilteringStyle"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="10"/> + <layoutConstraint xsi:type="notation:Bounds" x="192" y="30" width="286" height="391"/> + </children> + <children type="3008"> + <children type="5005"/> + <children type="7002"> + <children type="3009"> + <children type="5004"/> + <children type="7003"> + <styles xsi:type="notation:SortingStyle"/> + <styles xsi:type="notation:FilteringStyle"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="64" y="72" width="184" height="40"/> + </children> + <styles xsi:type="notation:SortingStyle"/> + <styles xsi:type="notation:FilteringStyle"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="10"/> + <layoutConstraint xsi:type="notation:Bounds" x="85" y="162" width="273" height="139"/> + </children> + <children type="3008"> + <children type="5005"/> + <children type="7002"> + <styles xsi:type="notation:SortingStyle"/> + <styles xsi:type="notation:FilteringStyle"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="10"/> + <layoutConstraint xsi:type="notation:Bounds" x="305" y="164" width="150" height="70"/> + </children> + <children xsi:type="notation:Shape" type="Text" fontName="Segoe UI" description="Interesting"> + <children xsi:type="notation:BasicDecorationNode" type="DiagramName"/> + <children xsi:type="notation:BasicDecorationNode" type="Description"/> + <layoutConstraint xsi:type="notation:Bounds" x="1405" y="171"/> + </children> + <styles xsi:type="notation:SortingStyle"/> + <styles xsi:type="notation:FilteringStyle"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="10"/> + <layoutConstraint xsi:type="notation:Bounds" x="30" y="30" width="653" height="173"/> + </gmfView> + <location x="30" y="30"/> + </formatdata:NodeFormatData> + <formatdata:NodeFormatData id="//targetp1/targetC1-1" width="134" height="42"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_PaqIenKSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <customFeatures>uid</customFeatures> + <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="3009"> + <children type="5004"/> + <children type="7003"> + <styles xsi:type="notation:SortingStyle"/> + <styles xsi:type="notation:FilteringStyle"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="485" y="101" width="134" height="42"/> + </gmfView> + <outgoingEdges id="//targetp1/targetC1-1/targetaC1-2" sourceTerminal="(0.29671716696969697,0.057142857000000005)" targetTerminal="(0.44573824061946904,0.94285715)"> + <label id="//targetp1/targetC1-1/targetaC1-2" width="-1" height="-1"> + <location x="-50" y="48"/> + </label> + <siriusStyle xsi:type="diagram:EdgeStyle" uid="_PaqIe3KSEeucccBCuyOcEw"> + <customFeatures>uid</customFeatures> + <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@edgeMappings[name='DT2_EReference']/@style"/> + <centerLabelStyle uid="_PaqIfHKSEeucccBCuyOcEw" showIcon="false"/> + </siriusStyle> + <gmfView xsi:type="notation:Edge" type="4001"> + <children type="6001"> + <layoutConstraint xsi:type="notation:Bounds" x="-50" y="48"/> + </children> + <children type="6002"> + <layoutConstraint xsi:type="notation:Bounds" x="-23" y="-165"/> + </children> + <children type="6003"> + <layoutConstraint xsi:type="notation:Bounds" x="-22" y="11"/> + </children> + <styles xsi:type="notation:ConnectorStyle"/> + <styles xsi:type="notation:FontStyle" fontName="Sans" fontHeight="8"/> + <bendpoints xsi:type="notation:RelativeBendpoints" points="[31, 38, 10, 99]$[119, 143, 98, 204]$[205, -33, 184, 28]$[36, -58, 15, 3]"/> + <sourceAnchor xsi:type="notation:IdentityAnchor" id="(0.29671716696969697,0.057142857000000005)"/> + <targetAnchor xsi:type="notation:IdentityAnchor" id="(0.44573824061946904,0.94285715)"/> + </gmfView> + <pointList x="651" y="174"/> + <pointList x="688" y="90"/> + <pointList x="564" y="63"/> + <pointList x="401" y="114"/> + <sourceRefPoint x="649" y="177"/> + <targetRefPoint x="350" y="130"/> + </outgoingEdges> + <outgoingEdges id="//targetp1/targetC1-1/targetaC1-1-1" sourceTerminal="(0.0,0.0)" targetTerminal="(0.41935483870967744,0.0)"> + <label id="//targetp1/targetC1-1/targetaC1-1-1" width="-1" height="-1"> + <location x="6"/> + </label> + <siriusStyle xsi:type="diagram:EdgeStyle" uid="_PaqIfXKSEeucccBCuyOcEw"> + <customFeatures>uid</customFeatures> + <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@edgeMappings[name='DT2_EReference']/@style"/> + <centerLabelStyle uid="_PaqIfnKSEeucccBCuyOcEw" showIcon="false"/> + </siriusStyle> + <gmfView xsi:type="notation:Edge" type="4001"> + <children type="6001"> + <layoutConstraint xsi:type="notation:Bounds" x="6"/> + </children> + <children type="6002"> + <layoutConstraint xsi:type="notation:Bounds" x="-34" y="-12"/> + </children> + <children type="6003"> + <layoutConstraint xsi:type="notation:Bounds" x="-285" y="-20"/> + </children> + <styles xsi:type="notation:ConnectorStyle"/> + <styles xsi:type="notation:FontStyle" fontName="Sans" fontHeight="8"/> + <bendpoints xsi:type="notation:RelativeBendpoints" points="[0, 0, 228, 5]$[-126, 26, 102, 31]$[-156, 16, 72, 21]"/> + <sourceAnchor xsi:type="notation:IdentityAnchor" id="(0.0,0.0)"/> + <targetAnchor xsi:type="notation:IdentityAnchor" id="(0.41935483870967744,0.0)"/> + </gmfView> + <pointList x="719" y="204"/> + <pointList x="819" y="197"/> + <pointList x="1067" y="108"/> + <sourceRefPoint x="659" y="208"/> + <targetRefPoint x="1067" y="108"/> + </outgoingEdges> + <location x="570" y="144"/> + </formatdata:NodeFormatData> + <formatdata:EdgeFormatData id="//targetp1/targetC1-1/targetaC1-1-1" sourceTerminal="(0.0,0.0)" targetTerminal="(0.41935483870967744,0.0)"> + <label id="//targetp1/targetC1-1/targetaC1-1-1" width="-1" height="-1"> + <location x="6"/> + </label> + <siriusStyle xsi:type="diagram:EdgeStyle" uid="_PaqvhXKSEeucccBCuyOcEw"> + <customFeatures>uid</customFeatures> + <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@edgeMappings[name='DT2_EReference']/@style"/> + <centerLabelStyle uid="_PaqvhnKSEeucccBCuyOcEw" showIcon="false"/> + </siriusStyle> + <gmfView xsi:type="notation:Edge" type="4001"> + <children type="6001"> + <layoutConstraint xsi:type="notation:Bounds" x="6"/> + </children> + <children type="6002"> + <layoutConstraint xsi:type="notation:Bounds" x="-34" y="-12"/> + </children> + <children type="6003"> + <layoutConstraint xsi:type="notation:Bounds" x="-285" y="-20"/> + </children> + <styles xsi:type="notation:ConnectorStyle"/> + <styles xsi:type="notation:FontStyle" fontName="Sans" fontHeight="8"/> + <bendpoints xsi:type="notation:RelativeBendpoints" points="[0, 0, 228, 5]$[-126, 26, 102, 31]$[-156, 16, 72, 21]"/> + <sourceAnchor xsi:type="notation:IdentityAnchor" id="(0.0,0.0)"/> + <targetAnchor xsi:type="notation:IdentityAnchor" id="(0.41935483870967744,0.0)"/> + </gmfView> + <pointList x="719" y="204"/> + <pointList x="819" y="197"/> + <pointList x="1067" y="108"/> + <sourceRefPoint x="659" y="208"/> + <targetRefPoint x="1067" y="108"/> + </formatdata:EdgeFormatData> + <formatdata:EdgeFormatData id="//targetp1/targetC1-1/targetaC1-2" sourceTerminal="(0.29671716696969697,0.057142857000000005)" targetTerminal="(0.44573824061946904,0.94285715)"> + <label id="//targetp1/targetC1-1/targetaC1-2" width="-1" height="-1"> + <location x="-50" y="48"/> + </label> + <siriusStyle xsi:type="diagram:EdgeStyle" uid="_Paqvh3KSEeucccBCuyOcEw"> + <customFeatures>uid</customFeatures> + <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@edgeMappings[name='DT2_EReference']/@style"/> + <centerLabelStyle uid="_PaqviHKSEeucccBCuyOcEw" showIcon="false"/> + </siriusStyle> + <gmfView xsi:type="notation:Edge" type="4001"> + <children type="6001"> + <layoutConstraint xsi:type="notation:Bounds" x="-50" y="48"/> + </children> + <children type="6002"> + <layoutConstraint xsi:type="notation:Bounds" x="-23" y="-165"/> + </children> + <children type="6003"> + <layoutConstraint xsi:type="notation:Bounds" x="-22" y="11"/> + </children> + <styles xsi:type="notation:ConnectorStyle"/> + <styles xsi:type="notation:FontStyle" fontName="Sans" fontHeight="8"/> + <bendpoints xsi:type="notation:RelativeBendpoints" points="[31, 38, 10, 99]$[119, 143, 98, 204]$[205, -33, 184, 28]$[36, -58, 15, 3]"/> + <sourceAnchor xsi:type="notation:IdentityAnchor" id="(0.29671716696969697,0.057142857000000005)"/> + <targetAnchor xsi:type="notation:IdentityAnchor" id="(0.44573824061946904,0.94285715)"/> + </gmfView> + <pointList x="651" y="174"/> + <pointList x="688" y="90"/> + <pointList x="564" y="63"/> + <pointList x="401" y="114"/> + <sourceRefPoint x="649" y="177"/> + <targetRefPoint x="350" y="130"/> + </formatdata:EdgeFormatData> + <formatdata:NodeFormatData id="//targetp1/targetC1-2" width="115" height="38"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_PaqIf3KSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <customFeatures>uid</customFeatures> + <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="3009"> + <children type="5004"/> + <children type="7003"> + <styles xsi:type="notation:SortingStyle"/> + <styles xsi:type="notation:FilteringStyle"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="495" y="6" width="115" height="38"/> + </gmfView> + <location x="252" y="35"/> + </formatdata:NodeFormatData> + <formatdata:NodeFormatData id="//targetp1/targetC1-3" width="141" height="63"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_PaqIgHKSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <customFeatures>uid</customFeatures> + <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="3009"> + <children type="5004"/> + <children type="7003"> + <children type="3010"> + <styles xsi:type="notation:FontStyle"/> + <layoutConstraint xsi:type="notation:Location"/> + </children> + <styles xsi:type="notation:SortingStyle"/> + <styles xsi:type="notation:FilteringStyle"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" y="12" width="141" height="63"/> + </gmfView> + <location x="61" y="35"/> + </formatdata:NodeFormatData> + <formatdata:NodeFormatData id="//targetp1/targetp1-1" width="286" height="391"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_PaqIgXKSEeucccBCuyOcEw" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <customFeatures>uid</customFeatures> + <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="3008"> + <children type="5005"/> + <children type="7002"> + <children type="3009"> + <children type="5004"/> + <children type="7003"> + <children type="3010"> + <styles xsi:type="notation:FontStyle"/> + <layoutConstraint xsi:type="notation:Location"/> + </children> + <styles xsi:type="notation:SortingStyle"/> + <styles xsi:type="notation:FilteringStyle"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="8" y="60" width="126" height="47"/> + </children> + <children type="3009"> + <children type="5004"/> + <children type="7003"> + <styles xsi:type="notation:SortingStyle"/> + <styles xsi:type="notation:FilteringStyle"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="104" y="324" width="157" height="40"/> + </children> + <styles xsi:type="notation:SortingStyle"/> + <styles xsi:type="notation:FilteringStyle"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="10"/> + <layoutConstraint xsi:type="notation:Bounds" x="192" y="30" width="286" height="391"/> + </gmfView> + <location x="972" y="12"/> + </formatdata:NodeFormatData> + <formatdata:NodeFormatData id="//targetp1/targetp1-1/targetC1-1-1" width="126" height="47"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_PaqIhHKSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <customFeatures>uid</customFeatures> + <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="3009"> + <children type="5004"/> + <children type="7003"> + <children type="3010"> + <styles xsi:type="notation:FontStyle"/> + <layoutConstraint xsi:type="notation:Location"/> + </children> + <styles xsi:type="notation:SortingStyle"/> + <styles xsi:type="notation:FilteringStyle"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="8" y="60" width="126" height="47"/> + </gmfView> + <location x="65" y="66"/> + </formatdata:NodeFormatData> + <formatdata:NodeFormatData id="//targetp1/targetp1-1/targetC1-1-2" width="157" height="40"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_PaqIhXKSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <customFeatures>uid</customFeatures> + <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="3009"> + <children type="5004"/> + <children type="7003"> + <styles xsi:type="notation:SortingStyle"/> + <styles xsi:type="notation:FilteringStyle"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="104" y="324" width="157" height="40"/> + </gmfView> + <location x="208" y="330"/> + </formatdata:NodeFormatData> + <formatdata:NodeFormatData id="//targetp1/targetp1-2" width="273" height="139"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_PaqIhnKSEeucccBCuyOcEw" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <customFeatures>uid</customFeatures> + <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="3008"> + <children type="5005"/> + <children type="7002"> + <children type="3009"> + <children type="5004"/> + <children type="7003"> + <styles xsi:type="notation:SortingStyle"/> + <styles xsi:type="notation:FilteringStyle"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="64" y="72" width="184" height="40"/> + </children> + <styles xsi:type="notation:SortingStyle"/> + <styles xsi:type="notation:FilteringStyle"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="10"/> + <layoutConstraint xsi:type="notation:Bounds" x="85" y="162" width="273" height="139"/> + </gmfView> + <location x="90" y="168"/> + </formatdata:NodeFormatData> + <formatdata:NodeFormatData id="//targetp1/targetp1-2/targetC1-2-1" width="184" height="40"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_PaqIiHKSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <customFeatures>uid</customFeatures> + <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="3009"> + <children type="5004"/> + <children type="7003"> + <styles xsi:type="notation:SortingStyle"/> + <styles xsi:type="notation:FilteringStyle"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="64" y="72" width="184" height="40"/> + </gmfView> + <location x="17" y="39"/> + </formatdata:NodeFormatData> + <formatdata:NodeFormatData id="//targetp1/targetp1-3" width="150" height="70"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_PaqIiXKSEeucccBCuyOcEw" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <customFeatures>uid</customFeatures> + <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="3008"> + <children type="5005"/> + <children type="7002"> + <styles xsi:type="notation:SortingStyle"/> + <styles xsi:type="notation:FilteringStyle"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="10"/> + <layoutConstraint xsi:type="notation:Bounds" x="305" y="164" width="150" height="70"/> + </gmfView> + <location x="301" y="170"/> + </formatdata:NodeFormatData> + <formatdata:NodeFormatData id="//targetp2" width="401" height="114"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_PaqIinKSEeucccBCuyOcEw" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <customFeatures>uid</customFeatures> + <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="2002"> + <children type="5006"/> + <children type="7001"> + <children type="3008"> + <children type="5005"/> + <children type="7002"> + <children type="3009"> + <children type="5004"/> + <children type="7003"> + <children type="3010"> + <styles xsi:type="notation:FontStyle"/> + <layoutConstraint xsi:type="notation:Location"/> + </children> + <styles xsi:type="notation:SortingStyle"/> + <styles xsi:type="notation:FilteringStyle"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" width="153" height="53"/> + </children> + <styles xsi:type="notation:SortingStyle"/> + <styles xsi:type="notation:FilteringStyle"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="10"/> + <layoutConstraint xsi:type="notation:Bounds" x="15" y="23" width="206" height="77"/> + </children> + <children type="3008"> + <children type="5005"/> + <children type="7002"> + <styles xsi:type="notation:SortingStyle"/> + <styles xsi:type="notation:FilteringStyle"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="10"/> + <layoutConstraint xsi:type="notation:Bounds" x="225" y="23" width="155" height="77"/> + </children> + <styles xsi:type="notation:SortingStyle"/> + <styles xsi:type="notation:FilteringStyle"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="10"/> + <layoutConstraint xsi:type="notation:Bounds" x="30" y="260" width="401" height="114"/> + </gmfView> + <location x="48" y="543"/> + </formatdata:NodeFormatData> + <formatdata:NodeFormatData id="//targetp2/targetp2-1" width="206" height="77"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_PaqvgHKSEeucccBCuyOcEw" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <customFeatures>uid</customFeatures> + <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="3008"> + <children type="5005"/> + <children type="7002"> + <children type="3009"> + <children type="5004"/> + <children type="7003"> + <children type="3010"> + <styles xsi:type="notation:FontStyle"/> + <layoutConstraint xsi:type="notation:Location"/> + </children> + <styles xsi:type="notation:SortingStyle"/> + <styles xsi:type="notation:FilteringStyle"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" width="153" height="53"/> + </children> + <styles xsi:type="notation:SortingStyle"/> + <styles xsi:type="notation:FilteringStyle"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="10"/> + <layoutConstraint xsi:type="notation:Bounds" x="15" y="23" width="206" height="77"/> + </gmfView> + <location x="20" y="29"/> + </formatdata:NodeFormatData> + <formatdata:NodeFormatData id="//targetp2/targetp2-1/targetnew%20EClass%201" width="153" height="53"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_PaqvgnKSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <customFeatures>uid</customFeatures> + <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="3009"> + <children type="5004"/> + <children type="7003"> + <children type="3010"> + <styles xsi:type="notation:FontStyle"/> + <layoutConstraint xsi:type="notation:Location"/> + </children> + <styles xsi:type="notation:SortingStyle"/> + <styles xsi:type="notation:FilteringStyle"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" width="153" height="53"/> + </gmfView> + <location x="15" y="40"/> + </formatdata:NodeFormatData> + <formatdata:NodeFormatData id="//targetp2/targetp2-2" width="155" height="77"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_Paqvg3KSEeucccBCuyOcEw" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <customFeatures>uid</customFeatures> + <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="3008"> + <children type="5005"/> + <children type="7002"> + <styles xsi:type="notation:SortingStyle"/> + <styles xsi:type="notation:FilteringStyle"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="10"/> + <layoutConstraint xsi:type="notation:Bounds" x="225" y="23" width="155" height="77"/> + </gmfView> + <location x="216" y="51"/> + </formatdata:NodeFormatData> + <formatdata:NodeFormatData id="//targetp3" width="171" height="70"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_PaqvhHKSEeucccBCuyOcEw" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <customFeatures>uid</customFeatures> + <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="2002"> + <children type="5006"/> + <children type="7001"> + <styles xsi:type="notation:SortingStyle"/> + <styles xsi:type="notation:FilteringStyle"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="10"/> + <layoutConstraint xsi:type="notation:Bounds" x="27" y="456" width="171" height="70"/> + </gmfView> + <location x="491" y="492"/> + </formatdata:NodeFormatData> + <formatdata:NodeFormatData id="//targetp4" width="196" height="92"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_PaphYHKSEeucccBCuyOcEw" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <customFeatures>uid</customFeatures> + <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="2002"> + <children type="5006"/> + <children type="7001"> + <styles xsi:type="notation:SortingStyle"/> + <styles xsi:type="notation:FilteringStyle"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="10"/> + <layoutConstraint xsi:type="notation:Bounds" x="997" y="72" width="196" height="92"/> + </gmfView> + <location x="1622" y="30"/> + </formatdata:NodeFormatData> +</xmi:XMI> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/mb_ed_from___storedFormat-DiagType2__with__notes__of__MyPackage___to___storedFormat-DiagType2__Raw__of__targetMyPackage__subset.xmi b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/mb_ed_from___storedFormat-DiagType2__with__notes__of__MyPackage___to___storedFormat-DiagType2__Raw__of__targetMyPackage__subset.xmi new file mode 100644 index 0000000000..4442e16f55 --- /dev/null +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/mb_ed_from___storedFormat-DiagType2__with__notes__of__MyPackage___to___storedFormat-DiagType2__Raw__of__targetMyPackage__subset.xmi @@ -0,0 +1,425 @@ +<?xml version="1.0" encoding="ASCII"?> +<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:diagram="http://www.eclipse.org/sirius/diagram/1.1.0" xmlns:formatdata="http://www.eclipse.org/sirius/dsl/formatdata/1.1.0" 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"> + <formatdata:NodeFormatData id="//targetp1" width="653" height="173"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_PW0xUXKSEeucccBCuyOcEw" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <customFeatures>uid</customFeatures> + <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="2002"> + <children type="5006"/> + <children type="7001"> + <children type="3009"> + <children type="5004"/> + <children type="7003"> + <styles xsi:type="notation:SortingStyle"/> + <styles xsi:type="notation:FilteringStyle"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="485" y="101" width="134" height="42"/> + </children> + <children type="3009"> + <children type="5004"/> + <children type="7003"> + <styles xsi:type="notation:SortingStyle"/> + <styles xsi:type="notation:FilteringStyle"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="495" y="6" width="115" height="38"/> + </children> + <children type="3009"> + <children type="5004"/> + <children type="7003"> + <children type="3010"> + <styles xsi:type="notation:FontStyle"/> + <layoutConstraint xsi:type="notation:Location"/> + </children> + <styles xsi:type="notation:SortingStyle"/> + <styles xsi:type="notation:FilteringStyle"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="56" y="29" width="121" height="71"/> + </children> + <children type="3008"> + <children type="5005"/> + <children type="7002"> + <children type="3009"> + <children type="5004"/> + <children type="7003"> + <children type="3010"> + <styles xsi:type="notation:FontStyle"/> + <layoutConstraint xsi:type="notation:Location"/> + </children> + <styles xsi:type="notation:SortingStyle"/> + <styles xsi:type="notation:FilteringStyle"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="8" y="60" width="126" height="47"/> + </children> + <children type="3009"> + <children type="5004"/> + <children type="7003"> + <styles xsi:type="notation:SortingStyle"/> + <styles xsi:type="notation:FilteringStyle"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="203" y="324" width="121" height="71"/> + </children> + <styles xsi:type="notation:SortingStyle"/> + <styles xsi:type="notation:FilteringStyle"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="10"/> + <layoutConstraint xsi:type="notation:Bounds" x="192" y="30" width="286" height="391"/> + </children> + <children type="3008"> + <children type="5005"/> + <children type="7002"> + <children type="3009"> + <children type="5004"/> + <children type="7003"> + <styles xsi:type="notation:SortingStyle"/> + <styles xsi:type="notation:FilteringStyle"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="12" y="33" width="121" height="71"/> + </children> + <styles xsi:type="notation:SortingStyle"/> + <styles xsi:type="notation:FilteringStyle"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="10"/> + <layoutConstraint xsi:type="notation:Bounds" x="85" y="162" width="273" height="139"/> + </children> + <children type="3008"> + <children type="5005"/> + <children type="7002"> + <styles xsi:type="notation:SortingStyle"/> + <styles xsi:type="notation:FilteringStyle"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="10"/> + <layoutConstraint xsi:type="notation:Bounds" x="296" y="164" width="172" height="84"/> + </children> + <children xsi:type="notation:Shape" type="Text" fontName="Segoe UI" description="Interesting"> + <children xsi:type="notation:BasicDecorationNode" type="DiagramName"/> + <children xsi:type="notation:BasicDecorationNode" type="Description"/> + <layoutConstraint xsi:type="notation:Bounds" x="1405" y="171"/> + </children> + <styles xsi:type="notation:SortingStyle"/> + <styles xsi:type="notation:FilteringStyle"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="10"/> + <layoutConstraint xsi:type="notation:Bounds" x="30" y="30" width="653" height="173"/> + </gmfView> + <location x="30" y="30"/> + </formatdata:NodeFormatData> + <formatdata:NodeFormatData id="//targetp1/targetC1-1" width="134" height="42"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_PW1YY3KSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <customFeatures>uid</customFeatures> + <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="3009"> + <children type="5004"/> + <children type="7003"> + <styles xsi:type="notation:SortingStyle"/> + <styles xsi:type="notation:FilteringStyle"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="485" y="101" width="134" height="42"/> + </gmfView> + <outgoingEdges id="//targetp1/targetC1-1/targetaC1-2" sourceTerminal="(0.41666666,0.057142857)" targetTerminal="(0.57894737,0.94285715)"> + <label id="//targetp1/targetC1-1/targetaC1-2" width="-1" height="-1"> + <location x="36" y="-1"/> + </label> + <siriusStyle xsi:type="diagram:EdgeStyle" uid="_PW1YZHKSEeucccBCuyOcEw"> + <customFeatures>uid</customFeatures> + <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@edgeMappings[name='DT2_EReference']/@style"/> + <centerLabelStyle uid="_PW1YZXKSEeucccBCuyOcEw" showIcon="false"/> + </siriusStyle> + <gmfView xsi:type="notation:Edge" type="4001"> + <children type="6001"> + <layoutConstraint xsi:type="notation:Bounds" x="36" y="-1"/> + </children> + <children type="6002"> + <layoutConstraint xsi:type="notation:Bounds" x="-23" y="-165"/> + </children> + <children type="6003"> + <layoutConstraint xsi:type="notation:Bounds" x="-22" y="11"/> + </children> + <styles xsi:type="notation:ConnectorStyle"/> + <styles xsi:type="notation:FontStyle" fontName="Sans" fontHeight="8"/> + <bendpoints xsi:type="notation:RelativeBendpoints" points="[2, -3, 301, 44]$[39, -87, 338, -40]$[-85, -114, 214, -67]$[-248, -63, 51, -16]"/> + <sourceAnchor xsi:type="notation:IdentityAnchor" id="(0.41666666,0.057142857)"/> + <targetAnchor xsi:type="notation:IdentityAnchor" id="(0.57894737,0.94285715)"/> + </gmfView> + <pointList x="651" y="174"/> + <pointList x="688" y="90"/> + <pointList x="564" y="63"/> + <pointList x="401" y="114"/> + <sourceRefPoint x="649" y="177"/> + <targetRefPoint x="350" y="130"/> + </outgoingEdges> + <outgoingEdges id="//targetp1/targetC1-1/targetaC1-1-1" sourceTerminal="(0.0,0.0)" targetTerminal="(0.41935483870967744,0.0)"> + <label id="//targetp1/targetC1-1/targetaC1-1-1" width="-1" height="-1"> + <location x="6"/> + </label> + <siriusStyle xsi:type="diagram:EdgeStyle" uid="_PW1YZnKSEeucccBCuyOcEw"> + <customFeatures>uid</customFeatures> + <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@edgeMappings[name='DT2_EReference']/@style"/> + <centerLabelStyle uid="_PW1YZ3KSEeucccBCuyOcEw" showIcon="false"/> + </siriusStyle> + <gmfView xsi:type="notation:Edge" type="4001"> + <children type="6001"> + <layoutConstraint xsi:type="notation:Bounds" x="6"/> + </children> + <children type="6002"> + <layoutConstraint xsi:type="notation:Bounds" x="-34" y="-12"/> + </children> + <children type="6003"> + <layoutConstraint xsi:type="notation:Bounds" x="-285" y="-20"/> + </children> + <styles xsi:type="notation:ConnectorStyle"/> + <styles xsi:type="notation:FontStyle" fontName="Sans" fontHeight="8"/> + <bendpoints xsi:type="notation:RelativeBendpoints" points="[0, 0, 228, 5]$[-126, 26, 102, 31]$[-156, 16, 72, 21]"/> + <sourceAnchor xsi:type="notation:IdentityAnchor" id="(0.0,0.0)"/> + <targetAnchor xsi:type="notation:IdentityAnchor" id="(0.41935483870967744,0.0)"/> + </gmfView> + <pointList x="719" y="204"/> + <pointList x="819" y="197"/> + <pointList x="1067" y="108"/> + <sourceRefPoint x="659" y="208"/> + <targetRefPoint x="1067" y="108"/> + </outgoingEdges> + <location x="570" y="144"/> + </formatdata:NodeFormatData> + <formatdata:EdgeFormatData id="//targetp1/targetC1-1/targetaC1-1-1" sourceTerminal="(0.0,0.0)" targetTerminal="(0.41935483870967744,0.0)"> + <label id="//targetp1/targetC1-1/targetaC1-1-1" width="-1" height="-1"> + <location x="6"/> + </label> + <siriusStyle xsi:type="diagram:EdgeStyle" uid="_PW1YdXKSEeucccBCuyOcEw"> + <customFeatures>uid</customFeatures> + <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@edgeMappings[name='DT2_EReference']/@style"/> + <centerLabelStyle uid="_PW1YdnKSEeucccBCuyOcEw" showIcon="false"/> + </siriusStyle> + <gmfView xsi:type="notation:Edge" type="4001"> + <children type="6001"> + <layoutConstraint xsi:type="notation:Bounds" x="6"/> + </children> + <children type="6002"> + <layoutConstraint xsi:type="notation:Bounds" x="-34" y="-12"/> + </children> + <children type="6003"> + <layoutConstraint xsi:type="notation:Bounds" x="-285" y="-20"/> + </children> + <styles xsi:type="notation:ConnectorStyle"/> + <styles xsi:type="notation:FontStyle" fontName="Sans" fontHeight="8"/> + <bendpoints xsi:type="notation:RelativeBendpoints" points="[0, 0, 228, 5]$[-126, 26, 102, 31]$[-156, 16, 72, 21]"/> + <sourceAnchor xsi:type="notation:IdentityAnchor" id="(0.0,0.0)"/> + <targetAnchor xsi:type="notation:IdentityAnchor" id="(0.41935483870967744,0.0)"/> + </gmfView> + <pointList x="719" y="204"/> + <pointList x="819" y="197"/> + <pointList x="1067" y="108"/> + <sourceRefPoint x="659" y="208"/> + <targetRefPoint x="1067" y="108"/> + </formatdata:EdgeFormatData> + <formatdata:NodeFormatData id="//targetp1/targetC1-2" width="115" height="38"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_PW1YaHKSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <customFeatures>uid</customFeatures> + <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="3009"> + <children type="5004"/> + <children type="7003"> + <styles xsi:type="notation:SortingStyle"/> + <styles xsi:type="notation:FilteringStyle"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="495" y="6" width="115" height="38"/> + </gmfView> + <location x="252" y="35"/> + </formatdata:NodeFormatData> + <formatdata:NodeFormatData id="//targetp1/targetp1-1" width="286" height="391"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_PW1YaXKSEeucccBCuyOcEw" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <customFeatures>uid</customFeatures> + <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="3008"> + <children type="5005"/> + <children type="7002"> + <children type="3009"> + <children type="5004"/> + <children type="7003"> + <children type="3010"> + <styles xsi:type="notation:FontStyle"/> + <layoutConstraint xsi:type="notation:Location"/> + </children> + <styles xsi:type="notation:SortingStyle"/> + <styles xsi:type="notation:FilteringStyle"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="8" y="60" width="126" height="47"/> + </children> + <children type="3009"> + <children type="5004"/> + <children type="7003"> + <styles xsi:type="notation:SortingStyle"/> + <styles xsi:type="notation:FilteringStyle"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="203" y="324" width="121" height="71"/> + </children> + <styles xsi:type="notation:SortingStyle"/> + <styles xsi:type="notation:FilteringStyle"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="10"/> + <layoutConstraint xsi:type="notation:Bounds" x="192" y="30" width="286" height="391"/> + </gmfView> + <location x="972" y="12"/> + </formatdata:NodeFormatData> + <formatdata:NodeFormatData id="//targetp1/targetp1-1/targetC1-1-1" width="126" height="47"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_PW1YbHKSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <customFeatures>uid</customFeatures> + <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="3009"> + <children type="5004"/> + <children type="7003"> + <children type="3010"> + <styles xsi:type="notation:FontStyle"/> + <layoutConstraint xsi:type="notation:Location"/> + </children> + <styles xsi:type="notation:SortingStyle"/> + <styles xsi:type="notation:FilteringStyle"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="8" y="60" width="126" height="47"/> + </gmfView> + <location x="65" y="66"/> + </formatdata:NodeFormatData> + <formatdata:NodeFormatData id="//targetp2" width="401" height="114"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_PW1YbXKSEeucccBCuyOcEw" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <customFeatures>uid</customFeatures> + <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="2002"> + <children type="5006"/> + <children type="7001"> + <children type="3008"> + <children type="5005"/> + <children type="7002"> + <children type="3009"> + <children type="5004"/> + <children type="7003"> + <children type="3010"> + <styles xsi:type="notation:FontStyle"/> + <layoutConstraint xsi:type="notation:Location"/> + </children> + <styles xsi:type="notation:SortingStyle"/> + <styles xsi:type="notation:FilteringStyle"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" width="153" height="53"/> + </children> + <styles xsi:type="notation:SortingStyle"/> + <styles xsi:type="notation:FilteringStyle"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="10"/> + <layoutConstraint xsi:type="notation:Bounds" x="15" y="23" width="206" height="77"/> + </children> + <children type="3008"> + <children type="5005"/> + <children type="7002"> + <styles xsi:type="notation:SortingStyle"/> + <styles xsi:type="notation:FilteringStyle"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="10"/> + <layoutConstraint xsi:type="notation:Bounds" x="225" y="23" width="155" height="77"/> + </children> + <styles xsi:type="notation:SortingStyle"/> + <styles xsi:type="notation:FilteringStyle"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="10"/> + <layoutConstraint xsi:type="notation:Bounds" x="30" y="260" width="401" height="114"/> + </gmfView> + <location x="48" y="543"/> + </formatdata:NodeFormatData> + <formatdata:NodeFormatData id="//targetp2/targetp2-1" width="206" height="77"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_PW1YcXKSEeucccBCuyOcEw" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <customFeatures>uid</customFeatures> + <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="3008"> + <children type="5005"/> + <children type="7002"> + <children type="3009"> + <children type="5004"/> + <children type="7003"> + <children type="3010"> + <styles xsi:type="notation:FontStyle"/> + <layoutConstraint xsi:type="notation:Location"/> + </children> + <styles xsi:type="notation:SortingStyle"/> + <styles xsi:type="notation:FilteringStyle"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" width="153" height="53"/> + </children> + <styles xsi:type="notation:SortingStyle"/> + <styles xsi:type="notation:FilteringStyle"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="10"/> + <layoutConstraint xsi:type="notation:Bounds" x="15" y="23" width="206" height="77"/> + </gmfView> + <location x="20" y="29"/> + </formatdata:NodeFormatData> + <formatdata:NodeFormatData id="//targetp2/targetp2-1/targetnew%20EClass%201" width="153" height="53"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_PW1Yc3KSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <customFeatures>uid</customFeatures> + <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="3009"> + <children type="5004"/> + <children type="7003"> + <children type="3010"> + <styles xsi:type="notation:FontStyle"/> + <layoutConstraint xsi:type="notation:Location"/> + </children> + <styles xsi:type="notation:SortingStyle"/> + <styles xsi:type="notation:FilteringStyle"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" width="153" height="53"/> + </gmfView> + <location x="15" y="40"/> + </formatdata:NodeFormatData> + <formatdata:NodeFormatData id="//targetp2/targetp2-2" width="155" height="77"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_PW1YdHKSEeucccBCuyOcEw" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <customFeatures>uid</customFeatures> + <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="3008"> + <children type="5005"/> + <children type="7002"> + <styles xsi:type="notation:SortingStyle"/> + <styles xsi:type="notation:FilteringStyle"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="10"/> + <layoutConstraint xsi:type="notation:Bounds" x="225" y="23" width="155" height="77"/> + </gmfView> + <location x="216" y="51"/> + </formatdata:NodeFormatData> + <formatdata:NodeFormatData id="//targetp4" width="196" height="92"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_PW0xUHKSEeucccBCuyOcEw" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> + <customFeatures>uid</customFeatures> + <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="2002"> + <children type="5006"/> + <children type="7001"> + <styles xsi:type="notation:SortingStyle"/> + <styles xsi:type="notation:FilteringStyle"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="10"/> + <layoutConstraint xsi:type="notation:Bounds" x="997" y="72" width="196" height="92"/> + </gmfView> + <location x="1622" y="30"/> + </formatdata:NodeFormatData> +</xmi:XMI> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/mb_ed_from___storedFormat-DiagType8__of__MyPackage___to___storedFormat-DiagType8__Raw__of__targetMyPackage__full.xmi b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/mb_ed_from___storedFormat-DiagType8__of__MyPackage___to___storedFormat-DiagType8__Raw__of__targetMyPackage__full.xmi index a20f884d7a..e7ca6af4f7 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/mb_ed_from___storedFormat-DiagType8__of__MyPackage___to___storedFormat-DiagType8__Raw__of__targetMyPackage__full.xmi +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/mb_ed_from___storedFormat-DiagType8__of__MyPackage___to___storedFormat-DiagType8__Raw__of__targetMyPackage__full.xmi @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="ASCII"?> <xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:diagram="http://www.eclipse.org/sirius/diagram/1.1.0" xmlns:formatdata="http://www.eclipse.org/sirius/dsl/formatdata/1.1.0" 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"> <formatdata:NodeFormatData id="//targetp1" width="635" height="323"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_LLRyEWysEeuxXtQYUb0q2w" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_O6bJMXKSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <customFeatures>backgroundColor</customFeatures> <customFeatures>foregroundColor</customFeatures> @@ -55,7 +55,7 @@ <label id="//targetp1/targetC1-1"> <location x="62" y="2"/> </label> - <siriusStyle xsi:type="diagram:Dot" uid="_LLRyFWysEeuxXtQYUb0q2w"> + <siriusStyle xsi:type="diagram:Dot" uid="_O6bJNXKSEeucccBCuyOcEw"> <customFeatures>uid</customFeatures> <description xsi:type="style:DotDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']/@style"/> </siriusStyle> @@ -76,7 +76,7 @@ <label id="//targetp1/targetC1-2"> <location y="5"/> </label> - <siriusStyle xsi:type="diagram:Dot" uid="_LLRyFmysEeuxXtQYUb0q2w"> + <siriusStyle xsi:type="diagram:Dot" uid="_O6bJNnKSEeucccBCuyOcEw"> <customFeatures>uid</customFeatures> <description xsi:type="style:DotDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']/@style"/> </siriusStyle> @@ -97,7 +97,7 @@ <label id="//targetp1/targetC1-3"> <location y="5"/> </label> - <siriusStyle xsi:type="diagram:Dot" uid="_LLRyF2ysEeuxXtQYUb0q2w"> + <siriusStyle xsi:type="diagram:Dot" uid="_O6bJN3KSEeucccBCuyOcEw"> <customFeatures>uid</customFeatures> <description xsi:type="style:DotDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']/@style"/> </siriusStyle> @@ -115,7 +115,7 @@ <location x="10" y="203"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetp1-1" width="199" height="137"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_LLSZKGysEeuxXtQYUb0q2w" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_O6bwSHKSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@style"/> </siriusStyle> @@ -156,7 +156,7 @@ <label id="//targetp1/targetp1-1/targetC1-1-1"> <location y="5"/> </label> - <siriusStyle xsi:type="diagram:Dot" uid="_LLSZK2ysEeuxXtQYUb0q2w"> + <siriusStyle xsi:type="diagram:Dot" uid="_O6bwS3KSEeucccBCuyOcEw"> <customFeatures>uid</customFeatures> <description xsi:type="style:DotDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']/@style"/> </siriusStyle> @@ -177,7 +177,7 @@ <label id="//targetp1/targetp1-1/targetC1-1-2"> <location y="5"/> </label> - <siriusStyle xsi:type="diagram:Dot" uid="_LLSZLGysEeuxXtQYUb0q2w"> + <siriusStyle xsi:type="diagram:Dot" uid="_O6bwTHKSEeucccBCuyOcEw"> <customFeatures>uid</customFeatures> <description xsi:type="style:DotDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']/@style"/> </siriusStyle> @@ -195,7 +195,7 @@ <location x="235" y="88"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetp1-2" width="199" height="70"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_LLSZJWysEeuxXtQYUb0q2w" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_O6bwRXKSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@style"/> </siriusStyle> @@ -225,7 +225,7 @@ <label id="//targetp1/targetp1-2/targetC1-2-1"> <location y="5"/> </label> - <siriusStyle xsi:type="diagram:Dot" uid="_LLSZJ2ysEeuxXtQYUb0q2w"> + <siriusStyle xsi:type="diagram:Dot" uid="_O6bwR3KSEeucccBCuyOcEw"> <customFeatures>uid</customFeatures> <description xsi:type="style:DotDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']/@style"/> </siriusStyle> @@ -243,7 +243,7 @@ <location x="90" y="60"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetp1-3" width="199" height="70"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_LLSZLWysEeuxXtQYUb0q2w" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_O6bwTXKSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@style"/> </siriusStyle> @@ -259,7 +259,7 @@ <location x="635" y="140"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2" width="499" height="114"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_LLRyGGysEeuxXtQYUb0q2w" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_O6bJOHKSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <customFeatures>backgroundColor</customFeatures> <customFeatures>foregroundColor</customFeatures> @@ -277,7 +277,7 @@ <location x="242" y="165"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2/targetp2-1" width="199" height="70"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_LLSZIWysEeuxXtQYUb0q2w" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_O6bwQXKSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@style"/> </siriusStyle> @@ -307,7 +307,7 @@ <label id="//targetp2/targetp2-1/targetnew%20EClass%201"> <location y="5"/> </label> - <siriusStyle xsi:type="diagram:Dot" uid="_LLSZI2ysEeuxXtQYUb0q2w"> + <siriusStyle xsi:type="diagram:Dot" uid="_O6bwQ3KSEeucccBCuyOcEw"> <customFeatures>uid</customFeatures> <description xsi:type="style:DotDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']/@style"/> </siriusStyle> @@ -325,7 +325,7 @@ <location x="216" y="58"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2/targetp2-2" width="199" height="70"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_LLSZJGysEeuxXtQYUb0q2w" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_O6bwRHKSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@style"/> </siriusStyle> @@ -341,7 +341,7 @@ <location x="255" y="55"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp3" width="188" height="70"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_LLSZIGysEeuxXtQYUb0q2w" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_O6bwQHKSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <customFeatures>backgroundColor</customFeatures> <customFeatures>foregroundColor</customFeatures> @@ -359,7 +359,7 @@ <location x="125" y="175"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp4" width="188" height="70"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_LLRyEGysEeuxXtQYUb0q2w" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_O6bJMHKSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@style"/> </siriusStyle> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/mb_ed_from___storedFormat-DiagType8__of__MyPackage___to___storedFormat-DiagType8__Raw__of__targetMyPackage__subset.xmi b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/mb_ed_from___storedFormat-DiagType8__of__MyPackage___to___storedFormat-DiagType8__Raw__of__targetMyPackage__subset.xmi index 2c44395ab4..abf0ca49b9 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/mb_ed_from___storedFormat-DiagType8__of__MyPackage___to___storedFormat-DiagType8__Raw__of__targetMyPackage__subset.xmi +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/mb_ed_from___storedFormat-DiagType8__of__MyPackage___to___storedFormat-DiagType8__Raw__of__targetMyPackage__subset.xmi @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="ASCII"?> <xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:diagram="http://www.eclipse.org/sirius/diagram/1.1.0" xmlns:formatdata="http://www.eclipse.org/sirius/dsl/formatdata/1.1.0" 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"> <formatdata:NodeFormatData id="//targetp1" width="635" height="323"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_LDknkGysEeuxXtQYUb0q2w" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_Oyq7YHKSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <customFeatures>backgroundColor</customFeatures> <customFeatures>foregroundColor</customFeatures> @@ -55,7 +55,7 @@ <label id="//targetp1/targetC1-1"> <location x="62" y="2"/> </label> - <siriusStyle xsi:type="diagram:Dot" uid="_LDlOoGysEeuxXtQYUb0q2w"> + <siriusStyle xsi:type="diagram:Dot" uid="_Oyq7ZHKSEeucccBCuyOcEw"> <customFeatures>uid</customFeatures> <description xsi:type="style:DotDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']/@style"/> </siriusStyle> @@ -76,7 +76,7 @@ <label id="//targetp1/targetC1-2"> <location y="5"/> </label> - <siriusStyle xsi:type="diagram:Dot" uid="_LDlOoWysEeuxXtQYUb0q2w"> + <siriusStyle xsi:type="diagram:Dot" uid="_Oyq7ZXKSEeucccBCuyOcEw"> <customFeatures>uid</customFeatures> <description xsi:type="style:DotDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']/@style"/> </siriusStyle> @@ -94,7 +94,7 @@ <location x="-22" y="30"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetp1-1" width="199" height="137"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_LDlOp2ysEeuxXtQYUb0q2w" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_OyricnKSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@style"/> </siriusStyle> @@ -135,7 +135,7 @@ <label id="//targetp1/targetp1-1/targetC1-1-1"> <location y="5"/> </label> - <siriusStyle xsi:type="diagram:Dot" uid="_LDl1sGysEeuxXtQYUb0q2w"> + <siriusStyle xsi:type="diagram:Dot" uid="_OyridXKSEeucccBCuyOcEw"> <customFeatures>uid</customFeatures> <description xsi:type="style:DotDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']/@style"/> </siriusStyle> @@ -153,7 +153,7 @@ <location x="-22"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2" width="499" height="114"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_LDlOomysEeuxXtQYUb0q2w" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_Oyq7ZnKSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <customFeatures>backgroundColor</customFeatures> <customFeatures>foregroundColor</customFeatures> @@ -171,7 +171,7 @@ <location x="242" y="165"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2/targetp2-1" width="199" height="70"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_LDlOo2ysEeuxXtQYUb0q2w" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_Oyq7Z3KSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@style"/> </siriusStyle> @@ -201,7 +201,7 @@ <label id="//targetp2/targetp2-1/targetnew%20EClass%201"> <location y="5"/> </label> - <siriusStyle xsi:type="diagram:Dot" uid="_LDlOpWysEeuxXtQYUb0q2w"> + <siriusStyle xsi:type="diagram:Dot" uid="_OyricHKSEeucccBCuyOcEw"> <customFeatures>uid</customFeatures> <description xsi:type="style:DotDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']/@style"/> </siriusStyle> @@ -219,7 +219,7 @@ <location x="216" y="58"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2/targetp2-2" width="199" height="70"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_LDlOpmysEeuxXtQYUb0q2w" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_OyricXKSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@style"/> </siriusStyle> @@ -235,7 +235,7 @@ <location x="255" y="55"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp4" width="188" height="70"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_LDkAgGysEeuxXtQYUb0q2w" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_OyqUUHKSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@style"/> </siriusStyle> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/mb_ed_from___storedFormat-DiagType8__of__p2___to___storedFormat-DiagType8__Raw__of__targetMyPackage__full.xmi b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/mb_ed_from___storedFormat-DiagType8__of__p2___to___storedFormat-DiagType8__Raw__of__targetMyPackage__full.xmi index ee3c9ae0b9..b13d68d7cc 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/mb_ed_from___storedFormat-DiagType8__of__p2___to___storedFormat-DiagType8__Raw__of__targetMyPackage__full.xmi +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/mb_ed_from___storedFormat-DiagType8__of__p2___to___storedFormat-DiagType8__Raw__of__targetMyPackage__full.xmi @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="ASCII"?> <xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:diagram="http://www.eclipse.org/sirius/diagram/1.1.0" xmlns:formatdata="http://www.eclipse.org/sirius/dsl/formatdata/1.1.0" 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"> <formatdata:NodeFormatData id="//targetp1" width="212" height="213"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_LNFI4GysEeuxXtQYUb0q2w" borderSize="1" borderSizeComputationExpression="1" backgroundColor="224,133,3" foregroundColor="224,133,3"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_O78zMXKSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1" backgroundColor="224,133,3" foregroundColor="224,133,3"> <customFeatures>backgroundColor</customFeatures> <customFeatures>foregroundColor</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@style"/> @@ -54,7 +54,7 @@ <label id="//targetp1/targetC1-1"> <location x="31" y="7"/> </label> - <siriusStyle xsi:type="diagram:Dot" uid="_LNFI5GysEeuxXtQYUb0q2w"> + <siriusStyle xsi:type="diagram:Dot" uid="_O78zNXKSEeucccBCuyOcEw"> <description xsi:type="style:DotDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']/@style"/> </siriusStyle> <gmfView xsi:type="notation:Node" type="3012"> @@ -74,7 +74,7 @@ <label id="//targetp1/targetC1-2"> <location x="31" y="7"/> </label> - <siriusStyle xsi:type="diagram:Dot" uid="_LNFI5WysEeuxXtQYUb0q2w"> + <siriusStyle xsi:type="diagram:Dot" uid="_O79aQHKSEeucccBCuyOcEw"> <description xsi:type="style:DotDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']/@style"/> </siriusStyle> <gmfView xsi:type="notation:Node" type="3012"> @@ -94,7 +94,7 @@ <label id="//targetp1/targetC1-3"> <location x="31" y="7"/> </label> - <siriusStyle xsi:type="diagram:Dot" uid="_LNFI5mysEeuxXtQYUb0q2w"> + <siriusStyle xsi:type="diagram:Dot" uid="_O79aQXKSEeucccBCuyOcEw"> <description xsi:type="style:DotDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']/@style"/> </siriusStyle> <gmfView xsi:type="notation:Node" type="3012"> @@ -111,7 +111,7 @@ <location x="10" y="203"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetp1-1" width="245" height="183"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_LNFv9WysEeuxXtQYUb0q2w" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_O79aS3KSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1"> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@style"/> </siriusStyle> <gmfView xsi:type="notation:Node" type="2002"> @@ -151,7 +151,7 @@ <label id="//targetp1/targetp1-1/targetC1-1-1"> <location x="31" y="7"/> </label> - <siriusStyle xsi:type="diagram:Dot" uid="_LNFv-GysEeuxXtQYUb0q2w"> + <siriusStyle xsi:type="diagram:Dot" uid="_O79aTnKSEeucccBCuyOcEw"> <description xsi:type="style:DotDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']/@style"/> </siriusStyle> <gmfView xsi:type="notation:Node" type="3012"> @@ -171,7 +171,7 @@ <label id="//targetp1/targetp1-1/targetC1-1-2"> <location x="-26" y="31"/> </label> - <siriusStyle xsi:type="diagram:Dot" uid="_LNFv-WysEeuxXtQYUb0q2w"> + <siriusStyle xsi:type="diagram:Dot" uid="_O79aT3KSEeucccBCuyOcEw"> <description xsi:type="style:DotDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']/@style"/> </siriusStyle> <gmfView xsi:type="notation:Node" type="3012"> @@ -188,7 +188,7 @@ <location x="235" y="88"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetp1-2" width="227" height="70"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_LNFv8mysEeuxXtQYUb0q2w" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_O79aSHKSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1"> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@style"/> </siriusStyle> <gmfView xsi:type="notation:Node" type="2002"> @@ -217,7 +217,7 @@ <label id="//targetp1/targetp1-2/targetC1-2-1"> <location x="31" y="7"/> </label> - <siriusStyle xsi:type="diagram:Dot" uid="_LNFv9GysEeuxXtQYUb0q2w"> + <siriusStyle xsi:type="diagram:Dot" uid="_O79aSnKSEeucccBCuyOcEw"> <description xsi:type="style:DotDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']/@style"/> </siriusStyle> <gmfView xsi:type="notation:Node" type="3012"> @@ -234,7 +234,7 @@ <location x="90" y="60"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetp1-3" width="223" height="70"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_LNFv-mysEeuxXtQYUb0q2w" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_O79aUHKSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1"> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@style"/> </siriusStyle> <gmfView xsi:type="notation:Node" type="2002"> @@ -249,7 +249,7 @@ <location x="635" y="140"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2" width="229" height="188"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_LNFI52ysEeuxXtQYUb0q2w" borderSize="1" borderSizeComputationExpression="1" backgroundColor="224,133,3" foregroundColor="224,133,3"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_O79aQnKSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1" backgroundColor="224,133,3" foregroundColor="224,133,3"> <customFeatures>backgroundColor</customFeatures> <customFeatures>foregroundColor</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@style"/> @@ -266,7 +266,7 @@ <location x="242" y="165"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2/targetp2-1" width="309" height="79"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_LNFI6WysEeuxXtQYUb0q2w" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_O79aRHKSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@style"/> </siriusStyle> @@ -296,7 +296,7 @@ <label id="//targetp2/targetp2-1/targetnew%20EClass%201"> <location y="5"/> </label> - <siriusStyle xsi:type="diagram:Dot" uid="_LNFv8GysEeuxXtQYUb0q2w"> + <siriusStyle xsi:type="diagram:Dot" uid="_O79aRnKSEeucccBCuyOcEw"> <customFeatures>uid</customFeatures> <description xsi:type="style:DotDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']/@style"/> </siriusStyle> @@ -314,7 +314,7 @@ <location x="216" y="58"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2/targetp2-2" width="309" height="78"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_LNFv8WysEeuxXtQYUb0q2w" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_O79aR3KSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@style"/> </siriusStyle> @@ -330,7 +330,7 @@ <location x="255" y="55"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp3" width="245" height="88"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_LNFI6GysEeuxXtQYUb0q2w" borderSize="1" borderSizeComputationExpression="1" backgroundColor="77,137,20" foregroundColor="77,137,20"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_O79aQ3KSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1" backgroundColor="77,137,20" foregroundColor="77,137,20"> <customFeatures>backgroundColor</customFeatures> <customFeatures>foregroundColor</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@style"/> @@ -347,7 +347,7 @@ <location x="125" y="175"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp4" width="226" height="70"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_LNEh0GysEeuxXtQYUb0q2w" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_O78zMHKSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1"> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@style"/> </siriusStyle> <gmfView xsi:type="notation:Node" type="2002"> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/mb_ed_from___storedFormat-DiagType8__of__p2___to___storedFormat-DiagType8__Raw__of__targetMyPackage__subset.xmi b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/mb_ed_from___storedFormat-DiagType8__of__p2___to___storedFormat-DiagType8__Raw__of__targetMyPackage__subset.xmi index ca4c920a39..b27cda69db 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/mb_ed_from___storedFormat-DiagType8__of__p2___to___storedFormat-DiagType8__Raw__of__targetMyPackage__subset.xmi +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/mb_ed_from___storedFormat-DiagType8__of__p2___to___storedFormat-DiagType8__Raw__of__targetMyPackage__subset.xmi @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="ASCII"?> <xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:diagram="http://www.eclipse.org/sirius/diagram/1.1.0" xmlns:formatdata="http://www.eclipse.org/sirius/dsl/formatdata/1.1.0" 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"> <formatdata:NodeFormatData id="//targetp1" width="212" height="213"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_LFmn4GysEeuxXtQYUb0q2w" borderSize="1" borderSizeComputationExpression="1" backgroundColor="224,133,3" foregroundColor="224,133,3"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_O0-ogXKSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1" backgroundColor="224,133,3" foregroundColor="224,133,3"> <customFeatures>backgroundColor</customFeatures> <customFeatures>foregroundColor</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@style"/> @@ -54,7 +54,7 @@ <label id="//targetp1/targetC1-1"> <location x="31" y="7"/> </label> - <siriusStyle xsi:type="diagram:Dot" uid="_LFmn5GysEeuxXtQYUb0q2w"> + <siriusStyle xsi:type="diagram:Dot" uid="_O0_PknKSEeucccBCuyOcEw"> <description xsi:type="style:DotDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']/@style"/> </siriusStyle> <gmfView xsi:type="notation:Node" type="3012"> @@ -74,7 +74,7 @@ <label id="//targetp1/targetC1-2"> <location x="31" y="7"/> </label> - <siriusStyle xsi:type="diagram:Dot" uid="_LFmn5WysEeuxXtQYUb0q2w"> + <siriusStyle xsi:type="diagram:Dot" uid="_O0_Pk3KSEeucccBCuyOcEw"> <description xsi:type="style:DotDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']/@style"/> </siriusStyle> <gmfView xsi:type="notation:Node" type="3012"> @@ -91,7 +91,7 @@ <location x="-22" y="30"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetp1-1" width="245" height="183"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_LFmn62ysEeuxXtQYUb0q2w" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_O0_PmXKSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1"> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@style"/> </siriusStyle> <gmfView xsi:type="notation:Node" type="2002"> @@ -131,7 +131,7 @@ <label id="//targetp1/targetp1-1/targetC1-1-1"> <location x="31" y="7"/> </label> - <siriusStyle xsi:type="diagram:Dot" uid="_LFnO8WysEeuxXtQYUb0q2w"> + <siriusStyle xsi:type="diagram:Dot" uid="_O0_2oXKSEeucccBCuyOcEw"> <description xsi:type="style:DotDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']/@style"/> </siriusStyle> <gmfView xsi:type="notation:Node" type="3012"> @@ -148,7 +148,7 @@ <location x="-22"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2" width="229" height="188"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_LFmn5mysEeuxXtQYUb0q2w" borderSize="1" borderSizeComputationExpression="1" backgroundColor="224,133,3" foregroundColor="224,133,3"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_O0_PlHKSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1" backgroundColor="224,133,3" foregroundColor="224,133,3"> <customFeatures>backgroundColor</customFeatures> <customFeatures>foregroundColor</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@style"/> @@ -165,7 +165,7 @@ <location x="242" y="165"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2/targetp2-1" width="309" height="79"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_LFmn52ysEeuxXtQYUb0q2w" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_O0_PlXKSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@style"/> </siriusStyle> @@ -195,7 +195,7 @@ <label id="//targetp2/targetp2-1/targetnew%20EClass%201"> <location y="5"/> </label> - <siriusStyle xsi:type="diagram:Dot" uid="_LFmn6WysEeuxXtQYUb0q2w"> + <siriusStyle xsi:type="diagram:Dot" uid="_O0_Pl3KSEeucccBCuyOcEw"> <customFeatures>uid</customFeatures> <description xsi:type="style:DotDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']/@style"/> </siriusStyle> @@ -213,7 +213,7 @@ <location x="216" y="58"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2/targetp2-2" width="309" height="78"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_LFmn6mysEeuxXtQYUb0q2w" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_O0_PmHKSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@style"/> </siriusStyle> @@ -229,7 +229,7 @@ <location x="255" y="55"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp4" width="226" height="70"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_LFmA0GysEeuxXtQYUb0q2w" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_O0-ogHKSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1"> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@style"/> </siriusStyle> <gmfView xsi:type="notation:Node" type="2002"> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/mb_ed_from___storedFormat-DiagType8_unsyncBN__of__MyPackage___to___storedFormat-DiagType8_unsyncBN__Raw__of__targetMyPackage__full.xmi b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/mb_ed_from___storedFormat-DiagType8_unsyncBN__of__MyPackage___to___storedFormat-DiagType8_unsyncBN__Raw__of__targetMyPackage__full.xmi index 88f0558193..b2ae485602 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/mb_ed_from___storedFormat-DiagType8_unsyncBN__of__MyPackage___to___storedFormat-DiagType8_unsyncBN__Raw__of__targetMyPackage__full.xmi +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/mb_ed_from___storedFormat-DiagType8_unsyncBN__of__MyPackage___to___storedFormat-DiagType8_unsyncBN__Raw__of__targetMyPackage__full.xmi @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="ASCII"?> <xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:diagram="http://www.eclipse.org/sirius/diagram/1.1.0" xmlns:formatdata="http://www.eclipse.org/sirius/dsl/formatdata/1.1.0" 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"> <formatdata:NodeFormatData id="//targetp1" width="212" height="99"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_Lb5A8WysEeuxXtQYUb0q2w" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_PKPt4HKSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8_unsync_onlyBN']/@defaultLayer/@containerMappings[name='DT8_unsyncBN_Package']/@style"/> </siriusStyle> @@ -42,7 +42,7 @@ <label id="//targetp1/targetC1-2"> <location x="31" y="9"/> </label> - <siriusStyle xsi:type="diagram:Dot" uid="_Lb5A82ysEeuxXtQYUb0q2w"> + <siriusStyle xsi:type="diagram:Dot" uid="_PKPt4nKSEeucccBCuyOcEw"> <customFeatures>uid</customFeatures> <description xsi:type="style:DotDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8_unsync_onlyBN']/@defaultLayer/@containerMappings[name='DT8_unsyncBN_Package']/@borderedNodeMappings[name='DT8_unsyncBN_Class']/@style"/> </siriusStyle> @@ -60,7 +60,7 @@ <location x="18" y="84"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetp1-1" width="212" height="99"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_Lb5oAWysEeuxXtQYUb0q2w" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_PKPt6nKSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8_unsync_onlyBN']/@defaultLayer/@containerMappings[name='DT8_unsyncBN_Package']/@style"/> </siriusStyle> @@ -76,7 +76,7 @@ <location x="161" y="170"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetp1-2" width="212" height="99"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_Lb5A-GysEeuxXtQYUb0q2w" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_PKPt53KSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8_unsync_onlyBN']/@defaultLayer/@containerMappings[name='DT8_unsyncBN_Package']/@style"/> </siriusStyle> @@ -106,7 +106,7 @@ <label id="//targetp1/targetp1-2/targetC1-2-1"> <location x="31" y="10"/> </label> - <siriusStyle xsi:type="diagram:Dot" uid="_Lb5oAGysEeuxXtQYUb0q2w"> + <siriusStyle xsi:type="diagram:Dot" uid="_PKPt6XKSEeucccBCuyOcEw"> <customFeatures>uid</customFeatures> <description xsi:type="style:DotDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8_unsync_onlyBN']/@defaultLayer/@containerMappings[name='DT8_unsyncBN_Package']/@borderedNodeMappings[name='DT8_unsyncBN_Class']/@style"/> </siriusStyle> @@ -124,7 +124,7 @@ <location x="251" y="27"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetp1-3" width="212" height="99"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_Lb5oAmysEeuxXtQYUb0q2w" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_PKPt63KSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8_unsync_onlyBN']/@defaultLayer/@containerMappings[name='DT8_unsyncBN_Package']/@style"/> </siriusStyle> @@ -140,7 +140,7 @@ <location x="233" y="382"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2" width="212" height="99"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_Lb5A9GysEeuxXtQYUb0q2w" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_PKPt43KSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8_unsync_onlyBN']/@defaultLayer/@containerMappings[name='DT8_unsyncBN_Package']/@style"/> </siriusStyle> @@ -156,7 +156,7 @@ <location x="351" y="488"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2/targetp2-1" width="212" height="99"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_Lb5A9mysEeuxXtQYUb0q2w" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_PKPt5XKSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8_unsync_onlyBN']/@defaultLayer/@containerMappings[name='DT8_unsyncBN_Package']/@style"/> </siriusStyle> @@ -172,7 +172,7 @@ <location x="511" y="382"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2/targetp2-2" width="212" height="99"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_Lb5A92ysEeuxXtQYUb0q2w" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_PKPt5nKSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8_unsync_onlyBN']/@defaultLayer/@containerMappings[name='DT8_unsyncBN_Package']/@style"/> </siriusStyle> @@ -188,7 +188,7 @@ <location x="638" y="276"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp3" width="212" height="99"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_Lb5A9WysEeuxXtQYUb0q2w" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_PKPt5HKSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8_unsync_onlyBN']/@defaultLayer/@containerMappings[name='DT8_unsyncBN_Package']/@style"/> </siriusStyle> @@ -204,7 +204,7 @@ <location x="763" y="170"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp4" width="212" height="99"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_Lb5A8GysEeuxXtQYUb0q2w" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_PKPG0HKSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8_unsync_onlyBN']/@defaultLayer/@containerMappings[name='DT8_unsyncBN_Package']/@style"/> </siriusStyle> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/mb_ed_from___storedFormat-DiagType8_unsyncBN__of__MyPackage___to___storedFormat-DiagType8_unsyncBN__Raw__of__targetMyPackage__subset.xmi b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/mb_ed_from___storedFormat-DiagType8_unsyncBN__of__MyPackage___to___storedFormat-DiagType8_unsyncBN__Raw__of__targetMyPackage__subset.xmi index 4d3c475ca1..0992f00eb3 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/mb_ed_from___storedFormat-DiagType8_unsyncBN__of__MyPackage___to___storedFormat-DiagType8_unsyncBN__Raw__of__targetMyPackage__subset.xmi +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/mb_ed_from___storedFormat-DiagType8_unsyncBN__of__MyPackage___to___storedFormat-DiagType8_unsyncBN__Raw__of__targetMyPackage__subset.xmi @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="ASCII"?> <xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:diagram="http://www.eclipse.org/sirius/diagram/1.1.0" xmlns:formatdata="http://www.eclipse.org/sirius/dsl/formatdata/1.1.0" 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"> <formatdata:NodeFormatData id="//targetp1" width="212" height="99"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_LYZBAWysEeuxXtQYUb0q2w" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_PG3pwXKSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8_unsync_onlyBN']/@defaultLayer/@containerMappings[name='DT8_unsyncBN_Package']/@style"/> </siriusStyle> @@ -42,7 +42,7 @@ <label id="//targetp1/targetC1-2"> <location x="31" y="9"/> </label> - <siriusStyle xsi:type="diagram:Dot" uid="_LYZoEGysEeuxXtQYUb0q2w"> + <siriusStyle xsi:type="diagram:Dot" uid="_PG4Q0XKSEeucccBCuyOcEw"> <customFeatures>uid</customFeatures> <description xsi:type="style:DotDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8_unsync_onlyBN']/@defaultLayer/@containerMappings[name='DT8_unsyncBN_Package']/@borderedNodeMappings[name='DT8_unsyncBN_Class']/@style"/> </siriusStyle> @@ -60,7 +60,7 @@ <location x="18" y="84"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetp1-1" width="212" height="99"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_LYZoFGysEeuxXtQYUb0q2w" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_PG4Q1XKSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8_unsync_onlyBN']/@defaultLayer/@containerMappings[name='DT8_unsyncBN_Package']/@style"/> </siriusStyle> @@ -76,7 +76,7 @@ <location x="161" y="170"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2" width="212" height="99"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_LYZoEWysEeuxXtQYUb0q2w" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_PG4Q0nKSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8_unsync_onlyBN']/@defaultLayer/@containerMappings[name='DT8_unsyncBN_Package']/@style"/> </siriusStyle> @@ -92,7 +92,7 @@ <location x="351" y="488"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2/targetp2-1" width="212" height="99"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_LYZoEmysEeuxXtQYUb0q2w" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_PG4Q03KSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8_unsync_onlyBN']/@defaultLayer/@containerMappings[name='DT8_unsyncBN_Package']/@style"/> </siriusStyle> @@ -108,7 +108,7 @@ <location x="511" y="382"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2/targetp2-2" width="212" height="99"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_LYZoE2ysEeuxXtQYUb0q2w" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_PG4Q1HKSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8_unsync_onlyBN']/@defaultLayer/@containerMappings[name='DT8_unsyncBN_Package']/@style"/> </siriusStyle> @@ -124,7 +124,7 @@ <location x="638" y="276"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp4" width="212" height="99"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_LYZBAGysEeuxXtQYUb0q2w" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_PG3pwHKSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8_unsync_onlyBN']/@defaultLayer/@containerMappings[name='DT8_unsyncBN_Package']/@style"/> </siriusStyle> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/mb_ed_from___storedFormat-DiagType8_unsync__of__MyPackage___to___storedFormat-DiagType8_unsync__Raw__of__targetMyPackage__full.xmi b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/mb_ed_from___storedFormat-DiagType8_unsync__of__MyPackage___to___storedFormat-DiagType8_unsync__Raw__of__targetMyPackage__full.xmi index 06d7b3d91f..affde0ead0 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/mb_ed_from___storedFormat-DiagType8_unsync__of__MyPackage___to___storedFormat-DiagType8_unsync__Raw__of__targetMyPackage__full.xmi +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/mb_ed_from___storedFormat-DiagType8_unsync__of__MyPackage___to___storedFormat-DiagType8_unsync__Raw__of__targetMyPackage__full.xmi @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="ASCII"?> <xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:diagram="http://www.eclipse.org/sirius/diagram/1.1.0" xmlns:formatdata="http://www.eclipse.org/sirius/dsl/formatdata/1.1.0" 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"> <formatdata:NodeFormatData id="//targetp1" width="203" height="78"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_LUxFQWysEeuxXtQYUb0q2w" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_PDfloXKSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <customFeatures>backgroundColor</customFeatures> <customFeatures>foregroundColor</customFeatures> @@ -19,7 +19,7 @@ <location x="270" y="45"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetp1-1" width="203" height="78"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_LUxFR2ysEeuxXtQYUb0q2w" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_PDflp3KSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8_unsync']/@containerMappings[name='DT8_unsync_Package']/@style"/> </siriusStyle> @@ -49,7 +49,7 @@ <label id="//targetp1/targetp1-1/targetC1-1-1"> <location x="31" y="7"/> </label> - <siriusStyle xsi:type="diagram:Dot" uid="_LUxFSWysEeuxXtQYUb0q2w"> + <siriusStyle xsi:type="diagram:Dot" uid="_PDflqXKSEeucccBCuyOcEw"> <customFeatures>uid</customFeatures> <description xsi:type="style:DotDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8_unsync']/@containerMappings[name='DT8_unsync_Package']/@borderedNodeMappings[name='DT8_unsync_Class']/@style"/> </siriusStyle> @@ -67,7 +67,7 @@ <location x="10" y="-22"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetp1-2" width="203" height="78"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_LUxFRmysEeuxXtQYUb0q2w" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_PDflpnKSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8_unsync']/@containerMappings[name='DT8_unsync_Package']/@style"/> </siriusStyle> @@ -83,7 +83,7 @@ <location x="245" y="85"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetp1-3" width="203" height="78"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_LUxFSmysEeuxXtQYUb0q2w" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_PDflqnKSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8_unsync']/@containerMappings[name='DT8_unsync_Package']/@style"/> </siriusStyle> @@ -99,7 +99,7 @@ <location x="185" y="140"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2" width="203" height="78"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_LUxFQmysEeuxXtQYUb0q2w" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_PDflonKSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8_unsync']/@containerMappings[name='DT8_unsync_Package']/@style"/> </siriusStyle> @@ -115,7 +115,7 @@ <location x="255" y="100"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2/targetp2-1" width="203" height="78"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_LUxFRGysEeuxXtQYUb0q2w" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_PDflpHKSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8_unsync']/@containerMappings[name='DT8_unsync_Package']/@style"/> </siriusStyle> @@ -131,7 +131,7 @@ <location x="195" y="110"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2/targetp2-2" width="203" height="78"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_LUxFRWysEeuxXtQYUb0q2w" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_PDflpXKSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8_unsync']/@containerMappings[name='DT8_unsync_Package']/@style"/> </siriusStyle> @@ -147,7 +147,7 @@ <location x="412" y="38"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp3" width="203" height="78"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_LUxFQ2ysEeuxXtQYUb0q2w" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_PDflo3KSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <customFeatures>backgroundColor</customFeatures> <customFeatures>foregroundColor</customFeatures> @@ -165,7 +165,7 @@ <location x="85" y="145"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp4" width="203" height="78"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_LUxFQGysEeuxXtQYUb0q2w" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_PDfloHKSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8_unsync']/@containerMappings[name='DT8_unsync_Package']/@style"/> </siriusStyle> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/mb_ed_from___storedFormat-DiagType8_unsync__of__MyPackage___to___storedFormat-DiagType8_unsync__Raw__of__targetMyPackage__subset.xmi b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/mb_ed_from___storedFormat-DiagType8_unsync__of__MyPackage___to___storedFormat-DiagType8_unsync__Raw__of__targetMyPackage__subset.xmi index d0ec44aaf0..ad6b7f4eb5 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/mb_ed_from___storedFormat-DiagType8_unsync__of__MyPackage___to___storedFormat-DiagType8_unsync__Raw__of__targetMyPackage__subset.xmi +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/xmi/raw/mb_ed_from___storedFormat-DiagType8_unsync__of__MyPackage___to___storedFormat-DiagType8_unsync__Raw__of__targetMyPackage__subset.xmi @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="ASCII"?> <xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:diagram="http://www.eclipse.org/sirius/diagram/1.1.0" xmlns:formatdata="http://www.eclipse.org/sirius/dsl/formatdata/1.1.0" 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"> <formatdata:NodeFormatData id="//targetp1" width="203" height="78"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_LQ88QWysEeuxXtQYUb0q2w" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_O__lsXKSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <customFeatures>backgroundColor</customFeatures> <customFeatures>foregroundColor</customFeatures> @@ -19,7 +19,7 @@ <location x="270" y="45"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp1/targetp1-1" width="203" height="78"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_LQ88RWysEeuxXtQYUb0q2w" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_O__ltXKSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8_unsync']/@containerMappings[name='DT8_unsync_Package']/@style"/> </siriusStyle> @@ -49,7 +49,7 @@ <label id="//targetp1/targetp1-1/targetC1-1-1"> <location x="31" y="7"/> </label> - <siriusStyle xsi:type="diagram:Dot" uid="_LQ88R2ysEeuxXtQYUb0q2w"> + <siriusStyle xsi:type="diagram:Dot" uid="_PAAMwXKSEeucccBCuyOcEw"> <customFeatures>uid</customFeatures> <description xsi:type="style:DotDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8_unsync']/@containerMappings[name='DT8_unsync_Package']/@borderedNodeMappings[name='DT8_unsync_Class']/@style"/> </siriusStyle> @@ -67,7 +67,7 @@ <location x="10" y="-22"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2" width="203" height="78"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_LQ88QmysEeuxXtQYUb0q2w" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_O__lsnKSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8_unsync']/@containerMappings[name='DT8_unsync_Package']/@style"/> </siriusStyle> @@ -83,7 +83,7 @@ <location x="255" y="100"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2/targetp2-1" width="203" height="78"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_LQ88Q2ysEeuxXtQYUb0q2w" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_O__ls3KSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8_unsync']/@containerMappings[name='DT8_unsync_Package']/@style"/> </siriusStyle> @@ -99,7 +99,7 @@ <location x="195" y="110"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp2/targetp2-2" width="203" height="78"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_LQ88RGysEeuxXtQYUb0q2w" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_O__ltHKSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8_unsync']/@containerMappings[name='DT8_unsync_Package']/@style"/> </siriusStyle> @@ -115,7 +115,7 @@ <location x="412" y="38"/> </formatdata:NodeFormatData> <formatdata:NodeFormatData id="//targetp4" width="203" height="78"> - <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_LQ88QGysEeuxXtQYUb0q2w" borderSize="1" borderSizeComputationExpression="1"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" uid="_O__lsHKSEeucccBCuyOcEw" borderSize="1" borderSizeComputationExpression="1"> <customFeatures>uid</customFeatures> <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/mappingbased/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8_unsync']/@containerMappings[name='DT8_unsync_Package']/@style"/> </siriusStyle> diff --git a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/format/data/MappingBasedSiriusFormatDataManagerExistingTargetDiagramTest.java b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/format/data/MappingBasedSiriusFormatDataManagerExistingTargetDiagramTest.java index f9db2cb1dc..5ff62aa132 100644 --- a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/format/data/MappingBasedSiriusFormatDataManagerExistingTargetDiagramTest.java +++ b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/format/data/MappingBasedSiriusFormatDataManagerExistingTargetDiagramTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 Obeo. + * Copyright (c) 2020, 2021 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at @@ -23,6 +23,9 @@ import java.util.stream.Collectors; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.transaction.RecordingCommand; import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart; +import org.eclipse.gmf.runtime.notation.Location; +import org.eclipse.gmf.runtime.notation.Node; +import org.eclipse.gmf.runtime.notation.Shape; import org.eclipse.sirius.diagram.DDiagram; import org.eclipse.sirius.diagram.formatdata.tools.api.util.FormatHelper.FormatDifference; import org.eclipse.sirius.diagram.formatdata.tools.api.util.configuration.Configuration; @@ -67,10 +70,6 @@ public class MappingBasedSiriusFormatDataManagerExistingTargetDiagramTest extend protected static final Representation MB_REPRES_TYPE8 = new Representation("DiagType8", MB_DIAG_TYPE8_MYPACKAGE, MB_DIAG_TYPE8_P2, MB_DIAG_TYPE8_RAW); - protected static final Diagram MB_DIAG_TYPE8_NOTES_MYPACKAGE = new Diagram("DiagType8 with notes of MyPackage", 16, 0); - - protected static final RepresentationWithNotes MB_REPRES_TYPE8_NOTES = new RepresentationWithNotes("DiagType8", MB_DIAG_TYPE8_NOTES_MYPACKAGE, MB_DIAG_TYPE8_RAW); - protected static final Diagram MB_DIAG_TYPE8UNSYNC_MYPACKAGE = new Diagram("DiagType8_unsync of MyPackage", 16, 0); protected static final Diagram MB_DIAG_TYPE8UNSYNC_RAW = new Diagram("DiagType8_unsync Raw of targetMyPackage", 16, 0, true); @@ -89,7 +88,13 @@ public class MappingBasedSiriusFormatDataManagerExistingTargetDiagramTest extend protected static final Representation MB_REPRES_TYPE10 = new Representation("DiagType10", MB_DIAG_TYPE10_MYPACKAGE, MB_DIAG_TYPE10_RAW); - protected static final Representation[] MB_ALL_REPRESENTATIONS = { MB_REPRES_TYPE8, MB_REPRES_TYPE8UNSYNC, MB_REPRES_TYPE8UNSYNCBN, MB_REPRES_TYPE10 }; + protected static final Diagram MB_DIAG_TYPE2_NOTES_MYPACKAGE = new Diagram("DiagType2 with notes of MyPackage", 16, 2); + + protected static final Diagram MB_DIAG_TYPE2_RAW = new Diagram("DiagType2 Raw of targetMyPackage", 16, 2, true); + + protected static final RepresentationWithNotes MB_REPRES_NOTES_TYPE2 = new RepresentationWithNotes("DiagType2", MB_DIAG_TYPE2_NOTES_MYPACKAGE, MB_DIAG_TYPE2_RAW); + + protected static final Representation[] MB_ALL_REPRESENTATIONS = { MB_REPRES_TYPE8, MB_REPRES_TYPE8UNSYNC, MB_REPRES_TYPE8UNSYNCBN, MB_REPRES_TYPE10, MB_REPRES_NOTES_TYPE2 }; @Parameters public static Collection<Object[]> data() { @@ -217,13 +222,38 @@ public class MappingBasedSiriusFormatDataManagerExistingTargetDiagramTest extend } // Update diagram, but transaction will be rollbacked DDiagram newDiagram = MappingBasedSiriusFormatManagerFactory.getInstance().applyFormatOnDiagram(session, (DDiagram) getDRepresentation(sourceDiagramEditPart), map, session, - (DDiagram) getDRepresentation(targetDiagramEditPart), false); + (DDiagram) getDRepresentation(targetDiagramEditPart), true); newManager.storeFormatData(targetDiagramEditPart); if (MB_GENERATE_IMAGES_TEST_DATA) { exportDiagramToTempFolder(diagramMappingName + "_from", dDiagram); exportDiagramToTempFolder(diagramMappingName + "_to", newDiagram); } + if (MB_DIAG_TYPE2_NOTES_MYPACKAGE.name.equals(diagramToCopyFormat.name)) { + // Specific checks about notes and texts that are not tested by "FormatData" + Collection<Node> sourceNotes = org.eclipse.sirius.diagram.ui.tools.api.util.GMFNotationHelper.getNotes(sourceDiagramEditPart.getDiagramView()); + Collection<Node> targetNotes = org.eclipse.sirius.diagram.ui.tools.api.util.GMFNotationHelper.getNotes(targetDiagramEditPart.getDiagramView()); + // There is 1 additional notes in target diagram + assertEquals("The number of Notes is wrong.", sourceNotes.size() + 1, targetNotes.size()); + Collection<Node> sourceTexts = org.eclipse.sirius.diagram.ui.tools.api.util.GMFNotationHelper.getTextNotes(sourceDiagramEditPart.getDiagramView()); + Collection<Node> targetTexts = org.eclipse.sirius.diagram.ui.tools.api.util.GMFNotationHelper.getTextNotes(targetDiagramEditPart.getDiagramView()); + // 2 Texts in source and target diagrams + assertEquals("The number of Texts in source diagram is wrong.", 2, sourceTexts.size()); + assertEquals("The number of Texts is wrong.", sourceTexts.size(), targetTexts.size()); + // Check the location of Texts (it is not done for Notes because there are several Notes + // with the same description + for (Node sourceText : sourceTexts) { + String sourceDescription = ((Shape) sourceText).getDescription(); + for (Node targetText : targetTexts) { + if (sourceDescription.equals(((Shape) targetText).getDescription())) { + Location sourceLocation = (Location) sourceText.getLayoutConstraint(); + Location targetLocation = (Location) sourceText.getLayoutConstraint(); + assertEquals("The location of the Text \"" + sourceDescription + "\" is wrong (X coordinate).", sourceLocation.getX(), targetLocation.getX()); + assertEquals("The location of the Text \"" + sourceDescription + "\" is wrong (Y coordinate).", sourceLocation.getY(), targetLocation.getY()); + } + } + } + } } }; @@ -232,6 +262,7 @@ public class MappingBasedSiriusFormatDataManagerExistingTargetDiagramTest extend // unchanged targetDiagramEditPart.getEditingDomain().addResourceSetListener(ROLLBACK_LISTENER); targetDiagramEditPart.getEditingDomain().getCommandStack().execute(command); + } finally { targetDiagramEditPart.getEditingDomain().removeResourceSetListener(ROLLBACK_LISTENER); } |