Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvlorenzo2012-04-11 11:12:47 -0400
committervlorenzo2012-04-11 11:12:47 -0400
commita387c39b648c4e1881c8e8bb585247fe4507c537 (patch)
tree49144b24072ea420f95e47f347a83f167e4ee01f /sandbox/UMLCompareMergerExample
parentf144f20d8687d946fb43e04d8b8be7ad12e0f1dd (diff)
downloadorg.eclipse.papyrus-a387c39b648c4e1881c8e8bb585247fe4507c537.tar.gz
org.eclipse.papyrus-a387c39b648c4e1881c8e8bb585247fe4507c537.tar.xz
org.eclipse.papyrus-a387c39b648c4e1881c8e8bb585247fe4507c537.zip
A save of my work
Diffstat (limited to 'sandbox/UMLCompareMergerExample')
-rw-r--r--sandbox/UMLCompareMergerExample/ModelElementChangeLeftTargetExample2/.project11
-rw-r--r--sandbox/UMLCompareMergerExample/ModelElementChangeLeftTargetExample2/myModel.di17
-rw-r--r--sandbox/UMLCompareMergerExample/ModelElementChangeLeftTargetExample2/myModel.notation63
-rw-r--r--sandbox/UMLCompareMergerExample/ModelElementChangeLeftTargetExample2/myModel.uml9
-rw-r--r--sandbox/UMLCompareMergerExample/ModelElementChangeLeftTargetExample2/myModel2.di17
-rw-r--r--sandbox/UMLCompareMergerExample/ModelElementChangeLeftTargetExample2/myModel2.notation63
-rw-r--r--sandbox/UMLCompareMergerExample/ModelElementChangeLeftTargetExample2/myModel2.uml6
7 files changed, 186 insertions, 0 deletions
diff --git a/sandbox/UMLCompareMergerExample/ModelElementChangeLeftTargetExample2/.project b/sandbox/UMLCompareMergerExample/ModelElementChangeLeftTargetExample2/.project
new file mode 100644
index 00000000000..f3930c8c05a
--- /dev/null
+++ b/sandbox/UMLCompareMergerExample/ModelElementChangeLeftTargetExample2/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>ModelElementChangeLeftTargetExample2</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ </buildSpec>
+ <natures>
+ </natures>
+</projectDescription>
diff --git a/sandbox/UMLCompareMergerExample/ModelElementChangeLeftTargetExample2/myModel.di b/sandbox/UMLCompareMergerExample/ModelElementChangeLeftTargetExample2/myModel.di
new file mode 100644
index 00000000000..487c030ab9e
--- /dev/null
+++ b/sandbox/UMLCompareMergerExample/ModelElementChangeLeftTargetExample2/myModel.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="myModel.notation#_xv1SQIPnEeGwermsETzm6w"/>
+ </availablePage>
+ </pageList>
+ <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
+ <windows>
+ <children xsi:type="di:TabFolder">
+ <children>
+ <emfPageIdentifier href="myModel.notation#_xv1SQIPnEeGwermsETzm6w"/>
+ </children>
+ </children>
+ </windows>
+ </sashModel>
+</di:SashWindowsMngr>
diff --git a/sandbox/UMLCompareMergerExample/ModelElementChangeLeftTargetExample2/myModel.notation b/sandbox/UMLCompareMergerExample/ModelElementChangeLeftTargetExample2/myModel.notation
new file mode 100644
index 00000000000..aa1818fcfa5
--- /dev/null
+++ b/sandbox/UMLCompareMergerExample/ModelElementChangeLeftTargetExample2/myModel.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="_xv1SQIPnEeGwermsETzm6w" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">
+ <children xmi:type="notation:Shape" xmi:id="_yDenAIPnEeGwermsETzm6w" type="2008" fontName="Segoe UI" lineColor="0">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yDfOEIPnEeGwermsETzm6w" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yDfOEYPnEeGwermsETzm6w" key="fontHeight" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yDfOEoPnEeGwermsETzm6w" key="bold" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yDfOE4PnEeGwermsETzm6w" key="italic" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yDfOFIPnEeGwermsETzm6w" key="fontColor" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yDfOFYPnEeGwermsETzm6w" key="fillColor" value="true"/>
+ </eAnnotations>
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yDfOFoPnEeGwermsETzm6w" source="ShadowFigure">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yDfOF4PnEeGwermsETzm6w" key="ShadowFigure_Value" value="false"/>
+ </eAnnotations>
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yDfOGIPnEeGwermsETzm6w" source="displayNameLabelIcon">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yDfOGYPnEeGwermsETzm6w" key="displayNameLabelIcon_value" value="false"/>
+ </eAnnotations>
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yDfOGoPnEeGwermsETzm6w" source="QualifiedName">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yDfOG4PnEeGwermsETzm6w" key="QualifiedNameDepth" value="1000"/>
+ </eAnnotations>
+ <children xmi:type="notation:DecorationNode" xmi:id="_yDfOHIPnEeGwermsETzm6w" type="5029"/>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_yDfOHYPnEeGwermsETzm6w" type="7017">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yDf1KoPnEeGwermsETzm6w" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yDf1K4PnEeGwermsETzm6w" key="showTitle" value="true"/>
+ </eAnnotations>
+ <children xmi:type="notation:Shape" xmi:id="_ysMz4IPnEeGwermsETzm6w" type="3012" fontName="Segoe UI" lineColor="0">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ysMz4oPnEeGwermsETzm6w" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ysMz44PnEeGwermsETzm6w" key="fontHeight" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ysMz5IPnEeGwermsETzm6w" key="bold" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ysMz5YPnEeGwermsETzm6w" key="italic" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ysMz5oPnEeGwermsETzm6w" key="fontColor" value="true"/>
+ </eAnnotations>
+ <element xmi:type="uml:Property" href="myModel.uml#_ysLlwIPnEeGwermsETzm6w"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_ysMz4YPnEeGwermsETzm6w"/>
+ </children>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_yDfOHoPnEeGwermsETzm6w"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_yDfOH4PnEeGwermsETzm6w"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_yDfOIIPnEeGwermsETzm6w"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yDfOIYPnEeGwermsETzm6w"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_yDf1IIPnEeGwermsETzm6w" type="7018">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yDf1LIPnEeGwermsETzm6w" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yDf1LYPnEeGwermsETzm6w" key="showTitle" value="true"/>
+ </eAnnotations>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_yDf1IYPnEeGwermsETzm6w"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_yDf1IoPnEeGwermsETzm6w"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_yDf1I4PnEeGwermsETzm6w"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yDf1JIPnEeGwermsETzm6w"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_yDf1JYPnEeGwermsETzm6w" type="7019">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yDf1LoPnEeGwermsETzm6w" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yDf1L4PnEeGwermsETzm6w" key="showTitle" value="true"/>
+ </eAnnotations>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_yDf1JoPnEeGwermsETzm6w"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_yDf1J4PnEeGwermsETzm6w"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_yDf1KIPnEeGwermsETzm6w"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yDf1KYPnEeGwermsETzm6w"/>
+ </children>
+ <element xmi:type="uml:Class" href="myModel.uml#_yDdY4IPnEeGwermsETzm6w"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yDenAYPnEeGwermsETzm6w" x="445" y="194"/>
+ </children>
+ <styles xmi:type="notation:DiagramStyle" xmi:id="_xv1SQYPnEeGwermsETzm6w"/>
+ <element xmi:type="uml:Model" href="myModel.uml#_xv0rMIPnEeGwermsETzm6w"/>
+</notation:Diagram>
diff --git a/sandbox/UMLCompareMergerExample/ModelElementChangeLeftTargetExample2/myModel.uml b/sandbox/UMLCompareMergerExample/ModelElementChangeLeftTargetExample2/myModel.uml
new file mode 100644
index 00000000000..b1e060e4a25
--- /dev/null
+++ b/sandbox/UMLCompareMergerExample/ModelElementChangeLeftTargetExample2/myModel.uml
@@ -0,0 +1,9 @@
+<?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="_xv0rMIPnEeGwermsETzm6w" name="model">
+ <packagedElement xmi:type="uml:Class" xmi:id="_yDdY4IPnEeGwermsETzm6w" name="Class1">
+ <ownedAttribute xmi:id="_ysLlwIPnEeGwermsETzm6w" name="Property1">
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_L-QuAIPoEeGwermsETzm6w"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_L-QuAYPoEeGwermsETzm6w" value="*"/>
+ </ownedAttribute>
+ </packagedElement>
+</uml:Model>
diff --git a/sandbox/UMLCompareMergerExample/ModelElementChangeLeftTargetExample2/myModel2.di b/sandbox/UMLCompareMergerExample/ModelElementChangeLeftTargetExample2/myModel2.di
new file mode 100644
index 00000000000..2fc2d68ccc6
--- /dev/null
+++ b/sandbox/UMLCompareMergerExample/ModelElementChangeLeftTargetExample2/myModel2.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="myModel.notation#_xv1SQIPnEeGwermsETzm6w"/>
+ </availablePage>
+ </pageList>
+ <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
+ <windows>
+ <children xsi:type="di:TabFolder">
+ <children>
+ <emfPageIdentifier href="myModel2.notation#_xv1SQIPnEeGwermsETzm6w"/>
+ </children>
+ </children>
+ </windows>
+ </sashModel>
+</di:SashWindowsMngr>
diff --git a/sandbox/UMLCompareMergerExample/ModelElementChangeLeftTargetExample2/myModel2.notation b/sandbox/UMLCompareMergerExample/ModelElementChangeLeftTargetExample2/myModel2.notation
new file mode 100644
index 00000000000..157a43b1f92
--- /dev/null
+++ b/sandbox/UMLCompareMergerExample/ModelElementChangeLeftTargetExample2/myModel2.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="_xv1SQIPnEeGwermsETzm6w" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">
+ <children xmi:type="notation:Shape" xmi:id="_yDenAIPnEeGwermsETzm6w" type="2008" fontName="Segoe UI" lineColor="0">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yDfOEIPnEeGwermsETzm6w" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yDfOEYPnEeGwermsETzm6w" key="fontHeight" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yDfOEoPnEeGwermsETzm6w" key="bold" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yDfOE4PnEeGwermsETzm6w" key="italic" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yDfOFIPnEeGwermsETzm6w" key="fontColor" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yDfOFYPnEeGwermsETzm6w" key="fillColor" value="true"/>
+ </eAnnotations>
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yDfOFoPnEeGwermsETzm6w" source="ShadowFigure">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yDfOF4PnEeGwermsETzm6w" key="ShadowFigure_Value" value="false"/>
+ </eAnnotations>
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yDfOGIPnEeGwermsETzm6w" source="displayNameLabelIcon">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yDfOGYPnEeGwermsETzm6w" key="displayNameLabelIcon_value" value="false"/>
+ </eAnnotations>
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yDfOGoPnEeGwermsETzm6w" source="QualifiedName">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yDfOG4PnEeGwermsETzm6w" key="QualifiedNameDepth" value="1000"/>
+ </eAnnotations>
+ <children xmi:type="notation:DecorationNode" xmi:id="_yDfOHIPnEeGwermsETzm6w" type="5029"/>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_yDfOHYPnEeGwermsETzm6w" type="7017">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yDf1KoPnEeGwermsETzm6w" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yDf1K4PnEeGwermsETzm6w" key="showTitle" value="true"/>
+ </eAnnotations>
+ <children xmi:type="notation:Shape" xmi:id="_ysMz4IPnEeGwermsETzm6w" type="3012" fontName="Segoe UI" lineColor="0">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ysMz4oPnEeGwermsETzm6w" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ysMz44PnEeGwermsETzm6w" key="fontHeight" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ysMz5IPnEeGwermsETzm6w" key="bold" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ysMz5YPnEeGwermsETzm6w" key="italic" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ysMz5oPnEeGwermsETzm6w" key="fontColor" value="true"/>
+ </eAnnotations>
+ <element xmi:type="uml:Property" href="myModel2.uml#_ysLlwIPnEeGwermsETzm6w"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_ysMz4YPnEeGwermsETzm6w"/>
+ </children>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_yDfOHoPnEeGwermsETzm6w"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_yDfOH4PnEeGwermsETzm6w"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_yDfOIIPnEeGwermsETzm6w"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yDfOIYPnEeGwermsETzm6w"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_yDf1IIPnEeGwermsETzm6w" type="7018">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yDf1LIPnEeGwermsETzm6w" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yDf1LYPnEeGwermsETzm6w" key="showTitle" value="true"/>
+ </eAnnotations>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_yDf1IYPnEeGwermsETzm6w"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_yDf1IoPnEeGwermsETzm6w"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_yDf1I4PnEeGwermsETzm6w"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yDf1JIPnEeGwermsETzm6w"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_yDf1JYPnEeGwermsETzm6w" type="7019">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yDf1LoPnEeGwermsETzm6w" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yDf1L4PnEeGwermsETzm6w" key="showTitle" value="true"/>
+ </eAnnotations>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_yDf1JoPnEeGwermsETzm6w"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_yDf1J4PnEeGwermsETzm6w"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_yDf1KIPnEeGwermsETzm6w"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yDf1KYPnEeGwermsETzm6w"/>
+ </children>
+ <element xmi:type="uml:Class" href="myModel2.uml#_yDdY4IPnEeGwermsETzm6w"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yDenAYPnEeGwermsETzm6w" x="445" y="194"/>
+ </children>
+ <styles xmi:type="notation:DiagramStyle" xmi:id="_xv1SQYPnEeGwermsETzm6w"/>
+ <element xmi:type="uml:Model" href="myModel2.uml#_xv0rMIPnEeGwermsETzm6w"/>
+</notation:Diagram>
diff --git a/sandbox/UMLCompareMergerExample/ModelElementChangeLeftTargetExample2/myModel2.uml b/sandbox/UMLCompareMergerExample/ModelElementChangeLeftTargetExample2/myModel2.uml
new file mode 100644
index 00000000000..114dc3d3a4b
--- /dev/null
+++ b/sandbox/UMLCompareMergerExample/ModelElementChangeLeftTargetExample2/myModel2.uml
@@ -0,0 +1,6 @@
+<?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="_xv0rMIPnEeGwermsETzm6w" name="model">
+ <packagedElement xmi:type="uml:Class" xmi:id="_yDdY4IPnEeGwermsETzm6w" name="Class1">
+ <ownedAttribute xmi:id="_ysLlwIPnEeGwermsETzm6w" name="Property1"/>
+ </packagedElement>
+</uml:Model>

Back to the top