Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvlorenzo2012-06-26 04:31:24 -0400
committervlorenzo2012-06-26 04:31:24 -0400
commit81f05cfc36c8d356dbf75d950e1581171f55474b (patch)
treef4dc3e98ecc173a42b2defd43c37935d2a6435df
parent53098c6944fd07566101617b0d0f6e2ad7c0f228 (diff)
downloadorg.eclipse.papyrus-81f05cfc36c8d356dbf75d950e1581171f55474b.tar.gz
org.eclipse.papyrus-81f05cfc36c8d356dbf75d950e1581171f55474b.tar.xz
org.eclipse.papyrus-81f05cfc36c8d356dbf75d950e1581171f55474b.zip
Save an example of Generalization Merge
-rw-r--r--sandbox/UMLCompareMergerExample/generalization/right.notation8
-rw-r--r--sandbox/UMLCompareMergerExample/generalization/right.uml4
2 files changed, 4 insertions, 8 deletions
diff --git a/sandbox/UMLCompareMergerExample/generalization/right.notation b/sandbox/UMLCompareMergerExample/generalization/right.notation
index e391fd6d0d1..f4eb1f328c2 100644
--- a/sandbox/UMLCompareMergerExample/generalization/right.notation
+++ b/sandbox/UMLCompareMergerExample/generalization/right.notation
@@ -74,10 +74,6 @@
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_KoWWE79nEeGcX795R_wLEg" source="PapyrusCSSForceValue">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_KogHAL9nEeGcX795R_wLEg" key="showTitle" value="true"/>
</eAnnotations>
- <children xmi:type="notation:Shape" xmi:id="_PgeikL9nEeGcX795R_wLEg" type="3012">
- <element xmi:type="uml:Property" href="right.uml#_Mr3s8L9nEeGcX795R_wLEg"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_Pgeikb9nEeGcX795R_wLEg"/>
- </children>
<styles xmi:type="notation:TitleStyle" xmi:id="_KoWWBb9nEeGcX795R_wLEg"/>
<styles xmi:type="notation:SortingStyle" xmi:id="_KoWWBr9nEeGcX795R_wLEg"/>
<styles xmi:type="notation:FilteringStyle" xmi:id="_KoWWB79nEeGcX795R_wLEg"/>
@@ -106,14 +102,14 @@
</children>
<styles xmi:type="notation:DiagramStyle" xmi:id="_FQXksb9nEeGcX795R_wLEg"/>
<element xmi:type="uml:Model" href="right.uml#_FO4W8L9nEeGcX795R_wLEg"/>
- <edges xmi:type="notation:Connector" xmi:id="_LUPLoL9nEeGcX795R_wLEg" type="4002" source="_KoWWAb9nEeGcX795R_wLEg" target="_JUI8IL9nEeGcX795R_wLEg">
+ <edges xmi:type="notation:Connector" xmi:id="_LUPLoL9nEeGcX795R_wLEg" type="4002" source="_KYR5sL9nEeGcX795R_wLEg" target="_JUI8IL9nEeGcX795R_wLEg">
<children xmi:type="notation:DecorationNode" xmi:id="_LUPLo79nEeGcX795R_wLEg" type="6007">
<layoutConstraint xmi:type="notation:Location" xmi:id="_LUPLpL9nEeGcX795R_wLEg" y="40"/>
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_LUPLob9nEeGcX795R_wLEg"/>
<element xmi:type="uml:Generalization" href="right.uml#_LTC40L9nEeGcX795R_wLEg"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_LUPLor9nEeGcX795R_wLEg" points="[-10, -11, 224, 256]$[-221, -246, 13, 21]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LVRtcL9nEeGcX795R_wLEg" id="(0.29,0.11)"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LVRtcL9nEeGcX795R_wLEg" id="(0.46,0.09)"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LVRtcb9nEeGcX795R_wLEg" id="(0.69,0.79)"/>
</edges>
</notation:Diagram>
diff --git a/sandbox/UMLCompareMergerExample/generalization/right.uml b/sandbox/UMLCompareMergerExample/generalization/right.uml
index 330a163470c..c03324aca85 100644
--- a/sandbox/UMLCompareMergerExample/generalization/right.uml
+++ b/sandbox/UMLCompareMergerExample/generalization/right.uml
@@ -12,8 +12,8 @@
</defaultValue>
</ownedAttribute>
</packagedElement>
- <packagedElement xmi:type="uml:Class" xmi:id="_KX--wL9nEeGcX795R_wLEg" name="Class2"/>
- <packagedElement xmi:type="uml:Class" xmi:id="_KoWWAL9nEeGcX795R_wLEg" name="Class3">
+ <packagedElement xmi:type="uml:Class" xmi:id="_KX--wL9nEeGcX795R_wLEg" name="Class2">
<generalization xmi:id="_LTC40L9nEeGcX795R_wLEg" general="_JTZVQL9nEeGcX795R_wLEg"/>
</packagedElement>
+ <packagedElement xmi:type="uml:Class" xmi:id="_KoWWAL9nEeGcX795R_wLEg" name="Class3"/>
</uml:Model>

Back to the top