diff options
16 files changed, 728 insertions, 38 deletions
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/Debug/.gitignore b/extraplugins/codegen/org.eclipse.papyrus.cpp.test/Debug/.gitignore new file mode 100644 index 00000000000..5f376f39c91 --- /dev/null +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.test/Debug/.gitignore @@ -0,0 +1 @@ +/TestCDTintegration diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/Debug/TestCCodeGen/subdir.mk b/extraplugins/codegen/org.eclipse.papyrus.cpp.test/Debug/TestCCodeGen/subdir.mk new file mode 100644 index 00000000000..d1ff75c23f8 --- /dev/null +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.test/Debug/TestCCodeGen/subdir.mk @@ -0,0 +1,47 @@ +################################################################################ +# Automatically-generated file. Do not edit! +################################################################################ + +# Add inputs and outputs from these tool invocations to the build variables +CPP_SRCS += \ +../TestCCodeGen/Class1.cpp \ +../TestCCodeGen/Class2.cpp \ +../TestCCodeGen/Class3.cpp + +C_SRCS += \ +../TestCCodeGen/Class1.c \ +../TestCCodeGen/Class2.c \ +../TestCCodeGen/Class3.c + +OBJS += \ +./TestCCodeGen/Class1.o \ +./TestCCodeGen/Class2.o \ +./TestCCodeGen/Class3.o + +C_DEPS += \ +./TestCCodeGen/Class1.d \ +./TestCCodeGen/Class2.d \ +./TestCCodeGen/Class3.d + +CPP_DEPS += \ +./TestCCodeGen/Class1.d \ +./TestCCodeGen/Class2.d \ +./TestCCodeGen/Class3.d + + +# Each subdirectory must supply rules for building sources it contributes +TestCCodeGen/%.o: ../TestCCodeGen/%.c + @echo 'Building file: $<' + @echo 'Invoking: GCC C Compiler' + gcc -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<" + @echo 'Finished building: $<' + @echo ' ' + +TestCCodeGen/%.o: ../TestCCodeGen/%.cpp + @echo 'Building file: $<' + @echo 'Invoking: GCC C++ Compiler' + g++ -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<" + @echo 'Finished building: $<' + @echo ' ' + + diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/Debug/makefile b/extraplugins/codegen/org.eclipse.papyrus.cpp.test/Debug/makefile index 280ae99e60b..453585cf42d 100644 --- a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/Debug/makefile +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.test/Debug/makefile @@ -8,10 +8,8 @@ RM := rm -rf # All of the sources participating in the build are defined here -include sources.mk --include model/implementation/Class0/subdir.mk --include model/implementation/subdir.mk --include model/Class3/subdir.mk --include model/subdir.mk +-include TestCDTintegration/subdir.mk +-include TestCCodeGen/subdir.mk -include subdir.mk -include objects.mk @@ -41,19 +39,19 @@ endif # Add inputs and outputs from these tool invocations to the build variables # All Target -all: TestCDT +all: org.eclipse.papyrus.cpp.test # Tool invocations -TestCDT: $(OBJS) $(USER_OBJS) +org.eclipse.papyrus.cpp.test: $(OBJS) $(USER_OBJS) @echo 'Building target: $@' @echo 'Invoking: GCC C++ Linker' - g++ -o "TestCDT" $(OBJS) $(USER_OBJS) $(LIBS) + g++ -o "org.eclipse.papyrus.cpp.test" $(OBJS) $(USER_OBJS) $(LIBS) @echo 'Finished building target: $@' @echo ' ' # Other Targets clean: - -$(RM) $(OBJS)$(C++_DEPS)$(C_DEPS)$(CC_DEPS)$(CPP_DEPS)$(EXECUTABLES)$(CXX_DEPS)$(C_UPPER_DEPS) TestCDT + -$(RM) $(OBJS)$(C++_DEPS)$(C_DEPS)$(CC_DEPS)$(CPP_DEPS)$(EXECUTABLES)$(CXX_DEPS)$(C_UPPER_DEPS) org.eclipse.papyrus.cpp.test -@echo ' ' .PHONY: all clean dependents diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/Debug/sources.mk b/extraplugins/codegen/org.eclipse.papyrus.cpp.test/Debug/sources.mk index 45921d2fcef..477eca1972c 100644 --- a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/Debug/sources.mk +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.test/Debug/sources.mk @@ -23,8 +23,6 @@ C_UPPER_DEPS := # Every subdirectory with source files must be described here SUBDIRS := \ -model/implementation \ -model/implementation/Class0 \ -model \ -model/Class3 \ +TestCDTintegration \ +TestCCodeGen \ diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/TestCDTintegration/Class1.cpp b/extraplugins/codegen/org.eclipse.papyrus.cpp.test/TestCDTintegration/Class1.cpp new file mode 100644 index 00000000000..eae7809c990 --- /dev/null +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.test/TestCDTintegration/Class1.cpp @@ -0,0 +1,29 @@ +// -------------------------------------------------------- +// Code generated by Papyrus C++ +// -------------------------------------------------------- + +#define TestCDTintegration_Class1_BODY + +/************************************************************ + Class1 class body + ************************************************************/ + + + +// include associated header file +#include <TestCDTintegration/Class1.h> + + + +// Derived includes directives + + + +// static attributes (if any) + + + + +/************************************************************ + End of Class1 class body + ************************************************************/
\ No newline at end of file diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/TestCDTintegration/Class1.h b/extraplugins/codegen/org.eclipse.papyrus.cpp.test/TestCDTintegration/Class1.h new file mode 100644 index 00000000000..eeecc852d10 --- /dev/null +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.test/TestCDTintegration/Class1.h @@ -0,0 +1,60 @@ +// -------------------------------------------------------- +// Code generated by Papyrus C++ +// -------------------------------------------------------- + +#ifndef TESTCDTINTEGRATION_CLASS1_H +#define TESTCDTINTEGRATION_CLASS1_H + +/************************************************************ + Class1 class header + ************************************************************/ + +/* Owner package header include */ +#include <TestCDTintegration/Pkg_TestCDTintegration.h> + + + + + + + + +/************************************************************/ +/** + * + */ +class Class1 + { + public: + + protected: + + private: + + + public: + + + protected: + + + private: + + +}; +/************************************************************/ +/* External declarations (package visibility) */ + + +/************************************************************/ + + +/* Inline functions */ + + + +/************************************************************ + End of Class1 class header + ************************************************************/ + +#endif
\ No newline at end of file diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/TestCDTintegration/Class2.cpp b/extraplugins/codegen/org.eclipse.papyrus.cpp.test/TestCDTintegration/Class2.cpp new file mode 100644 index 00000000000..42a31cf03f3 --- /dev/null +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.test/TestCDTintegration/Class2.cpp @@ -0,0 +1,29 @@ +// -------------------------------------------------------- +// Code generated by Papyrus C++ +// -------------------------------------------------------- + +#define TestCDTintegration_Class2_BODY + +/************************************************************ + Class2 class body + ************************************************************/ + + + +// include associated header file +#include <TestCDTintegration/Class2.h> + + + +// Derived includes directives + + + +// static attributes (if any) + + + + +/************************************************************ + End of Class2 class body + ************************************************************/
\ No newline at end of file diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/TestCDTintegration/Class2.h b/extraplugins/codegen/org.eclipse.papyrus.cpp.test/TestCDTintegration/Class2.h new file mode 100644 index 00000000000..925ad340934 --- /dev/null +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.test/TestCDTintegration/Class2.h @@ -0,0 +1,60 @@ +// -------------------------------------------------------- +// Code generated by Papyrus C++ +// -------------------------------------------------------- + +#ifndef TESTCDTINTEGRATION_CLASS2_H +#define TESTCDTINTEGRATION_CLASS2_H + +/************************************************************ + Class2 class header + ************************************************************/ + +/* Owner package header include */ +#include <TestCDTintegration/Pkg_TestCDTintegration.h> + + + + + + + + +/************************************************************/ +/** + * + */ +class Class2 + { + public: + + protected: + + private: + + + public: + + + protected: + + + private: + + +}; +/************************************************************/ +/* External declarations (package visibility) */ + + +/************************************************************/ + + +/* Inline functions */ + + + +/************************************************************ + End of Class2 class header + ************************************************************/ + +#endif
\ No newline at end of file diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/TestCDTintegration/Class3.cpp b/extraplugins/codegen/org.eclipse.papyrus.cpp.test/TestCDTintegration/Class3.cpp index a6647187b0b..398cd202ba1 100644 --- a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/TestCDTintegration/Class3.cpp +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.test/TestCDTintegration/Class3.cpp @@ -27,7 +27,8 @@ * @param arg */ void Class3::Operation1(int /*in*/ arg[25]) { - + // Now let's add some code + arg[0] = 1; } @@ -35,4 +36,4 @@ void Class3::Operation1(int /*in*/ arg[25]) { /************************************************************ End of Class3 class body - ************************************************************/
\ No newline at end of file + ************************************************************/ diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/TestCDTintegration/Package1/Pkg_Package1.h b/extraplugins/codegen/org.eclipse.papyrus.cpp.test/TestCDTintegration/Package1/Pkg_Package1.h new file mode 100644 index 00000000000..3566e1c114a --- /dev/null +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.test/TestCDTintegration/Package1/Pkg_Package1.h @@ -0,0 +1,49 @@ +// -------------------------------------------------------- +// Code generated by Papyrus C++ +// -------------------------------------------------------- + +#ifndef PKG_TESTCDTINTEGRATION_PACKAGE1 +#define PKG_TESTCDTINTEGRATION_PACKAGE1 + +/************************************************************ + Pkg_Package1 package header + ************************************************************/ + +/* Owner package header include */ +#include <TestCDTintegration/Pkg_TestCDTintegration.h> + + +#ifndef _IN_ +#define _IN_ +#endif +#ifndef _OUT_ +#define _OUT_ +#endif +#ifndef _INOUT_ +#define _INOUT_ +#endif + + +/* Package dependency header include */ + + + +namespace Package1 { + +// Types defined within the package + + +/** + * + */ +typedef int Test; + + +} // of namespace Package1 + + +/************************************************************ + End of Pkg_Package1 package header + ************************************************************/ + +#endif
\ No newline at end of file diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/model/TestCCodeGen.di b/extraplugins/codegen/org.eclipse.papyrus.cpp.test/model/TestCCodeGen.di new file mode 100644 index 00000000000..b1b3ed6ae2a --- /dev/null +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.test/model/TestCCodeGen.di @@ -0,0 +1,29 @@ +<?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"> + <availablePage> + <emfPageIdentifier href="TestCDTintegration.notation"/> + </availablePage> + <availablePage> + <emfPageIdentifier href="TestCDTintegration.notation"/> + </availablePage> + <availablePage> + <emfPageIdentifier href="TestCDTintegration.notation"/> + </availablePage> + <availablePage> + <emfPageIdentifier href="TestCDTintegration.notation#_JOw40PccEd-KM6l7lmIPkw"/> + </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="TestCCodeGen.notation#_JOw40PccEd-KM6l7lmIPkw"/> + </children> + <children> + <emfPageIdentifier href="TestCDTintegration.notation#_JOw40PccEd-KM6l7lmIPkw"/> + </children> + </children> + </windows> + </sashModel> +</di:SashWindowsMngr> diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/model/TestCCodeGen.notation b/extraplugins/codegen/org.eclipse.papyrus.cpp.test/model/TestCCodeGen.notation new file mode 100644 index 00000000000..322e298d2d9 --- /dev/null +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.test/model/TestCCodeGen.notation @@ -0,0 +1,151 @@ +<?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/TextEditor/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"/> + </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> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iUDXkv6QEeKlg5tzGV3QVQ" source="QualifiedName"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iUDXk_6QEeKlg5tzGV3QVQ" 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"> + <children xmi:type="notation:Shape" xmi:id="_9v0FwBlCEeOWi_t2E10dLQ" type="3012" fontName="Sans Serif" lineColor="0"> + <element xmi:type="uml:Property" href="TestCCodeGen.uml#_9vmDUBlCEeOWi_t2E10dLQ"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_9v0FwRlCEeOWi_t2E10dLQ"/> + </children> + <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> + <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> + <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"/> + </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> + <element xmi:type="uml:Class" href="TestCCodeGen.uml#_K8FLcB0LEeKlYLZOWTi6uw"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iUAUQf6QEeKlg5tzGV3QVQ" x="45" y="88" width="280"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_3PkE0BlCEeOWi_t2E10dLQ" type="2008" fontName="Sans Serif" lineColor="0"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3Pl6ABlCEeOWi_t2E10dLQ" source="ShadowFigure"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3Pl6ARlCEeOWi_t2E10dLQ" key="ShadowFigure_Value" value="false"/> + </eAnnotations> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3Pl6AhlCEeOWi_t2E10dLQ" source="displayNameLabelIcon"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3Pl6AxlCEeOWi_t2E10dLQ" key="displayNameLabelIcon_value" value="false"/> + </eAnnotations> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3PmhEBlCEeOWi_t2E10dLQ" source="QualifiedName"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3PmhERlCEeOWi_t2E10dLQ" key="QualifiedNameDepth" value="1000"/> + </eAnnotations> + <children xmi:type="notation:DecorationNode" xmi:id="_3PmhEhlCEeOWi_t2E10dLQ" type="5029"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_3PmhExlCEeOWi_t2E10dLQ" type="7017"> + <children xmi:type="notation:Shape" xmi:id="_peGDkBlDEeOWi_t2E10dLQ" type="3012" fontName="Sans Serif" lineColor="0"> + <element xmi:type="uml:Property" href="TestCCodeGen.uml#_pd7rgBlDEeOWi_t2E10dLQ"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_peGDkRlDEeOWi_t2E10dLQ"/> + </children> + <styles xmi:type="notation:TitleStyle" xmi:id="_3PmhFBlCEeOWi_t2E10dLQ"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_3PmhFRlCEeOWi_t2E10dLQ"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_3PmhFhlCEeOWi_t2E10dLQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3PmhFxlCEeOWi_t2E10dLQ"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_3PmhGBlCEeOWi_t2E10dLQ" type="7018"> + <children xmi:type="notation:Shape" xmi:id="_tcRwYBlDEeOWi_t2E10dLQ" type="3013" fontName="Sans Serif" lineColor="0"> + <element xmi:type="uml:Operation" href="TestCCodeGen.uml#_tcJNgBlDEeOWi_t2E10dLQ"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_tcRwYRlDEeOWi_t2E10dLQ"/> + </children> + <styles xmi:type="notation:TitleStyle" xmi:id="_3PmhGRlCEeOWi_t2E10dLQ"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_3PmhGhlCEeOWi_t2E10dLQ"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_3PmhGxlCEeOWi_t2E10dLQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3PmhHBlCEeOWi_t2E10dLQ"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_3PmhHRlCEeOWi_t2E10dLQ" type="7019"> + <styles xmi:type="notation:TitleStyle" xmi:id="_3PmhHhlCEeOWi_t2E10dLQ"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_3PmhHxlCEeOWi_t2E10dLQ"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_3PmhIBlCEeOWi_t2E10dLQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3PmhIRlCEeOWi_t2E10dLQ"/> + </children> + <element xmi:type="uml:Class" href="TestCCodeGen.uml#_419y0A7hEeKpbseGaEy1LA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3PkE0RlCEeOWi_t2E10dLQ" x="506" y="86" width="161"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_5FTB8BlDEeOWi_t2E10dLQ" type="2008" fontName="Sans Serif" lineColor="0"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_5FTpABlDEeOWi_t2E10dLQ" source="ShadowFigure"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5FTpARlDEeOWi_t2E10dLQ" key="ShadowFigure_Value" value="false"/> + </eAnnotations> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_5FTpAhlDEeOWi_t2E10dLQ" source="displayNameLabelIcon"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5FTpAxlDEeOWi_t2E10dLQ" key="displayNameLabelIcon_value" value="false"/> + </eAnnotations> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_5FTpBBlDEeOWi_t2E10dLQ" source="QualifiedName"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5FTpBRlDEeOWi_t2E10dLQ" key="QualifiedNameDepth" value="1000"/> + </eAnnotations> + <children xmi:type="notation:DecorationNode" xmi:id="_5FTpBhlDEeOWi_t2E10dLQ" type="5029"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_5FTpBxlDEeOWi_t2E10dLQ" type="7017"> + <children xmi:type="notation:Shape" xmi:id="_9Gsa0BlDEeOWi_t2E10dLQ" type="3012" fontName="Sans Serif" lineColor="0"> + <element xmi:type="uml:Property" href="TestCCodeGen.uml#_9GkfABlDEeOWi_t2E10dLQ"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_9Gsa0RlDEeOWi_t2E10dLQ"/> + </children> + <styles xmi:type="notation:TitleStyle" xmi:id="_5FTpCBlDEeOWi_t2E10dLQ"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_5FTpCRlDEeOWi_t2E10dLQ"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_5FTpChlDEeOWi_t2E10dLQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5FTpCxlDEeOWi_t2E10dLQ"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_5FTpDBlDEeOWi_t2E10dLQ" type="7018"> + <children xmi:type="notation:Shape" xmi:id="_78ClkBlDEeOWi_t2E10dLQ" type="3013" fontName="Sans Serif" lineColor="0"> + <element xmi:type="uml:Operation" href="TestCCodeGen.uml#_777Q0BlDEeOWi_t2E10dLQ"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_78ClkRlDEeOWi_t2E10dLQ"/> + </children> + <styles xmi:type="notation:TitleStyle" xmi:id="_5FTpDRlDEeOWi_t2E10dLQ"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_5FTpDhlDEeOWi_t2E10dLQ"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_5FTpDxlDEeOWi_t2E10dLQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5FTpEBlDEeOWi_t2E10dLQ"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_5FUQEBlDEeOWi_t2E10dLQ" type="7019"> + <styles xmi:type="notation:TitleStyle" xmi:id="_5FUQERlDEeOWi_t2E10dLQ"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_5FUQEhlDEeOWi_t2E10dLQ"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_5FUQExlDEeOWi_t2E10dLQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5FUQFBlDEeOWi_t2E10dLQ"/> + </children> + <element xmi:type="uml:Class" href="TestCCodeGen.uml#_mp8XAA7QEeKcN-88BXIIKg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5FTB8RlDEeOWi_t2E10dLQ" x="514" y="227" width="153"/> + </children> + <styles xmi:type="notation:DiagramStyle" xmi:id="_JOw40fccEd-KM6l7lmIPkw"/> + <element xmi:type="uml:Model" href="TestCCodeGen.uml#_Ae6MwPccEd-KM6l7lmIPkw"/> + <edges xmi:type="notation:Connector" xmi:id="_4ryLMBlCEeOWi_t2E10dLQ" type="4002" source="_iUAUQP6QEeKlg5tzGV3QVQ" target="_3PkE0BlCEeOWi_t2E10dLQ" lineColor="0"> + <children xmi:type="notation:DecorationNode" xmi:id="_4rzZUBlCEeOWi_t2E10dLQ" type="6007"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_4rzZURlCEeOWi_t2E10dLQ" y="40"/> + </children> + <styles xmi:type="notation:FontStyle" xmi:id="_4ryLMRlCEeOWi_t2E10dLQ" fontName="Sans Serif"/> + <element xmi:type="uml:Generalization" href="TestCCodeGen.uml#_4rHc0BlCEeOWi_t2E10dLQ"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_4ryLMhlCEeOWi_t2E10dLQ" points="[42, -6, -190, 0]$[223, -7, -9, -1]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4sXaABlCEeOWi_t2E10dLQ" id="(0.85,0.53)"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4sXaARlCEeOWi_t2E10dLQ" id="(0.09,0.49)"/> + </edges> + <edges xmi:type="notation:Connector" xmi:id="_7APEoBlDEeOWi_t2E10dLQ" type="4002" source="_iUAUQP6QEeKlg5tzGV3QVQ" target="_5FTB8BlDEeOWi_t2E10dLQ" lineColor="0"> + <children xmi:type="notation:DecorationNode" xmi:id="_7AQSwBlDEeOWi_t2E10dLQ" type="6007"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_7AQSwRlDEeOWi_t2E10dLQ" y="40"/> + </children> + <styles xmi:type="notation:FontStyle" xmi:id="_7APrsBlDEeOWi_t2E10dLQ" fontName="Sans Serif"/> + <element xmi:type="uml:Generalization" href="TestCCodeGen.uml#_7AHv4BlDEeOWi_t2E10dLQ"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_7APrsRlDEeOWi_t2E10dLQ" points="[15, 6, -265, -117]$[357, 129, 77, 6]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7AVyUBlDEeOWi_t2E10dLQ" id="(0.9464285714285714,0.66)"/> + </edges> + </notation:Diagram> + <texteditormodel:TextEditorModel xmi:id="_z3K2EA5UEeOvI9e-hgvtnQ" 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/TestCCodeGen.uml b/extraplugins/codegen/org.eclipse.papyrus.cpp.test/model/TestCCodeGen.uml new file mode 100644 index 00000000000..46032827278 --- /dev/null +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.test/model/TestCCodeGen.uml @@ -0,0 +1,187 @@ +<?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"> + <uml:Model xmi:id="_Ae6MwPccEd-KM6l7lmIPkw" name="TestCCodeGen"> + <packageImport xmi:id="_GQ1SgP6SEeKlg5tzGV3QVQ"> + <importedPackage xmi:type="uml:Model" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_DV8nkBv8EduZN5aJJITI5w"/> + </packageImport> + <packagedElement xmi:type="uml:Package" xmi:id="_wCdtcH_1EeGMcIDCiaPhww" name="implementation"> + <ownedComment xmi:id="_13ZsYBhXEeKGC8dT0Hrc_A"/> + <packagedElement xmi:type="uml:Class" xmi:id="_KOvvIPccEd-KM6l7lmIPkw" clientDependency="_Edy9EBvREeKM2oNGoGF4uQ" name="Class0"> + <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_U_ezUMzYEeGcRfFFcVPhOg" name="operation1" specification="_mbXNMH8tEeGWNf8qHJJtnw"> + <ownedParameter xmi:id="_42nn4BoKEeKjbYasGOLMuA" name="Parameter1"> + <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusCpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/> + </ownedParameter> + <ownedParameter xmi:id="_42o2ABoKEeKjbYasGOLMuA" name="Parameter2"> + <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusCpp_LIBRARIES/AnsiCLibrary.uml#_5lVhgBydEduyofBvg4RL2w"/> + </ownedParameter> + <ownedParameter xmi:id="_42z1IBoKEeKjbYasGOLMuA" name="p3"> + <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusCpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/> + </ownedParameter> + <language>C/C++</language> + <body></body> + </ownedBehavior> + <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_a9tFQMzYEeGcRfFFcVPhOg" name="operation2" specification="_XC6DoMzYEeGcRfFFcVPhOg"> + <language>C/C++</language> + <body>my Text</body> + </ownedBehavior> + <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_vZAVMBnOEeK5EK5DdRYilA" name="operation3" specification="_q1fIIBRnEeK2iINwXBL4pA"> + <language>C/C++</language> + <body></body> + </ownedBehavior> + <ownedOperation xmi:id="_mbXNMH8tEeGWNf8qHJJtnw" name="operation1" method="_U_ezUMzYEeGcRfFFcVPhOg"> + <ownedParameter xmi:id="_42nA0BoKEeKjbYasGOLMuA" name="Parameter1"> + <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusCpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/> + </ownedParameter> + <ownedParameter xmi:id="_42oO8BoKEeKjbYasGOLMuA" name="Parameter2"> + <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusCpp_LIBRARIES/AnsiCLibrary.uml#_5lVhgBydEduyofBvg4RL2w"/> + </ownedParameter> + <ownedParameter xmi:id="_42zOEBoKEeKjbYasGOLMuA" name="p3"> + <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusCpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/> + </ownedParameter> + </ownedOperation> + <ownedOperation xmi:id="_XC6DoMzYEeGcRfFFcVPhOg" name="operation2" method="_a9tFQMzYEeGcRfFFcVPhOg"/> + <ownedOperation xmi:id="_q1fIIBRnEeK2iINwXBL4pA" name="operation3" method="_vZAVMBnOEeK5EK5DdRYilA"/> + <ownedOperation xmi:id="_BVivAB0LEeKlYLZOWTi6uw" name="Operation1"/> + </packagedElement> + <packagedElement xmi:type="uml:Abstraction" xmi:id="_Edy9EBvREeKM2oNGoGF4uQ" name="Allocate1" client="_KOvvIPccEd-KM6l7lmIPkw" supplier="_mp8XAA7QEeKcN-88BXIIKg"/> + </packagedElement> + <packagedElement xmi:type="uml:Class" xmi:id="_mp8XAA7QEeKcN-88BXIIKg" name="Class1"> + <ownedAttribute xmi:id="_9GkfABlDEeOWi_t2E10dLQ" name="i" visibility="public"> + <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/> + <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_-8RcYBlDEeOWi_t2E10dLQ" value="1"/> + <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_-8fe0BlDEeOWi_t2E10dLQ" value="1"/> + </ownedAttribute> + <ownedOperation xmi:id="_777Q0BlDEeOWi_t2E10dLQ" name="Operation1"/> + </packagedElement> + <packagedElement xmi:type="uml:Class" xmi:id="_419y0A7hEeKpbseGaEy1LA" name="Class2"> + <ownedAttribute xmi:id="_pd7rgBlDEeOWi_t2E10dLQ" name="j" visibility="public"> + <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/> + <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_sa39wBlDEeOWi_t2E10dLQ" value="1"/> + <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sbDj8BlDEeOWi_t2E10dLQ" value="1"/> + </ownedAttribute> + <ownedOperation xmi:id="_tcJNgBlDEeOWi_t2E10dLQ" name="superClassOp"/> + </packagedElement> + <packagedElement xmi:type="uml:Class" xmi:id="_K8FLcB0LEeKlYLZOWTi6uw" name="Class3"> + <generalization xmi:id="_4rHc0BlCEeOWi_t2E10dLQ" general="_419y0A7hEeKpbseGaEy1LA"/> + <generalization xmi:id="_7AHv4BlDEeOWi_t2E10dLQ" general="_mp8XAA7QEeKcN-88BXIIKg"/> + <ownedAttribute xmi:id="_9vmDUBlCEeOWi_t2E10dLQ" name="ch" visibility="public"> + <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_5lVhgBydEduyofBvg4RL2w"/> + <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Dd8GMBlDEeOWi_t2E10dLQ" value="1"/> + <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DeDa8BlDEeOWi_t2E10dLQ" value="1"/> + <defaultValue xmi:type="uml:LiteralString" xmi:id="_DeUgsBlDEeOWi_t2E10dLQ" name="dgdf" value="25
"/> + </ownedAttribute> + <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_kTVuwP6QEeKlg5tzGV3QVQ" name="Operation1" isReentrant="false" specification="_TY18YB0LEeKlYLZOWTi6uw"> + <ownedParameter xmi:id="_Gz6-YC-bEeO2L7HZ7MAV3w" 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> + </ownedBehavior> + <ownedOperation xmi:id="_TY18YB0LEeKlYLZOWTi6uw" name="Operation1" method="_kTVuwP6QEeKlg5tzGV3QVQ"> + <ownedComment xmi:id="_II4ccP6WEeKlg5tzGV3QVQ" annotatedElement="_II4ccP6WEeKlg5tzGV3QVQ"> + <body>Here you can document operation1</body> + </ownedComment> + <ownedParameter xmi:id="_Gz6XUC-bEeO2L7HZ7MAV3w" name="arg"> + <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/> + </ownedParameter> + </ownedOperation> + </packagedElement> + <profileApplication xmi:id="_G5ec8CcLEeGC--E0ZVgUkg"> + <eAnnotations xmi:id="_G6JLUCcLEeGC--E0ZVgUkg" source="http://www.eclipse.org/uml2/2.0.0/UML"> + <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/FCM/1#/"/> + </eAnnotations> + <appliedProfile href="pathmap://FCM_PROFILES/FCM.profile.uml#_5mvT0MtjEd2H_o0jIC6qDQ"/> + </profileApplication> + <profileApplication xmi:id="_VN5k0CcLEeGC--E0ZVgUkg"> + <eAnnotations xmi:id="_VRMJYCcLEeGC--E0ZVgUkg" source="http://www.eclipse.org/uml2/2.0.0/UML"> + <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/MARTE/1#//Alloc"/> + </eAnnotations> + <appliedProfile href="pathmap://Papyrus_PROFILES/MARTE.profile.uml#_ar8OsAPMEdyuUt-4qHuVvQ"/> + </profileApplication> + <profileApplication xmi:id="_WAm0ICcLEeGC--E0ZVgUkg"> + <eAnnotations xmi:id="_WDDEICcLEeGC--E0ZVgUkg" source="http://www.eclipse.org/uml2/2.0.0/UML"> + <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/MARTE/1#//HLAM"/> + </eAnnotations> + <appliedProfile href="pathmap://Papyrus_PROFILES/MARTE.profile.uml#_yNSZIAPMEdyuUt-4qHuVvQ"/> + </profileApplication> + <profileApplication xmi:id="_YgXbICcLEeGC--E0ZVgUkg"> + <eAnnotations xmi:id="_Yi1gUCcLEeGC--E0ZVgUkg" source="http://www.eclipse.org/uml2/2.0.0/UML"> + <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/MARTE/1#//GCM"/> + </eAnnotations> + <appliedProfile href="pathmap://Papyrus_PROFILES/MARTE.profile.uml#_YgAioAPMEdyuUt-4qHuVvQ"/> + </profileApplication> + <profileApplication xmi:id="_1PzP4P6QEeKlg5tzGV3QVQ"> + <eAnnotations xmi:id="_1QM4gP6QEeKlg5tzGV3QVQ" source="http://www.eclipse.org/uml2/2.0.0/UML"> + <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/C_Cpp/1#/"/> + </eAnnotations> + <appliedProfile 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="_KUCbUBlDEeOWi_t2E10dLQ" definition="[25]"/> + <C_Cpp:Array xmi:id="_wABfgBlDEeOWi_t2E10dLQ" definition="[25]"/> + <C_Cpp:Array xmi:id="__WqSUBlDEeOWi_t2E10dLQ" definition="[25]"/> + <C_Cpp:Array xmi:id="_T6AakBlEEeOWi_t2E10dLQ" definition="[25]"/> + <C_Cpp:Array xmi:id="_ZD9-ABlEEeOWi_t2E10dLQ" definition="[25]"/> + <C_Cpp:Typedef xmi:id="_GSsl0C-JEeObJ6ARx67E0g" definition="int"> + <base_primitivetype href="TestCDTintegration.uml#_DHJ24C-JEeObJ6ARx67E0g"/> + </C_Cpp:Typedef> + <C_Cpp:Array xmi:id="_NeBkEC-JEeObJ6ARx67E0g" definition="[25]"/> + <C_Cpp:Array xmi:id="_PZJ0AC-JEeObJ6ARx67E0g" definition="[25]"/> + <C_Cpp:Array xmi:id="_-e1fkC-WEeOlesq5lIESug" definition="[25]"/> + <C_Cpp:Array xmi:id="_AvLxkC-XEeOlesq5lIESug" definition="[25]"/> + <C_Cpp:Array xmi:id="_e8dogC-XEeOm_pHVqAkACg" definition="[25]"/> + <C_Cpp:Array xmi:id="_wpcnoC-XEeOm_pHVqAkACg" definition="[25]"/> + <C_Cpp:Array xmi:id="_xJ_v8C-XEeOm_pHVqAkACg" definition="[25]"/> + <C_Cpp:Array xmi:id="_xifvgC-XEeOm_pHVqAkACg" definition="[25]"/> + <C_Cpp:Array xmi:id="_ErNs0C-YEeOm_pHVqAkACg" definition="[25]"/> + <C_Cpp:Array xmi:id="_FLFfsC-YEeOm_pHVqAkACg" definition="[25]"/> + <C_Cpp:Array xmi:id="_kxBgwC-aEeO2L7HZ7MAV3w" definition="[25]"/> + <C_Cpp:Array xmi:id="_lL0mYC-aEeO2L7HZ7MAV3w" definition="[25]"/> + <C_Cpp:Array xmi:id="_mVwp8C-aEeO2L7HZ7MAV3w" definition="[25]"/> + <C_Cpp:Array xmi:id="_8OlXYC-aEeO2L7HZ7MAV3w" definition="[25]"/> + <C_Cpp:Array xmi:id="_CV-MYC-bEeO2L7HZ7MAV3w" definition="[25]"/> + <C_Cpp:Array xmi:id="_D_qHAC-bEeO2L7HZ7MAV3w" definition="[25]"/> + <C_Cpp:Array xmi:id="_Gz9aoC-bEeO2L7HZ7MAV3w" base_parameter="_Gz6XUC-bEeO2L7HZ7MAV3w" definition="[25]"/> +</xmi:XMI> 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 269e61e7e17..11802ddc6e3 100644 --- a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/model/TestCDTintegration.di +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.test/model/TestCDTintegration.di @@ -2,27 +2,20 @@ <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"> <availablePage> - <emfPageIdentifier href="TestCDTintegration.notation"/> + <emfPageIdentifier href="TestCDTintegration.notation#_s2zhQBlCEeOWi_t2E10dLQ"/> </availablePage> <availablePage> - <emfPageIdentifier href="TestCDTintegration.notation"/> - </availablePage> - <availablePage> - <emfPageIdentifier href="TestCDTintegration.notation#_z3K2EA5UEeOvI9e-hgvtnQ"/> + <emfPageIdentifier href="TestCDTintegration.notation#_7RQ-EC-bEeO2L7HZ7MAV3w"/> </availablePage> </pageList> - <sashModel xmi:id="_AfdmYvccEd-KM6l7lmIPkw" currentSelection="//@sashModel/@windows.0/@children.0/@children.1"> + <sashModel xmi:id="_AfdmYvccEd-KM6l7lmIPkw" currentSelection="//@sashModel/@windows.0/@children.0"> <windows xmi:id="_AfdmY_ccEd-KM6l7lmIPkw"> - <children xsi:type="di:SashPanel" direction="256"> - <children xsi:type="di:TabFolder"> - <children> - <emfPageIdentifier href="TestCDTintegration.notation#_JOw40PccEd-KM6l7lmIPkw"/> - </children> + <children xsi:type="di:TabFolder"> + <children> + <emfPageIdentifier href="TestCDTintegration.notation#_JOw40PccEd-KM6l7lmIPkw"/> </children> - <children xsi:type="di:TabFolder"> - <children> - <emfPageIdentifier href="TestCDTintegration.notation#_z3K2EA5UEeOvI9e-hgvtnQ"/> - </children> + <children> + <emfPageIdentifier href="TestCDTintegration.notation#_7RQ-EC-bEeO2L7HZ7MAV3w"/> </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 ee611a77af5..ef9263d71d7 100644 --- a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/model/TestCDTintegration.notation +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.test/model/TestCDTintegration.notation @@ -1,5 +1,5 @@ <?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/TextEditor/0.10.0/texteditormodel" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML"> +<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"> @@ -23,7 +23,7 @@ <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="TestCDTintegration.uml#_TY18YB0LEeKlYLZOWTi6uw"/> + <element xmi:type="uml:Operation" href="TestCCodeGen.uml#_TY18YB0LEeKlYLZOWTi6uw"/> <layoutConstraint xmi:type="notation:Location" xmi:id="_jWd20f6QEeKlg5tzGV3QVQ"/> </children> <styles xmi:type="notation:TitleStyle" xmi:id="_iUD-of6QEeKlg5tzGV3QVQ"/> @@ -37,13 +37,64 @@ <styles xmi:type="notation:FilteringStyle" xmi:id="_iUD-qP6QEeKlg5tzGV3QVQ"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iUD-qf6QEeKlg5tzGV3QVQ"/> </children> - <element xmi:type="uml:Class" href="TestCDTintegration.uml#_K8FLcB0LEeKlYLZOWTi6uw"/> + <element xmi:type="uml:Class" href="TestCCodeGen.uml#_K8FLcB0LEeKlYLZOWTi6uw"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iUAUQf6QEeKlg5tzGV3QVQ" x="45" y="88" width="280"/> </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"/> + </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> + <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> + <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"/> + </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> + <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> + <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> + <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> + <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> + <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"/> + </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"/> + </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"/> + </children> <styles xmi:type="notation:DiagramStyle" xmi:id="_JOw40fccEd-KM6l7lmIPkw"/> - <element xmi:type="uml:Model" href="TestCDTintegration.uml#_Ae6MwPccEd-KM6l7lmIPkw"/> + <element xmi:type="uml:Model" href="TestCCodeGen.uml#_Ae6MwPccEd-KM6l7lmIPkw"/> </notation:Diagram> - <texteditormodel:TextEditorModel xmi:id="_z3K2EA5UEeOvI9e-hgvtnQ" type="CDTEditorInPapyrus" name="CDT Class3"> + <texteditormodel:TextEditorModel xmi:id="_7RQ-EC-bEeO2L7HZ7MAV3w" 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 3c8971339bf..8bd80559529 100644 --- a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/model/TestCDTintegration.uml +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.test/model/TestCDTintegration.uml @@ -49,21 +49,25 @@ <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="_14qzwA5UEeOvI9e-hgvtnQ" name="arg"> + <ownedParameter xmi:type="uml:Parameter" xmi:id="_Af5mIC-cEeO2L7HZ7MAV3w" name="arg"> <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/> </ownedParameter> <language>C/C++</language> - <body></body> + <body>// Now let's add some code +arg[0] = 1;</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="_14a8IA5UEeOvI9e-hgvtnQ" name="arg"> + <ownedParameter xmi:type="uml:Parameter" xmi:id="_Af4_EC-cEeO2L7HZ7MAV3w" name="arg"> <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/> </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"/> + </packagedElement> <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_G5ec8CcLEeGC--E0ZVgUkg"> <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_G6JLUCcLEeGC--E0ZVgUkg" source="http://www.eclipse.org/uml2/2.0.0/UML"> <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/FCM/1#/"/> @@ -134,5 +138,8 @@ <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" base_parameter="_14a8IA5UEeOvI9e-hgvtnQ" 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]"/> </xmi:XMI> |