diff options
Diffstat (limited to 'extraplugins/codegen')
3 files changed, 120 insertions, 130 deletions
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/model/TestCDTintegration.di b/extraplugins/codegen/org.eclipse.papyrus.cpp.test/model/TestCDTintegration.di index 11802ddc6e3..8a277e6db1e 100644 --- a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/model/TestCDTintegration.di +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.test/model/TestCDTintegration.di @@ -1,21 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> -<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" xmi:id="_AfdmYPccEd-KM6l7lmIPkw"> - <pageList xmi:id="_AfdmYfccEd-KM6l7lmIPkw"> +<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="TestCDTintegration.notation#_s2zhQBlCEeOWi_t2E10dLQ"/> + <emfPageIdentifier href="TestCDTintegration.notation#_8vp88DcVEeO6UdbIk03c9Q"/> </availablePage> <availablePage> - <emfPageIdentifier href="TestCDTintegration.notation#_7RQ-EC-bEeO2L7HZ7MAV3w"/> + <emfPageIdentifier href="TestCDTintegration.notation#_JY8YsDcWEeO6UdbIk03c9Q"/> </availablePage> </pageList> - <sashModel xmi:id="_AfdmYvccEd-KM6l7lmIPkw" currentSelection="//@sashModel/@windows.0/@children.0"> - <windows xmi:id="_AfdmY_ccEd-KM6l7lmIPkw"> - <children xsi:type="di:TabFolder"> - <children> - <emfPageIdentifier href="TestCDTintegration.notation#_JOw40PccEd-KM6l7lmIPkw"/> + <sashModel currentSelection="//@sashModel/@windows.0/@children.0/@children.1"> + <windows> + <children xsi:type="di:SashPanel" direction="256"> + <children xsi:type="di:TabFolder"> + <children> + <emfPageIdentifier href="TestCDTintegration.notation#_8vp88DcVEeO6UdbIk03c9Q"/> + </children> </children> - <children> - <emfPageIdentifier href="TestCDTintegration.notation#_7RQ-EC-bEeO2L7HZ7MAV3w"/> + <children xsi:type="di:TabFolder"> + <children> + <emfPageIdentifier href="TestCDTintegration.notation#_JY8YsDcWEeO6UdbIk03c9Q"/> + </children> </children> </children> </windows> diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/model/TestCDTintegration.notation b/extraplugins/codegen/org.eclipse.papyrus.cpp.test/model/TestCDTintegration.notation index ef9263d71d7..56f606875f2 100644 --- a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/model/TestCDTintegration.notation +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.test/model/TestCDTintegration.notation @@ -1,100 +1,109 @@ <?xml version="1.0" encoding="UTF-8"?> <xmi:XMI 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:texteditormodel="http://www.eclipse.org/Papyrus/Example/0.10.0/texteditormodel" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML"> - <notation:Diagram xmi:id="_JOw40PccEd-KM6l7lmIPkw" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel"> - <children xmi:type="notation:Shape" xmi:id="_iUAUQP6QEeKlg5tzGV3QVQ" type="2008" fontName="Sans Serif" lineColor="0"> - <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iUCwgP6QEeKlg5tzGV3QVQ" source="ShadowFigure"> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iUCwgf6QEeKlg5tzGV3QVQ" key="ShadowFigure_Value" value="false"/> + <notation:Diagram xmi:id="_8vp88DcVEeO6UdbIk03c9Q" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel"> + <children xmi:type="notation:Shape" xmi:id="__McvgDcVEeO6UdbIk03c9Q" type="2008" fontName="Sans Serif" lineColor="0"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__Md9oDcVEeO6UdbIk03c9Q" source="ShadowFigure"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__MeksDcVEeO6UdbIk03c9Q" key="ShadowFigure_Value" value="false"/> </eAnnotations> - <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iUDXkP6QEeKlg5tzGV3QVQ" source="displayNameLabelIcon"> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iUDXkf6QEeKlg5tzGV3QVQ" key="displayNameLabelIcon_value" value="false"/> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__MeksTcVEeO6UdbIk03c9Q" source="displayNameLabelIcon"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__MeksjcVEeO6UdbIk03c9Q" key="displayNameLabelIcon_value" value="false"/> </eAnnotations> - <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iUDXkv6QEeKlg5tzGV3QVQ" source="QualifiedName"> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iUDXk_6QEeKlg5tzGV3QVQ" key="QualifiedNameDepth" value="1000"/> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__MekszcVEeO6UdbIk03c9Q" source="QualifiedName"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__MektDcVEeO6UdbIk03c9Q" key="QualifiedNameDepth" value="1000"/> </eAnnotations> - <children xmi:type="notation:DecorationNode" xmi:id="_iUDXlP6QEeKlg5tzGV3QVQ" type="5029"/> - <children xmi:type="notation:BasicCompartment" xmi:id="_iUDXlf6QEeKlg5tzGV3QVQ" type="7017"> - <styles xmi:type="notation:TitleStyle" xmi:id="_iUDXlv6QEeKlg5tzGV3QVQ"/> - <styles xmi:type="notation:SortingStyle" xmi:id="_iUDXl_6QEeKlg5tzGV3QVQ"/> - <styles xmi:type="notation:FilteringStyle" xmi:id="_iUDXmP6QEeKlg5tzGV3QVQ"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iUDXmf6QEeKlg5tzGV3QVQ"/> + <children xmi:type="notation:DecorationNode" xmi:id="__MektTcVEeO6UdbIk03c9Q" type="5029"/> + <children xmi:type="notation:BasicCompartment" xmi:id="__MektjcVEeO6UdbIk03c9Q" type="7017"> + <styles xmi:type="notation:TitleStyle" xmi:id="__MektzcVEeO6UdbIk03c9Q"/> + <styles xmi:type="notation:SortingStyle" xmi:id="__MekuDcVEeO6UdbIk03c9Q"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="__MekuTcVEeO6UdbIk03c9Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="__MekujcVEeO6UdbIk03c9Q"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_iUD-oP6QEeKlg5tzGV3QVQ" type="7018"> - <children xmi:type="notation:Shape" xmi:id="_jWd20P6QEeKlg5tzGV3QVQ" type="3013" fontName="Sans Serif" lineColor="0"> - <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_LOzoYP6SEeKlg5tzGV3QVQ" source="CustomAppearance_Annotation"> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_LOzoYf6SEeKlg5tzGV3QVQ" key="CustomAppearance_MaskValue" value="6920"/> - </eAnnotations> - <element xmi:type="uml:Operation" href="TestCCodeGen.uml#_TY18YB0LEeKlYLZOWTi6uw"/> - <layoutConstraint xmi:type="notation:Location" xmi:id="_jWd20f6QEeKlg5tzGV3QVQ"/> + <children xmi:type="notation:BasicCompartment" xmi:id="__MfLwDcVEeO6UdbIk03c9Q" type="7018"> + <children xmi:type="notation:Shape" xmi:id="_A3SgsDcWEeO6UdbIk03c9Q" type="3013" fontName="Sans Serif" lineColor="0"> + <element xmi:type="uml:Operation" href="TestCDTintegration.uml#_TY18YB0LEeKlYLZOWTi6uw"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_A3SgsTcWEeO6UdbIk03c9Q"/> </children> - <styles xmi:type="notation:TitleStyle" xmi:id="_iUD-of6QEeKlg5tzGV3QVQ"/> - <styles xmi:type="notation:SortingStyle" xmi:id="_iUD-ov6QEeKlg5tzGV3QVQ"/> - <styles xmi:type="notation:FilteringStyle" xmi:id="_iUD-o_6QEeKlg5tzGV3QVQ"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iUD-pP6QEeKlg5tzGV3QVQ"/> + <styles xmi:type="notation:TitleStyle" xmi:id="__MfLwTcVEeO6UdbIk03c9Q"/> + <styles xmi:type="notation:SortingStyle" xmi:id="__MfLwjcVEeO6UdbIk03c9Q"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="__MfLwzcVEeO6UdbIk03c9Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="__MfLxDcVEeO6UdbIk03c9Q"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="__MfLxTcVEeO6UdbIk03c9Q" visible="false" type="7019"> + <styles xmi:type="notation:TitleStyle" xmi:id="__MfLxjcVEeO6UdbIk03c9Q"/> + <styles xmi:type="notation:SortingStyle" xmi:id="__MfLxzcVEeO6UdbIk03c9Q"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="__MfLyDcVEeO6UdbIk03c9Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="__MfLyTcVEeO6UdbIk03c9Q"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_iUD-pf6QEeKlg5tzGV3QVQ" type="7019"> - <styles xmi:type="notation:TitleStyle" xmi:id="_iUD-pv6QEeKlg5tzGV3QVQ"/> - <styles xmi:type="notation:SortingStyle" xmi:id="_iUD-p_6QEeKlg5tzGV3QVQ"/> - <styles xmi:type="notation:FilteringStyle" xmi:id="_iUD-qP6QEeKlg5tzGV3QVQ"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iUD-qf6QEeKlg5tzGV3QVQ"/> + <children xmi:type="notation:BasicCompartment" xmi:id="__MmggDcVEeO6UdbIk03c9Q" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="__MmggTcVEeO6UdbIk03c9Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="__MmggjcVEeO6UdbIk03c9Q"/> </children> - <element xmi:type="uml:Class" href="TestCCodeGen.uml#_K8FLcB0LEeKlYLZOWTi6uw"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iUAUQf6QEeKlg5tzGV3QVQ" x="45" y="88" width="280"/> + <element xmi:type="uml:Class" href="TestCDTintegration.uml#_K8FLcB0LEeKlYLZOWTi6uw"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="__McvgTcVEeO6UdbIk03c9Q" x="110" y="70" width="233"/> </children> - <children xmi:type="notation:Shape" xmi:id="_eoXn0C-XEeOm_pHVqAkACg" type="2007" fontName="Sans Serif" lineColor="0"> - <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_eoaEEC-XEeOm_pHVqAkACg" source="ShadowFigure"> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_eoaEES-XEeOm_pHVqAkACg" key="ShadowFigure_Value" value="false"/> + <children xmi:type="notation:Shape" xmi:id="__kHooDcVEeO6UdbIk03c9Q" type="2007" fontName="Sans Serif" lineColor="0"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__kIPsDcVEeO6UdbIk03c9Q" source="ShadowFigure"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__kIPsTcVEeO6UdbIk03c9Q" key="ShadowFigure_Value" value="false"/> </eAnnotations> - <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_eoaEEi-XEeOm_pHVqAkACg" source="displayNameLabelIcon"> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_eoaEEy-XEeOm_pHVqAkACg" key="displayNameLabelIcon_value" value="false"/> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__kIPsjcVEeO6UdbIk03c9Q" source="displayNameLabelIcon"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__kIPszcVEeO6UdbIk03c9Q" key="displayNameLabelIcon_value" value="false"/> </eAnnotations> - <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_eoaEFC-XEeOm_pHVqAkACg" source="QualifiedName"> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_eoaEFS-XEeOm_pHVqAkACg" key="QualifiedNameDepth" value="1000"/> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__kIPtDcVEeO6UdbIk03c9Q" source="QualifiedName"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__kIPtTcVEeO6UdbIk03c9Q" key="QualifiedNameDepth" value="1000"/> </eAnnotations> - <children xmi:type="notation:DecorationNode" xmi:id="_eoarIC-XEeOm_pHVqAkACg" type="5026"/> - <children xmi:type="notation:DecorationNode" xmi:id="_eoarIS-XEeOm_pHVqAkACg" type="7016"> - <children xmi:type="notation:Shape" xmi:id="_oLxQsC-XEeOm_pHVqAkACg" type="3026" fontName="Sans Serif" lineColor="0"> - <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_oLye0C-XEeOm_pHVqAkACg" source="ShadowFigure"> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_oLye0S-XEeOm_pHVqAkACg" key="ShadowFigure_Value" value="false"/> + <children xmi:type="notation:DecorationNode" xmi:id="__kIPtjcVEeO6UdbIk03c9Q" type="5026"/> + <children xmi:type="notation:DecorationNode" xmi:id="__kIPtzcVEeO6UdbIk03c9Q" type="7016"> + <children xmi:type="notation:Shape" xmi:id="_B_6VoDcWEeO6UdbIk03c9Q" type="3026" fontName="Sans Serif" lineColor="0"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_B_6VojcWEeO6UdbIk03c9Q" source="ShadowFigure"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_B_6VozcWEeO6UdbIk03c9Q" key="ShadowFigure_Value" value="false"/> </eAnnotations> - <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_oLye0i-XEeOm_pHVqAkACg" source="displayNameLabelIcon"> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_oLye0y-XEeOm_pHVqAkACg" key="displayNameLabelIcon_value" value="false"/> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_B_6VpDcWEeO6UdbIk03c9Q" source="displayNameLabelIcon"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_B_6VpTcWEeO6UdbIk03c9Q" key="displayNameLabelIcon_value" value="false"/> </eAnnotations> - <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_oLye1C-XEeOm_pHVqAkACg" source="QualifiedName"> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_oLye1S-XEeOm_pHVqAkACg" key="QualifiedNameDepth" value="1000"/> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_B_68sDcWEeO6UdbIk03c9Q" source="QualifiedName"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_B_68sTcWEeO6UdbIk03c9Q" key="QualifiedNameDepth" value="1000"/> </eAnnotations> - <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_wNCYcC-XEeOm_pHVqAkACg" source="Stereotype_Annotation"> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wNCYcS-XEeOm_pHVqAkACg" key="StereotypeWithQualifiedNameList" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wNCYci-XEeOm_pHVqAkACg" key="StereotypeList" value="C_Cpp::Typedef"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wNCYcy-XEeOm_pHVqAkACg" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wNCYdC-XEeOm_pHVqAkACg" key="PropStereoDisplay" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wNCYdS-XEeOm_pHVqAkACg" key="StereotypePropertyLocation" value="Compartment"/> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_D6Uz4DcWEeO6UdbIk03c9Q" source="Stereotype_Annotation"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_D6Uz4TcWEeO6UdbIk03c9Q" key="StereotypeWithQualifiedNameList" value=""/> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_D6Uz4jcWEeO6UdbIk03c9Q" key="StereotypeList" value="C_Cpp::Typedef"/> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_D6Uz4zcWEeO6UdbIk03c9Q" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_D6Uz5DcWEeO6UdbIk03c9Q" key="PropStereoDisplay" value=""/> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_D6Uz5TcWEeO6UdbIk03c9Q" key="StereotypePropertyLocation" value="Compartment"/> </eAnnotations> - <children xmi:type="notation:DecorationNode" xmi:id="_oLye1i-XEeOm_pHVqAkACg" type="5058"/> - <children xmi:type="notation:BasicCompartment" xmi:id="_oLzF4C-XEeOm_pHVqAkACg" visible="false" type="7041"> - <styles xmi:type="notation:TitleStyle" xmi:id="_oLzF4S-XEeOm_pHVqAkACg"/> - <styles xmi:type="notation:SortingStyle" xmi:id="_oLzF4i-XEeOm_pHVqAkACg"/> - <styles xmi:type="notation:FilteringStyle" xmi:id="_oLzF4y-XEeOm_pHVqAkACg"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oLzF5C-XEeOm_pHVqAkACg"/> + <children xmi:type="notation:DecorationNode" xmi:id="_B_68sjcWEeO6UdbIk03c9Q" type="5058"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_B_68szcWEeO6UdbIk03c9Q" visible="false" type="7041"> + <styles xmi:type="notation:TitleStyle" xmi:id="_B_68tDcWEeO6UdbIk03c9Q"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_B_68tTcWEeO6UdbIk03c9Q"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_B_68tjcWEeO6UdbIk03c9Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_B_68tzcWEeO6UdbIk03c9Q"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_oLzF5S-XEeOm_pHVqAkACg" visible="false" type="7042"> - <styles xmi:type="notation:TitleStyle" xmi:id="_oLzF5i-XEeOm_pHVqAkACg"/> - <styles xmi:type="notation:SortingStyle" xmi:id="_oLzF5y-XEeOm_pHVqAkACg"/> - <styles xmi:type="notation:FilteringStyle" xmi:id="_oLzF6C-XEeOm_pHVqAkACg"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oLzF6S-XEeOm_pHVqAkACg"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_B_68uDcWEeO6UdbIk03c9Q" visible="false" type="7042"> + <styles xmi:type="notation:TitleStyle" xmi:id="_B_68uTcWEeO6UdbIk03c9Q"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_B_68ujcWEeO6UdbIk03c9Q"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_B_68uzcWEeO6UdbIk03c9Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_B_68vDcWEeO6UdbIk03c9Q"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_CAGi4DcWEeO6UdbIk03c9Q" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_CAGi4TcWEeO6UdbIk03c9Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CAGi4jcWEeO6UdbIk03c9Q"/> </children> <element xmi:type="uml:PrimitiveType" href="TestCDTintegration.uml#_DHJ24C-JEeObJ6ARx67E0g"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oLxQsS-XEeOm_pHVqAkACg" x="10" y="11" width="127" height="60"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_B_6VoTcWEeO6UdbIk03c9Q" x="28" y="28" width="165" height="71"/> </children> - <styles xmi:type="notation:TitleStyle" xmi:id="_eoarIi-XEeOm_pHVqAkACg"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eoarIy-XEeOm_pHVqAkACg" x="-3" y="15" width="223" height="95"/> + <styles xmi:type="notation:TitleStyle" xmi:id="__kIPuDcVEeO6UdbIk03c9Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="__kIPuTcVEeO6UdbIk03c9Q"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="__kNIMDcVEeO6UdbIk03c9Q" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="__kNIMTcVEeO6UdbIk03c9Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="__kNIMjcVEeO6UdbIk03c9Q"/> </children> <element xmi:type="uml:Package" href="TestCDTintegration.uml#_-2_pQC-IEeObJ6ARx67E0g"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eoXn0S-XEeOm_pHVqAkACg" x="45" y="219" width="223" height="115"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="__kHooTcVEeO6UdbIk03c9Q" x="118" y="265" width="261" height="141"/> </children> - <styles xmi:type="notation:DiagramStyle" xmi:id="_JOw40fccEd-KM6l7lmIPkw"/> - <element xmi:type="uml:Model" href="TestCCodeGen.uml#_Ae6MwPccEd-KM6l7lmIPkw"/> + <styles xmi:type="notation:DiagramStyle" xmi:id="_8vp88TcVEeO6UdbIk03c9Q"/> + <element xmi:type="uml:Model" href="TestCDTintegration.uml#_Ae6MwPccEd-KM6l7lmIPkw"/> </notation:Diagram> - <texteditormodel:TextEditorModel xmi:id="_7RQ-EC-bEeO2L7HZ7MAV3w" type="CDTEditorInPapyrus" name="CDT Class3"> + <texteditormodel:TextEditorModel xmi:id="_JY8YsDcWEeO6UdbIk03c9Q" type="CDTEditorInPapyrus" name="CDT Class3"> <editedObject xmi:type="uml:Class" href="TestCDTintegration.uml#_K8FLcB0LEeKlYLZOWTi6uw"/> </texteditormodel:TextEditorModel> </xmi:XMI> diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/model/TestCDTintegration.uml b/extraplugins/codegen/org.eclipse.papyrus.cpp.test/model/TestCDTintegration.uml index ea9c24a440e..3c80329d324 100644 --- a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/model/TestCDTintegration.uml +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.test/model/TestCDTintegration.uml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<xmi:XMI xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Alloc="http://www.eclipse.org/papyrus/Alloc/1" xmlns:C_Cpp="http://www.eclipse.org/papyrus/C_Cpp/1" xmlns:Cpp="http://papyrus/CppProfile/1" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/Alloc/1 http://www.eclipse.org/papyrus/MARTE/1#//Alloc"> +<xmi:XMI xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:C_Cpp="http://www.eclipse.org/papyrus/C_Cpp/1" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML"> <uml:Model xmi:id="_Ae6MwPccEd-KM6l7lmIPkw" name="TestCDTintegration"> <packageImport xmi:type="uml:PackageImport" xmi:id="_GQ1SgP6SEeKlg5tzGV3QVQ"> <importedPackage xmi:type="uml:Model" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_DV8nkBv8EduZN5aJJITI5w"/> @@ -49,21 +49,37 @@ <packagedElement xmi:type="uml:Class" xmi:id="_419y0A7hEeKpbseGaEy1LA" name="Class2"/> <packagedElement xmi:type="uml:Class" xmi:id="_K8FLcB0LEeKlYLZOWTi6uw" name="Class3"> <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_kTVuwP6QEeKlg5tzGV3QVQ" name="Operation1" isReentrant="false" specification="_TY18YB0LEeKlYLZOWTi6uw"> - <ownedParameter xmi:type="uml:Parameter" xmi:id="_Af5mIC-cEeO2L7HZ7MAV3w" name="arg"> + <ownedParameter xmi:type="uml:Parameter" xmi:id="_8cplwDczEeOimIxd1A6OhA" name="arg"> <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/> </ownedParameter> <language>C/C++</language> <body>// Now let's add some code -arg[0] = 1;</body> +cout << "value: " << arg;</body> + </ownedBehavior> + <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_pX7DgDcmEeO6UdbIk03c9Q" name="Operation2" isReentrant="false" specification="_jnWMADcmEeO6UdbIk03c9Q"> + <ownedParameter xmi:type="uml:Parameter" xmi:id="_8cra8TczEeOimIxd1A6OhA" name="args"> + <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_5lVhgBydEduyofBvg4RL2w"/> + </ownedParameter> + <language>C/C++</language> + <body>// Now let's add some code +args[0] = 2;</body> </ownedBehavior> <ownedOperation xmi:type="uml:Operation" xmi:id="_TY18YB0LEeKlYLZOWTi6uw" name="Operation1" method="_kTVuwP6QEeKlg5tzGV3QVQ"> <ownedComment xmi:type="uml:Comment" xmi:id="_II4ccP6WEeKlg5tzGV3QVQ" annotatedElement="_II4ccP6WEeKlg5tzGV3QVQ"> <body></body> </ownedComment> - <ownedParameter xmi:type="uml:Parameter" xmi:id="_Af4_EC-cEeO2L7HZ7MAV3w" name="arg"> + <ownedParameter xmi:type="uml:Parameter" xmi:id="_8co-sDczEeOimIxd1A6OhA" name="arg"> <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/> </ownedParameter> </ownedOperation> + <ownedOperation xmi:type="uml:Operation" xmi:id="_jnWMADcmEeO6UdbIk03c9Q" name="Operation2" method="_pX7DgDcmEeO6UdbIk03c9Q"> + <ownedComment xmi:type="uml:Comment" xmi:id="_rH4lQDcmEeO6UdbIk03c9Q" annotatedElement="_rH4lQDcmEeO6UdbIk03c9Q"> + <body></body> + </ownedComment> + <ownedParameter xmi:type="uml:Parameter" xmi:id="_8cra8DczEeOimIxd1A6OhA" name="args"> + <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_5lVhgBydEduyofBvg4RL2w"/> + </ownedParameter> + </ownedOperation> </packagedElement> <packagedElement xmi:type="uml:Package" xmi:id="_-2_pQC-IEeObJ6ARx67E0g" name="Package1"> <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_DHJ24C-JEeObJ6ARx67E0g" name="Test"/> @@ -99,47 +115,8 @@ arg[0] = 1;</body> <appliedProfile xmi:type="uml:Profile" href="pathmap://PapyrusC_Cpp_PROFILES/C_Cpp.profile.uml#_j9REUByGEduN1bTiWJ0lyw"/> </profileApplication> </uml:Model> - <Cpp:CppConst xmi:id="_1NjzwA1XEeK5O8LY525qvg"/> - <Cpp:CppPtr xmi:id="_1NpTUA1XEeK5O8LY525qvg"/> - <Cpp:CppConst xmi:id="_1O0_EA1XEeK5O8LY525qvg"/> - <Cpp:CppPtr xmi:id="_1O6eoA1XEeK5O8LY525qvg"/> - <Cpp:CppConst xmi:id="_LqnwQA4UEeK3V5UIs8bMtQ"/> - <Cpp:CppPtr xmi:id="_LqqMgA4UEeK3V5UIs8bMtQ"/> - <Cpp:CppConst xmi:id="_LqtP0A4UEeK3V5UIs8bMtQ"/> - <Cpp:CppPtr xmi:id="_LqvsEA4UEeK3V5UIs8bMtQ"/> - <Cpp:CppConst xmi:id="_cCEqYA4VEeKZ9ci_RaQQlQ"/> - <Cpp:CppPtr xmi:id="_cCKxAA4VEeKZ9ci_RaQQlQ"/> - <Cpp:CppConst xmi:id="_cClAsA4VEeKZ9ci_RaQQlQ"/> - <Cpp:CppPtr xmi:id="_cCwm4A4VEeKZ9ci_RaQQlQ"/> - <Cpp:CppConst xmi:id="_gKRO0A4VEeKZ9ci_RaQQlQ"/> - <Cpp:CppPtr xmi:id="_gKUSIA4VEeKZ9ci_RaQQlQ"/> - <Cpp:CppInclude xmi:id="_GV9Q8BoCEeKjbYasGOLMuA" base_class="_KOvvIPccEd-KM6l7lmIPkw" preBody="#define xytz"/> - <Cpp:CppConst xmi:id="_sKD1sBoKEeKjbYasGOLMuA"/> - <Cpp:CppPtr xmi:id="_sKHgEBoKEeKjbYasGOLMuA"/> - <Cpp:CppConst xmi:id="_sKO00BoKEeKjbYasGOLMuA"/> - <Cpp:CppPtr xmi:id="_sKSfMBoKEeKjbYasGOLMuA"/> - <Cpp:CppConst xmi:id="_3cU0IBoKEeKjbYasGOLMuA"/> - <Cpp:CppPtr xmi:id="_3cYegBoKEeKjbYasGOLMuA"/> - <Cpp:CppConst xmi:id="_3cgaUBoKEeKjbYasGOLMuA"/> - <Cpp:CppPtr xmi:id="_3ckEsBoKEeKjbYasGOLMuA"/> - <Cpp:CppConst xmi:id="_4alzMBoKEeKjbYasGOLMuA"/> - <Cpp:CppPtr xmi:id="_4arSwBoKEeKjbYasGOLMuA"/> - <Cpp:CppConst xmi:id="_4a1q0BoKEeKjbYasGOLMuA"/> - <Cpp:CppPtr xmi:id="_4a6jUBoKEeKjbYasGOLMuA"/> - <Cpp:CppConst xmi:id="_42hhQBoKEeKjbYasGOLMuA"/> - <Cpp:CppPtr xmi:id="_42lLoBoKEeKjbYasGOLMuA"/> - <Cpp:CppConst xmi:id="_42tHcBoKEeKjbYasGOLMuA" base_parameter="_42oO8BoKEeKjbYasGOLMuA"/> - <Cpp:CppPtr xmi:id="_42x_8BoKEeKjbYasGOLMuA" base_parameter="_42oO8BoKEeKjbYasGOLMuA"/> - <Alloc:Allocate xmi:id="_EpVesBvREeKM2oNGoGF4uQ" base_Abstraction="_Edy9EBvREeKM2oNGoGF4uQ"/> - <C_Cpp:Ptr xmi:id="_OtrjAP6SEeKlg5tzGV3QVQ"/> - <C_Cpp:Ptr xmi:id="_RcHfMP6SEeKlg5tzGV3QVQ"/> - <C_Cpp:Ptr xmi:id="_nvLRkP6SEeKlg5tzGV3QVQ"/> - <C_Cpp:Array xmi:id="_jzudwP6UEeKlg5tzGV3QVQ" definition="[25]"/> - <C_Cpp:Array xmi:id="_erFBkP6XEeKlg5tzGV3QVQ" definition="[267]"/> - <C_Cpp:Array xmi:id="_U3c_wP9lEeK-WfgwzfbGXg" definition="[25]"/> - <C_Cpp:Array xmi:id="_HJeEsAFFEeO6K_N_1OaJGA" definition="[25]"/> - <C_Cpp:Array xmi:id="_14-VwA5UEeOvI9e-hgvtnQ" definition="[25]"/> - <C_Cpp:Array xmi:id="_yHL1wBlCEeOWi_t2E10dLQ" definition="[25]"/> - <C_Cpp:Array xmi:id="_8HiewC-bEeO2L7HZ7MAV3w" definition="[25]"/> - <C_Cpp:Array xmi:id="_Af8CYC-cEeO2L7HZ7MAV3w" base_parameter="_Af4_EC-cEeO2L7HZ7MAV3w" definition="[25]"/> + <C_Cpp:Typedef xmi:id="_D6FjUDcWEeO6UdbIk03c9Q" definition="int" base_primitivetype="_DHJ24C-JEeObJ6ARx67E0g"/> + <C_Cpp:Const xmi:id="_8cvsYDczEeOimIxd1A6OhA" base_parameter="_8cra8DczEeOimIxd1A6OhA"/> + <C_Cpp:Ptr xmi:id="_8czWwDczEeOimIxd1A6OhA" base_parameter="_8cra8DczEeOimIxd1A6OhA"/> + <C_Cpp:Array xmi:id="_8c3oMDczEeOimIxd1A6OhA" base_parameter="_8cra8DczEeOimIxd1A6OhA" definition="[5]"/> </xmi:XMI> |