diff options
| author | pguilet | 2016-11-23 15:05:16 +0000 |
|---|---|---|
| committer | Steve Monnier | 2016-11-25 13:27:06 +0000 |
| commit | 8dadc572a41ead59b252e84e97704a285170306f (patch) | |
| tree | 6711d6689c0bc81148592fb8882c6c83dd724720 | |
| parent | cb11744b51780fa8ae0b06a76b56a6afe5792d51 (diff) | |
| download | org.eclipse.sirius-8dadc572a41ead59b252e84e97704a285170306f.tar.gz org.eclipse.sirius-8dadc572a41ead59b252e84e97704a285170306f.tar.xz org.eclipse.sirius-8dadc572a41ead59b252e84e97704a285170306f.zip | |
[507616] Add corresponding tests
-Adds two diagrams allowing to test copy/paste format when source
diagram have many nodes with same semantic element but different mapping
and when it have many relation based edges with the same source but
different mapping. The target diagram have the same mappings.
-Updated the copy/paste formats tests to use the new diagrams.
-The new diagrams used in updated test also test the bug 508036 because
they contains hidden elements.
Bug: 507616
Change-Id: I66ceaff4f9e161525314acda565009c9f0217488
Signed-off-by: pguilet <pierre.guilet@obeo.fr>
18 files changed, 3232 insertions, 10 deletions
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/data/xmi/raw/from___storedFormat-DiagType10__of__MyPackage___to___storedFormat-Type10__Raw__Diagram.xmi b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/data/xmi/raw/from___storedFormat-DiagType10__of__MyPackage___to___storedFormat-Type10__Raw__Diagram.xmi new file mode 100644 index 0000000000..cf07dcb3a2 --- /dev/null +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/data/xmi/raw/from___storedFormat-DiagType10__of__MyPackage___to___storedFormat-Type10__Raw__Diagram.xmi @@ -0,0 +1,147 @@ +<?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.2/notation" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0"> + <formatdata:NodeFormatData id="//p1/C1-2" width="30" height="30"> + <label id="//p1/C1-2"> + <location x="31"/> + </label> + <siriusStyle xsi:type="diagram:Lozenge" color="114,73,110"> + <customFeatures>color</customFeatures> + <description xsi:type="style:LozengeNodeDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_2_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="2001"> + <children type="5002"> + <layoutConstraint xsi:type="notation:Location" x="31"/> + </children> + <children type="3017"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="90" y="60" width="30" height="30"/> + </gmfView> + <location x="90" y="60"/> + </formatdata:NodeFormatData> + <formatdata:NodeFormatData id="//p1/C1-2" width="30" height="30"> + <label id="//p1/C1-2"> + <location x="31"/> + </label> + <siriusStyle xsi:type="diagram:Ellipse" borderSize="1" borderSizeComputationExpression="1"> + <customFeatures>color</customFeatures> + <description xsi:type="style:EllipseNodeDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="2001"> + <children type="5002"> + <layoutConstraint xsi:type="notation:Location" x="31"/> + </children> + <children type="3016"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="-158" y="50" width="30" height="30"/> + </gmfView> + <location x="-158" y="50"/> + </formatdata:NodeFormatData> + <formatdata:NodeFormatData id="//p1/p1-1/C1-1-1" width="30" height="30"> + <label id="//p1/p1-1/C1-1-1"> + <location x="31"/> + </label> + <siriusStyle xsi:type="diagram:Ellipse" borderSize="1" borderSizeComputationExpression="1"> + <description xsi:type="style:EllipseNodeDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="2001"> + <children type="5002"> + <layoutConstraint xsi:type="notation:Location" x="31"/> + </children> + <children type="3016"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="-38" y="50" width="30" height="30"/> + </gmfView> + <location x="-38" y="50"/> + </formatdata:NodeFormatData> + <formatdata:NodeFormatData id="//p1/C1-1" width="30" height="30"> + <label id="//p1/C1-1"> + <location x="31"/> + </label> + <siriusStyle xsi:type="diagram:Ellipse" borderSize="1" borderSizeComputationExpression="1"> + <description xsi:type="style:EllipseNodeDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="2001"> + <children type="5002"> + <layoutConstraint xsi:type="notation:Location" x="31"/> + </children> + <children type="3016"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="-38" y="270" width="30" height="30"/> + </gmfView> + <outgoingEdges id="//p1/C1-1/aC1-2" sourceTerminal="(0.5,0.0)" targetTerminal="(0.5,1.0)"> + <label id="//p1/C1-1/aC1-2" width="-1" height="-1"> + <location y="-10"/> + </label> + <siriusStyle xsi:type="diagram:EdgeStyle"> + <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@edgeMappings[name='DT10_EReference']/@style"/> + <centerLabelStyle showIcon="false"/> + </siriusStyle> + <gmfView xsi:type="notation:Edge" type="4001"> + <children type="6001"> + <layoutConstraint xsi:type="notation:Bounds" y="-10"/> + </children> + <children type="6002"> + <layoutConstraint xsi:type="notation:Bounds" x="4" y="-9"/> + </children> + <children type="6003"> + <layoutConstraint xsi:type="notation:Bounds" x="-9" y="2"/> + </children> + <styles xsi:type="notation:ConnectorStyle"/> + <styles xsi:type="notation:FontStyle" fontName="Segoe UI" fontHeight="8"/> + <bendpoints xsi:type="notation:RelativeBendpoints" points="[0, 0, 120, 190]$[-120, -190, 0, 0]"/> + <sourceAnchor xsi:type="notation:IdentityAnchor" id="(0.5,0.0)"/> + <targetAnchor xsi:type="notation:IdentityAnchor" id="(0.5,1.0)"/> + </gmfView> + <pointList x="-38" y="276"/> + <pointList x="-92" y="301"/> + <pointList x="-205" y="252"/> + <pointList x="-143" y="80"/> + <sourceRefPoint x="-23" y="270"/> + <targetRefPoint x="-143" y="80"/> + </outgoingEdges> + <outgoingEdges id="//p1/C1-1/aC1-1-1" sourceTerminal="(0.5,0.0)" targetTerminal="(0.5,1.0)"> + <label id="//p1/C1-1/aC1-1-1" width="-1" height="-1"> + <location y="-10"/> + </label> + <siriusStyle xsi:type="diagram:EdgeStyle"> + <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@edgeMappings[name='DT10_EReference']/@style"/> + <centerLabelStyle showIcon="false"/> + </siriusStyle> + <gmfView xsi:type="notation:Edge" type="4001"> + <children type="6001"> + <layoutConstraint xsi:type="notation:Bounds" y="-10"/> + </children> + <children type="6002"> + <layoutConstraint xsi:type="notation:Bounds" x="-10" y="-3"/> + </children> + <children type="6003"> + <layoutConstraint xsi:type="notation:Bounds" x="7" y="-10"/> + </children> + <styles xsi:type="notation:ConnectorStyle"/> + <styles xsi:type="notation:FontStyle" fontName="Segoe UI" fontHeight="8"/> + <bendpoints xsi:type="notation:RelativeBendpoints" points="[0, 0, 0, 190]$[0, -190, 0, 0]"/> + <sourceAnchor xsi:type="notation:IdentityAnchor" id="(0.5,0.0)"/> + <targetAnchor xsi:type="notation:IdentityAnchor" id="(0.5,1.0)"/> + </gmfView> + <pointList x="-23" y="270"/> + <pointList x="-13" y="181"/> + <pointList x="147" y="73"/> + <pointList x="-8" y="73"/> + <sourceRefPoint x="-23" y="270"/> + <targetRefPoint x="-23" y="80"/> + </outgoingEdges> + <location x="-38" y="270"/> + </formatdata:NodeFormatData> +</xmi:XMI> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/data/xmi/raw/from___storedFormat-DiagType10__of__MyPackage___to___storedFormat-Type1__Raw__Diagram.xmi b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/data/xmi/raw/from___storedFormat-DiagType10__of__MyPackage___to___storedFormat-Type1__Raw__Diagram.xmi new file mode 100644 index 0000000000..c61afa37a7 --- /dev/null +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/data/xmi/raw/from___storedFormat-DiagType10__of__MyPackage___to___storedFormat-Type1__Raw__Diagram.xmi @@ -0,0 +1,188 @@ +<?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.2/notation" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0"> + <formatdata:NodeFormatData id="//p3" width="157" height="91"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" borderSize="1" borderSizeComputationExpression="1"> + <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@containerMappings[name='DT1_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="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="165" y="130" width="157" height="91"/> + </gmfView> + <location x="165" y="130"/> + </formatdata:NodeFormatData> + <formatdata:NodeFormatData id="//p4" width="168" height="80"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" borderSize="1" borderSizeComputationExpression="1"> + <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@containerMappings[name='DT1_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="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="35" y="230" width="168" height="80"/> + </gmfView> + <location x="35" y="230"/> + </formatdata:NodeFormatData> + <formatdata:NodeFormatData id="//p1" width="311" height="234"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" borderSize="1" borderSizeComputationExpression="1"> + <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@containerMappings[name='DT1_Package']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="2002"> + <children type="5006"/> + <children type="7001"> + <children type="3007"> + <children type="5003"> + <layoutConstraint xsi:type="notation:Location" x="31"/> + </children> + <children type="3004"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="-468" y="209" width="30" height="30"/> + </children> + <children type="3007"> + <children type="5003"> + <layoutConstraint xsi:type="notation:Location" x="31"/> + </children> + <children type="3004"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="-340" y="-1" width="30" height="30"/> + </children> + <children type="3007"> + <children type="5003"> + <layoutConstraint xsi:type="notation:Location" y="5"/> + </children> + <children type="3004"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="25" y="34" width="30" height="30"/> + </children> + <styles xsi:type="notation:SortingStyle"/> + <styles xsi:type="notation:FilteringStyle"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="425" y="55" width="311" height="234"/> + </gmfView> + <children id="//p1/C1-1" width="30" height="30"> + <label id="//p1/C1-1"> + <location x="31"/> + </label> + <siriusStyle xsi:type="diagram:Ellipse" borderSize="1" borderSizeComputationExpression="1"> + <customFeatures>borderSize</customFeatures> + <customFeatures>borderSizeComputationExpression</customFeatures> + <description xsi:type="style:EllipseNodeDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="3007"> + <children type="5003"> + <layoutConstraint xsi:type="notation:Location" x="31"/> + </children> + <children type="3004"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="-468" y="209" width="30" height="30"/> + </gmfView> + <outgoingEdges id="//p1/C1-1/aC1-2" sourceTerminal="(0.5,0.0)" targetTerminal="(0.5,1.0)"> + <label id="//p1/C1-1/aC1-2" width="-1" height="-1"> + <location y="-10"/> + </label> + <siriusStyle xsi:type="diagram:EdgeStyle"> + <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@edgeMappings[name='DT10_EReference']/@style"/> + <centerLabelStyle showIcon="false"/> + </siriusStyle> + <gmfView xsi:type="notation:Edge" type="4001"> + <children type="6001"> + <layoutConstraint xsi:type="notation:Bounds" y="-10"/> + </children> + <children type="6002"> + <layoutConstraint xsi:type="notation:Bounds" y="10"/> + </children> + <children type="6003"> + <layoutConstraint xsi:type="notation:Bounds" y="10"/> + </children> + <styles xsi:type="notation:ConnectorStyle"/> + <styles xsi:type="notation:FontStyle" fontName="Segoe UI" fontHeight="8"/> + <bendpoints xsi:type="notation:RelativeBendpoints" points="[0, 0, 120, 190]$[-120, -190, 0, 0]"/> + <sourceAnchor xsi:type="notation:IdentityAnchor" id="(0.5,0.0)"/> + <targetAnchor xsi:type="notation:IdentityAnchor" id="(0.5,1.0)"/> + </gmfView> + <pointList x="-9" y="270"/> + <pointList x="102" y="90"/> + <sourceRefPoint x="-10" y="271"/> + <targetRefPoint x="107" y="81"/> + </outgoingEdges> + <location x="-463" y="215"/> + </children> + <children id="//p1/C1-2" width="30" height="30"> + <label id="//p1/C1-2"> + <location x="31"/> + </label> + <siriusStyle xsi:type="diagram:Lozenge" color="114,73,110"> + <customFeatures>color</customFeatures> + <description xsi:type="style:LozengeNodeDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_2_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="3007"> + <children type="5003"> + <layoutConstraint xsi:type="notation:Location" x="31"/> + </children> + <children type="3004"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="-340" y="-1" width="30" height="30"/> + </gmfView> + <location x="-335" y="5"/> + </children> + <children id="//p1/C1-3" width="30" height="30"> + <label id="//p1/C1-3"> + <location y="5"/> + </label> + <siriusStyle xsi:type="diagram:BundledImage"> + <description xsi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@containerMappings[name='DT1_Package']/@subNodeMappings[name='DT1_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="3007"> + <children type="5003"> + <layoutConstraint xsi:type="notation:Location" y="5"/> + </children> + <children type="3004"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="25" y="34" width="30" height="30"/> + </gmfView> + <location x="30" y="40"/> + </children> + <location x="425" y="55"/> + </formatdata:NodeFormatData> + <formatdata:NodeFormatData id="//p2" width="157" height="80"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" borderSize="1" borderSizeComputationExpression="1"> + <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@containerMappings[name='DT1_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="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="40" y="35" width="157" height="80"/> + </gmfView> + <location x="40" y="35"/> + </formatdata:NodeFormatData> +</xmi:XMI> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/data/xmi/raw/from___storedFormat-DiagType10__of__MyPackage___to___storedFormat-Type7__Raw__Diagram.xmi b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/data/xmi/raw/from___storedFormat-DiagType10__of__MyPackage___to___storedFormat-Type7__Raw__Diagram.xmi new file mode 100644 index 0000000000..403e935a39 --- /dev/null +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/data/xmi/raw/from___storedFormat-DiagType10__of__MyPackage___to___storedFormat-Type7__Raw__Diagram.xmi @@ -0,0 +1,449 @@ +<?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.2/notation" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0"> + <formatdata:NodeFormatData id="//p3" width="135" height="102"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" borderSize="1" borderSizeComputationExpression="1"> + <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_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="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="-11" y="11" width="135" height="102"/> + </gmfView> + <location x="-11" y="11"/> + </formatdata:NodeFormatData> + <formatdata:NodeFormatData id="//p4" width="135" height="102"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" borderSize="1" borderSizeComputationExpression="1"> + <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_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="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="-11" y="11" width="135" height="102"/> + </gmfView> + <location x="-11" y="11"/> + </formatdata:NodeFormatData> + <formatdata:NodeFormatData id="//p1" width="157" height="80"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" borderSize="1" borderSizeComputationExpression="1"> + <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_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"> + <styles xsi:type="notation:SortingStyle"/> + <styles xsi:type="notation:FilteringStyle"/> + </children> + <children type="3012"> + <children type="5010"> + <layoutConstraint xsi:type="notation:Location" x="31"/> + </children> + <children type="3002"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="-22" y="53" width="30" height="30"/> + </children> + <children type="3012"> + <children type="5010"> + <layoutConstraint xsi:type="notation:Location" y="5"/> + </children> + <children type="3002"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="-22" y="8" width="30" height="30"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="-26" y="-23" width="174" height="85"/> + </children> + <children type="3008"> + <children type="5005"/> + <children type="7002"> + <styles xsi:type="notation:SortingStyle"/> + <styles xsi:type="notation:FilteringStyle"/> + </children> + <children type="3012"> + <children type="5010"> + <layoutConstraint xsi:type="notation:Location" y="5"/> + </children> + <children type="3002"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" y="-22" width="30" height="30"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="-32" y="-23" width="157" height="83"/> + </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="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="-26" y="-23" width="157" height="73"/> + </children> + <styles xsi:type="notation:SortingStyle"/> + <styles xsi:type="notation:FilteringStyle"/> + </children> + <children type="3012"> + <children type="5010"> + <layoutConstraint xsi:type="notation:Location" x="31"/> + </children> + <children type="3002"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="40" y="70" width="30" height="30"/> + </children> + <children type="3012"> + <children type="5010"> + <layoutConstraint xsi:type="notation:Location" x="31"/> + </children> + <children type="3002"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="90" y="70" width="30" height="30"/> + </children> + <children type="3012"> + <children type="5010"> + <layoutConstraint xsi:type="notation:Location" y="5"/> + </children> + <children type="3002"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="9" y="70" width="30" height="30"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" width="157" height="80"/> + </gmfView> + <children id="//p1/p1-1" width="174" height="85"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" borderSize="1" borderSizeComputationExpression="1"> + <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_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> + <children type="3012"> + <children type="5010"> + <layoutConstraint xsi:type="notation:Location" x="31"/> + </children> + <children type="3002"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="-22" y="53" width="30" height="30"/> + </children> + <children type="3012"> + <children type="5010"> + <layoutConstraint xsi:type="notation:Location" y="5"/> + </children> + <children type="3002"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="-22" y="8" width="30" height="30"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="-26" y="-23" width="174" height="85"/> + </gmfView> + <children id="//p1/p1-1/C1-1-1" width="30" height="30"> + <label id="//p1/p1-1/C1-1-1"> + <location x="31"/> + </label> + <siriusStyle xsi:type="diagram:Ellipse" borderSize="1" borderSizeComputationExpression="1"> + <customFeatures>borderSize</customFeatures> + <customFeatures>borderSizeComputationExpression</customFeatures> + <description xsi:type="style:EllipseNodeDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="3012"> + <children type="5010"> + <layoutConstraint xsi:type="notation:Location" x="31"/> + </children> + <children type="3002"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="-22" y="53" width="30" height="30"/> + </gmfView> + <location x="1" y="-22"/> + </children> + <children id="//p1/p1-1/C1-1-2" width="30" height="30"> + <label id="//p1/p1-1/C1-1-2"> + <location y="5"/> + </label> + <siriusStyle xsi:type="diagram:Dot"> + <description xsi:type="style:DotDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@borderedNodeMappings[name='DT7_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="3012"> + <children type="5010"> + <layoutConstraint xsi:type="notation:Location" y="5"/> + </children> + <children type="3002"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="-22" y="8" width="30" height="30"/> + </gmfView> + <location x="-22" y="8"/> + </children> + <location x="-21" y="-17"/> + </children> + <children id="//p1/p1-2" width="157" height="83"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" borderSize="1" borderSizeComputationExpression="1"> + <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_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> + <children type="3012"> + <children type="5010"> + <layoutConstraint xsi:type="notation:Location" y="5"/> + </children> + <children type="3002"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" y="-22" width="30" height="30"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="-32" y="-23" width="157" height="83"/> + </gmfView> + <children id="//p1/p1-2/C1-2-1" width="30" height="30"> + <label id="//p1/p1-2/C1-2-1"> + <location y="5"/> + </label> + <siriusStyle xsi:type="diagram:Dot"> + <description xsi:type="style:DotDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@borderedNodeMappings[name='DT7_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="3012"> + <children type="5010"> + <layoutConstraint xsi:type="notation:Location" y="5"/> + </children> + <children type="3002"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" y="-22" width="30" height="30"/> + </gmfView> + <location y="-22"/> + </children> + <location x="-27" y="-17"/> + </children> + <children id="//p1/p1-3" width="157" height="73"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" borderSize="1" borderSizeComputationExpression="1"> + <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_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="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="-26" y="-23" width="157" height="73"/> + </gmfView> + <location x="-21" y="-17"/> + </children> + <children id="//p1/C1-1" width="30" height="30"> + <label id="//p1/C1-1"> + <location x="31"/> + </label> + <siriusStyle xsi:type="diagram:Ellipse" borderSize="1" borderSizeComputationExpression="1"> + <customFeatures>borderSize</customFeatures> + <customFeatures>borderSizeComputationExpression</customFeatures> + <description xsi:type="style:EllipseNodeDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="3012"> + <children type="5010"> + <layoutConstraint xsi:type="notation:Location" x="31"/> + </children> + <children type="3002"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="40" y="70" width="30" height="30"/> + </gmfView> + <location x="-22" y="30"/> + </children> + <children id="//p1/C1-2" width="30" height="30"> + <label id="//p1/C1-2"> + <location x="31"/> + </label> + <siriusStyle xsi:type="diagram:Lozenge" color="114,73,110"> + <customFeatures>backgroundColor</customFeatures> + <description xsi:type="style:LozengeNodeDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_2_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="3012"> + <children type="5010"> + <layoutConstraint xsi:type="notation:Location" x="31"/> + </children> + <children type="3002"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="90" y="70" width="30" height="30"/> + </gmfView> + <location x="-22"/> + </children> + <children id="//p1/C1-3" width="30" height="30"> + <label id="//p1/C1-3"> + <location y="5"/> + </label> + <siriusStyle xsi:type="diagram:Dot"> + <description xsi:type="style:DotDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@borderedNodeMappings[name='DT7_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="3012"> + <children type="5010"> + <layoutConstraint xsi:type="notation:Location" y="5"/> + </children> + <children type="3002"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="9" y="70" width="30" height="30"/> + </gmfView> + <location x="9" y="70"/> + </children> + <location/> + </formatdata:NodeFormatData> + <formatdata:NodeFormatData id="//p2" width="234" height="190"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" borderSize="1" borderSizeComputationExpression="1"> + <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_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"> + <styles xsi:type="notation:SortingStyle"/> + <styles xsi:type="notation:FilteringStyle"/> + </children> + <children type="3012"> + <children type="5010"> + <layoutConstraint xsi:type="notation:Location" x="31" y="15"/> + </children> + <children type="3002"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="13" y="-22" width="30" height="30"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="6" y="5" width="178" height="85"/> + </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="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="6" y="5" width="157" height="80"/> + </children> + <styles xsi:type="notation:SortingStyle"/> + <styles xsi:type="notation:FilteringStyle"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="-22" width="234" height="190"/> + </gmfView> + <children id="//p2/p2-1" width="178" height="85"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" borderSize="1" borderSizeComputationExpression="1"> + <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_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> + <children type="3012"> + <children type="5010"> + <layoutConstraint xsi:type="notation:Location" x="31" y="15"/> + </children> + <children type="3002"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="13" y="-22" width="30" height="30"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="6" y="5" width="178" height="85"/> + </gmfView> + <children id="//p2/p2-1/new%20EClass%201" width="30" height="30"> + <label id="//p2/p2-1/new%20EClass%201"> + <location x="31" y="15"/> + </label> + <siriusStyle xsi:type="diagram:Dot"> + <description xsi:type="style:DotDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@borderedNodeMappings[name='DT7_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="3012"> + <children type="5010"> + <layoutConstraint xsi:type="notation:Location" x="31" y="15"/> + </children> + <children type="3002"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="13" y="-22" width="30" height="30"/> + </gmfView> + <location x="13" y="-22"/> + </children> + <location x="11" y="11"/> + </children> + <children id="//p2/p2-2" width="157" height="80"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" borderSize="1" borderSizeComputationExpression="1"> + <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_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="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="6" y="5" width="157" height="80"/> + </gmfView> + <location x="11" y="11"/> + </children> + <location x="-22"/> + </formatdata:NodeFormatData> +</xmi:XMI> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/data/xmi/raw/from___storedFormat-DiagType10__of__MyPackage___to___storedFormat-Type8__Raw__Diagram.xmi b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/data/xmi/raw/from___storedFormat-DiagType10__of__MyPackage___to___storedFormat-Type8__Raw__Diagram.xmi new file mode 100644 index 0000000000..b0586ff156 --- /dev/null +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/data/xmi/raw/from___storedFormat-DiagType10__of__MyPackage___to___storedFormat-Type8__Raw__Diagram.xmi @@ -0,0 +1,360 @@ +<?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.2/notation" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0"> + <formatdata:NodeFormatData id="//p3" width="135" height="58"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" borderSize="1" borderSizeComputationExpression="1"> + <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_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="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="-11" y="11" width="135" height="58"/> + </gmfView> + <location x="-11" y="11"/> + </formatdata:NodeFormatData> + <formatdata:NodeFormatData id="//p4" width="124" height="69"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" borderSize="1" borderSizeComputationExpression="1"> + <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_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="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="-11" y="11" width="124" height="69"/> + </gmfView> + <location x="-11" y="11"/> + </formatdata:NodeFormatData> + <formatdata:NodeFormatData id="//p1" width="179" height="102"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" borderSize="1" borderSizeComputationExpression="1"> + <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_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> + <children type="3012"> + <children type="5010"> + <layoutConstraint xsi:type="notation:Location" x="31"/> + </children> + <children type="3002"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" y="92" width="30" height="30"/> + </children> + <children type="3012"> + <children type="5010"> + <layoutConstraint xsi:type="notation:Location" x="31"/> + </children> + <children type="3002"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="101" y="92" width="30" height="30"/> + </children> + <children type="3012"> + <children type="5010"> + <layoutConstraint xsi:type="notation:Location" y="5"/> + </children> + <children type="3002"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="-22" y="39" width="30" height="30"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="-11" y="11" width="179" height="102"/> + </gmfView> + <children id="//p1/C1-1" width="30" height="30"> + <label id="//p1/C1-1"> + <location x="31"/> + </label> + <siriusStyle xsi:type="diagram:Ellipse" borderSize="1" borderSizeComputationExpression="1"> + <customFeatures>borderSize</customFeatures> + <customFeatures>borderSizeComputationExpression</customFeatures> + <description xsi:type="style:EllipseNodeDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="3012"> + <children type="5010"> + <layoutConstraint xsi:type="notation:Location" x="31"/> + </children> + <children type="3002"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" y="92" width="30" height="30"/> + </gmfView> + <location x="6" y="-22"/> + </children> + <children id="//p1/C1-2" width="30" height="30"> + <label id="//p1/C1-2"> + <location x="31"/> + </label> + <siriusStyle xsi:type="diagram:Lozenge" color="114,73,110"> + <customFeatures>backgroundColor</customFeatures> + <description xsi:type="style:LozengeNodeDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_2_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="3012"> + <children type="5010"> + <layoutConstraint xsi:type="notation:Location" x="31"/> + </children> + <children type="3002"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="101" y="92" width="30" height="30"/> + </gmfView> + <location x="-22" y="8"/> + </children> + <children id="//p1/C1-3" width="30" height="30"> + <label id="//p1/C1-3"> + <location y="5"/> + </label> + <siriusStyle xsi:type="diagram:Dot"> + <description xsi:type="style:DotDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/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"> + <children type="5010"> + <layoutConstraint xsi:type="notation:Location" y="5"/> + </children> + <children type="3002"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="-22" y="39" width="30" height="30"/> + </gmfView> + <location x="-22" y="39"/> + </children> + <location x="-11" y="11"/> + </formatdata:NodeFormatData> + <formatdata:NodeFormatData id="//p2" width="124" height="102"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" borderSize="1" borderSizeComputationExpression="1"> + <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_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="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="-11" y="11" width="124" height="102"/> + </gmfView> + <location x="-11" y="11"/> + </formatdata:NodeFormatData> + <formatdata:NodeFormatData id="//p1/p1-1" width="311" height="113"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" borderSize="1" borderSizeComputationExpression="1"> + <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_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> + <children type="3012"> + <children type="5010"> + <layoutConstraint xsi:type="notation:Location" x="31"/> + </children> + <children type="3002"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="-22" y="39" width="30" height="30"/> + </children> + <children type="3012"> + <children type="5010"> + <layoutConstraint xsi:type="notation:Location" y="5"/> + </children> + <children type="3002"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="-22" y="8" width="30" height="30"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="-11" y="11" width="311" height="113"/> + </gmfView> + <children id="//p1/p1-1/C1-1-1" width="30" height="30"> + <label id="//p1/p1-1/C1-1-1"> + <location x="31"/> + </label> + <siriusStyle xsi:type="diagram:Ellipse" borderSize="1" borderSizeComputationExpression="1"> + <customFeatures>borderSize</customFeatures> + <customFeatures>borderSizeComputationExpression</customFeatures> + <description xsi:type="style:EllipseNodeDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="3012"> + <children type="5010"> + <layoutConstraint xsi:type="notation:Location" x="31"/> + </children> + <children type="3002"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="-22" y="39" width="30" height="30"/> + </gmfView> + <location x="8" y="-22"/> + </children> + <children id="//p1/p1-1/C1-1-2" width="30" height="30"> + <label id="//p1/p1-1/C1-1-2"> + <location y="5"/> + </label> + <siriusStyle xsi:type="diagram:Dot"> + <description xsi:type="style:DotDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/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"> + <children type="5010"> + <layoutConstraint xsi:type="notation:Location" y="5"/> + </children> + <children type="3002"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="-22" y="8" width="30" height="30"/> + </gmfView> + <location x="-22" y="8"/> + </children> + <location x="-11" y="11"/> + </formatdata:NodeFormatData> + <formatdata:NodeFormatData id="//p1/p1-2" width="157" height="58"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" borderSize="1" borderSizeComputationExpression="1"> + <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_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> + <children type="3012"> + <children type="5010"> + <layoutConstraint xsi:type="notation:Location" y="5"/> + </children> + <children type="3002"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="6" y="-22" width="30" height="30"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="-11" y="11" width="157" height="58"/> + </gmfView> + <children id="//p1/p1-2/C1-2-1" width="30" height="30"> + <label id="//p1/p1-2/C1-2-1"> + <location y="5"/> + </label> + <siriusStyle xsi:type="diagram:Dot"> + <description xsi:type="style:DotDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/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"> + <children type="5010"> + <layoutConstraint xsi:type="notation:Location" y="5"/> + </children> + <children type="3002"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="6" y="-22" width="30" height="30"/> + </gmfView> + <location x="6" y="-22"/> + </children> + <location x="-11" y="11"/> + </formatdata:NodeFormatData> + <formatdata:NodeFormatData id="//p1/p1-3" width="146" height="58"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" borderSize="1" borderSizeComputationExpression="1"> + <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_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="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="-11" y="11" width="146" height="58"/> + </gmfView> + <location x="-11" y="11"/> + </formatdata:NodeFormatData> + <formatdata:NodeFormatData id="//p2/p2-2" width="124" height="58"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" borderSize="1" borderSizeComputationExpression="1"> + <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_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="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="-11" y="11" width="124" height="58"/> + </gmfView> + <location x="-11" y="11"/> + </formatdata:NodeFormatData> + <formatdata:NodeFormatData id="//p2/p2-1" width="135" height="69"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" borderSize="1" borderSizeComputationExpression="1"> + <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_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> + <children type="3012"> + <children type="5010"> + <layoutConstraint xsi:type="notation:Location" y="5"/> + </children> + <children type="3002"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="-22" width="30" height="30"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="-11" y="11" width="135" height="69"/> + </gmfView> + <children id="//p2/p2-1/new%20EClass%201" width="30" height="30"> + <label id="//p2/p2-1/new%20EClass%201"> + <location y="5"/> + </label> + <siriusStyle xsi:type="diagram:Dot"> + <description xsi:type="style:DotDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/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"> + <children type="5010"> + <layoutConstraint xsi:type="notation:Location" y="5"/> + </children> + <children type="3002"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="-22" width="30" height="30"/> + </gmfView> + <location x="-22"/> + </children> + <location x="-11" y="11"/> + </formatdata:NodeFormatData> +</xmi:XMI> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/data/xmi/raw/from___storedFormat-DiagType10__of__MyPackage___to___storedFormat-Type9__Raw__Diagram.xmi b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/data/xmi/raw/from___storedFormat-DiagType10__of__MyPackage___to___storedFormat-Type9__Raw__Diagram.xmi new file mode 100644 index 0000000000..b098513d81 --- /dev/null +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/data/xmi/raw/from___storedFormat-DiagType10__of__MyPackage___to___storedFormat-Type9__Raw__Diagram.xmi @@ -0,0 +1,285 @@ +<?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.2/notation" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0"> + <formatdata:NodeFormatData id="//p3" width="87" height="58"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" borderSize="1" borderSizeComputationExpression="1"> + <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_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="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="22" y="11" width="87" height="58"/> + </gmfView> + <location x="22" y="11"/> + </formatdata:NodeFormatData> + <formatdata:NodeFormatData id="//p4" width="113" height="69"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" borderSize="1" borderSizeComputationExpression="1"> + <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_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="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="22" y="7" width="113" height="69"/> + </gmfView> + <location x="22" y="7"/> + </formatdata:NodeFormatData> + <formatdata:NodeFormatData id="//p1" width="168" height="80"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" borderSize="1" borderSizeComputationExpression="1"> + <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_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> + <children type="3012"> + <children type="5010"> + <layoutConstraint xsi:type="notation:Location" x="31"/> + </children> + <children type="3002"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="66" y="70" width="30" height="30"/> + </children> + <children type="3012"> + <children type="5010"> + <layoutConstraint xsi:type="notation:Location" x="31"/> + </children> + <children type="3002"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="68" y="70" width="30" height="30"/> + </children> + <children type="3012"> + <children type="5010"> + <layoutConstraint xsi:type="notation:Location" y="5"/> + </children> + <children type="3002"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="35" y="70" width="30" height="30"/> + </children> + <children type="3012"> + <children type="5010"> + <layoutConstraint xsi:type="notation:Location" x="31"/> + </children> + <children type="3002"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="-22" y="39" width="30" height="30"/> + </children> + <children type="3012"> + <children type="5010"> + <layoutConstraint xsi:type="notation:Location" y="5"/> + </children> + <children type="3002"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="87" y="-22" width="30" height="30"/> + </children> + <children type="3012"> + <children type="5010"> + <layoutConstraint xsi:type="notation:Location" y="5"/> + </children> + <children type="3002"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="4" y="70" width="30" height="30"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="22" y="11" width="168" height="80"/> + </gmfView> + <children id="//p1/C1-1" width="30" height="30"> + <label id="//p1/C1-1"> + <location x="31"/> + </label> + <siriusStyle xsi:type="diagram:Ellipse" borderSize="1" borderSizeComputationExpression="1"> + <customFeatures>borderSize</customFeatures> + <customFeatures>borderSizeComputationExpression</customFeatures> + <description xsi:type="style:EllipseNodeDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="3012"> + <children type="5010"> + <layoutConstraint xsi:type="notation:Location" x="31"/> + </children> + <children type="3002"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="66" y="70" width="30" height="30"/> + </gmfView> + <location x="97" y="70"/> + </children> + <children id="//p1/C1-2" width="30" height="30"> + <label id="//p1/C1-2"> + <location x="31"/> + </label> + <siriusStyle xsi:type="diagram:Lozenge" color="114,73,110"> + <customFeatures>backgroundColor</customFeatures> + <description xsi:type="style:LozengeNodeDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_2_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="3012"> + <children type="5010"> + <layoutConstraint xsi:type="notation:Location" x="31"/> + </children> + <children type="3002"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="68" y="70" width="30" height="30"/> + </gmfView> + <location x="66" y="70"/> + </children> + <children id="//p1/C1-3" width="30" height="30"> + <label id="//p1/C1-3"> + <location y="5"/> + </label> + <siriusStyle xsi:type="diagram:Dot"> + <description xsi:type="style:DotDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']/@borderedNodeMappings[name='DT9_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="3012"> + <children type="5010"> + <layoutConstraint xsi:type="notation:Location" y="5"/> + </children> + <children type="3002"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="35" y="70" width="30" height="30"/> + </gmfView> + <location x="35" y="70"/> + </children> + <children id="//p1/p1-1/C1-1-1" width="30" height="30"> + <label id="//p1/p1-1/C1-1-1"> + <location x="31"/> + </label> + <siriusStyle xsi:type="diagram:Ellipse" borderSize="1" borderSizeComputationExpression="1"> + <customFeatures>borderSize</customFeatures> + <customFeatures>borderSizeComputationExpression</customFeatures> + <description xsi:type="style:EllipseNodeDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="3012"> + <children type="5010"> + <layoutConstraint xsi:type="notation:Location" x="31"/> + </children> + <children type="3002"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="-22" y="39" width="30" height="30"/> + </gmfView> + <location x="158" y="14"/> + </children> + <children id="//p1/p1-1/C1-1-2" width="30" height="30"> + <label id="//p1/p1-1/C1-1-2"> + <location y="5"/> + </label> + <siriusStyle xsi:type="diagram:Dot"> + <description xsi:type="style:DotDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']/@borderedNodeMappings[name='DT9_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="3012"> + <children type="5010"> + <layoutConstraint xsi:type="notation:Location" y="5"/> + </children> + <children type="3002"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="87" y="-22" width="30" height="30"/> + </gmfView> + <location x="87" y="-22"/> + </children> + <children id="//p1/p1-2/C1-2-1" width="30" height="30"> + <label id="//p1/p1-2/C1-2-1"> + <location y="5"/> + </label> + <siriusStyle xsi:type="diagram:Dot"> + <description xsi:type="style:DotDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']/@borderedNodeMappings[name='DT9_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="3012"> + <children type="5010"> + <layoutConstraint xsi:type="notation:Location" y="5"/> + </children> + <children type="3002"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="4" y="70" width="30" height="30"/> + </gmfView> + <location x="4" y="70"/> + </children> + <location x="22" y="11"/> + </formatdata:NodeFormatData> + <formatdata:NodeFormatData id="//p2" width="344" height="91"> + <siriusStyle xsi:type="diagram:FlatContainerStyle" borderSize="1" borderSizeComputationExpression="1"> + <description xsi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_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> + <children type="3012"> + <children type="5010"> + <layoutConstraint xsi:type="notation:Location" x="-79" y="7"/> + </children> + <children type="3002"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="-22" y="22" width="30" height="30"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="297" width="344" height="91"/> + </gmfView> + <children id="//p2/p2-1/new%20EClass%201" width="30" height="30"> + <label id="//p2/p2-1/new%20EClass%201"> + <location x="-79" y="7"/> + </label> + <siriusStyle xsi:type="diagram:Dot"> + <description xsi:type="style:DotDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']/@borderedNodeMappings[name='DT9_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="3012"> + <children type="5010"> + <layoutConstraint xsi:type="notation:Location" x="-79" y="7"/> + </children> + <children type="3002"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="-22" y="22" width="30" height="30"/> + </gmfView> + <location x="-22" y="22"/> + </children> + <location x="297"/> + </formatdata:NodeFormatData> +</xmi:XMI> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/data/xmi/raw/from___storedFormat-DiagType1__of__MyPackage___to___storedFormat-Type10__Raw__Diagram.xmi b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/data/xmi/raw/from___storedFormat-DiagType1__of__MyPackage___to___storedFormat-Type10__Raw__Diagram.xmi new file mode 100644 index 0000000000..4be02fa984 --- /dev/null +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/data/xmi/raw/from___storedFormat-DiagType1__of__MyPackage___to___storedFormat-Type10__Raw__Diagram.xmi @@ -0,0 +1,147 @@ +<?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.2/notation" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0"> + <formatdata:NodeFormatData id="//p1/C1-2" width="30" height="30"> + <label id="//p1/C1-2"> + <location x="31"/> + </label> + <siriusStyle xsi:type="diagram:Lozenge" color="114,73,210"> + <customFeatures>color</customFeatures> + <description xsi:type="style:LozengeNodeDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_2_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="2001"> + <children type="5002"> + <layoutConstraint xsi:type="notation:Location" x="31"/> + </children> + <children type="3017"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="440" y="185" width="30" height="30"/> + </gmfView> + <location x="440" y="185"/> + </formatdata:NodeFormatData> + <formatdata:NodeFormatData id="//p1/C1-2" width="30" height="30"> + <label id="//p1/C1-2"> + <location x="31"/> + </label> + <siriusStyle xsi:type="diagram:Ellipse" borderSize="1" borderSizeComputationExpression="1" color="200,136,136"> + <customFeatures>color</customFeatures> + <description xsi:type="style:EllipseNodeDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="2001"> + <children type="5002"> + <layoutConstraint xsi:type="notation:Location" x="31"/> + </children> + <children type="3016"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="35" y="81" width="30" height="30"/> + </gmfView> + <location x="35" y="81"/> + </formatdata:NodeFormatData> + <formatdata:NodeFormatData id="//p1/p1-1/C1-1-1" width="30" height="30"> + <label id="//p1/p1-1/C1-1-1"> + <location x="31"/> + </label> + <siriusStyle xsi:type="diagram:Ellipse" borderSize="1" borderSizeComputationExpression="1"> + <description xsi:type="style:EllipseNodeDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="2001"> + <children type="5002"> + <layoutConstraint xsi:type="notation:Location" x="31"/> + </children> + <children type="3016"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="160" y="110" width="30" height="30"/> + </gmfView> + <location x="160" y="110"/> + </formatdata:NodeFormatData> + <formatdata:NodeFormatData id="//p1/C1-1" width="30" height="30"> + <label id="//p1/C1-1"> + <location x="31"/> + </label> + <siriusStyle xsi:type="diagram:Ellipse" borderSize="1" borderSizeComputationExpression="1"> + <description xsi:type="style:EllipseNodeDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="2001"> + <children type="5002"> + <layoutConstraint xsi:type="notation:Location" x="31"/> + </children> + <children type="3016"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="250" y="275" width="30" height="30"/> + </gmfView> + <outgoingEdges id="//p1/C1-1/aC1-2" sourceTerminal="(0.5,0.0)" targetTerminal="(0.5,1.0)"> + <label id="//p1/C1-1/aC1-2" width="-1" height="-1"> + <location x="3" y="10"/> + </label> + <siriusStyle xsi:type="diagram:EdgeStyle"> + <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@edgeMappings[name='DT10_EReference']/@style"/> + <centerLabelStyle showIcon="false"/> + </siriusStyle> + <gmfView xsi:type="notation:Edge" type="4001"> + <children type="6001"> + <layoutConstraint xsi:type="notation:Bounds" x="3" y="10"/> + </children> + <children type="6002"> + <layoutConstraint xsi:type="notation:Bounds" x="4" y="-9"/> + </children> + <children type="6003"> + <layoutConstraint xsi:type="notation:Bounds" x="-9" y="2"/> + </children> + <styles xsi:type="notation:ConnectorStyle"/> + <styles xsi:type="notation:FontStyle" fontName="Segoe UI" fontHeight="8"/> + <bendpoints xsi:type="notation:RelativeBendpoints" points="[-15, 6, 200, 170]$[-100, 40, 115, 204]$[-245, 0, -30, 164]$[-215, -164, 0, 0]"/> + <sourceAnchor xsi:type="notation:IdentityAnchor" id="(0.5,0.0)"/> + <targetAnchor xsi:type="notation:IdentityAnchor" id="(0.5,1.0)"/> + </gmfView> + <pointList x="250" y="281"/> + <pointList x="165" y="315"/> + <pointList x="20" y="275"/> + <pointList x="50" y="111"/> + <sourceRefPoint x="265" y="275"/> + <targetRefPoint x="50" y="111"/> + </outgoingEdges> + <outgoingEdges id="//p1/C1-1/aC1-1-1" sourceTerminal="(0.5,0.0)" targetTerminal="(0.5,1.0)"> + <label id="//p1/C1-1/aC1-1-1" width="-1" height="-1"> + <location x="6" y="-8"/> + </label> + <siriusStyle xsi:type="diagram:EdgeStyle"> + <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@edgeMappings[name='DT10_EReference']/@style"/> + <centerLabelStyle showIcon="false"/> + </siriusStyle> + <gmfView xsi:type="notation:Edge" type="4001"> + <children type="6001"> + <layoutConstraint xsi:type="notation:Bounds" x="6" y="-8"/> + </children> + <children type="6002"> + <layoutConstraint xsi:type="notation:Bounds" x="-10" y="-3"/> + </children> + <children type="6003"> + <layoutConstraint xsi:type="notation:Bounds" x="7" y="-10"/> + </children> + <styles xsi:type="notation:ConnectorStyle"/> + <styles xsi:type="notation:FontStyle" fontName="Segoe UI" fontHeight="8"/> + <bendpoints xsi:type="notation:RelativeBendpoints" points="[0, 0, 90, 135]$[-20, -70, 70, 65]$[110, -160, 200, -25]$[-75, -137, 15, -2]"/> + <sourceAnchor xsi:type="notation:IdentityAnchor" id="(0.5,0.0)"/> + <targetAnchor xsi:type="notation:IdentityAnchor" id="(0.5,1.0)"/> + </gmfView> + <pointList x="265" y="275"/> + <pointList x="245" y="205"/> + <pointList x="375" y="115"/> + <pointList x="190" y="138"/> + <sourceRefPoint x="265" y="275"/> + <targetRefPoint x="175" y="140"/> + </outgoingEdges> + <location x="250" y="275"/> + </formatdata:NodeFormatData> +</xmi:XMI> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/data/xmi/raw/from___storedFormat-DiagType2__of__MyPackage___to___storedFormat-Type10__Raw__Diagram.xmi b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/data/xmi/raw/from___storedFormat-DiagType2__of__MyPackage___to___storedFormat-Type10__Raw__Diagram.xmi new file mode 100644 index 0000000000..6a2b4591ef --- /dev/null +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/data/xmi/raw/from___storedFormat-DiagType2__of__MyPackage___to___storedFormat-Type10__Raw__Diagram.xmi @@ -0,0 +1,147 @@ +<?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.2/notation" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0"> + <formatdata:NodeFormatData id="//p1/C1-2" width="89" height="38"> + <label id="//p1/C1-2"> + <location x="31"/> + </label> + <siriusStyle xsi:type="diagram:Lozenge" color="114,73,210"> + <customFeatures>color</customFeatures> + <description xsi:type="style:LozengeNodeDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_2_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="2001"> + <children type="5002"> + <layoutConstraint xsi:type="notation:Location" x="31"/> + </children> + <children type="3017"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="530" y="42" width="89" height="38"/> + </gmfView> + <location x="530" y="42"/> + </formatdata:NodeFormatData> + <formatdata:NodeFormatData id="//p1/C1-2" width="89" height="38"> + <label id="//p1/C1-2"> + <location x="31"/> + </label> + <siriusStyle xsi:type="diagram:Ellipse" borderSize="1" borderSizeComputationExpression="1" color="200,136,136"> + <customFeatures>color</customFeatures> + <description xsi:type="style:EllipseNodeDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="2001"> + <children type="5002"> + <layoutConstraint xsi:type="notation:Location" x="31"/> + </children> + <children type="3016"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="530" y="42" width="89" height="38"/> + </gmfView> + <location x="530" y="42"/> + </formatdata:NodeFormatData> + <formatdata:NodeFormatData id="//p1/p1-1/C1-1-1" width="74" height="47"> + <label id="//p1/p1-1/C1-1-1"> + <location x="31"/> + </label> + <siriusStyle xsi:type="diagram:Ellipse" borderSize="1" borderSizeComputationExpression="1"> + <description xsi:type="style:EllipseNodeDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="2001"> + <children type="5002"> + <layoutConstraint xsi:type="notation:Location" x="31"/> + </children> + <children type="3016"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="292" y="132" width="74" height="47"/> + </gmfView> + <location x="292" y="132"/> + </formatdata:NodeFormatData> + <formatdata:NodeFormatData id="//p1/C1-1" width="96" height="42"> + <label id="//p1/C1-1"> + <location x="31"/> + </label> + <siriusStyle xsi:type="diagram:Ellipse" borderSize="1" borderSizeComputationExpression="1"> + <description xsi:type="style:EllipseNodeDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="2001"> + <children type="5002"> + <layoutConstraint xsi:type="notation:Location" x="31"/> + </children> + <children type="3016"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="520" y="137" width="96" height="42"/> + </gmfView> + <outgoingEdges id="//p1/C1-1/aC1-2" sourceTerminal="(0.41666666,0.057142857)" targetTerminal="(0.57894737,0.94285715)"> + <label id="//p1/C1-1/aC1-2" width="-1" height="-1"> + <location x="-50" y="48"/> + </label> + <siriusStyle xsi:type="diagram:EdgeStyle"> + <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@edgeMappings[name='DT2_EReference']/@style"/> + <centerLabelStyle showIcon="false" labelColor="209,209,209"/> + </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="4" y="-9"/> + </children> + <children type="6003"> + <layoutConstraint xsi:type="notation:Bounds" x="-9" y="2"/> + </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.41666666,0.057142857)"/> + <targetAnchor xsi:type="notation:IdentityAnchor" id="(0.57894737,0.94285715)"/> + </gmfView> + <pointList x="524" y="167"/> + <pointList x="510" y="210"/> + <pointList x="440" y="203"/> + <pointList x="545" y="72"/> + <sourceRefPoint x="535" y="137"/> + <targetRefPoint x="545" y="72"/> + </outgoingEdges> + <outgoingEdges id="//p1/C1-1/aC1-1-1" sourceTerminal="(0.0,0.0)" targetTerminal="(0.0,0.0)"> + <label id="//p1/C1-1/aC1-1-1" width="-1" height="-1"> + <location x="6"/> + </label> + <siriusStyle xsi:type="diagram:EdgeStyle"> + <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@edgeMappings[name='DT2_EReference']/@style"/> + <centerLabelStyle showIcon="false" labelColor="209,209,209"/> + </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="-10" y="-3"/> + </children> + <children type="6003"> + <layoutConstraint xsi:type="notation:Bounds" x="7" y="-10"/> + </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.0,0.0)"/> + </gmfView> + <pointList x="535" y="137"/> + <pointList x="468" y="120"/> + <pointList x="552" y="83"/> + <pointList x="322" y="157"/> + <sourceRefPoint x="535" y="137"/> + <targetRefPoint x="307" y="162"/> + </outgoingEdges> + <location x="520" y="137"/> + </formatdata:NodeFormatData> +</xmi:XMI> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/data/xmi/raw/from___storedFormat-DiagType3__of__MyPackage___to___storedFormat-Type10__Raw__Diagram.xmi b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/data/xmi/raw/from___storedFormat-DiagType3__of__MyPackage___to___storedFormat-Type10__Raw__Diagram.xmi new file mode 100644 index 0000000000..4be02fa984 --- /dev/null +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/data/xmi/raw/from___storedFormat-DiagType3__of__MyPackage___to___storedFormat-Type10__Raw__Diagram.xmi @@ -0,0 +1,147 @@ +<?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.2/notation" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0"> + <formatdata:NodeFormatData id="//p1/C1-2" width="30" height="30"> + <label id="//p1/C1-2"> + <location x="31"/> + </label> + <siriusStyle xsi:type="diagram:Lozenge" color="114,73,210"> + <customFeatures>color</customFeatures> + <description xsi:type="style:LozengeNodeDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_2_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="2001"> + <children type="5002"> + <layoutConstraint xsi:type="notation:Location" x="31"/> + </children> + <children type="3017"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="440" y="185" width="30" height="30"/> + </gmfView> + <location x="440" y="185"/> + </formatdata:NodeFormatData> + <formatdata:NodeFormatData id="//p1/C1-2" width="30" height="30"> + <label id="//p1/C1-2"> + <location x="31"/> + </label> + <siriusStyle xsi:type="diagram:Ellipse" borderSize="1" borderSizeComputationExpression="1" color="200,136,136"> + <customFeatures>color</customFeatures> + <description xsi:type="style:EllipseNodeDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="2001"> + <children type="5002"> + <layoutConstraint xsi:type="notation:Location" x="31"/> + </children> + <children type="3016"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="35" y="81" width="30" height="30"/> + </gmfView> + <location x="35" y="81"/> + </formatdata:NodeFormatData> + <formatdata:NodeFormatData id="//p1/p1-1/C1-1-1" width="30" height="30"> + <label id="//p1/p1-1/C1-1-1"> + <location x="31"/> + </label> + <siriusStyle xsi:type="diagram:Ellipse" borderSize="1" borderSizeComputationExpression="1"> + <description xsi:type="style:EllipseNodeDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="2001"> + <children type="5002"> + <layoutConstraint xsi:type="notation:Location" x="31"/> + </children> + <children type="3016"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="160" y="110" width="30" height="30"/> + </gmfView> + <location x="160" y="110"/> + </formatdata:NodeFormatData> + <formatdata:NodeFormatData id="//p1/C1-1" width="30" height="30"> + <label id="//p1/C1-1"> + <location x="31"/> + </label> + <siriusStyle xsi:type="diagram:Ellipse" borderSize="1" borderSizeComputationExpression="1"> + <description xsi:type="style:EllipseNodeDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="2001"> + <children type="5002"> + <layoutConstraint xsi:type="notation:Location" x="31"/> + </children> + <children type="3016"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="250" y="275" width="30" height="30"/> + </gmfView> + <outgoingEdges id="//p1/C1-1/aC1-2" sourceTerminal="(0.5,0.0)" targetTerminal="(0.5,1.0)"> + <label id="//p1/C1-1/aC1-2" width="-1" height="-1"> + <location x="3" y="10"/> + </label> + <siriusStyle xsi:type="diagram:EdgeStyle"> + <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@edgeMappings[name='DT10_EReference']/@style"/> + <centerLabelStyle showIcon="false"/> + </siriusStyle> + <gmfView xsi:type="notation:Edge" type="4001"> + <children type="6001"> + <layoutConstraint xsi:type="notation:Bounds" x="3" y="10"/> + </children> + <children type="6002"> + <layoutConstraint xsi:type="notation:Bounds" x="4" y="-9"/> + </children> + <children type="6003"> + <layoutConstraint xsi:type="notation:Bounds" x="-9" y="2"/> + </children> + <styles xsi:type="notation:ConnectorStyle"/> + <styles xsi:type="notation:FontStyle" fontName="Segoe UI" fontHeight="8"/> + <bendpoints xsi:type="notation:RelativeBendpoints" points="[-15, 6, 200, 170]$[-100, 40, 115, 204]$[-245, 0, -30, 164]$[-215, -164, 0, 0]"/> + <sourceAnchor xsi:type="notation:IdentityAnchor" id="(0.5,0.0)"/> + <targetAnchor xsi:type="notation:IdentityAnchor" id="(0.5,1.0)"/> + </gmfView> + <pointList x="250" y="281"/> + <pointList x="165" y="315"/> + <pointList x="20" y="275"/> + <pointList x="50" y="111"/> + <sourceRefPoint x="265" y="275"/> + <targetRefPoint x="50" y="111"/> + </outgoingEdges> + <outgoingEdges id="//p1/C1-1/aC1-1-1" sourceTerminal="(0.5,0.0)" targetTerminal="(0.5,1.0)"> + <label id="//p1/C1-1/aC1-1-1" width="-1" height="-1"> + <location x="6" y="-8"/> + </label> + <siriusStyle xsi:type="diagram:EdgeStyle"> + <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@edgeMappings[name='DT10_EReference']/@style"/> + <centerLabelStyle showIcon="false"/> + </siriusStyle> + <gmfView xsi:type="notation:Edge" type="4001"> + <children type="6001"> + <layoutConstraint xsi:type="notation:Bounds" x="6" y="-8"/> + </children> + <children type="6002"> + <layoutConstraint xsi:type="notation:Bounds" x="-10" y="-3"/> + </children> + <children type="6003"> + <layoutConstraint xsi:type="notation:Bounds" x="7" y="-10"/> + </children> + <styles xsi:type="notation:ConnectorStyle"/> + <styles xsi:type="notation:FontStyle" fontName="Segoe UI" fontHeight="8"/> + <bendpoints xsi:type="notation:RelativeBendpoints" points="[0, 0, 90, 135]$[-20, -70, 70, 65]$[110, -160, 200, -25]$[-75, -137, 15, -2]"/> + <sourceAnchor xsi:type="notation:IdentityAnchor" id="(0.5,0.0)"/> + <targetAnchor xsi:type="notation:IdentityAnchor" id="(0.5,1.0)"/> + </gmfView> + <pointList x="265" y="275"/> + <pointList x="245" y="205"/> + <pointList x="375" y="115"/> + <pointList x="190" y="138"/> + <sourceRefPoint x="265" y="275"/> + <targetRefPoint x="175" y="140"/> + </outgoingEdges> + <location x="250" y="275"/> + </formatdata:NodeFormatData> +</xmi:XMI> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/data/xmi/raw/from___storedFormat-DiagType4__of__MyPackage___to___storedFormat-Type10__Raw__Diagram.xmi b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/data/xmi/raw/from___storedFormat-DiagType4__of__MyPackage___to___storedFormat-Type10__Raw__Diagram.xmi new file mode 100644 index 0000000000..4be02fa984 --- /dev/null +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/data/xmi/raw/from___storedFormat-DiagType4__of__MyPackage___to___storedFormat-Type10__Raw__Diagram.xmi @@ -0,0 +1,147 @@ +<?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.2/notation" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0"> + <formatdata:NodeFormatData id="//p1/C1-2" width="30" height="30"> + <label id="//p1/C1-2"> + <location x="31"/> + </label> + <siriusStyle xsi:type="diagram:Lozenge" color="114,73,210"> + <customFeatures>color</customFeatures> + <description xsi:type="style:LozengeNodeDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_2_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="2001"> + <children type="5002"> + <layoutConstraint xsi:type="notation:Location" x="31"/> + </children> + <children type="3017"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="440" y="185" width="30" height="30"/> + </gmfView> + <location x="440" y="185"/> + </formatdata:NodeFormatData> + <formatdata:NodeFormatData id="//p1/C1-2" width="30" height="30"> + <label id="//p1/C1-2"> + <location x="31"/> + </label> + <siriusStyle xsi:type="diagram:Ellipse" borderSize="1" borderSizeComputationExpression="1" color="200,136,136"> + <customFeatures>color</customFeatures> + <description xsi:type="style:EllipseNodeDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="2001"> + <children type="5002"> + <layoutConstraint xsi:type="notation:Location" x="31"/> + </children> + <children type="3016"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="35" y="81" width="30" height="30"/> + </gmfView> + <location x="35" y="81"/> + </formatdata:NodeFormatData> + <formatdata:NodeFormatData id="//p1/p1-1/C1-1-1" width="30" height="30"> + <label id="//p1/p1-1/C1-1-1"> + <location x="31"/> + </label> + <siriusStyle xsi:type="diagram:Ellipse" borderSize="1" borderSizeComputationExpression="1"> + <description xsi:type="style:EllipseNodeDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="2001"> + <children type="5002"> + <layoutConstraint xsi:type="notation:Location" x="31"/> + </children> + <children type="3016"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="160" y="110" width="30" height="30"/> + </gmfView> + <location x="160" y="110"/> + </formatdata:NodeFormatData> + <formatdata:NodeFormatData id="//p1/C1-1" width="30" height="30"> + <label id="//p1/C1-1"> + <location x="31"/> + </label> + <siriusStyle xsi:type="diagram:Ellipse" borderSize="1" borderSizeComputationExpression="1"> + <description xsi:type="style:EllipseNodeDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="2001"> + <children type="5002"> + <layoutConstraint xsi:type="notation:Location" x="31"/> + </children> + <children type="3016"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="250" y="275" width="30" height="30"/> + </gmfView> + <outgoingEdges id="//p1/C1-1/aC1-2" sourceTerminal="(0.5,0.0)" targetTerminal="(0.5,1.0)"> + <label id="//p1/C1-1/aC1-2" width="-1" height="-1"> + <location x="3" y="10"/> + </label> + <siriusStyle xsi:type="diagram:EdgeStyle"> + <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@edgeMappings[name='DT10_EReference']/@style"/> + <centerLabelStyle showIcon="false"/> + </siriusStyle> + <gmfView xsi:type="notation:Edge" type="4001"> + <children type="6001"> + <layoutConstraint xsi:type="notation:Bounds" x="3" y="10"/> + </children> + <children type="6002"> + <layoutConstraint xsi:type="notation:Bounds" x="4" y="-9"/> + </children> + <children type="6003"> + <layoutConstraint xsi:type="notation:Bounds" x="-9" y="2"/> + </children> + <styles xsi:type="notation:ConnectorStyle"/> + <styles xsi:type="notation:FontStyle" fontName="Segoe UI" fontHeight="8"/> + <bendpoints xsi:type="notation:RelativeBendpoints" points="[-15, 6, 200, 170]$[-100, 40, 115, 204]$[-245, 0, -30, 164]$[-215, -164, 0, 0]"/> + <sourceAnchor xsi:type="notation:IdentityAnchor" id="(0.5,0.0)"/> + <targetAnchor xsi:type="notation:IdentityAnchor" id="(0.5,1.0)"/> + </gmfView> + <pointList x="250" y="281"/> + <pointList x="165" y="315"/> + <pointList x="20" y="275"/> + <pointList x="50" y="111"/> + <sourceRefPoint x="265" y="275"/> + <targetRefPoint x="50" y="111"/> + </outgoingEdges> + <outgoingEdges id="//p1/C1-1/aC1-1-1" sourceTerminal="(0.5,0.0)" targetTerminal="(0.5,1.0)"> + <label id="//p1/C1-1/aC1-1-1" width="-1" height="-1"> + <location x="6" y="-8"/> + </label> + <siriusStyle xsi:type="diagram:EdgeStyle"> + <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@edgeMappings[name='DT10_EReference']/@style"/> + <centerLabelStyle showIcon="false"/> + </siriusStyle> + <gmfView xsi:type="notation:Edge" type="4001"> + <children type="6001"> + <layoutConstraint xsi:type="notation:Bounds" x="6" y="-8"/> + </children> + <children type="6002"> + <layoutConstraint xsi:type="notation:Bounds" x="-10" y="-3"/> + </children> + <children type="6003"> + <layoutConstraint xsi:type="notation:Bounds" x="7" y="-10"/> + </children> + <styles xsi:type="notation:ConnectorStyle"/> + <styles xsi:type="notation:FontStyle" fontName="Segoe UI" fontHeight="8"/> + <bendpoints xsi:type="notation:RelativeBendpoints" points="[0, 0, 90, 135]$[-20, -70, 70, 65]$[110, -160, 200, -25]$[-75, -137, 15, -2]"/> + <sourceAnchor xsi:type="notation:IdentityAnchor" id="(0.5,0.0)"/> + <targetAnchor xsi:type="notation:IdentityAnchor" id="(0.5,1.0)"/> + </gmfView> + <pointList x="265" y="275"/> + <pointList x="245" y="205"/> + <pointList x="375" y="115"/> + <pointList x="190" y="138"/> + <sourceRefPoint x="265" y="275"/> + <targetRefPoint x="175" y="140"/> + </outgoingEdges> + <location x="250" y="275"/> + </formatdata:NodeFormatData> +</xmi:XMI> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/data/xmi/raw/from___storedFormat-DiagType5__of__MyPackage___to___storedFormat-Type10__Raw__Diagram.xmi b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/data/xmi/raw/from___storedFormat-DiagType5__of__MyPackage___to___storedFormat-Type10__Raw__Diagram.xmi new file mode 100644 index 0000000000..47e10313b4 --- /dev/null +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/data/xmi/raw/from___storedFormat-DiagType5__of__MyPackage___to___storedFormat-Type10__Raw__Diagram.xmi @@ -0,0 +1,149 @@ +<?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.2/notation" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0"> + <formatdata:NodeFormatData id="//p1/C1-2" width="76" height="35"> + <label id="//p1/C1-2"> + <location y="5"/> + </label> + <siriusStyle xsi:type="diagram:Ellipse" borderSize="1" borderSizeComputationExpression="1"> + <customFeatures>borderSize</customFeatures> + <customFeatures>borderSizeComputationExpression</customFeatures> + <customFeatures>color</customFeatures> + <description xsi:type="style:EllipseNodeDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType5']/@nodeMappings[name='DT5_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="2001"> + <children type="5002"> + <layoutConstraint xsi:type="notation:Location" y="5"/> + </children> + <children type="3017"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="319" y="148" width="76" height="35"/> + </gmfView> + <location x="319" y="148"/> + </formatdata:NodeFormatData> + <formatdata:NodeFormatData id="//p1/C1-2" width="76" height="35"> + <label id="//p1/C1-2"> + <location y="5"/> + </label> + <siriusStyle xsi:type="diagram:Ellipse" borderSize="1" borderSizeComputationExpression="1"> + <customFeatures>color</customFeatures> + <description xsi:type="style:EllipseNodeDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType5']/@nodeMappings[name='DT5_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="2001"> + <children type="5002"> + <layoutConstraint xsi:type="notation:Location" y="5"/> + </children> + <children type="3016"> + <styles xsi:type="notation:ShapeStyle" fontName="Sans"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="319" y="148" width="76" height="35"/> + </gmfView> + <location x="319" y="148"/> + </formatdata:NodeFormatData> + <formatdata:NodeFormatData id="//p1/p1-1/C1-1-1" width="30" height="30"> + <label id="//p1/p1-1/C1-1-1"> + <location y="5"/> + </label> + <siriusStyle xsi:type="diagram:Ellipse" borderSize="1" borderSizeComputationExpression="1"> + <description xsi:type="style:EllipseNodeDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType5']/@nodeMappings[name='DT5_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="2001"> + <children type="5002"> + <layoutConstraint xsi:type="notation:Location" y="5"/> + </children> + <children type="3016"> + <styles xsi:type="notation:ShapeStyle" fontName="Sans"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="450" width="30" height="30"/> + </gmfView> + <location x="450"/> + </formatdata:NodeFormatData> + <formatdata:NodeFormatData id="//p1/C1-1" width="96" height="35"> + <label id="//p1/C1-1"> + <location y="5"/> + </label> + <siriusStyle xsi:type="diagram:Ellipse" borderSize="1" borderSizeComputationExpression="1"> + <description xsi:type="style:EllipseNodeDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType5']/@nodeMappings[name='DT5_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="2001"> + <children type="5002"> + <layoutConstraint xsi:type="notation:Location" y="5"/> + </children> + <children type="3016"> + <styles xsi:type="notation:ShapeStyle" fontName="Sans"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="299" y="278" width="96" height="35"/> + </gmfView> + <outgoingEdges id="//p1/C1-1/aC1-2" sourceTerminal="(0.5,0.0)" targetTerminal="(0.5,1.0)"> + <label id="//p1/C1-1/aC1-2" width="-1" height="-1"> + <location x="3" y="10"/> + </label> + <siriusStyle xsi:type="diagram:EdgeStyle"> + <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@edgeMappings[name='DT10_EReference']/@style"/> + <centerLabelStyle showIcon="false"/> + </siriusStyle> + <gmfView xsi:type="notation:Edge" type="4001"> + <children type="6001"> + <layoutConstraint xsi:type="notation:Bounds" x="3" y="10"/> + </children> + <children type="6002"> + <layoutConstraint xsi:type="notation:Bounds" x="4" y="-9"/> + </children> + <children type="6003"> + <layoutConstraint xsi:type="notation:Bounds" x="-9" y="2"/> + </children> + <styles xsi:type="notation:ConnectorStyle"/> + <styles xsi:type="notation:FontStyle" fontName="Segoe UI" fontHeight="8"/> + <bendpoints xsi:type="notation:RelativeBendpoints" points="[-15, 6, 200, 170]$[-100, 40, 115, 204]$[-245, 0, -30, 164]$[-215, -164, 0, 0]"/> + <sourceAnchor xsi:type="notation:IdentityAnchor" id="(0.5,0.0)"/> + <targetAnchor xsi:type="notation:IdentityAnchor" id="(0.5,1.0)"/> + </gmfView> + <pointList x="303" y="308"/> + <pointList x="292" y="339"/> + <pointList x="225" y="320"/> + <pointList x="334" y="178"/> + <sourceRefPoint x="314" y="278"/> + <targetRefPoint x="334" y="178"/> + </outgoingEdges> + <outgoingEdges id="//p1/C1-1/aC1-1-1" sourceTerminal="(0.5,0.0)" targetTerminal="(0.5,1.0)"> + <label id="//p1/C1-1/aC1-1-1" width="-1" height="-1"> + <location x="6" y="-8"/> + </label> + <siriusStyle xsi:type="diagram:EdgeStyle"> + <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@edgeMappings[name='DT10_EReference']/@style"/> + <centerLabelStyle showIcon="false"/> + </siriusStyle> + <gmfView xsi:type="notation:Edge" type="4001"> + <children type="6001"> + <layoutConstraint xsi:type="notation:Bounds" x="6" y="-8"/> + </children> + <children type="6002"> + <layoutConstraint xsi:type="notation:Bounds" x="-10" y="-3"/> + </children> + <children type="6003"> + <layoutConstraint xsi:type="notation:Bounds" x="7" y="-10"/> + </children> + <styles xsi:type="notation:ConnectorStyle"/> + <styles xsi:type="notation:FontStyle" fontName="Segoe UI" fontHeight="8"/> + <bendpoints xsi:type="notation:RelativeBendpoints" points="[0, 0, 90, 135]$[-20, -70, 70, 65]$[110, -160, 200, -25]$[-75, -137, 15, -2]"/> + <sourceAnchor xsi:type="notation:IdentityAnchor" id="(0.5,0.0)"/> + <targetAnchor xsi:type="notation:IdentityAnchor" id="(0.5,1.0)"/> + </gmfView> + <pointList x="314" y="278"/> + <pointList x="374" y="170"/> + <pointList x="584" y="42"/> + <pointList x="465" y="30"/> + <sourceRefPoint x="314" y="278"/> + <targetRefPoint x="465" y="30"/> + </outgoingEdges> + <location x="299" y="278"/> + </formatdata:NodeFormatData> +</xmi:XMI> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/data/xmi/raw/from___storedFormat-DiagType6__of__MyPackage___to___storedFormat-Type10__Raw__Diagram.xmi b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/data/xmi/raw/from___storedFormat-DiagType6__of__MyPackage___to___storedFormat-Type10__Raw__Diagram.xmi new file mode 100644 index 0000000000..4acec1acba --- /dev/null +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/data/xmi/raw/from___storedFormat-DiagType6__of__MyPackage___to___storedFormat-Type10__Raw__Diagram.xmi @@ -0,0 +1,149 @@ +<?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.2/notation" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0"> + <formatdata:NodeFormatData id="//p1/C1-2" width="30" height="30"> + <label id="//p1/C1-2"> + <location x="-41" y="18"/> + </label> + <siriusStyle xsi:type="diagram:Ellipse" borderSize="1" borderSizeComputationExpression="1"> + <customFeatures>borderSize</customFeatures> + <customFeatures>borderSizeComputationExpression</customFeatures> + <customFeatures>color</customFeatures> + <description xsi:type="style:EllipseNodeDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType6']/@nodeMappings[name='DT6_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="2001"> + <children type="5002"> + <layoutConstraint xsi:type="notation:Location" x="-41" y="18"/> + </children> + <children type="3017"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="481" y="77" width="30" height="30"/> + </gmfView> + <location x="481" y="77"/> + </formatdata:NodeFormatData> + <formatdata:NodeFormatData id="//p1/C1-2" width="30" height="30"> + <label id="//p1/C1-2"> + <location x="-41" y="18"/> + </label> + <siriusStyle xsi:type="diagram:Ellipse" borderSize="1" borderSizeComputationExpression="1"> + <customFeatures>color</customFeatures> + <description xsi:type="style:EllipseNodeDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType6']/@nodeMappings[name='DT6_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="2001"> + <children type="5002"> + <layoutConstraint xsi:type="notation:Location" x="-41" y="18"/> + </children> + <children type="3016"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="481" y="77" width="30" height="30"/> + </gmfView> + <location x="481" y="77"/> + </formatdata:NodeFormatData> + <formatdata:NodeFormatData id="//p1/p1-1/C1-1-1" width="30" height="30"> + <label id="//p1/p1-1/C1-1-1"> + <location x="57" y="4"/> + </label> + <siriusStyle xsi:type="diagram:Ellipse" borderSize="1" borderSizeComputationExpression="1"> + <description xsi:type="style:EllipseNodeDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType6']/@nodeMappings[name='DT6_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="2001"> + <children type="5002"> + <layoutConstraint xsi:type="notation:Location" x="57" y="4"/> + </children> + <children type="3016"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="267" y="25" width="30" height="30"/> + </gmfView> + <location x="267" y="25"/> + </formatdata:NodeFormatData> + <formatdata:NodeFormatData id="//p1/C1-1" width="61" height="18"> + <label id="//p1/C1-1"> + <location x="120" y="-15"/> + </label> + <siriusStyle xsi:type="diagram:Ellipse" borderSize="1" borderSizeComputationExpression="1"> + <description xsi:type="style:EllipseNodeDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType6']/@nodeMappings[name='DT6_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="2001"> + <children type="5002"> + <layoutConstraint xsi:type="notation:Location" x="120" y="-15"/> + </children> + <children type="3016"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="169" y="89" width="61" height="18"/> + </gmfView> + <outgoingEdges id="//p1/C1-1/aC1-2" sourceTerminal="(0.8032786885245902,0.1111111111111111)" targetTerminal="(0.5333333333333333,0.8)"> + <label id="//p1/C1-1/aC1-2" width="32" height="22"> + <location x="7" y="21"/> + </label> + <siriusStyle xsi:type="diagram:EdgeStyle"> + <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType6']/@edgeMappings[name='DT6_EReference']/@style"/> + <centerLabelStyle showIcon="false"/> + </siriusStyle> + <gmfView xsi:type="notation:Edge" type="4001"> + <children type="6001"> + <layoutConstraint xsi:type="notation:Bounds" x="7" y="21" width="32" height="22"/> + </children> + <children type="6002"> + <layoutConstraint xsi:type="notation:Bounds" x="4" y="-9"/> + </children> + <children type="6003"> + <layoutConstraint xsi:type="notation:Bounds" x="-9" y="2"/> + </children> + <styles xsi:type="notation:ConnectorStyle"/> + <styles xsi:type="notation:FontStyle" fontName="Sans" fontHeight="8"/> + <bendpoints xsi:type="notation:RelativeBendpoints" points="[12, 6, -267, -4]$[107, 58, -172, 48]$[229, 56, -50, 46]$[272, 16, -7, 6]"/> + <sourceAnchor xsi:type="notation:IdentityAnchor" id="(0.8032786885245902,0.1111111111111111)"/> + <targetAnchor xsi:type="notation:IdentityAnchor" id="(0.5333333333333333,0.8)"/> + </gmfView> + <pointList x="199" y="109"/> + <pointList x="259" y="189"/> + <pointList x="290" y="210"/> + <pointList x="496" y="107"/> + <sourceRefPoint x="184" y="89"/> + <targetRefPoint x="496" y="107"/> + </outgoingEdges> + <outgoingEdges id="//p1/C1-1/aC1-1-1" sourceTerminal="(0.5081967213114754,0.05555555555555555)" targetTerminal="(0.16666666666666666,0.4666666666666667)"> + <label id="//p1/C1-1/aC1-1-1" width="43" height="20"> + <location x="19" y="-15"/> + </label> + <siriusStyle xsi:type="diagram:EdgeStyle"> + <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType6']/@edgeMappings[name='DT6_EReference']/@style"/> + <centerLabelStyle showIcon="false"/> + </siriusStyle> + <gmfView xsi:type="notation:Edge" type="4001"> + <children type="6001"> + <layoutConstraint xsi:type="notation:Bounds" x="19" y="-15" width="43" height="20"/> + </children> + <children type="6002"> + <layoutConstraint xsi:type="notation:Bounds" x="-10" y="-3"/> + </children> + <children type="6003"> + <layoutConstraint xsi:type="notation:Bounds" x="7" y="-10"/> + </children> + <styles xsi:type="notation:ConnectorStyle"/> + <styles xsi:type="notation:FontStyle" fontName="Sans" fontHeight="8"/> + <bendpoints xsi:type="notation:RelativeBendpoints" points="[0, -1, -72, 50]$[0, -45, -72, 6]$[67, -45, -5, 6]"/> + <sourceAnchor xsi:type="notation:IdentityAnchor" id="(0.5081967213114754,0.05555555555555555)"/> + <targetAnchor xsi:type="notation:IdentityAnchor" id="(0.16666666666666666,0.4666666666666667)"/> + </gmfView> + <pointList x="184" y="89"/> + <pointList x="226" y="52"/> + <pointList x="419" y="-4"/> + <pointList x="297" y="48"/> + <sourceRefPoint x="184" y="89"/> + <targetRefPoint x="282" y="55"/> + </outgoingEdges> + <location x="169" y="89"/> + </formatdata:NodeFormatData> +</xmi:XMI> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/data/xmi/raw/from___storedFormat-DiagType7__of__MyPackage___to___storedFormat-Type10__Raw__Diagram.xmi b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/data/xmi/raw/from___storedFormat-DiagType7__of__MyPackage___to___storedFormat-Type10__Raw__Diagram.xmi new file mode 100644 index 0000000000..27f79d1956 --- /dev/null +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/data/xmi/raw/from___storedFormat-DiagType7__of__MyPackage___to___storedFormat-Type10__Raw__Diagram.xmi @@ -0,0 +1,153 @@ +<?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.2/notation" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0"> + <formatdata:NodeFormatData id="//p1/C1-2" width="30" height="30"> + <label id="//p1/C1-2"> + <location y="5"/> + </label> + <siriusStyle xsi:type="diagram:Dot"> + <customFeatures>color</customFeatures> + <description xsi:type="style:DotDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@borderedNodeMappings[name='DT7_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="2001"> + <children type="5002"> + <layoutConstraint xsi:type="notation:Location" y="5"/> + </children> + <children type="3017"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="453" y="-2" width="30" height="30"/> + </gmfView> + <location x="453" y="-2"/> + </formatdata:NodeFormatData> + <formatdata:NodeFormatData id="//p1/C1-2" width="30" height="30"> + <label id="//p1/C1-2"> + <location y="5"/> + </label> + <siriusStyle xsi:type="diagram:Dot"> + <customFeatures>borderSize</customFeatures> + <customFeatures>borderSizeComputationExpression</customFeatures> + <customFeatures>color</customFeatures> + <description xsi:type="style:DotDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@borderedNodeMappings[name='DT7_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="2001"> + <children type="5002"> + <layoutConstraint xsi:type="notation:Location" y="5"/> + </children> + <children type="3016"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="453" y="-2" width="30" height="30"/> + </gmfView> + <location x="453" y="-2"/> + </formatdata:NodeFormatData> + <formatdata:NodeFormatData id="//p1/p1-1/C1-1-1" width="30" height="30"> + <label id="//p1/p1-1/C1-1-1"> + <location y="5"/> + </label> + <siriusStyle xsi:type="diagram:Dot"> + <customFeatures>borderSize</customFeatures> + <customFeatures>borderSizeComputationExpression</customFeatures> + <description xsi:type="style:DotDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@borderedNodeMappings[name='DT7_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="2001"> + <children type="5002"> + <layoutConstraint xsi:type="notation:Location" y="5"/> + </children> + <children type="3016"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="289" y="86" width="30" height="30"/> + </gmfView> + <location x="289" y="86"/> + </formatdata:NodeFormatData> + <formatdata:NodeFormatData id="//p1/C1-1" width="61" height="18"> + <label id="//p1/C1-1"> + <location x="142" y="43"/> + </label> + <siriusStyle xsi:type="diagram:Dot"> + <customFeatures>borderSize</customFeatures> + <customFeatures>borderSizeComputationExpression</customFeatures> + <description xsi:type="style:DotDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@borderedNodeMappings[name='DT7_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="2001"> + <children type="5002"> + <layoutConstraint xsi:type="notation:Location" x="142" y="43"/> + </children> + <children type="3016"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="140" y="10" width="61" height="18"/> + </gmfView> + <outgoingEdges id="//p1/C1-1/aC1-2" sourceTerminal="(0.5,0.0)" targetTerminal="(0.5,1.0)"> + <label id="//p1/C1-1/aC1-2" width="-1" height="-1"> + <location x="3" y="10"/> + </label> + <siriusStyle xsi:type="diagram:EdgeStyle"> + <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@edgeMappings[name='DT10_EReference']/@style"/> + <centerLabelStyle showIcon="false"/> + </siriusStyle> + <gmfView xsi:type="notation:Edge" type="4001"> + <children type="6001"> + <layoutConstraint xsi:type="notation:Bounds" x="3" y="10"/> + </children> + <children type="6002"> + <layoutConstraint xsi:type="notation:Bounds" x="4" y="-9"/> + </children> + <children type="6003"> + <layoutConstraint xsi:type="notation:Bounds" x="-9" y="2"/> + </children> + <styles xsi:type="notation:ConnectorStyle"/> + <styles xsi:type="notation:FontStyle" fontName="Segoe UI" fontHeight="8"/> + <bendpoints xsi:type="notation:RelativeBendpoints" points="[-15, 6, 200, 170]$[-100, 40, 115, 204]$[-245, 0, -30, 164]$[-215, -164, 0, 0]"/> + <sourceAnchor xsi:type="notation:IdentityAnchor" id="(0.5,0.0)"/> + <targetAnchor xsi:type="notation:IdentityAnchor" id="(0.5,1.0)"/> + </gmfView> + <pointList x="170" y="29"/> + <pointList x="231" y="110"/> + <pointList x="262" y="131"/> + <pointList x="468" y="28"/> + <sourceRefPoint x="155" y="10"/> + <targetRefPoint x="468" y="28"/> + </outgoingEdges> + <outgoingEdges id="//p1/C1-1/aC1-1-1" sourceTerminal="(0.5,0.0)" targetTerminal="(0.5,1.0)"> + <label id="//p1/C1-1/aC1-1-1" width="-1" height="-1"> + <location x="6" y="-8"/> + </label> + <siriusStyle xsi:type="diagram:EdgeStyle"> + <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@edgeMappings[name='DT10_EReference']/@style"/> + <centerLabelStyle showIcon="false"/> + </siriusStyle> + <gmfView xsi:type="notation:Edge" type="4001"> + <children type="6001"> + <layoutConstraint xsi:type="notation:Bounds" x="6" y="-8"/> + </children> + <children type="6002"> + <layoutConstraint xsi:type="notation:Bounds" x="-10" y="-3"/> + </children> + <children type="6003"> + <layoutConstraint xsi:type="notation:Bounds" x="7" y="-10"/> + </children> + <styles xsi:type="notation:ConnectorStyle"/> + <styles xsi:type="notation:FontStyle" fontName="Segoe UI" fontHeight="8"/> + <bendpoints xsi:type="notation:RelativeBendpoints" points="[0, 0, 90, 135]$[-20, -70, 70, 65]$[110, -160, 200, -25]$[-75, -137, 15, -2]"/> + <sourceAnchor xsi:type="notation:IdentityAnchor" id="(0.5,0.0)"/> + <targetAnchor xsi:type="notation:IdentityAnchor" id="(0.5,1.0)"/> + </gmfView> + <pointList x="170" y="12"/> + <pointList x="214" y="20"/> + <pointList x="424" y="10"/> + <pointList x="319" y="102"/> + <sourceRefPoint x="155" y="10"/> + <targetRefPoint x="304" y="116"/> + </outgoingEdges> + <location x="140" y="10"/> + </formatdata:NodeFormatData> +</xmi:XMI> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/data/xmi/raw/from___storedFormat-DiagType8__of__MyPackage___to___storedFormat-Type10__Raw__Diagram.xmi b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/data/xmi/raw/from___storedFormat-DiagType8__of__MyPackage___to___storedFormat-Type10__Raw__Diagram.xmi new file mode 100644 index 0000000000..10fecffc69 --- /dev/null +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/data/xmi/raw/from___storedFormat-DiagType8__of__MyPackage___to___storedFormat-Type10__Raw__Diagram.xmi @@ -0,0 +1,153 @@ +<?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.2/notation" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0"> + <formatdata:NodeFormatData id="//p1/C1-2" width="30" height="30"> + <label id="//p1/C1-2"> + <location y="5"/> + </label> + <siriusStyle xsi:type="diagram:Dot"> + <customFeatures>color</customFeatures> + <description xsi:type="style:DotDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="2001"> + <children type="5002"> + <layoutConstraint xsi:type="notation:Location" y="5"/> + </children> + <children type="3017"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="632" y="358" width="30" height="30"/> + </gmfView> + <location x="632" y="358"/> + </formatdata:NodeFormatData> + <formatdata:NodeFormatData id="//p1/C1-2" width="30" height="30"> + <label id="//p1/C1-2"> + <location y="5"/> + </label> + <siriusStyle xsi:type="diagram:Dot"> + <customFeatures>borderSize</customFeatures> + <customFeatures>borderSizeComputationExpression</customFeatures> + <customFeatures>color</customFeatures> + <description xsi:type="style:DotDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="2001"> + <children type="5002"> + <layoutConstraint xsi:type="notation:Location" y="5"/> + </children> + <children type="3016"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="632" y="358" width="30" height="30"/> + </gmfView> + <location x="632" y="358"/> + </formatdata:NodeFormatData> + <formatdata:NodeFormatData id="//p1/p1-1/C1-1-1" width="30" height="30"> + <label id="//p1/p1-1/C1-1-1"> + <location y="5"/> + </label> + <siriusStyle xsi:type="diagram:Dot"> + <customFeatures>borderSize</customFeatures> + <customFeatures>borderSizeComputationExpression</customFeatures> + <description xsi:type="style:DotDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="2001"> + <children type="5002"> + <layoutConstraint xsi:type="notation:Location" y="5"/> + </children> + <children type="3016"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="285" y="86" width="30" height="30"/> + </gmfView> + <location x="285" y="86"/> + </formatdata:NodeFormatData> + <formatdata:NodeFormatData id="//p1/C1-1" width="61" height="18"> + <label id="//p1/C1-1"> + <location y="5"/> + </label> + <siriusStyle xsi:type="diagram:Dot"> + <customFeatures>borderSize</customFeatures> + <customFeatures>borderSizeComputationExpression</customFeatures> + <description xsi:type="style:DotDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="2001"> + <children type="5002"> + <layoutConstraint xsi:type="notation:Location" y="5"/> + </children> + <children type="3016"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="320" y="370" width="61" height="18"/> + </gmfView> + <outgoingEdges id="//p1/C1-1/aC1-2" sourceTerminal="(0.5,0.0)" targetTerminal="(0.5,1.0)"> + <label id="//p1/C1-1/aC1-2" width="-1" height="-1"> + <location x="3" y="10"/> + </label> + <siriusStyle xsi:type="diagram:EdgeStyle"> + <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@edgeMappings[name='DT10_EReference']/@style"/> + <centerLabelStyle showIcon="false"/> + </siriusStyle> + <gmfView xsi:type="notation:Edge" type="4001"> + <children type="6001"> + <layoutConstraint xsi:type="notation:Bounds" x="3" y="10"/> + </children> + <children type="6002"> + <layoutConstraint xsi:type="notation:Bounds" x="4" y="-9"/> + </children> + <children type="6003"> + <layoutConstraint xsi:type="notation:Bounds" x="-9" y="2"/> + </children> + <styles xsi:type="notation:ConnectorStyle"/> + <styles xsi:type="notation:FontStyle" fontName="Segoe UI" fontHeight="8"/> + <bendpoints xsi:type="notation:RelativeBendpoints" points="[-15, 6, 200, 170]$[-100, 40, 115, 204]$[-245, 0, -30, 164]$[-215, -164, 0, 0]"/> + <sourceAnchor xsi:type="notation:IdentityAnchor" id="(0.5,0.0)"/> + <targetAnchor xsi:type="notation:IdentityAnchor" id="(0.5,1.0)"/> + </gmfView> + <pointList x="350" y="390"/> + <pointList x="410" y="470"/> + <pointList x="441" y="491"/> + <pointList x="647" y="388"/> + <sourceRefPoint x="335" y="370"/> + <targetRefPoint x="647" y="388"/> + </outgoingEdges> + <outgoingEdges id="//p1/C1-1/aC1-1-1" sourceTerminal="(0.5,0.0)" targetTerminal="(0.5,1.0)"> + <label id="//p1/C1-1/aC1-1-1" width="-1" height="-1"> + <location x="6" y="-8"/> + </label> + <siriusStyle xsi:type="diagram:EdgeStyle"> + <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@edgeMappings[name='DT10_EReference']/@style"/> + <centerLabelStyle showIcon="false"/> + </siriusStyle> + <gmfView xsi:type="notation:Edge" type="4001"> + <children type="6001"> + <layoutConstraint xsi:type="notation:Bounds" x="6" y="-8"/> + </children> + <children type="6002"> + <layoutConstraint xsi:type="notation:Bounds" x="-10" y="-3"/> + </children> + <children type="6003"> + <layoutConstraint xsi:type="notation:Bounds" x="7" y="-10"/> + </children> + <styles xsi:type="notation:ConnectorStyle"/> + <styles xsi:type="notation:FontStyle" fontName="Segoe UI" fontHeight="8"/> + <bendpoints xsi:type="notation:RelativeBendpoints" points="[0, 0, 90, 135]$[-20, -70, 70, 65]$[110, -160, 200, -25]$[-75, -137, 15, -2]"/> + <sourceAnchor xsi:type="notation:IdentityAnchor" id="(0.5,0.0)"/> + <targetAnchor xsi:type="notation:IdentityAnchor" id="(0.5,1.0)"/> + </gmfView> + <pointList x="333" y="370"/> + <pointList x="333" y="260"/> + <pointList x="481" y="130"/> + <pointList x="300" y="116"/> + <sourceRefPoint x="335" y="370"/> + <targetRefPoint x="300" y="116"/> + </outgoingEdges> + <location x="320" y="370"/> + </formatdata:NodeFormatData> +</xmi:XMI> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/data/xmi/raw/from___storedFormat-DiagType8__of__p2___to___storedFormat-Type10__Raw__Diagram.xmi b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/data/xmi/raw/from___storedFormat-DiagType8__of__p2___to___storedFormat-Type10__Raw__Diagram.xmi new file mode 100644 index 0000000000..4be02fa984 --- /dev/null +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/data/xmi/raw/from___storedFormat-DiagType8__of__p2___to___storedFormat-Type10__Raw__Diagram.xmi @@ -0,0 +1,147 @@ +<?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.2/notation" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0"> + <formatdata:NodeFormatData id="//p1/C1-2" width="30" height="30"> + <label id="//p1/C1-2"> + <location x="31"/> + </label> + <siriusStyle xsi:type="diagram:Lozenge" color="114,73,210"> + <customFeatures>color</customFeatures> + <description xsi:type="style:LozengeNodeDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_2_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="2001"> + <children type="5002"> + <layoutConstraint xsi:type="notation:Location" x="31"/> + </children> + <children type="3017"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="440" y="185" width="30" height="30"/> + </gmfView> + <location x="440" y="185"/> + </formatdata:NodeFormatData> + <formatdata:NodeFormatData id="//p1/C1-2" width="30" height="30"> + <label id="//p1/C1-2"> + <location x="31"/> + </label> + <siriusStyle xsi:type="diagram:Ellipse" borderSize="1" borderSizeComputationExpression="1" color="200,136,136"> + <customFeatures>color</customFeatures> + <description xsi:type="style:EllipseNodeDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="2001"> + <children type="5002"> + <layoutConstraint xsi:type="notation:Location" x="31"/> + </children> + <children type="3016"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="35" y="81" width="30" height="30"/> + </gmfView> + <location x="35" y="81"/> + </formatdata:NodeFormatData> + <formatdata:NodeFormatData id="//p1/p1-1/C1-1-1" width="30" height="30"> + <label id="//p1/p1-1/C1-1-1"> + <location x="31"/> + </label> + <siriusStyle xsi:type="diagram:Ellipse" borderSize="1" borderSizeComputationExpression="1"> + <description xsi:type="style:EllipseNodeDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="2001"> + <children type="5002"> + <layoutConstraint xsi:type="notation:Location" x="31"/> + </children> + <children type="3016"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="160" y="110" width="30" height="30"/> + </gmfView> + <location x="160" y="110"/> + </formatdata:NodeFormatData> + <formatdata:NodeFormatData id="//p1/C1-1" width="30" height="30"> + <label id="//p1/C1-1"> + <location x="31"/> + </label> + <siriusStyle xsi:type="diagram:Ellipse" borderSize="1" borderSizeComputationExpression="1"> + <description xsi:type="style:EllipseNodeDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="2001"> + <children type="5002"> + <layoutConstraint xsi:type="notation:Location" x="31"/> + </children> + <children type="3016"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="250" y="275" width="30" height="30"/> + </gmfView> + <outgoingEdges id="//p1/C1-1/aC1-2" sourceTerminal="(0.5,0.0)" targetTerminal="(0.5,1.0)"> + <label id="//p1/C1-1/aC1-2" width="-1" height="-1"> + <location x="3" y="10"/> + </label> + <siriusStyle xsi:type="diagram:EdgeStyle"> + <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@edgeMappings[name='DT10_EReference']/@style"/> + <centerLabelStyle showIcon="false"/> + </siriusStyle> + <gmfView xsi:type="notation:Edge" type="4001"> + <children type="6001"> + <layoutConstraint xsi:type="notation:Bounds" x="3" y="10"/> + </children> + <children type="6002"> + <layoutConstraint xsi:type="notation:Bounds" x="4" y="-9"/> + </children> + <children type="6003"> + <layoutConstraint xsi:type="notation:Bounds" x="-9" y="2"/> + </children> + <styles xsi:type="notation:ConnectorStyle"/> + <styles xsi:type="notation:FontStyle" fontName="Segoe UI" fontHeight="8"/> + <bendpoints xsi:type="notation:RelativeBendpoints" points="[-15, 6, 200, 170]$[-100, 40, 115, 204]$[-245, 0, -30, 164]$[-215, -164, 0, 0]"/> + <sourceAnchor xsi:type="notation:IdentityAnchor" id="(0.5,0.0)"/> + <targetAnchor xsi:type="notation:IdentityAnchor" id="(0.5,1.0)"/> + </gmfView> + <pointList x="250" y="281"/> + <pointList x="165" y="315"/> + <pointList x="20" y="275"/> + <pointList x="50" y="111"/> + <sourceRefPoint x="265" y="275"/> + <targetRefPoint x="50" y="111"/> + </outgoingEdges> + <outgoingEdges id="//p1/C1-1/aC1-1-1" sourceTerminal="(0.5,0.0)" targetTerminal="(0.5,1.0)"> + <label id="//p1/C1-1/aC1-1-1" width="-1" height="-1"> + <location x="6" y="-8"/> + </label> + <siriusStyle xsi:type="diagram:EdgeStyle"> + <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@edgeMappings[name='DT10_EReference']/@style"/> + <centerLabelStyle showIcon="false"/> + </siriusStyle> + <gmfView xsi:type="notation:Edge" type="4001"> + <children type="6001"> + <layoutConstraint xsi:type="notation:Bounds" x="6" y="-8"/> + </children> + <children type="6002"> + <layoutConstraint xsi:type="notation:Bounds" x="-10" y="-3"/> + </children> + <children type="6003"> + <layoutConstraint xsi:type="notation:Bounds" x="7" y="-10"/> + </children> + <styles xsi:type="notation:ConnectorStyle"/> + <styles xsi:type="notation:FontStyle" fontName="Segoe UI" fontHeight="8"/> + <bendpoints xsi:type="notation:RelativeBendpoints" points="[0, 0, 90, 135]$[-20, -70, 70, 65]$[110, -160, 200, -25]$[-75, -137, 15, -2]"/> + <sourceAnchor xsi:type="notation:IdentityAnchor" id="(0.5,0.0)"/> + <targetAnchor xsi:type="notation:IdentityAnchor" id="(0.5,1.0)"/> + </gmfView> + <pointList x="265" y="275"/> + <pointList x="245" y="205"/> + <pointList x="375" y="115"/> + <pointList x="190" y="138"/> + <sourceRefPoint x="265" y="275"/> + <targetRefPoint x="175" y="140"/> + </outgoingEdges> + <location x="250" y="275"/> + </formatdata:NodeFormatData> +</xmi:XMI> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/data/xmi/raw/from___storedFormat-DiagType9__of__MyPackage___to___storedFormat-Type10__Raw__Diagram.xmi b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/data/xmi/raw/from___storedFormat-DiagType9__of__MyPackage___to___storedFormat-Type10__Raw__Diagram.xmi new file mode 100644 index 0000000000..55b2d0655a --- /dev/null +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/data/xmi/raw/from___storedFormat-DiagType9__of__MyPackage___to___storedFormat-Type10__Raw__Diagram.xmi @@ -0,0 +1,153 @@ +<?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.2/notation" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0"> + <formatdata:NodeFormatData id="//p1/C1-2" width="30" height="30"> + <label id="//p1/C1-2"> + <location y="5"/> + </label> + <siriusStyle xsi:type="diagram:Dot"> + <customFeatures>color</customFeatures> + <description xsi:type="style:DotDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']/@borderedNodeMappings[name='DT9_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="2001"> + <children type="5002"> + <layoutConstraint xsi:type="notation:Location" y="5"/> + </children> + <children type="3017"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="456" y="-2" width="30" height="30"/> + </gmfView> + <location x="456" y="-2"/> + </formatdata:NodeFormatData> + <formatdata:NodeFormatData id="//p1/C1-2" width="30" height="30"> + <label id="//p1/C1-2"> + <location y="5"/> + </label> + <siriusStyle xsi:type="diagram:Dot"> + <customFeatures>borderSize</customFeatures> + <customFeatures>borderSizeComputationExpression</customFeatures> + <customFeatures>color</customFeatures> + <description xsi:type="style:DotDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']/@borderedNodeMappings[name='DT9_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="2001"> + <children type="5002"> + <layoutConstraint xsi:type="notation:Location" y="5"/> + </children> + <children type="3016"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="456" y="-2" width="30" height="30"/> + </gmfView> + <location x="456" y="-2"/> + </formatdata:NodeFormatData> + <formatdata:NodeFormatData id="//p1/p1-1/C1-1-1" width="30" height="30"> + <label id="//p1/p1-1/C1-1-1"> + <location y="5"/> + </label> + <siriusStyle xsi:type="diagram:Dot"> + <customFeatures>borderSize</customFeatures> + <customFeatures>borderSizeComputationExpression</customFeatures> + <description xsi:type="style:DotDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']/@borderedNodeMappings[name='DT9_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="2001"> + <children type="5002"> + <layoutConstraint xsi:type="notation:Location" y="5"/> + </children> + <children type="3016"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="292" y="-2" width="30" height="30"/> + </gmfView> + <location x="292" y="-2"/> + </formatdata:NodeFormatData> + <formatdata:NodeFormatData id="//p1/C1-1" width="61" height="18"> + <label id="//p1/C1-1"> + <location y="5"/> + </label> + <siriusStyle xsi:type="diagram:Dot"> + <customFeatures>borderSize</customFeatures> + <customFeatures>borderSizeComputationExpression</customFeatures> + <description xsi:type="style:DotDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']/@borderedNodeMappings[name='DT9_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="2001"> + <children type="5002"> + <layoutConstraint xsi:type="notation:Location" y="5"/> + </children> + <children type="3016"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Sans" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="144" y="10" width="61" height="18"/> + </gmfView> + <outgoingEdges id="//p1/C1-1/aC1-2" sourceTerminal="(0.5,0.0)" targetTerminal="(0.5,1.0)"> + <label id="//p1/C1-1/aC1-2" width="-1" height="-1"> + <location x="3" y="10"/> + </label> + <siriusStyle xsi:type="diagram:EdgeStyle"> + <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@edgeMappings[name='DT10_EReference']/@style"/> + <centerLabelStyle showIcon="false"/> + </siriusStyle> + <gmfView xsi:type="notation:Edge" type="4001"> + <children type="6001"> + <layoutConstraint xsi:type="notation:Bounds" x="3" y="10"/> + </children> + <children type="6002"> + <layoutConstraint xsi:type="notation:Bounds" x="4" y="-9"/> + </children> + <children type="6003"> + <layoutConstraint xsi:type="notation:Bounds" x="-9" y="2"/> + </children> + <styles xsi:type="notation:ConnectorStyle"/> + <styles xsi:type="notation:FontStyle" fontName="Segoe UI" fontHeight="8"/> + <bendpoints xsi:type="notation:RelativeBendpoints" points="[-15, 6, 200, 170]$[-100, 40, 115, 204]$[-245, 0, -30, 164]$[-215, -164, 0, 0]"/> + <sourceAnchor xsi:type="notation:IdentityAnchor" id="(0.5,0.0)"/> + <targetAnchor xsi:type="notation:IdentityAnchor" id="(0.5,1.0)"/> + </gmfView> + <pointList x="174" y="30"/> + <pointList x="234" y="110"/> + <pointList x="265" y="131"/> + <pointList x="471" y="28"/> + <sourceRefPoint x="159" y="10"/> + <targetRefPoint x="471" y="28"/> + </outgoingEdges> + <outgoingEdges id="//p1/C1-1/aC1-1-1" sourceTerminal="(0.5,0.0)" targetTerminal="(0.5,1.0)"> + <label id="//p1/C1-1/aC1-1-1" width="-1" height="-1"> + <location x="6" y="-8"/> + </label> + <siriusStyle xsi:type="diagram:EdgeStyle"> + <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@edgeMappings[name='DT10_EReference']/@style"/> + <centerLabelStyle showIcon="false"/> + </siriusStyle> + <gmfView xsi:type="notation:Edge" type="4001"> + <children type="6001"> + <layoutConstraint xsi:type="notation:Bounds" x="6" y="-8"/> + </children> + <children type="6002"> + <layoutConstraint xsi:type="notation:Bounds" x="-10" y="-3"/> + </children> + <children type="6003"> + <layoutConstraint xsi:type="notation:Bounds" x="7" y="-10"/> + </children> + <styles xsi:type="notation:ConnectorStyle"/> + <styles xsi:type="notation:FontStyle" fontName="Segoe UI" fontHeight="8"/> + <bendpoints xsi:type="notation:RelativeBendpoints" points="[0, 0, 90, 135]$[-20, -70, 70, 65]$[110, -160, 200, -25]$[-75, -137, 15, -2]"/> + <sourceAnchor xsi:type="notation:IdentityAnchor" id="(0.5,0.0)"/> + <targetAnchor xsi:type="notation:IdentityAnchor" id="(0.5,1.0)"/> + </gmfView> + <pointList x="159" y="10"/> + <pointList x="218" y="-9"/> + <pointList x="427" y="-48"/> + <pointList x="322" y="18"/> + <sourceRefPoint x="159" y="10"/> + <targetRefPoint x="307" y="28"/> + </outgoingEdges> + <location x="144" y="10"/> + </formatdata:NodeFormatData> +</xmi:XMI> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/data/xmi/storedFormat-DiagType10__of__MyPackage.xmi b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/data/xmi/storedFormat-DiagType10__of__MyPackage.xmi new file mode 100644 index 0000000000..98956a7325 --- /dev/null +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/data/xmi/storedFormat-DiagType10__of__MyPackage.xmi @@ -0,0 +1,141 @@ +<?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.2/notation" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0"> + <formatdata:NodeFormatData id="//p1/C1-2" width="30" height="30"> + <label id="//p1/C1-2"> + <location x="31"/> + </label> + <siriusStyle xsi:type="diagram:Lozenge" color="114,73,110"> + <description xsi:type="style:LozengeNodeDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_2_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="2001"> + <children type="5002"> + <layoutConstraint xsi:type="notation:Location" x="31"/> + </children> + <children type="3017"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="90" y="60" width="30" height="30"/> + </gmfView> + <location x="90" y="60"/> + </formatdata:NodeFormatData> + <formatdata:NodeFormatData id="//p1/C1-2" width="30" height="30"> + <label id="//p1/C1-2"> + <location x="31"/> + </label> + <siriusStyle xsi:type="diagram:Ellipse" borderSize="1" borderSizeComputationExpression="1"> + <description xsi:type="style:EllipseNodeDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="2001"> + <children type="5002"> + <layoutConstraint xsi:type="notation:Location" x="31"/> + </children> + <children type="3016"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="-158" y="50" width="30" height="30"/> + </gmfView> + <location x="-158" y="50"/> + </formatdata:NodeFormatData> + <formatdata:NodeFormatData id="//p1/p1-1/C1-1-1" width="30" height="30"> + <label id="//p1/p1-1/C1-1-1"> + <location x="31"/> + </label> + <siriusStyle xsi:type="diagram:Ellipse" borderSize="1" borderSizeComputationExpression="1"> + <description xsi:type="style:EllipseNodeDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="2001"> + <children type="5002"> + <layoutConstraint xsi:type="notation:Location" x="31"/> + </children> + <children type="3016"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="-38" y="50" width="30" height="30"/> + </gmfView> + <location x="-38" y="50"/> + </formatdata:NodeFormatData> + <formatdata:NodeFormatData id="//p1/C1-1" width="30" height="30"> + <label id="//p1/C1-1"> + <location x="31"/> + </label> + <siriusStyle xsi:type="diagram:Ellipse" borderSize="1" borderSizeComputationExpression="1"> + <description xsi:type="style:EllipseNodeDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="2001"> + <children type="5002"> + <layoutConstraint xsi:type="notation:Location" x="31"/> + </children> + <children type="3016"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="-38" y="270" width="30" height="30"/> + </gmfView> + <outgoingEdges id="//p1/C1-1/aC1-2" sourceTerminal="(0.5,0.0)" targetTerminal="(0.5,1.0)"> + <label id="//p1/C1-1/aC1-2" width="-1" height="-1"> + <location y="-10"/> + </label> + <siriusStyle xsi:type="diagram:EdgeStyle"> + <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@edgeMappings[name='DT10_EReference']/@style"/> + <centerLabelStyle showIcon="false"/> + </siriusStyle> + <gmfView xsi:type="notation:Edge" type="4001"> + <children type="6001"> + <layoutConstraint xsi:type="notation:Bounds" y="-10"/> + </children> + <children type="6002"> + <layoutConstraint xsi:type="notation:Bounds" x="5" y="9"/> + </children> + <children type="6003"> + <layoutConstraint xsi:type="notation:Bounds" x="6" y="10"/> + </children> + <styles xsi:type="notation:ConnectorStyle"/> + <styles xsi:type="notation:FontStyle" fontName="Segoe UI" fontHeight="8"/> + <bendpoints xsi:type="notation:RelativeBendpoints" points="[0, 0, 45, 60]$[-45, -60, 0, 0]"/> + <sourceAnchor xsi:type="notation:IdentityAnchor" id="(0.5,0.0)"/> + <targetAnchor xsi:type="notation:IdentityAnchor" id="(0.5,1.0)"/> + </gmfView> + <pointList x="-23" y="270"/> + <pointList x="-143" y="80"/> + <sourceRefPoint x="-23" y="270"/> + <targetRefPoint x="-143" y="80"/> + </outgoingEdges> + <outgoingEdges id="//p1/C1-1/aC1-1-1" sourceTerminal="(0.5,0.0)" targetTerminal="(0.5,1.0)"> + <label id="//p1/C1-1/aC1-1-1" width="-1" height="-1"> + <location y="-10"/> + </label> + <siriusStyle xsi:type="diagram:EdgeStyle"> + <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@edgeMappings[name='DT10_EReference']/@style"/> + <centerLabelStyle showIcon="false"/> + </siriusStyle> + <gmfView xsi:type="notation:Edge" type="4001"> + <children type="6001"> + <layoutConstraint xsi:type="notation:Bounds" y="-10"/> + </children> + <children type="6002"> + <layoutConstraint xsi:type="notation:Bounds" x="-6" y="8"/> + </children> + <children type="6003"> + <layoutConstraint xsi:type="notation:Bounds" x="-5" y="8"/> + </children> + <styles xsi:type="notation:ConnectorStyle"/> + <styles xsi:type="notation:FontStyle" fontName="Segoe UI" fontHeight="8"/> + <bendpoints xsi:type="notation:RelativeBendpoints" points="[0, 0, -45, 60]$[45, -60, 0, 0]"/> + <sourceAnchor xsi:type="notation:IdentityAnchor" id="(0.5,0.0)"/> + <targetAnchor xsi:type="notation:IdentityAnchor" id="(0.5,1.0)"/> + </gmfView> + <pointList x="-23" y="270"/> + <pointList x="-23" y="80"/> + <sourceRefPoint x="-23" y="270"/> + <targetRefPoint x="-23" y="80"/> + </outgoingEdges> + <location x="-38" y="270"/> + </formatdata:NodeFormatData> +</xmi:XMI> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/data/xmi/storedFormat-Type10__Raw__Diagram.xmi b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/data/xmi/storedFormat-Type10__Raw__Diagram.xmi new file mode 100644 index 0000000000..4be02fa984 --- /dev/null +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/data/xmi/storedFormat-Type10__Raw__Diagram.xmi @@ -0,0 +1,147 @@ +<?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.2/notation" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0"> + <formatdata:NodeFormatData id="//p1/C1-2" width="30" height="30"> + <label id="//p1/C1-2"> + <location x="31"/> + </label> + <siriusStyle xsi:type="diagram:Lozenge" color="114,73,210"> + <customFeatures>color</customFeatures> + <description xsi:type="style:LozengeNodeDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_2_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="2001"> + <children type="5002"> + <layoutConstraint xsi:type="notation:Location" x="31"/> + </children> + <children type="3017"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="440" y="185" width="30" height="30"/> + </gmfView> + <location x="440" y="185"/> + </formatdata:NodeFormatData> + <formatdata:NodeFormatData id="//p1/C1-2" width="30" height="30"> + <label id="//p1/C1-2"> + <location x="31"/> + </label> + <siriusStyle xsi:type="diagram:Ellipse" borderSize="1" borderSizeComputationExpression="1" color="200,136,136"> + <customFeatures>color</customFeatures> + <description xsi:type="style:EllipseNodeDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="2001"> + <children type="5002"> + <layoutConstraint xsi:type="notation:Location" x="31"/> + </children> + <children type="3016"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="35" y="81" width="30" height="30"/> + </gmfView> + <location x="35" y="81"/> + </formatdata:NodeFormatData> + <formatdata:NodeFormatData id="//p1/p1-1/C1-1-1" width="30" height="30"> + <label id="//p1/p1-1/C1-1-1"> + <location x="31"/> + </label> + <siriusStyle xsi:type="diagram:Ellipse" borderSize="1" borderSizeComputationExpression="1"> + <description xsi:type="style:EllipseNodeDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="2001"> + <children type="5002"> + <layoutConstraint xsi:type="notation:Location" x="31"/> + </children> + <children type="3016"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="160" y="110" width="30" height="30"/> + </gmfView> + <location x="160" y="110"/> + </formatdata:NodeFormatData> + <formatdata:NodeFormatData id="//p1/C1-1" width="30" height="30"> + <label id="//p1/C1-1"> + <location x="31"/> + </label> + <siriusStyle xsi:type="diagram:Ellipse" borderSize="1" borderSizeComputationExpression="1"> + <description xsi:type="style:EllipseNodeDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_Class']/@style"/> + </siriusStyle> + <gmfView xsi:type="notation:Node" type="2001"> + <children type="5002"> + <layoutConstraint xsi:type="notation:Location" x="31"/> + </children> + <children type="3016"> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI"/> + <layoutConstraint xsi:type="notation:Bounds"/> + </children> + <styles xsi:type="notation:ShapeStyle" fontName="Segoe UI" fontHeight="8"/> + <layoutConstraint xsi:type="notation:Bounds" x="250" y="275" width="30" height="30"/> + </gmfView> + <outgoingEdges id="//p1/C1-1/aC1-2" sourceTerminal="(0.5,0.0)" targetTerminal="(0.5,1.0)"> + <label id="//p1/C1-1/aC1-2" width="-1" height="-1"> + <location x="3" y="10"/> + </label> + <siriusStyle xsi:type="diagram:EdgeStyle"> + <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@edgeMappings[name='DT10_EReference']/@style"/> + <centerLabelStyle showIcon="false"/> + </siriusStyle> + <gmfView xsi:type="notation:Edge" type="4001"> + <children type="6001"> + <layoutConstraint xsi:type="notation:Bounds" x="3" y="10"/> + </children> + <children type="6002"> + <layoutConstraint xsi:type="notation:Bounds" x="4" y="-9"/> + </children> + <children type="6003"> + <layoutConstraint xsi:type="notation:Bounds" x="-9" y="2"/> + </children> + <styles xsi:type="notation:ConnectorStyle"/> + <styles xsi:type="notation:FontStyle" fontName="Segoe UI" fontHeight="8"/> + <bendpoints xsi:type="notation:RelativeBendpoints" points="[-15, 6, 200, 170]$[-100, 40, 115, 204]$[-245, 0, -30, 164]$[-215, -164, 0, 0]"/> + <sourceAnchor xsi:type="notation:IdentityAnchor" id="(0.5,0.0)"/> + <targetAnchor xsi:type="notation:IdentityAnchor" id="(0.5,1.0)"/> + </gmfView> + <pointList x="250" y="281"/> + <pointList x="165" y="315"/> + <pointList x="20" y="275"/> + <pointList x="50" y="111"/> + <sourceRefPoint x="265" y="275"/> + <targetRefPoint x="50" y="111"/> + </outgoingEdges> + <outgoingEdges id="//p1/C1-1/aC1-1-1" sourceTerminal="(0.5,0.0)" targetTerminal="(0.5,1.0)"> + <label id="//p1/C1-1/aC1-1-1" width="-1" height="-1"> + <location x="6" y="-8"/> + </label> + <siriusStyle xsi:type="diagram:EdgeStyle"> + <description xsi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@edgeMappings[name='DT10_EReference']/@style"/> + <centerLabelStyle showIcon="false"/> + </siriusStyle> + <gmfView xsi:type="notation:Edge" type="4001"> + <children type="6001"> + <layoutConstraint xsi:type="notation:Bounds" x="6" y="-8"/> + </children> + <children type="6002"> + <layoutConstraint xsi:type="notation:Bounds" x="-10" y="-3"/> + </children> + <children type="6003"> + <layoutConstraint xsi:type="notation:Bounds" x="7" y="-10"/> + </children> + <styles xsi:type="notation:ConnectorStyle"/> + <styles xsi:type="notation:FontStyle" fontName="Segoe UI" fontHeight="8"/> + <bendpoints xsi:type="notation:RelativeBendpoints" points="[0, 0, 90, 135]$[-20, -70, 70, 65]$[110, -160, 200, -25]$[-75, -137, 15, -2]"/> + <sourceAnchor xsi:type="notation:IdentityAnchor" id="(0.5,0.0)"/> + <targetAnchor xsi:type="notation:IdentityAnchor" id="(0.5,1.0)"/> + </gmfView> + <pointList x="265" y="275"/> + <pointList x="245" y="205"/> + <pointList x="375" y="115"/> + <pointList x="190" y="138"/> + <sourceRefPoint x="265" y="275"/> + <targetRefPoint x="175" y="140"/> + </outgoingEdges> + <location x="250" y="275"/> + </formatdata:NodeFormatData> +</xmi:XMI> diff --git a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/format/data/AbstractSiriusFormatDataManagerForSemanticElementsTest.java b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/format/data/AbstractSiriusFormatDataManagerForSemanticElementsTest.java index 8f5e8d4045..adc32c03fd 100644 --- a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/format/data/AbstractSiriusFormatDataManagerForSemanticElementsTest.java +++ b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/format/data/AbstractSiriusFormatDataManagerForSemanticElementsTest.java @@ -39,7 +39,6 @@ import org.eclipse.sirius.diagram.formatdata.NodeFormatData; import org.eclipse.sirius.diagram.formatdata.tools.api.util.FormatHelper; import org.eclipse.sirius.diagram.formatdata.tools.api.util.FormatHelper.FormatDifference; import org.eclipse.sirius.diagram.formatdata.tools.api.util.configuration.Configuration; -import org.eclipse.sirius.diagram.ui.tools.api.format.FormatDataHelper; import org.eclipse.sirius.diagram.ui.tools.api.format.FormatDataKey; import org.eclipse.sirius.diagram.ui.tools.internal.format.AdvancedSiriusFormatDataManager; import org.eclipse.sirius.diagram.ui.tools.internal.format.NodeFormatDataKey; @@ -65,7 +64,7 @@ import com.google.common.collect.Lists; * * @author dlecan */ -public class AbstractSiriusFormatDataManagerForSemanticElementsTest extends SiriusDiagramTestCase { +public abstract class AbstractSiriusFormatDataManagerForSemanticElementsTest extends SiriusDiagramTestCase { protected static final boolean REGENERATE_TEST_DATA = false; @@ -197,9 +196,16 @@ public class AbstractSiriusFormatDataManagerForSemanticElementsTest extends Siri protected static final Diagram DIAG_TYPE9_RAW = new Diagram("Type9 Raw Diagram", 11, 0, true); + protected static final Diagram DIAG_TYPE10_MYPACKAGE = new Diagram("DiagType10 of MyPackage", 4, 2); + + protected static final Diagram DIAG_TYPE10_RAW = new Diagram("Type10 Raw Diagram", 4, 2, true); + protected static final Representation REPRES_TYPE9 = new Representation("DiagType9", DIAG_TYPE9_MYPACKAGE, DIAG_TYPE9_RAW); - protected static final Representation[] ALL_REPRESENTATIONS = { REPRES_TYPE1, REPRES_TYPE2, REPRES_TYPE3, REPRES_TYPE4, REPRES_TYPE5, REPRES_TYPE6, REPRES_TYPE7, REPRES_TYPE8, REPRES_TYPE9 }; + protected static final Representation REPRES_TYPE10 = new Representation("DiagType10", DIAG_TYPE10_MYPACKAGE, DIAG_TYPE10_RAW); + + protected static final Representation[] ALL_REPRESENTATIONS = { REPRES_TYPE1, REPRES_TYPE2, REPRES_TYPE3, REPRES_TYPE4, REPRES_TYPE5, REPRES_TYPE6, REPRES_TYPE7, REPRES_TYPE8, REPRES_TYPE9, + REPRES_TYPE10 }; protected static final String[][] ENCODED_CHARS = { { " ", "__" } }; @@ -207,8 +213,8 @@ public class AbstractSiriusFormatDataManagerForSemanticElementsTest extends Siri protected static final double LOW_ZOOM_LEVEL = 0.50; - // Really, shouldn't be higher than 15px - protected static final double LOW_ZOOM_DISTANCE = 15; + // Really, shouldn't be higher than 20px + protected static final double LOW_ZOOM_DISTANCE = 20; protected static final double IDENTITY_ZOOM_LEVEL = 1.0; @@ -382,12 +388,19 @@ public class AbstractSiriusFormatDataManagerForSemanticElementsTest extends Siri // Load referenced data final List<EObject> contents = loadReferenceData(path); - // Data will be sorted by keys, which are comparable - final Map<FormatDataKey, EObject> expected = new TreeMap<FormatDataKey, EObject>(); + // Data will be sorted by id + final List<EObject> expected = new ArrayList<EObject>(); for (final EObject eObject : contents) { - final FormatDataKey key = FormatDataHelper.INSTANCE.createKey((AbstractFormatData) eObject); - expected.put(key, eObject); + expected.add(eObject); } + Collections.sort(expected, new Comparator<EObject>() { + @Override + public int compare(EObject o1, EObject o2) { + AbstractFormatData formatData1 = (AbstractFormatData) o1; + AbstractFormatData formatData2 = (AbstractFormatData) o2; + return formatData1.getId().compareTo(formatData2.getId()); + } + }); // Sort elements, SemanticNodeFormatDataKey are comparable TreeMap<NodeFormatDataKey, Map<String, NodeFormatData>> rootNodeFormatDataMap = new TreeMap<NodeFormatDataKey, Map<String, NodeFormatData>>(newManager.getRootNodeFormatData()); @@ -395,7 +408,7 @@ public class AbstractSiriusFormatDataManagerForSemanticElementsTest extends Siri List<NodeFormatData> nodeFormatDataList = getNodeFormatDataList(rootNodeFormatDataMap); // Compare results - final FormatDifference<?> difference = FormatHelper.INSTANCE.computeFirstFormatDifference(expected.values(), nodeFormatDataList, configuration); + final FormatDifference<?> difference = FormatHelper.INSTANCE.computeFirstFormatDifference(expected, nodeFormatDataList, configuration); return difference; } |