Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvlorenzo2012-04-12 09:37:04 +0000
committervlorenzo2012-04-12 09:37:04 +0000
commita2376aeb6bd43880cf85badea81b084658b0d2c4 (patch)
treee534750dfe33d76dcd4b829e23b7e33afa7a7405
parent78fe6e4443af6989c750ddd1a9f921813c52bade (diff)
downloadorg.eclipse.papyrus-a2376aeb6bd43880cf85badea81b084658b0d2c4.tar.gz
org.eclipse.papyrus-a2376aeb6bd43880cf85badea81b084658b0d2c4.tar.xz
org.eclipse.papyrus-a2376aeb6bd43880cf85badea81b084658b0d2c4.zip
Save the example for ReferenceOrderChange
-rw-r--r--sandbox/UMLCompareMergerExample/ReferenceOrderChangeMerger/.project11
-rw-r--r--sandbox/UMLCompareMergerExample/ReferenceOrderChangeMerger/model.di17
-rw-r--r--sandbox/UMLCompareMergerExample/ReferenceOrderChangeMerger/model.notation63
-rw-r--r--sandbox/UMLCompareMergerExample/ReferenceOrderChangeMerger/model.uml12
-rw-r--r--sandbox/UMLCompareMergerExample/ReferenceOrderChangeMerger/model2.di17
-rw-r--r--sandbox/UMLCompareMergerExample/ReferenceOrderChangeMerger/model2.notation63
-rw-r--r--sandbox/UMLCompareMergerExample/ReferenceOrderChangeMerger/model2.uml12
7 files changed, 195 insertions, 0 deletions
diff --git a/sandbox/UMLCompareMergerExample/ReferenceOrderChangeMerger/.project b/sandbox/UMLCompareMergerExample/ReferenceOrderChangeMerger/.project
new file mode 100644
index 00000000000..d995741d7dc
--- /dev/null
+++ b/sandbox/UMLCompareMergerExample/ReferenceOrderChangeMerger/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>ReferenceOrderChangeMerger</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ </buildSpec>
+ <natures>
+ </natures>
+</projectDescription>
diff --git a/sandbox/UMLCompareMergerExample/ReferenceOrderChangeMerger/model.di b/sandbox/UMLCompareMergerExample/ReferenceOrderChangeMerger/model.di
new file mode 100644
index 00000000000..385b88ea881
--- /dev/null
+++ b/sandbox/UMLCompareMergerExample/ReferenceOrderChangeMerger/model.di
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="ASCII"?>
+<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">
+ <pageList>
+ <availablePage>
+ <emfPageIdentifier href="model.notation#_nNaD0ISAEeGLQPakUzVr5w"/>
+ </availablePage>
+ </pageList>
+ <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
+ <windows>
+ <children xsi:type="di:TabFolder">
+ <children>
+ <emfPageIdentifier href="model.notation#_nNaD0ISAEeGLQPakUzVr5w"/>
+ </children>
+ </children>
+ </windows>
+ </sashModel>
+</di:SashWindowsMngr>
diff --git a/sandbox/UMLCompareMergerExample/ReferenceOrderChangeMerger/model.notation b/sandbox/UMLCompareMergerExample/ReferenceOrderChangeMerger/model.notation
new file mode 100644
index 00000000000..3f5c8fab76a
--- /dev/null
+++ b/sandbox/UMLCompareMergerExample/ReferenceOrderChangeMerger/model.notation
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_nNaD0ISAEeGLQPakUzVr5w" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">
+ <children xmi:type="notation:Shape" xmi:id="_pqsloISAEeGLQPakUzVr5w" type="2008" fontName="Segoe UI" lineColor="0">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pqtMsISAEeGLQPakUzVr5w" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pqtMsYSAEeGLQPakUzVr5w" key="fontHeight" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pqtMsoSAEeGLQPakUzVr5w" key="bold" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pqtMs4SAEeGLQPakUzVr5w" key="italic" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pqtMtISAEeGLQPakUzVr5w" key="fontColor" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pqtMtYSAEeGLQPakUzVr5w" key="fillColor" value="true"/>
+ </eAnnotations>
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pqtzwISAEeGLQPakUzVr5w" source="ShadowFigure">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pqua0ISAEeGLQPakUzVr5w" key="ShadowFigure_Value" value="false"/>
+ </eAnnotations>
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pqua0YSAEeGLQPakUzVr5w" source="displayNameLabelIcon">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pqua0oSAEeGLQPakUzVr5w" key="displayNameLabelIcon_value" value="false"/>
+ </eAnnotations>
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pqua04SAEeGLQPakUzVr5w" source="QualifiedName">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pqua1ISAEeGLQPakUzVr5w" key="QualifiedNameDepth" value="1000"/>
+ </eAnnotations>
+ <children xmi:type="notation:DecorationNode" xmi:id="_pqvB4ISAEeGLQPakUzVr5w" type="5029"/>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_pqvB4YSAEeGLQPakUzVr5w" type="7017">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pqvo8ISAEeGLQPakUzVr5w" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pqvo8YSAEeGLQPakUzVr5w" key="showTitle" value="true"/>
+ </eAnnotations>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_pqvB4oSAEeGLQPakUzVr5w"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_pqvB44SAEeGLQPakUzVr5w"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_pqvB5ISAEeGLQPakUzVr5w"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pqvB5YSAEeGLQPakUzVr5w"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_pqvB5oSAEeGLQPakUzVr5w" type="7018">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pqvo8oSAEeGLQPakUzVr5w" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pqvo84SAEeGLQPakUzVr5w" key="showTitle" value="true"/>
+ </eAnnotations>
+ <children xmi:type="notation:Shape" xmi:id="_uWHy8ISAEeGLQPakUzVr5w" type="3013" fontName="Segoe UI" lineColor="0">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uWHy8oSAEeGLQPakUzVr5w" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uWHy84SAEeGLQPakUzVr5w" key="fontHeight" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uWHy9ISAEeGLQPakUzVr5w" key="bold" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uWHy9YSAEeGLQPakUzVr5w" key="italic" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uWHy9oSAEeGLQPakUzVr5w" key="fontColor" value="true"/>
+ </eAnnotations>
+ <element xmi:type="uml:Operation" href="model.uml#_uWFWsISAEeGLQPakUzVr5w"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_uWHy8YSAEeGLQPakUzVr5w"/>
+ </children>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_pqvB54SAEeGLQPakUzVr5w"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_pqvB6ISAEeGLQPakUzVr5w"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_pqvB6YSAEeGLQPakUzVr5w"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pqvB6oSAEeGLQPakUzVr5w"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_pqvB64SAEeGLQPakUzVr5w" type="7019">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pqwQAISAEeGLQPakUzVr5w" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pqwQAYSAEeGLQPakUzVr5w" key="showTitle" value="true"/>
+ </eAnnotations>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_pqvB7ISAEeGLQPakUzVr5w"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_pqvB7YSAEeGLQPakUzVr5w"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_pqvB7oSAEeGLQPakUzVr5w"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pqvB74SAEeGLQPakUzVr5w"/>
+ </children>
+ <element xmi:type="uml:Class" href="model.uml#_pqfKQISAEeGLQPakUzVr5w"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pqsloYSAEeGLQPakUzVr5w" x="264" y="137" width="612" height="254"/>
+ </children>
+ <styles xmi:type="notation:DiagramStyle" xmi:id="_nNaq4ISAEeGLQPakUzVr5w"/>
+ <element xmi:type="uml:Model" href="model.uml#_nNVLUISAEeGLQPakUzVr5w"/>
+</notation:Diagram>
diff --git a/sandbox/UMLCompareMergerExample/ReferenceOrderChangeMerger/model.uml b/sandbox/UMLCompareMergerExample/ReferenceOrderChangeMerger/model.uml
new file mode 100644
index 00000000000..e698bcef805
--- /dev/null
+++ b/sandbox/UMLCompareMergerExample/ReferenceOrderChangeMerger/model.uml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_nNVLUISAEeGLQPakUzVr5w" name="Model">
+ <packageImport xmi:id="_nNVLUYSAEeGLQPakUzVr5w">
+ <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
+ </packageImport>
+ <packagedElement xmi:type="uml:Class" xmi:id="_pqfKQISAEeGLQPakUzVr5w" name="Class1">
+ <ownedOperation xmi:id="_uWFWsISAEeGLQPakUzVr5w" name="Operation1">
+ <ownedParameter xmi:id="_8wzT0ISAEeGLQPakUzVr5w" name="param1"/>
+ <ownedParameter xmi:id="_9k8GgISAEeGLQPakUzVr5w" name="param2"/>
+ </ownedOperation>
+ </packagedElement>
+</uml:Model>
diff --git a/sandbox/UMLCompareMergerExample/ReferenceOrderChangeMerger/model2.di b/sandbox/UMLCompareMergerExample/ReferenceOrderChangeMerger/model2.di
new file mode 100644
index 00000000000..eaeddd6baa0
--- /dev/null
+++ b/sandbox/UMLCompareMergerExample/ReferenceOrderChangeMerger/model2.di
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="ASCII"?>
+<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">
+ <pageList>
+ <availablePage>
+ <emfPageIdentifier href="model2.notation#_nNaD0ISAEeGLQPakUzVr5w"/>
+ </availablePage>
+ </pageList>
+ <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
+ <windows>
+ <children xsi:type="di:TabFolder">
+ <children>
+ <emfPageIdentifier href="model2.notation#_nNaD0ISAEeGLQPakUzVr5w"/>
+ </children>
+ </children>
+ </windows>
+ </sashModel>
+</di:SashWindowsMngr>
diff --git a/sandbox/UMLCompareMergerExample/ReferenceOrderChangeMerger/model2.notation b/sandbox/UMLCompareMergerExample/ReferenceOrderChangeMerger/model2.notation
new file mode 100644
index 00000000000..7d94b63ac60
--- /dev/null
+++ b/sandbox/UMLCompareMergerExample/ReferenceOrderChangeMerger/model2.notation
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_nNaD0ISAEeGLQPakUzVr5w" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">
+ <children xmi:type="notation:Shape" xmi:id="_pqsloISAEeGLQPakUzVr5w" type="2008" fontName="Segoe UI" lineColor="0">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pqtMsISAEeGLQPakUzVr5w" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pqtMsYSAEeGLQPakUzVr5w" key="fontHeight" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pqtMsoSAEeGLQPakUzVr5w" key="bold" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pqtMs4SAEeGLQPakUzVr5w" key="italic" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pqtMtISAEeGLQPakUzVr5w" key="fontColor" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pqtMtYSAEeGLQPakUzVr5w" key="fillColor" value="true"/>
+ </eAnnotations>
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pqtzwISAEeGLQPakUzVr5w" source="ShadowFigure">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pqua0ISAEeGLQPakUzVr5w" key="ShadowFigure_Value" value="false"/>
+ </eAnnotations>
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pqua0YSAEeGLQPakUzVr5w" source="displayNameLabelIcon">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pqua0oSAEeGLQPakUzVr5w" key="displayNameLabelIcon_value" value="false"/>
+ </eAnnotations>
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pqua04SAEeGLQPakUzVr5w" source="QualifiedName">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pqua1ISAEeGLQPakUzVr5w" key="QualifiedNameDepth" value="1000"/>
+ </eAnnotations>
+ <children xmi:type="notation:DecorationNode" xmi:id="_pqvB4ISAEeGLQPakUzVr5w" type="5029"/>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_pqvB4YSAEeGLQPakUzVr5w" type="7017">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pqvo8ISAEeGLQPakUzVr5w" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pqvo8YSAEeGLQPakUzVr5w" key="showTitle" value="true"/>
+ </eAnnotations>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_pqvB4oSAEeGLQPakUzVr5w"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_pqvB44SAEeGLQPakUzVr5w"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_pqvB5ISAEeGLQPakUzVr5w"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pqvB5YSAEeGLQPakUzVr5w"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_pqvB5oSAEeGLQPakUzVr5w" type="7018">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pqvo8oSAEeGLQPakUzVr5w" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pqvo84SAEeGLQPakUzVr5w" key="showTitle" value="true"/>
+ </eAnnotations>
+ <children xmi:type="notation:Shape" xmi:id="_uWHy8ISAEeGLQPakUzVr5w" type="3013" fontName="Segoe UI" lineColor="0">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uWHy8oSAEeGLQPakUzVr5w" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uWHy84SAEeGLQPakUzVr5w" key="fontHeight" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uWHy9ISAEeGLQPakUzVr5w" key="bold" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uWHy9YSAEeGLQPakUzVr5w" key="italic" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uWHy9oSAEeGLQPakUzVr5w" key="fontColor" value="true"/>
+ </eAnnotations>
+ <element xmi:type="uml:Operation" href="model2.uml#_uWFWsISAEeGLQPakUzVr5w"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_uWHy8YSAEeGLQPakUzVr5w"/>
+ </children>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_pqvB54SAEeGLQPakUzVr5w"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_pqvB6ISAEeGLQPakUzVr5w"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_pqvB6YSAEeGLQPakUzVr5w"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pqvB6oSAEeGLQPakUzVr5w"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_pqvB64SAEeGLQPakUzVr5w" type="7019">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pqwQAISAEeGLQPakUzVr5w" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pqwQAYSAEeGLQPakUzVr5w" key="showTitle" value="true"/>
+ </eAnnotations>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_pqvB7ISAEeGLQPakUzVr5w"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_pqvB7YSAEeGLQPakUzVr5w"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_pqvB7oSAEeGLQPakUzVr5w"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pqvB74SAEeGLQPakUzVr5w"/>
+ </children>
+ <element xmi:type="uml:Class" href="model2.uml#_pqfKQISAEeGLQPakUzVr5w"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pqsloYSAEeGLQPakUzVr5w" x="264" y="137" width="612" height="254"/>
+ </children>
+ <styles xmi:type="notation:DiagramStyle" xmi:id="_nNaq4ISAEeGLQPakUzVr5w"/>
+ <element xmi:type="uml:Model" href="model2.uml#_nNVLUISAEeGLQPakUzVr5w"/>
+</notation:Diagram>
diff --git a/sandbox/UMLCompareMergerExample/ReferenceOrderChangeMerger/model2.uml b/sandbox/UMLCompareMergerExample/ReferenceOrderChangeMerger/model2.uml
new file mode 100644
index 00000000000..80a87d7702d
--- /dev/null
+++ b/sandbox/UMLCompareMergerExample/ReferenceOrderChangeMerger/model2.uml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_nNVLUISAEeGLQPakUzVr5w" name="Model">
+ <packageImport xmi:id="_nNVLUYSAEeGLQPakUzVr5w">
+ <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
+ </packageImport>
+ <packagedElement xmi:type="uml:Class" xmi:id="_pqfKQISAEeGLQPakUzVr5w" name="Class1">
+ <ownedOperation xmi:id="_uWFWsISAEeGLQPakUzVr5w" name="Operation1">
+ <ownedParameter xmi:id="_9k8GgISAEeGLQPakUzVr5w" name="param2"/>
+ <ownedParameter xmi:id="_8wzT0ISAEeGLQPakUzVr5w" name="param1"/>
+ </ownedOperation>
+ </packagedElement>
+</uml:Model>

Back to the top