Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/result/wave.notation')
-rw-r--r--compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/result/wave.notation191
1 files changed, 191 insertions, 0 deletions
diff --git a/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/result/wave.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/result/wave.notation
new file mode 100644
index 00000000..a9a11786
--- /dev/null
+++ b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/result/wave.notation
@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_zK9bUAeTEeapseY6dvJNJQ" type="PapyrusUMLClassDiagram" name="WaveDiagram" measurementUnit="Pixel">
+ <children xmi:type="notation:Shape" xmi:id="_z-2WYAeTEeapseY6dvJNJQ" type="2008">
+ <children xmi:type="notation:DecorationNode" xmi:id="_z-29cAeTEeapseY6dvJNJQ" type="5029"/>
+ <children xmi:type="notation:DecorationNode" xmi:id="_z-29cQeTEeapseY6dvJNJQ" type="8510">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_z-29cgeTEeapseY6dvJNJQ" y="5"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_z-29cweTEeapseY6dvJNJQ" type="7017">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_z-29dAeTEeapseY6dvJNJQ"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_z-29dQeTEeapseY6dvJNJQ"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_z-29dgeTEeapseY6dvJNJQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_z-29dweTEeapseY6dvJNJQ"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_z-29eAeTEeapseY6dvJNJQ" type="7018">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_z-29eQeTEeapseY6dvJNJQ"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_z-29egeTEeapseY6dvJNJQ"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_z-29eweTEeapseY6dvJNJQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_z-29fAeTEeapseY6dvJNJQ"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_z-29fQeTEeapseY6dvJNJQ" type="7019">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_z-29fgeTEeapseY6dvJNJQ"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_z-29fweTEeapseY6dvJNJQ"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_z-29gAeTEeapseY6dvJNJQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_z-29gQeTEeapseY6dvJNJQ"/>
+ </children>
+ <element xmi:type="uml:Class" href="wave.uml#_YnjOEAeTEeapseY6dvJNJQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_z-2WYQeTEeapseY6dvJNJQ" x="477" y="64"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_z_DKsAeTEeapseY6dvJNJQ" type="2004">
+ <children xmi:type="notation:DecorationNode" xmi:id="_z_DxwAeTEeapseY6dvJNJQ" type="5011"/>
+ <children xmi:type="notation:DecorationNode" xmi:id="_z_DxwQeTEeapseY6dvJNJQ" type="8507">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_z_DxwgeTEeapseY6dvJNJQ" y="5"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_z_DxwweTEeapseY6dvJNJQ" type="7006">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_z_DxxAeTEeapseY6dvJNJQ"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_z_DxxQeTEeapseY6dvJNJQ"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_z_DxxgeTEeapseY6dvJNJQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_z_DxxweTEeapseY6dvJNJQ"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_z_DxyAeTEeapseY6dvJNJQ" type="7007">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_z_DxyQeTEeapseY6dvJNJQ"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_z_DxygeTEeapseY6dvJNJQ"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_z_DxyweTEeapseY6dvJNJQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_z_DxzAeTEeapseY6dvJNJQ"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_z_DxzQeTEeapseY6dvJNJQ" type="7008">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_z_DxzgeTEeapseY6dvJNJQ"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_z_DxzweTEeapseY6dvJNJQ"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_z_Dx0AeTEeapseY6dvJNJQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_z_Dx0QeTEeapseY6dvJNJQ"/>
+ </children>
+ <element xmi:type="uml:Interface" href="model.uml#_b9l80AeTEeapseY6dvJNJQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_z_DKsQeTEeapseY6dvJNJQ" x="466" y="298"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_clGzUAeUEeapseY6dvJNJQ" type="2008">
+ <children xmi:type="notation:DecorationNode" xmi:id="_clIBcAeUEeapseY6dvJNJQ" type="5029"/>
+ <children xmi:type="notation:DecorationNode" xmi:id="_clIBcQeUEeapseY6dvJNJQ" type="8510">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_clIBcgeUEeapseY6dvJNJQ" y="5"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_clIBcweUEeapseY6dvJNJQ" type="7017">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_clIBdAeUEeapseY6dvJNJQ"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_clIBdQeUEeapseY6dvJNJQ"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_clIBdgeUEeapseY6dvJNJQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_clIBdweUEeapseY6dvJNJQ"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_clIBeAeUEeapseY6dvJNJQ" type="7018">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_clIBeQeUEeapseY6dvJNJQ"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_clIBegeUEeapseY6dvJNJQ"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_clIBeweUEeapseY6dvJNJQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_clIBfAeUEeapseY6dvJNJQ"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_clIBfQeUEeapseY6dvJNJQ" type="7019">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_clIBfgeUEeapseY6dvJNJQ"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_clIBfweUEeapseY6dvJNJQ"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_clIBgAeUEeapseY6dvJNJQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_clIBgQeUEeapseY6dvJNJQ"/>
+ </children>
+ <element xmi:type="uml:Class" href="wave.uml#_RWe-wAeUEeapseY6dvJNJQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_clGzUQeUEeapseY6dvJNJQ" x="999" y="64"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_clX5EAeUEeapseY6dvJNJQ" type="2004">
+ <children xmi:type="notation:DecorationNode" xmi:id="_clX5EgeUEeapseY6dvJNJQ" type="5011"/>
+ <children xmi:type="notation:DecorationNode" xmi:id="_clX5EweUEeapseY6dvJNJQ" type="8507">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_clX5FAeUEeapseY6dvJNJQ" y="5"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_clX5FQeUEeapseY6dvJNJQ" type="7006">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_clX5FgeUEeapseY6dvJNJQ"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_clX5FweUEeapseY6dvJNJQ"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_clX5GAeUEeapseY6dvJNJQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_clX5GQeUEeapseY6dvJNJQ"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_clX5GgeUEeapseY6dvJNJQ" type="7007">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_clX5GweUEeapseY6dvJNJQ"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_clX5HAeUEeapseY6dvJNJQ"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_clX5HQeUEeapseY6dvJNJQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_clX5HgeUEeapseY6dvJNJQ"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_clYgIAeUEeapseY6dvJNJQ" type="7008">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_clYgIQeUEeapseY6dvJNJQ"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_clYgIgeUEeapseY6dvJNJQ"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_clYgIweUEeapseY6dvJNJQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_clYgJAeUEeapseY6dvJNJQ"/>
+ </children>
+ <element xmi:type="uml:Interface" href="model.uml#_KfvwcAeUEeapseY6dvJNJQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_clX5EQeUEeapseY6dvJNJQ" x="701" y="288"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_cl1zIAeUEeapseY6dvJNJQ" type="2008">
+ <children xmi:type="notation:DecorationNode" xmi:id="_cl1zIgeUEeapseY6dvJNJQ" type="5029"/>
+ <children xmi:type="notation:DecorationNode" xmi:id="_cl1zIweUEeapseY6dvJNJQ" type="8510">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_cl1zJAeUEeapseY6dvJNJQ" y="5"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_cl1zJQeUEeapseY6dvJNJQ" type="7017">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_cl1zJgeUEeapseY6dvJNJQ"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_cl1zJweUEeapseY6dvJNJQ"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_cl1zKAeUEeapseY6dvJNJQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cl1zKQeUEeapseY6dvJNJQ"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_cl1zKgeUEeapseY6dvJNJQ" type="7018">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_cl1zKweUEeapseY6dvJNJQ"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_cl1zLAeUEeapseY6dvJNJQ"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_cl1zLQeUEeapseY6dvJNJQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cl1zLgeUEeapseY6dvJNJQ"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_cl1zLweUEeapseY6dvJNJQ" type="7019">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_cl1zMAeUEeapseY6dvJNJQ"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_cl1zMQeUEeapseY6dvJNJQ"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_cl1zMgeUEeapseY6dvJNJQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cl1zMweUEeapseY6dvJNJQ"/>
+ </children>
+ <element xmi:type="uml:Class" href="wave.uml#_X0F7YAeUEeapseY6dvJNJQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cl1zIQeUEeapseY6dvJNJQ" x="738" y="50"/>
+ </children>
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_zK9bUQeTEeapseY6dvJNJQ" name="diagram_compatibility_version" stringValue="1.1.0"/>
+ <styles xmi:type="notation:DiagramStyle" xmi:id="_zK9bUgeTEeapseY6dvJNJQ"/>
+ <styles xmi:type="style:PapyrusViewStyle" xmi:id="_zK9bUweTEeapseY6dvJNJQ">
+ <owner xmi:type="uml:Package" href="wave.uml#_MQcHcAeTEeapseY6dvJNJQ"/>
+ </styles>
+ <element xmi:type="uml:Package" href="wave.uml#_MQcHcAeTEeapseY6dvJNJQ"/>
+ <edges xmi:type="notation:Connector" xmi:id="_z_TCUAeTEeapseY6dvJNJQ" type="4008" source="_z-2WYAeTEeapseY6dvJNJQ" target="_z_DKsAeTEeapseY6dvJNJQ">
+ <children xmi:type="notation:DecorationNode" xmi:id="_z_TCUweTEeapseY6dvJNJQ" type="6026">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_z_TCVAeTEeapseY6dvJNJQ" y="40"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_z_TpYAeTEeapseY6dvJNJQ" type="6027">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_z_TpYQeTEeapseY6dvJNJQ" y="60"/>
+ </children>
+ <styles xmi:type="notation:FontStyle" xmi:id="_z_TCUQeTEeapseY6dvJNJQ"/>
+ <element xmi:type="uml:Realization" href="wave.uml#_wsQkQAeTEeapseY6dvJNJQ"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_z_TCUgeTEeapseY6dvJNJQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_z_TpYgeTEeapseY6dvJNJQ" id="(0.23,1.0)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_z_TpYweTEeapseY6dvJNJQ" id="(0.0,0.0)"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_clq0AAeUEeapseY6dvJNJQ" type="4008" source="_clGzUAeUEeapseY6dvJNJQ" target="_clX5EAeUEeapseY6dvJNJQ">
+ <children xmi:type="notation:DecorationNode" xmi:id="_clq0AweUEeapseY6dvJNJQ" type="6026">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_clq0BAeUEeapseY6dvJNJQ" y="40"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_clq0BQeUEeapseY6dvJNJQ" type="6027">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_clq0BgeUEeapseY6dvJNJQ" y="60"/>
+ </children>
+ <styles xmi:type="notation:FontStyle" xmi:id="_clq0AQeUEeapseY6dvJNJQ"/>
+ <element xmi:type="uml:Realization" href="wave.uml#_Vef9AAeUEeapseY6dvJNJQ"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_clq0AgeUEeapseY6dvJNJQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_clq0BweUEeapseY6dvJNJQ" id="(0.0,0.0)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_clq0CAeUEeapseY6dvJNJQ" id="(0.0,0.0)"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_cmJ8MAeUEeapseY6dvJNJQ" type="4008" source="_cl1zIAeUEeapseY6dvJNJQ" target="_z_DKsAeTEeapseY6dvJNJQ">
+ <children xmi:type="notation:DecorationNode" xmi:id="_cmJ8MweUEeapseY6dvJNJQ" type="6026">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_cmJ8NAeUEeapseY6dvJNJQ" y="40"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_cmKjQAeUEeapseY6dvJNJQ" type="6027">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_cmKjQQeUEeapseY6dvJNJQ" y="60"/>
+ </children>
+ <styles xmi:type="notation:FontStyle" xmi:id="_cmJ8MQeUEeapseY6dvJNJQ"/>
+ <element xmi:type="uml:Realization" href="wave.uml#_Z1xfQAeUEeapseY6dvJNJQ"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_cmJ8MgeUEeapseY6dvJNJQ" points="[0, 0, -406, -226]$[406, 226, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_cmKjQgeUEeapseY6dvJNJQ" id="(0.0,0.0)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_cmKjQweUEeapseY6dvJNJQ" id="(0.0,0.0)"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_cmWJcAeUEeapseY6dvJNJQ" type="4008" source="_cl1zIAeUEeapseY6dvJNJQ" target="_clX5EAeUEeapseY6dvJNJQ">
+ <children xmi:type="notation:DecorationNode" xmi:id="_cmWwgAeUEeapseY6dvJNJQ" type="6026">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_cmWwgQeUEeapseY6dvJNJQ" y="40"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_cmWwggeUEeapseY6dvJNJQ" type="6027">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_cmWwgweUEeapseY6dvJNJQ" y="60"/>
+ </children>
+ <styles xmi:type="notation:FontStyle" xmi:id="_cmWJcQeUEeapseY6dvJNJQ"/>
+ <element xmi:type="uml:Realization" href="wave.uml#_aytooAeUEeapseY6dvJNJQ"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_cmWJcgeUEeapseY6dvJNJQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_cmXXkAeUEeapseY6dvJNJQ" id="(0.25,1.0)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_cmXXkQeUEeapseY6dvJNJQ" id="(0.0,0.0)"/>
+ </edges>
+</notation:Diagram>

Back to the top