Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/sandbox/UMLCompareMergerExample
diff options
context:
space:
mode:
Diffstat (limited to 'sandbox/UMLCompareMergerExample')
-rw-r--r--sandbox/UMLCompareMergerExample/MoveModelElementExample1/.project11
-rw-r--r--sandbox/UMLCompareMergerExample/MoveModelElementExample1/model.di17
-rw-r--r--sandbox/UMLCompareMergerExample/MoveModelElementExample1/model.notation81
-rw-r--r--sandbox/UMLCompareMergerExample/MoveModelElementExample1/model.uml6
-rw-r--r--sandbox/UMLCompareMergerExample/MoveModelElementExample1/model2.di17
-rw-r--r--sandbox/UMLCompareMergerExample/MoveModelElementExample1/model2.notation81
-rw-r--r--sandbox/UMLCompareMergerExample/MoveModelElementExample1/model2.uml5
7 files changed, 218 insertions, 0 deletions
diff --git a/sandbox/UMLCompareMergerExample/MoveModelElementExample1/.project b/sandbox/UMLCompareMergerExample/MoveModelElementExample1/.project
new file mode 100644
index 00000000000..349693cff13
--- /dev/null
+++ b/sandbox/UMLCompareMergerExample/MoveModelElementExample1/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>MoveModelElementExample1</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ </buildSpec>
+ <natures>
+ </natures>
+</projectDescription>
diff --git a/sandbox/UMLCompareMergerExample/MoveModelElementExample1/model.di b/sandbox/UMLCompareMergerExample/MoveModelElementExample1/model.di
new file mode 100644
index 00000000000..7e0e8a2f1a1
--- /dev/null
+++ b/sandbox/UMLCompareMergerExample/MoveModelElementExample1/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#_geLncIPrEeGov9zerf2v0g"/>
+ </availablePage>
+ </pageList>
+ <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
+ <windows>
+ <children xsi:type="di:TabFolder">
+ <children>
+ <emfPageIdentifier href="model.notation#_geLncIPrEeGov9zerf2v0g"/>
+ </children>
+ </children>
+ </windows>
+ </sashModel>
+</di:SashWindowsMngr>
diff --git a/sandbox/UMLCompareMergerExample/MoveModelElementExample1/model.notation b/sandbox/UMLCompareMergerExample/MoveModelElementExample1/model.notation
new file mode 100644
index 00000000000..27b65ca9a15
--- /dev/null
+++ b/sandbox/UMLCompareMergerExample/MoveModelElementExample1/model.notation
@@ -0,0 +1,81 @@
+<?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="_geLncIPrEeGov9zerf2v0g" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">
+ <children xmi:type="notation:Shape" xmi:id="_hw7owIPrEeGov9zerf2v0g" type="2007" fontName="Segoe UI" lineColor="0">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_hw8P0IPrEeGov9zerf2v0g" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hw8P0YPrEeGov9zerf2v0g" key="fontHeight" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hw8P0oPrEeGov9zerf2v0g" key="bold" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hw8P04PrEeGov9zerf2v0g" key="italic" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hw8P1IPrEeGov9zerf2v0g" key="fontColor" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hw8P1YPrEeGov9zerf2v0g" key="fillColor" value="true"/>
+ </eAnnotations>
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_hw8P1oPrEeGov9zerf2v0g" source="ShadowFigure">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hw8P14PrEeGov9zerf2v0g" key="ShadowFigure_Value" value="false"/>
+ </eAnnotations>
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_hw8P2IPrEeGov9zerf2v0g" source="displayNameLabelIcon">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hw824IPrEeGov9zerf2v0g" key="displayNameLabelIcon_value" value="false"/>
+ </eAnnotations>
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_hw824YPrEeGov9zerf2v0g" source="QualifiedName">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hw824oPrEeGov9zerf2v0g" key="QualifiedNameDepth" value="1000"/>
+ </eAnnotations>
+ <children xmi:type="notation:DecorationNode" xmi:id="_hw8244PrEeGov9zerf2v0g" type="5026"/>
+ <children xmi:type="notation:DecorationNode" xmi:id="_hw825IPrEeGov9zerf2v0g" type="7016">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_hw8254PrEeGov9zerf2v0g" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hw826IPrEeGov9zerf2v0g" key="showTitle" value="true"/>
+ </eAnnotations>
+ <children xmi:type="notation:Shape" xmi:id="_iv058IPrEeGov9zerf2v0g" type="3010" fontName="Segoe UI" lineColor="0">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iv058oPrEeGov9zerf2v0g" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iv1hAIPrEeGov9zerf2v0g" key="fontHeight" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iv1hAYPrEeGov9zerf2v0g" key="bold" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iv1hAoPrEeGov9zerf2v0g" key="italic" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iv1hA4PrEeGov9zerf2v0g" key="fontColor" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iv1hBIPrEeGov9zerf2v0g" key="fillColor" value="true"/>
+ </eAnnotations>
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iv1hBYPrEeGov9zerf2v0g" source="ShadowFigure">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iv1hBoPrEeGov9zerf2v0g" key="ShadowFigure_Value" value="false"/>
+ </eAnnotations>
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iv1hB4PrEeGov9zerf2v0g" source="displayNameLabelIcon">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iv1hCIPrEeGov9zerf2v0g" key="displayNameLabelIcon_value" value="false"/>
+ </eAnnotations>
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iv1hCYPrEeGov9zerf2v0g" source="QualifiedName">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iv1hCoPrEeGov9zerf2v0g" key="QualifiedNameDepth" value="1000"/>
+ </eAnnotations>
+ <children xmi:type="notation:DecorationNode" xmi:id="_iv2IEIPrEeGov9zerf2v0g" type="5014"/>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_iv2IEYPrEeGov9zerf2v0g" type="7011">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iv2IIIPrEeGov9zerf2v0g" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iv2IIYPrEeGov9zerf2v0g" key="showTitle" value="true"/>
+ </eAnnotations>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_iv2IEoPrEeGov9zerf2v0g"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_iv2IE4PrEeGov9zerf2v0g"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_iv2IFIPrEeGov9zerf2v0g"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iv2IFYPrEeGov9zerf2v0g"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_iv2IFoPrEeGov9zerf2v0g" type="7012">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iv2vIIPrEeGov9zerf2v0g" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iv2vIYPrEeGov9zerf2v0g" key="showTitle" value="true"/>
+ </eAnnotations>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_iv2IF4PrEeGov9zerf2v0g"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_iv2IGIPrEeGov9zerf2v0g"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_iv2IGYPrEeGov9zerf2v0g"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iv2IGoPrEeGov9zerf2v0g"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_iv2IG4PrEeGov9zerf2v0g" type="7013">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iv2vIoPrEeGov9zerf2v0g" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iv2vI4PrEeGov9zerf2v0g" key="showTitle" value="true"/>
+ </eAnnotations>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_iv2IHIPrEeGov9zerf2v0g"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_iv2IHYPrEeGov9zerf2v0g"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_iv2IHoPrEeGov9zerf2v0g"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iv2IH4PrEeGov9zerf2v0g"/>
+ </children>
+ <element xmi:type="uml:Class" href="model.uml#_ivydsIPrEeGov9zerf2v0g"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iv058YPrEeGov9zerf2v0g" x="18" y="26"/>
+ </children>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_hw825YPrEeGov9zerf2v0g"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hw825oPrEeGov9zerf2v0g"/>
+ </children>
+ <element xmi:type="uml:Package" href="model.uml#_hw6aoIPrEeGov9zerf2v0g"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hw7owYPrEeGov9zerf2v0g" x="262" y="215" width="269" height="231"/>
+ </children>
+ <styles xmi:type="notation:DiagramStyle" xmi:id="_geLncYPrEeGov9zerf2v0g"/>
+ <element xmi:type="uml:Model" href="model.uml#_geLAYIPrEeGov9zerf2v0g"/>
+</notation:Diagram>
diff --git a/sandbox/UMLCompareMergerExample/MoveModelElementExample1/model.uml b/sandbox/UMLCompareMergerExample/MoveModelElementExample1/model.uml
new file mode 100644
index 00000000000..7fb81ec229a
--- /dev/null
+++ b/sandbox/UMLCompareMergerExample/MoveModelElementExample1/model.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="_geLAYIPrEeGov9zerf2v0g" name="model">
+ <packagedElement xmi:type="uml:Package" xmi:id="_hw6aoIPrEeGov9zerf2v0g" name="Package1">
+ <packagedElement xmi:type="uml:Class" xmi:id="_ivydsIPrEeGov9zerf2v0g" name="Class1"/>
+ </packagedElement>
+</uml:Model>
diff --git a/sandbox/UMLCompareMergerExample/MoveModelElementExample1/model2.di b/sandbox/UMLCompareMergerExample/MoveModelElementExample1/model2.di
new file mode 100644
index 00000000000..bcf122946df
--- /dev/null
+++ b/sandbox/UMLCompareMergerExample/MoveModelElementExample1/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="model.notation#_geLncIPrEeGov9zerf2v0g"/>
+ </availablePage>
+ </pageList>
+ <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
+ <windows>
+ <children xsi:type="di:TabFolder">
+ <children>
+ <emfPageIdentifier href="model2.notation#_geLncIPrEeGov9zerf2v0g"/>
+ </children>
+ </children>
+ </windows>
+ </sashModel>
+</di:SashWindowsMngr>
diff --git a/sandbox/UMLCompareMergerExample/MoveModelElementExample1/model2.notation b/sandbox/UMLCompareMergerExample/MoveModelElementExample1/model2.notation
new file mode 100644
index 00000000000..c4a85ffabd4
--- /dev/null
+++ b/sandbox/UMLCompareMergerExample/MoveModelElementExample1/model2.notation
@@ -0,0 +1,81 @@
+<?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="_geLncIPrEeGov9zerf2v0g" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">
+ <children xmi:type="notation:Shape" xmi:id="_hw7owIPrEeGov9zerf2v0g" type="2007" fontName="Segoe UI" lineColor="0">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_hw8P0IPrEeGov9zerf2v0g" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hw8P0YPrEeGov9zerf2v0g" key="fontHeight" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hw8P0oPrEeGov9zerf2v0g" key="bold" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hw8P04PrEeGov9zerf2v0g" key="italic" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hw8P1IPrEeGov9zerf2v0g" key="fontColor" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hw8P1YPrEeGov9zerf2v0g" key="fillColor" value="true"/>
+ </eAnnotations>
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_hw8P1oPrEeGov9zerf2v0g" source="ShadowFigure">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hw8P14PrEeGov9zerf2v0g" key="ShadowFigure_Value" value="false"/>
+ </eAnnotations>
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_hw8P2IPrEeGov9zerf2v0g" source="displayNameLabelIcon">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hw824IPrEeGov9zerf2v0g" key="displayNameLabelIcon_value" value="false"/>
+ </eAnnotations>
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_hw824YPrEeGov9zerf2v0g" source="QualifiedName">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hw824oPrEeGov9zerf2v0g" key="QualifiedNameDepth" value="1000"/>
+ </eAnnotations>
+ <children xmi:type="notation:DecorationNode" xmi:id="_hw8244PrEeGov9zerf2v0g" type="5026"/>
+ <children xmi:type="notation:DecorationNode" xmi:id="_hw825IPrEeGov9zerf2v0g" type="7016">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_hw8254PrEeGov9zerf2v0g" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hw826IPrEeGov9zerf2v0g" key="showTitle" value="true"/>
+ </eAnnotations>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_hw825YPrEeGov9zerf2v0g"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hw825oPrEeGov9zerf2v0g"/>
+ </children>
+ <element xmi:type="uml:Package" href="model2.uml#_hw6aoIPrEeGov9zerf2v0g"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hw7owYPrEeGov9zerf2v0g" x="262" y="215" width="269" height="231"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_iv058IPrEeGov9zerf2v0g" type="3010" fontName="Segoe UI" lineColor="0">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iv058oPrEeGov9zerf2v0g" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iv1hAIPrEeGov9zerf2v0g" key="fontHeight" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iv1hAYPrEeGov9zerf2v0g" key="bold" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iv1hAoPrEeGov9zerf2v0g" key="italic" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iv1hA4PrEeGov9zerf2v0g" key="fontColor" value="true"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iv1hBIPrEeGov9zerf2v0g" key="fillColor" value="true"/>
+ </eAnnotations>
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iv1hBYPrEeGov9zerf2v0g" source="ShadowFigure">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iv1hBoPrEeGov9zerf2v0g" key="ShadowFigure_Value" value="false"/>
+ </eAnnotations>
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iv1hB4PrEeGov9zerf2v0g" source="displayNameLabelIcon">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iv1hCIPrEeGov9zerf2v0g" key="displayNameLabelIcon_value" value="false"/>
+ </eAnnotations>
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iv1hCYPrEeGov9zerf2v0g" source="QualifiedName">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iv1hCoPrEeGov9zerf2v0g" key="QualifiedNameDepth" value="1000"/>
+ </eAnnotations>
+ <children xmi:type="notation:DecorationNode" xmi:id="_iv2IEIPrEeGov9zerf2v0g" type="5014"/>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_iv2IEYPrEeGov9zerf2v0g" type="7011">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iv2IIIPrEeGov9zerf2v0g" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iv2IIYPrEeGov9zerf2v0g" key="showTitle" value="true"/>
+ </eAnnotations>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_iv2IEoPrEeGov9zerf2v0g"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_iv2IE4PrEeGov9zerf2v0g"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_iv2IFIPrEeGov9zerf2v0g"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iv2IFYPrEeGov9zerf2v0g"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_iv2IFoPrEeGov9zerf2v0g" type="7012">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iv2vIIPrEeGov9zerf2v0g" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iv2vIYPrEeGov9zerf2v0g" key="showTitle" value="true"/>
+ </eAnnotations>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_iv2IF4PrEeGov9zerf2v0g"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_iv2IGIPrEeGov9zerf2v0g"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_iv2IGYPrEeGov9zerf2v0g"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iv2IGoPrEeGov9zerf2v0g"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_iv2IG4PrEeGov9zerf2v0g" type="7013">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iv2vIoPrEeGov9zerf2v0g" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iv2vI4PrEeGov9zerf2v0g" key="showTitle" value="true"/>
+ </eAnnotations>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_iv2IHIPrEeGov9zerf2v0g"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_iv2IHYPrEeGov9zerf2v0g"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_iv2IHoPrEeGov9zerf2v0g"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iv2IH4PrEeGov9zerf2v0g"/>
+ </children>
+ <element xmi:type="uml:Class" href="model2.uml#_ivydsIPrEeGov9zerf2v0g"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iv058YPrEeGov9zerf2v0g" x="705" y="270"/>
+ </children>
+ <styles xmi:type="notation:DiagramStyle" xmi:id="_geLncYPrEeGov9zerf2v0g"/>
+ <element xmi:type="uml:Model" href="model2.uml#_geLAYIPrEeGov9zerf2v0g"/>
+</notation:Diagram>
diff --git a/sandbox/UMLCompareMergerExample/MoveModelElementExample1/model2.uml b/sandbox/UMLCompareMergerExample/MoveModelElementExample1/model2.uml
new file mode 100644
index 00000000000..90b3b39b909
--- /dev/null
+++ b/sandbox/UMLCompareMergerExample/MoveModelElementExample1/model2.uml
@@ -0,0 +1,5 @@
+<?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="_geLAYIPrEeGov9zerf2v0g" name="model">
+ <packagedElement xmi:type="uml:Package" xmi:id="_hw6aoIPrEeGov9zerf2v0g" name="Package1"/>
+ <packagedElement xmi:type="uml:Class" xmi:id="_ivydsIPrEeGov9zerf2v0g" name="Class1"/>
+</uml:Model>

Back to the top