Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaadia Dhouib2014-01-27 13:21:53 +0000
committerSaadia Dhouib2014-01-27 13:21:53 +0000
commitb58a26434724150a2c7e0ae6e8a0406151d01774 (patch)
tree483ed8b252ec54960470dcf9844730eb592d1e61 /extraplugins
parentf31451326e4d9000bd53de8e7545221cbec83f66 (diff)
parent61fe1560ac4f7d2d667c116648cbe5a2eb6a10ef (diff)
downloadorg.eclipse.papyrus-b58a26434724150a2c7e0ae6e8a0406151d01774.tar.gz
org.eclipse.papyrus-b58a26434724150a2c7e0ae6e8a0406151d01774.tar.xz
org.eclipse.papyrus-b58a26434724150a2c7e0ae6e8a0406151d01774.zip
Merge branch 'master' of git://git.eclipse.org/gitroot/papyrus/org.eclipse.papyrus
Diffstat (limited to 'extraplugins')
-rw-r--r--extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile/img/adl.pngbin0 -> 719 bytes
-rw-r--r--extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile/img/adl.svg355
-rw-r--r--extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile/plugin.xml3
-rw-r--r--extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/plugin.xml9
-rw-r--r--extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/src/org/eclipse/papyrus/adl4eclipsetool/assistant/AdvancePluginImport.java149
-rw-r--r--extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/designer/ArchitectureSnapshotDesigner.java2
-rw-r--r--extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/designer/CompleteArchitectureSnapshotDesigner.java1
-rw-r--r--extraplugins/cdo/org.eclipse.papyrus.cdo.core/META-INF/MANIFEST.MF2
-rw-r--r--extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/META-INF/MANIFEST.MF2
-rw-r--r--extraplugins/cdo/org.eclipse.papyrus.cdo.ui/META-INF/MANIFEST.MF2
-rw-r--r--extraplugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui/META-INF/MANIFEST.MF2
-rw-r--r--extraplugins/cdo/org.eclipse.papyrus.cdo.uml.ui/META-INF/MANIFEST.MF2
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/.classpath2
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/META-INF/MANIFEST.MF2
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.acceleo/.classpath2
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.acceleo/META-INF/MANIFEST.MF2
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.acceleo/src/org/eclipse/papyrus/acceleo/GenUtils.java9
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.acceleo/src/org/eclipse/papyrus/acceleo/Messages.java15
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.acceleo/src/org/eclipse/papyrus/acceleo/ModelElementsCreator.java17
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.acceleo/src/org/eclipse/papyrus/acceleo/messages.properties1
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui/.classpath2
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui/META-INF/MANIFEST.MF2
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/.classpath2
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/META-INF/MANIFEST.MF2
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/build.properties1
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/Constants.java21
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/Messages.java15
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/StdStereo.java15
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppClassHeader.emtl1283
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppClassHeader.mtl38
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppAttribute.mtl12
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassFriendDeclaration.emtl6
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeClassDeclaration.emtl185
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeClassDeclaration.mtl2
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeDeclaration.emtl6
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassInheritedDeclarations.emtl6
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassTypeAndEnum.emtl10
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppOperations.emtl1780
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppOperations.mtl10
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppParameter.emtl24
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/messages.properties1
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/preferences/CppCodeGenConstants.java8
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/preferences/CppCodeGenPreferenceInitializer.java13
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/transformation/CppModelElementsCreator.java8
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/CppGenUtils.java6
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.profile/.classpath2
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.profile/META-INF/MANIFEST.MF2
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.genmodel7
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Array.java10
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/C_CppFactory.java52
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/C_CppPackage.java502
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Const.java10
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/ConstInit.java10
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/CppInit.java10
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/CppRoot.java10
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Default.java107
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/EAccessKind.java16
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/EStorageClass.java18
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/ExternLibrary.java11
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/External.java10
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Friend.java10
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Include.java64
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Inline.java10
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/ManualGeneration.java10
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/NoCodeGen.java10
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Ptr.java10
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Ref.java10
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/StorageClass.java11
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Template.java10
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/TemplateBinding.java10
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/TemplateParameter.java10
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Typedef.java10
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Union.java10
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Virtual.java10
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Visibility.java10
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/VisibilityKind.java16
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ArrayImpl.java16
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/C_CppFactoryImpl.java67
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/C_CppPackageImpl.java347
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ConstImpl.java14
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ConstInitImpl.java16
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/CppInitImpl.java16
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/CppRootImpl.java13
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ExternLibraryImpl.java26
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ExternalImpl.java12
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/FriendImpl.java14
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/IncludeImpl.java68
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/InlineImpl.java14
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ManualGenerationImpl.java15
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/NoCodeGenImpl.java14
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/PtrImpl.java16
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/RefImpl.java14
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/StorageClassImpl.java16
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/TemplateBindingImpl.java15
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/TemplateImpl.java15
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/TemplateParameterImpl.java15
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/TypedefImpl.java16
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/UnionImpl.java14
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/VirtualImpl.java14
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/VisibilityImpl.java16
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/util/C_CppAdapterFactory.java55
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/util/C_CppResourceFactoryImpl.java10
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/util/C_CppResourceImpl.java10
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/util/C_CppSwitch.java54
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/util/C_CppXMLProcessor.java13
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/cpp/profile/StdStereo.java5
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.test/Debug/.gitignore1
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.test/Debug/TestCCodeGen/subdir.mk47
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.test/Debug/makefile60
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.test/Debug/model/Class3/subdir.mk24
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.test/Debug/model/implementation/Class0/subdir.mk33
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.test/Debug/model/implementation/subdir.mk27
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.test/Debug/model/subdir.mk27
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.test/Debug/objects.mk8
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.test/Debug/sources.mk28
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.test/TestCDTintegration/Class1.cpp29
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.test/TestCDTintegration/Class1.h60
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.test/TestCDTintegration/Class2.cpp29
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.test/TestCDTintegration/Class2.h60
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.test/TestCDTintegration/Class3.cpp39
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.test/TestCDTintegration/Class3.h71
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.test/TestCDTintegration/Package1/Pkg_Package1.h49
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/.classpath14
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/META-INF/MANIFEST.MF2
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.texteditor.model/.classpath14
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.texteditor.model/META-INF/MANIFEST.MF2
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.texteditor.modelexplorer/.classpath2
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.texteditor.modelexplorer/META-INF/MANIFEST.MF4
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.views.cpp/.classpath2
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.views.cpp/META-INF/MANIFEST.MF4
-rw-r--r--extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.doc/resources/template-diaGen.pdfbin632121 -> 694392 bytes
-rw-r--r--extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.doc/resources/template-diaGen.pptxbin928095 -> 928322 bytes
-rw-r--r--extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/DiagramTemplateActionBarContributor.java2
-rw-r--r--extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/DiagramTemplateEditor.java2
-rw-r--r--extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/DiagramTemplateEditorPlugin.java2
-rw-r--r--extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/DiagramTemplateModelWizard.java2
-rw-r--r--extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/DiagramDefinitionContentProvider.java2
-rw-r--r--extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/DiagramDefinitionLabelProvider.java2
-rw-r--r--extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/DiagramKindContentProvider.java2
-rw-r--r--extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/ElementsAvailableContentProvider.java2
-rw-r--r--extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/ForContentProvider.java2
-rw-r--r--extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/ForLabelProvider.java2
-rw-r--r--extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/TypesAvailableFromEReferenceContentProvider.java2
-rw-r--r--extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/TypesContentProvider.java2
-rw-r--r--extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/WhatContentProvider.java2
-rw-r--r--extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/launcher/DiagramTemplateLauncher.java2
-rw-r--r--extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/launcher/DiagramTemplateLauncherReport.java2
-rw-r--r--extraplugins/domainmodel/org.eclipse.papyrus.uml.diagram.domain/src-gen/org/eclipse/papyrus/uml/diagram/domain/preferences/AssociationPreferencePage.java4
-rw-r--r--extraplugins/domainmodel/org.eclipse.papyrus.uml.diagram.domain/src-gen/org/eclipse/papyrus/uml/diagram/domain/preferences/ClassPreferencePage.java10
-rw-r--r--extraplugins/domainmodel/org.eclipse.papyrus.uml.diagram.domain/src-gen/org/eclipse/papyrus/uml/diagram/domain/preferences/DataTypePreferencePage.java10
-rw-r--r--extraplugins/domainmodel/org.eclipse.papyrus.uml.diagram.domain/src-gen/org/eclipse/papyrus/uml/diagram/domain/preferences/EnumerationPreferencePage.java10
-rw-r--r--extraplugins/domainmodel/org.eclipse.papyrus.uml.diagram.domain/src-gen/org/eclipse/papyrus/uml/diagram/domain/preferences/GeneralizationPreferencePage.java4
-rw-r--r--extraplugins/domainmodel/org.eclipse.papyrus.uml.diagram.domain/src-gen/org/eclipse/papyrus/uml/diagram/domain/preferences/InstanceSpecificationPreferencePage.java10
-rw-r--r--extraplugins/domainmodel/org.eclipse.papyrus.uml.diagram.domain/src-gen/org/eclipse/papyrus/uml/diagram/domain/preferences/PackagePreferencePage.java10
-rw-r--r--extraplugins/domainmodel/org.eclipse.papyrus.uml.diagram.domain/src-gen/org/eclipse/papyrus/uml/diagram/domain/preferences/PrimitiveTypePreferencePage.java10
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.codegen/.classpath8
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.codegen/.project42
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.codegen/.settings/org.eclipse.jdt.core.prefs (renamed from extraplugins/codegen/org.eclipse.papyrus.texteditor.modelexplorer/.settings/org.eclipse.jdt.core.prefs)14
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.codegen/META-INF/MANIFEST.MF25
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.codegen/build.acceleo26
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.codegen/build.properties9
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.codegen/icons/facade.pngbin0 -> 382 bytes
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.codegen/plugin.properties2
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.codegen/plugin.xml44
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genclass/eIsSet.mtl130
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genclass/eUnset.mtl54
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genclass/genDeclaredFields.mtl206
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genclass/genFeature.mtl902
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genclass/genOperation.mtl191
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genclass/reflectiveDelegationAlternative.mtl39
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genfacade/AbstractRepresentingClass.mtl69
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genfacade/Class.mtl1029
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genfacade/GenFacade.java420
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genfacade/GenFacade.mtl158
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genfacade/LoaderClass.mtl128
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genfacade/PackageClass.mtl1289
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genfacade/RepresentingElementAdapter.mtl106
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genfacade/ResourceClass.mtl536
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genfacade/WrapperClass.mtl189
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/utils/FacadeCodegenUtils.mtl127
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/utils/WrappingListUtils.mtl14
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.codegen/src/org/eclipse/papyrus/facade/codegen/FacadeCodeGenPlugin.java66
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.codegen/src/org/eclipse/papyrus/facade/codegen/Messages.java45
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.codegen/src/org/eclipse/papyrus/facade/codegen/handlers/GenerateFacadeHandler.java229
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.codegen/src/org/eclipse/papyrus/facade/codegen/messages.properties8
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.codegen/src/org/eclipse/papyrus/facade/codegen/utils/EEFGeneratorAdapter.java172
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.codegen/src/org/eclipse/papyrus/facade/codegen/utils/FacadeCodegenUtils.java1446
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.codegen/src/org/eclipse/papyrus/facade/codegen/utils/WrappingListUtils.java344
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/.classpath7
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/.project28
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/.settings/org.eclipse.jdt.core.prefs (renamed from extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/.settings/org.eclipse.jdt.core.prefs)18
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/META-INF/MANIFEST.MF18
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/build.properties6
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/association.pngbin0 -> 702 bytes
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/associationRequired.pngbin0 -> 706 bytes
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/checked.gifbin0 -> 343 bytes
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/combinaison.pngbin0 -> 424 bytes
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/facade.pngbin0 -> 382 bytes
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/fusion.pngbin0 -> 627 bytes
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/fusionRequired.pngbin0 -> 644 bytes
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/generalization.pngbin0 -> 628 bytes
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/generalizationRequired.pngbin0 -> 583 bytes
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/multigeneralization.pngbin0 -> 589 bytes
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/multigeneralizationRequired.pngbin0 -> 541 bytes
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/tag.pngbin0 -> 689 bytes
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/tagRequired.pngbin0 -> 740 bytes
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/unchecked.gifbin0 -> 251 bytes
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/virtualmetamodel/StereotypeInterface.gifbin0 -> 211 bytes
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/virtualmetamodel/VirtualDatatype.gifbin0 -> 199 bytes
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/virtualmetamodel/VirtualEnum.gifbin0 -> 131 bytes
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/virtualmetamodel/VirtualLiteral.gifbin0 -> 109 bytes
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/virtualmetamodel/VirtualMetaclass.gifbin0 -> 206 bytes
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/virtualmetamodel/VirtualOperation.gifbin0 -> 141 bytes
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/virtualmetamodel/VirtualParameter.gifbin0 -> 911 bytes
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/virtualmetamodel/VirtualReference.gifbin0 -> 183 bytes
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/plugin.xml17
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/com/swtdesigner/ResourceManager.java420
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/com/swtdesigner/SWTResourceManager.java453
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/FacadeDefinitionEditorActivator.java80
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/FacadeSpecificEditor.java761
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/Messages.java258
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/EditionUtils.java192
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/ExtensionKindColumnEditingSupport.java316
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/IsPossibleColumnEditingSupport.java218
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/MetaclassAliasColumnEditingSupport.java97
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/MetaclassIsAbstractColumnEditingSupport.java102
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/MetaclassToKeepColumnEditingSupport.java112
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/MetaclassUseRepresentedColumnEditingSupport.java99
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/PropertiesAliasColumnEdintingSupport.java100
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/PropertiesMaxColumnEdintingSupport.java149
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/PropertiesMinColumnEdintingSupport.java144
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/PropertiesToKeepColumnEditingSupport.java117
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/StereotypeIncompatibilityColumnEditingSupport.java297
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/messages.properties115
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/metamodel/CreatePreliminaryMetamodelListener.java346
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/metamodel/EcoreGenerator.java960
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/metamodel/MetamodelUtils.java1160
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/providers/ExtensionDefintionContentProvider.java121
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/providers/ExtensionDefintionLabelProvider.java236
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/providers/IncompatibilitiesContentProvider.java63
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/providers/IncompatibilitiesLabelProvider.java213
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/providers/MetamodelContentProvider.java115
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/providers/MetamodelLabelProvider.java279
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/providers/TypedElementContentProvider.java90
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/providers/TypedElementLabelProvider.java176
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/utils/ProfileUtils.java253
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/utils/PrunerUtils.java129
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/utils/StereotypeUtils.java150
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/utils/UMLModelUtils.java36
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.edit/.classpath7
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.edit/.project28
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.edit/META-INF/MANIFEST.MF23
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.edit/build.properties10
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateBaseMetaclass_compatibleStereotypes_Combination.gifbin0 -> 223 bytes
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateBaseMetaclass_incompatibleStereotypes_Combination.gifbin0 -> 223 bytes
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateExtensionDefinition_baseMetaclasses_BaseMetaclass.gifbin0 -> 223 bytes
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateFacadeMappping_mappings_Mapping.gifbin0 -> 223 bytes
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateFacadeMappping_mappings_StereotypedMapping.gifbin0 -> 223 bytes
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateFacade_extensionDefinitions_ExtensionDefinition.gifbin0 -> 223 bytes
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateFacade_virtualmetamodel_VirtualMetamodel.gifbin0 -> 223 bytes
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateVirtualEnum_literals_VirtualLiteral.gifbin0 -> 223 bytes
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateVirtualMetaclass_operations_VirtualOperation.gifbin0 -> 223 bytes
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateVirtualMetaclass_properties_VirtualProperty.gifbin0 -> 223 bytes
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateVirtualMetamodel_virtualClassifiers_VirtualDatatype.gifbin0 -> 223 bytes
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateVirtualMetamodel_virtualClassifiers_VirtualEnum.gifbin0 -> 223 bytes
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateVirtualMetamodel_virtualClassifiers_VirtualMetaclass.gifbin0 -> 223 bytes
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateVirtualOperation_parameters_VirtualParameter.gifbin0 -> 223 bytes
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/BaseMetaclass.gifbin0 -> 129 bytes
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/Combination.gifbin0 -> 129 bytes
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/ExtensionDefinition.gifbin0 -> 129 bytes
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/Facade.gifbin0 -> 129 bytes
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/FacadeMappping.gifbin0 -> 129 bytes
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/Mapping.gifbin0 -> 129 bytes
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/StereotypedMapping.gifbin0 -> 129 bytes
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/VirtualDatatype.gifbin0 -> 129 bytes
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/VirtualEnum.gifbin0 -> 129 bytes
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/VirtualLiteral.gifbin0 -> 129 bytes
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/VirtualMetaclass.gifbin0 -> 129 bytes
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/VirtualMetamodel.gifbin0 -> 129 bytes
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/VirtualOperation.gifbin0 -> 129 bytes
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/VirtualParameter.gifbin0 -> 129 bytes
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/VirtualProperty.gifbin0 -> 129 bytes
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.edit/plugin.properties85
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.edit/plugin.xml61
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/extensiondefinition/provider/BaseMetaclassItemProvider.java263
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/extensiondefinition/provider/CombinationItemProvider.java159
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/extensiondefinition/provider/ExtensionDefinitionItemProvider.java260
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/extensiondefinition/provider/ExtensiondefinitionItemProviderAdapterFactory.java258
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/provider/FacadeEditPlugin.java106
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/provider/FacadeItemProvider.java189
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/provider/FacadeItemProviderAdapterFactory.java210
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualClassifierItemProvider.java111
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualDatatypeItemProvider.java122
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualElementItemProvider.java231
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualEnumItemProvider.java168
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualLiteralItemProvider.java122
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualMetaclassItemProvider.java273
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualMetamodelItemProvider.java270
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualOperationItemProvider.java168
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualParameterItemProvider.java122
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualPropertyItemProvider.java122
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualTypedElementItemProvider.java191
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualmetamodelItemProviderAdapterFactory.java378
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facademapping/provider/FacadeMapppingItemProvider.java184
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facademapping/provider/FacademappingEditPlugin.java100
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facademapping/provider/FacademappingItemProviderAdapterFactory.java258
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facademapping/provider/MappingItemProvider.java180
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facademapping/provider/StereotypedMappingItemProvider.java180
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.editor/.classpath7
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.editor/.project28
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.editor/META-INF/MANIFEST.MF23
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.editor/build.properties10
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.editor/icons/full/obj16/ExtensiondefinitionModelFile.gifbin0 -> 346 bytes
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.editor/icons/full/obj16/FacadeModelFile.gifbin0 -> 346 bytes
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.editor/icons/full/obj16/FacademappingModelFile.gifbin0 -> 346 bytes
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.editor/icons/full/obj16/VirtualmetamodelModelFile.gifbin0 -> 346 bytes
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.editor/icons/full/wizban/NewExtensiondefinition.gifbin0 -> 2462 bytes
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.editor/icons/full/wizban/NewFacade.gifbin0 -> 2462 bytes
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.editor/icons/full/wizban/NewFacademapping.gifbin0 -> 2462 bytes
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.editor/icons/full/wizban/NewVirtualmetamodel.gifbin0 -> 2462 bytes
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.editor/plugin.properties78
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.editor/plugin.xml107
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facade/extensiondefinition/presentation/ExtensiondefinitionActionBarContributor.java436
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facade/extensiondefinition/presentation/ExtensiondefinitionEditor.java1843
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facade/extensiondefinition/presentation/ExtensiondefinitionModelWizard.java640
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facade/presentation/FacadeActionBarContributor.java434
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facade/presentation/FacadeEditor.java1841
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facade/presentation/FacadeEditorPlugin.java108
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facade/presentation/FacadeModelWizard.java638
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facade/virtualmetamodel/presentation/VirtualmetamodelActionBarContributor.java436
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facade/virtualmetamodel/presentation/VirtualmetamodelEditor.java1843
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facade/virtualmetamodel/presentation/VirtualmetamodelModelWizard.java640
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facademapping/presentation/FacademappingActionBarContributor.java434
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facademapping/presentation/FacademappingEditor.java1829
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facademapping/presentation/FacademappingEditorPlugin.java102
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facademapping/presentation/FacademappingModelWizard.java639
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.utils/.classpath7
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.utils/.project28
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.utils/.settings/org.eclipse.jdt.core.prefs7
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.utils/META-INF/MANIFEST.MF15
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.utils/build.properties4
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/CombinationGenerator.java123
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/FacadeUtilsActivator.java43
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/RepresentingElement.java26
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/wrappinglist/WrappingEObjectContainmentEList.java237
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/wrappinglist/WrappingEObjectContainmentWithInverseEList.java217
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/wrappinglist/WrappingEObjectEList.java228
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/wrappinglist/WrappingEObjectWithInverseEList.java186
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/wrappinglist/WrappingList.java31
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/wrappinglist/subset/WrappingSubsetEObjectContainmentEList.java188
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/wrappinglist/subset/WrappingSubsetEObjectContainmentWithInverseEList.java193
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/wrappinglist/subset/WrappingSubsetEObjectEList.java194
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/wrappinglist/subset/WrappingSubsetEObjectWithInverseEList.java203
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/.classpath7
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/.project28
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/META-INF/MANIFEST.MF33
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/build.properties16
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/icons/facade.pngbin0 -> 382 bytes
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/model/facade.ecore110
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/model/facade.genmodel55
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/model/facademapping.ecore26
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/model/facademapping.genmodel28
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/plugin.properties3
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/plugin.xml108
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/schema/facadeDefinition.exsd145
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/Facade.java89
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/FacadeActivator.java77
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/FacadeFactory.java53
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/FacadePackage.java199
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/Messages.java68
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/BaseMetaclass.java153
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/Combination.java53
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/ExtensionDefinition.java173
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/ExtensionDefinitionKind.java273
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/ExtensiondefinitionFactory.java71
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/ExtensiondefinitionPackage.java579
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/impl/BaseMetaclassImpl.java416
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/impl/CombinationImpl.java145
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/impl/ExtensionDefinitionImpl.java448
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/impl/ExtensiondefinitionFactoryImpl.java179
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/impl/ExtensiondefinitionPackageImpl.java391
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/util/ExtensiondefinitionAdapterFactory.java167
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/util/ExtensiondefinitionResourceFactoryImpl.java63
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/util/ExtensiondefinitionResourceImpl.java39
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/util/ExtensiondefinitionSwitch.java163
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/util/ExtensiondefinitionXMLProcessor.java61
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/validation/BaseMetaclassValidator.java37
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/validation/CombinationValidator.java30
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/validation/ExtensionDefinitionValidator.java40
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/impl/FacadeFactoryImpl.java106
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/impl/FacadeImpl.java255
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/impl/FacadePackageImpl.java228
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/messages.properties20
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/util/FacadeAdapterFactory.java131
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/util/FacadeResourceFactoryImpl.java63
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/util/FacadeResourceImpl.java39
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/util/FacadeSwitch.java121
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/util/FacadeXMLProcessor.java61
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/validation/FacadeValidator.java33
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualClassifier.java62
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualDatatype.java28
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualElement.java142
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualEnum.java51
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualLiteral.java28
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualMetaclass.java160
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualMetamodel.java167
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualOperation.java51
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualParameter.java28
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualProperty.java62
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualTypedElement.java114
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualmetamodelFactory.java116
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualmetamodelPackage.java1672
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualClassifierImpl.java206
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualDatatypeImpl.java50
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualElementImpl.java344
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualEnumImpl.java161
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualLiteralImpl.java50
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualMetaclassImpl.java410
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualMetamodelImpl.java432
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualOperationImpl.java161
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualParameterImpl.java50
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualPropertyImpl.java206
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualTypedElementImpl.java289
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualmetamodelFactoryImpl.java183
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualmetamodelPackageImpl.java666
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/util/VirtualmetamodelAdapterFactory.java311
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/util/VirtualmetamodelResourceFactoryImpl.java63
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/util/VirtualmetamodelResourceImpl.java39
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/util/VirtualmetamodelSwitch.java346
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/util/VirtualmetamodelXMLProcessor.java61
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/validation/VirtualClassifierValidator.java28
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/validation/VirtualDatatypeValidator.java26
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/validation/VirtualElementValidator.java31
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/validation/VirtualEnumValidator.java30
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/validation/VirtualLiteralValidator.java26
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/validation/VirtualMetaclassValidator.java39
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/validation/VirtualMetamodelValidator.java36
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/validation/VirtualOperationValidator.java30
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/validation/VirtualParameterValidator.java26
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/validation/VirtualPropertyValidator.java28
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/validation/VirtualTypedElementValidator.java30
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/ExtensionDefinitionKind.java273
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/FacadeMappping.java53
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/FacademappingFactory.java71
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/FacademappingPackage.java429
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/Mapping.java88
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/StereotypedMapping.java83
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/impl/FacadeMapppingImpl.java163
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/impl/FacademappingFactoryImpl.java179
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/impl/FacademappingPackageImpl.java304
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/impl/MappingImpl.java228
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/impl/StereotypedMappingImpl.java216
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/util/FacademappingAdapterFactory.java167
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/util/FacademappingSwitch.java164
-rw-r--r--extraplugins/facade/org.eclipse.papyrus.facade/text/description.txt12
-rw-r--r--extraplugins/org.eclipse.papyrus.qvtTransformation/src/org/eclipse/papyrus/qvttransformation/Activator.java2
-rw-r--r--extraplugins/org.eclipse.papyrus.qvtTransformation/src/org/eclipse/papyrus/qvttransformation/popup/actions/SelectQVTTransformation.java2
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/.classpath4
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/META-INF/MANIFEST.MF2
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/build.properties2
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/model/FCM.ecore42
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/model/FCM.genmodel27
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/model/FCM.profile.notation439
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/model/FCM.profile.uml62
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/plugin.xml3
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/schema/fcmBindingHelper.exsd99
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/schema/fcmEmbeddingRule.exsd17
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/schema/fcmPortMappingRule.exsd19
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/ActualChoice.java245
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/BindingHelper.java64
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/ExtendedSignature.java89
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/FCMFactory.java18
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/FCMPackage.java342
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/InstanceConfigurator.java27
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/Template.java74
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/TemplateKind.java379
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/BindingHelperImpl.java165
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/ExtendedSignatureImpl.java228
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/FCMFactoryImpl.java70
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/FCMPackageImpl.java143
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/InstanceConfiguratorImpl.java67
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/TemplateImpl.java169
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/ConnectorTypeUtil.java13
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/FCMAdapterFactory.java36
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/FCMSwitch.java42
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/IBindingHelper.java26
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/IEmbeddingRule.java13
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/IMappingRule.java13
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/ITemplateMappingRule.java13
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/MapUtil.java13
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/.classpath2
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/META-INF/MANIFEST.MF3
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/build.acceleo2
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/build.properties1
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/Activator.java2
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/CommandSupport.java13
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/ConfigUtils.java2
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/CreationUtils.java2
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/Description.java2
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/ElementFilter.java7
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/Log.java24
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/Messages.java119
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/ModelManagement.java4
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/PortUtils.java19
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/StUtils.java17
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/Stereotypes.java4
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/Utils.java31
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/acceleo/EnumService.java28
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/acceleo/UMLTool.java18
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/AllocUtils.java31
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/BootLoaderGen.java72
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/DepCreation.java89
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/DepPlanUtils.java128
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/DepUtils.java54
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/Deploy.java59
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/DeployConstants.java14
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/InstanceDeployer.java3
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/PartialCopy.java16
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/BindingHelperExt.java78
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/EmbeddingRule.java11
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/ExternalGenerator.java9
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/IEmbeddingRule.java9
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/IInstanceConfigurator.java8
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/InstanceConfigurator.java50
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/LanguageSupport.java10
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/generate/GenerateCode.java12
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/listeners/InterfaceListener.java32
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/listeners/ModelListener.java2
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/listeners/OperationListener.java2
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/listeners/ParameterListener.java2
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/make/GenerateMakefile.java26
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/make/ShowFiles.java10
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/messages.properties86
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/preferences/QompassPreferenceConstants.java8
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/sync/CompImplSync.java13
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/sync/DepPlanSync.java4
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/BindingUtils.java134
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/ConnectorBinding.java78
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/InstantiateCppInclude.java9
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/InstantiateCppIncludeWOB.java3
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/TemplateInstantiation.java38
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/TemplateInstantiationListener.java330
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/TemplateUtils.java43
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/AbstractContainerTrafo.java60
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/ApplyInstanceConfigurators.java40
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/CompImplTrafos.java21
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/CompTypeTrafos.java14
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/ConnectorReification.java63
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/ContainerContext.java72
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/ContainerTrafo.java371
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/Copy.java34
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/CopyTo.java3
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/FlattenInteractionComponents.java24
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/InstantiateDepPlan.java92
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/LWContainerTrafo.java94
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/MainModelTrafo.java213
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/PrefixConstants.java26
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/RuleManagement.java32
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/TrafoAndCodegenPackage.java361
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/TransformationContext.java2
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/UpdateUtils.java8
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/filters/FilterStateMachines.java3
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/filters/FixTemplateSync.java5
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/.classpath2
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/META-INF/MANIFEST.MF2
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/.classpath2
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/META-INF/MANIFEST.MF2
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/META-INF/MANIFEST.MF5
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/build.properties1
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/plugin.xml20
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/Messages.java43
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/AllocationDialog.java88
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/ConfigureInstanceDialog.java141
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/ConfigurePortDialog.java41
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/AddProfileAndModelLibsHandler.java4
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/ConfigureInstanceHandler.java9
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/ConfigurePortHandler.java42
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/CreateDepPlanHandler.java36
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/CreatePlatformHandler.java7
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/TrafoAndCodegenHandler.java56
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/messages.properties27
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/.classpath2
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/META-INF/MANIFEST.MF2
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.vsl/.classpath2
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.vsl/META-INF/MANIFEST.MF2
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.vsl/src/org/eclipse/papyrus/qompass/designer/vsl/Messages.java17
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.vsl/src/org/eclipse/papyrus/qompass/designer/vsl/ParseVSL.java28
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.vsl/src/org/eclipse/papyrus/qompass/designer/vsl/messages.properties3
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/.classpath2
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/META-INF/MANIFEST.MF5
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/build.acceleo2
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/ClientServerTimer.notation100
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/ClientServerTimer.uml48
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/core.di6
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/core.notation494
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/core.uml20
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/osal.notation822
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/osal.uml1005
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/statemachine.di2
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/statemachine.notation289
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/statemachine.uml196
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/plugin.xml32
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/Activator.java6
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/bindinghelpers/LoopOperations.java114
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/iconfigurators/AnimServiceConfigurator.java67
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/iconfigurators/CallEventConfigurator.java (renamed from extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/CallEventConfigurator.java)14
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/AMIcallback.java159
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/AMIpoll.java158
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/PullConsumer.java2
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/PushProdPullCons.java2
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/tmpModel/ClientServerTimerTmp.uml290
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/tmpModel/HelloWorldTmp.uml120
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/tmpModel/ProducerConsumerTmp.di9
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/tmpModel/ProducerConsumerTmp.notation2
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/tmpModel/ProducerConsumerTmp.uml466
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/tmpModel/ProducerTwoConsumersTmp.uml567
-rw-r--r--extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/.classpath14
-rw-r--r--extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/META-INF/MANIFEST.MF6
-rw-r--r--extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/Messages.java30
-rw-r--r--extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/TraceActions.java14
-rw-r--r--extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/TraceFunctions.java20
-rw-r--r--extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/TraceMechanism.java10
-rw-r--r--extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/TracepointConstants.java10
-rw-r--r--extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/commands/AbstractTracepointCommand.java6
-rw-r--r--extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/commands/ToggleBreakpointActivationCommand.java2
-rw-r--r--extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/commands/ToggleBreakpointCommand.java2
-rw-r--r--extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/commands/ToggleTracepointActivationCommand.java2
-rw-r--r--extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/commands/ToggleTracepointCommand.java2
-rw-r--r--extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/commands/TracepointPropertiesCommand.java2
-rw-r--r--extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/dialogs/TraceActionSelection.java25
-rw-r--r--extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/messages.properties15
-rw-r--r--extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/preferences/BinaryEncodedMChoiceFieldEditor.java4
-rw-r--r--extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/preferences/TPPreferenceConstants.java14
-rw-r--r--extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/preferences/TPPreferenceInitializer.java2
-rw-r--r--extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/preferences/TPPreferencePage.java15
-rw-r--r--extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/.classpath2
-rw-r--r--extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/META-INF/MANIFEST.MF5
-rw-r--r--extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/build.acceleo2
-rw-r--r--extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/examples/SampleOOTraceTest.di46
-rw-r--r--extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/examples/SampleOOTraceTest.notation410
-rw-r--r--extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/examples/SampleOOTraceTest.uml276
-rw-r--r--extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/library/tracing.di2
-rw-r--r--extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/library/tracing.notation359
-rw-r--r--extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/library/tracing.uml291
-rw-r--r--extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/plugin.xml4
-rw-r--r--extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/ClientServerTraceTestModelWizard.java2
-rw-r--r--extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/IConfiguratorOTF.java37
-rw-r--r--extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/IConfiguratorTrace.java14
-rw-r--r--extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/QompassTraceMechanism.java6
-rw-r--r--extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/StringConstants.java5
-rw-r--r--extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/acceleo/traceLTTng.mtl8
-rw-r--r--extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/.classpath2
-rw-r--r--extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/META-INF/MANIFEST.MF5
-rw-r--r--extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/build.properties1
-rw-r--r--extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/contexts.xml13
-rw-r--r--extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/plugin.xml19
-rw-r--r--extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/preferences/ComponentPreferencePage.java6
-rw-r--r--extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/preferences/PortPreferencePage.java6
-rw-r--r--extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/preferences/PropertyPreferencePage.java4
-rw-r--r--extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/DataTypePreferencePage.java8
-rw-r--r--extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/DiagramPreferencePage.java6
-rw-r--r--extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/EnumerationPreferencePage.java8
-rw-r--r--extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/PackagePreferencePage.java8
-rw-r--r--extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/PrimitiveTypePreferencePage.java6
-rw-r--r--extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/SignalPreferencePage.java8
-rw-r--r--extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/preferences/DiagramPreferencePage.java6
-rw-r--r--extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/preferences/InterfacePreferencePage.java8
-rw-r--r--extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/preferences/PackagePreferencePage.java8
-rw-r--r--extraplugins/tablemigration/org.eclipse.papyrus.infra.emf.nattable.converter/.classpath7
-rw-r--r--extraplugins/tablemigration/org.eclipse.papyrus.infra.emf.nattable.converter/.project28
-rw-r--r--extraplugins/tablemigration/org.eclipse.papyrus.infra.emf.nattable.converter/.settings/org.eclipse.jdt.core.prefs7
-rw-r--r--extraplugins/tablemigration/org.eclipse.papyrus.infra.emf.nattable.converter/META-INF/MANIFEST.MF27
-rw-r--r--extraplugins/tablemigration/org.eclipse.papyrus.infra.emf.nattable.converter/OSGI-INF/l10n/bundle.properties3
-rw-r--r--extraplugins/tablemigration/org.eclipse.papyrus.infra.emf.nattable.converter/about.html28
-rw-r--r--extraplugins/tablemigration/org.eclipse.papyrus.infra.emf.nattable.converter/build.properties9
-rw-r--r--extraplugins/tablemigration/org.eclipse.papyrus.infra.emf.nattable.converter/plugin.pdoc4
-rw-r--r--extraplugins/tablemigration/org.eclipse.papyrus.infra.emf.nattable.converter/plugin.xml39
-rw-r--r--extraplugins/tablemigration/org.eclipse.papyrus.infra.emf.nattable.converter/src/org/eclipse/papyrus/uml/nattable/converter/Activator.java71
-rw-r--r--extraplugins/tablemigration/org.eclipse.papyrus.infra.emf.nattable.converter/src/org/eclipse/papyrus/uml/nattable/converter/handlers/ConvertAllTablesHandler.java61
-rw-r--r--extraplugins/tablemigration/org.eclipse.papyrus.infra.emf.nattable.converter/src/org/eclipse/papyrus/uml/nattable/converter/handlers/ConvertOldTableHandler.java422
-rw-r--r--extraplugins/tablemigration/org.eclipse.papyrus.infra.emf.nattable.converter/src/org/eclipse/papyrus/uml/nattable/converter/messages/Messages.java33
-rw-r--r--extraplugins/tablemigration/org.eclipse.papyrus.infra.emf.nattable.converter/src/org/eclipse/papyrus/uml/nattable/converter/messages/messages.properties9
-rw-r--r--extraplugins/tablemigration/org.eclipse.papyrus.infra.table.instance/.classpath8
-rw-r--r--extraplugins/tablemigration/org.eclipse.papyrus.infra.table.instance/.project28
-rw-r--r--extraplugins/tablemigration/org.eclipse.papyrus.infra.table.instance/META-INF/MANIFEST.MF33
-rw-r--r--extraplugins/tablemigration/org.eclipse.papyrus.infra.table.instance/about.html28
-rw-r--r--extraplugins/tablemigration/org.eclipse.papyrus.infra.table.instance/build.properties8
-rw-r--r--extraplugins/tablemigration/org.eclipse.papyrus.infra.table.instance/custom-src/org/eclipse/papyrus/infra/table/instance/util/TableContentsUtils.java200
-rw-r--r--extraplugins/tablemigration/org.eclipse.papyrus.infra.table.instance/model/papyrustableinstance.ecore48
-rw-r--r--extraplugins/tablemigration/org.eclipse.papyrus.infra.table.instance/model/papyrustableinstance.genmodel19
-rw-r--r--extraplugins/tablemigration/org.eclipse.papyrus.infra.table.instance/plugin.properties2
-rw-r--r--extraplugins/tablemigration/org.eclipse.papyrus.infra.table.instance/plugin.xml20
-rw-r--r--extraplugins/tablemigration/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/infra/table/instance/Activator.java67
-rw-r--r--extraplugins/tablemigration/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/infra/table/instance/papyrustableinstance/PapyrusTableInstance.java212
-rw-r--r--extraplugins/tablemigration/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/infra/table/instance/papyrustableinstance/PapyrustableinstanceFactory.java46
-rw-r--r--extraplugins/tablemigration/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/infra/table/instance/papyrustableinstance/PapyrustableinstancePackage.java332
-rw-r--r--extraplugins/tablemigration/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/infra/table/instance/papyrustableinstance/impl/PapyrusTableInstanceImpl.java498
-rw-r--r--extraplugins/tablemigration/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/infra/table/instance/papyrustableinstance/impl/PapyrustableinstanceFactoryImpl.java99
-rw-r--r--extraplugins/tablemigration/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/infra/table/instance/papyrustableinstance/impl/PapyrustableinstancePackageImpl.java262
-rw-r--r--extraplugins/tablemigration/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/infra/table/instance/papyrustableinstance/util/PapyrustableinstanceAdapterFactory.java143
-rw-r--r--extraplugins/tablemigration/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/infra/table/instance/papyrustableinstance/util/PapyrustableinstanceSwitch.java131
-rw-r--r--extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/.classpath7
-rw-r--r--extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/.project28
-rw-r--r--extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/.settings/org.eclipse.jdt.core.prefs (renamed from extraplugins/codegen/org.eclipse.papyrus.acceleo/.settings/org.eclipse.jdt.core.prefs)15
-rw-r--r--extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/META-INF/MANIFEST.MF37
-rw-r--r--extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/about.html28
-rw-r--r--extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/build.properties12
-rw-r--r--extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/documentation.pdoc4
-rw-r--r--extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/icons/table.pngbin0 -> 1347 bytes
-rw-r--r--extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/plugin.properties3
-rw-r--r--extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/plugin.xml59
-rw-r--r--extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/resources/PapyrusTableFacet.facetSet12
-rw-r--r--extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/resources/PapyrusTableFacetCustomization.uiCustom17
-rw-r--r--extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/resources/PapyrusTableInstanceCustomization.uiCustom28
-rw-r--r--extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/resources/PapyrusTableQuery.querySet23
-rw-r--r--extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/Activator.java121
-rw-r--r--extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/handlers/AbstractTableModelExplorerHandler.java61
-rw-r--r--extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/handlers/DeleteTableHandler.java71
-rw-r--r--extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/handlers/DuplicateTableHandler.java82
-rw-r--r--extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/handlers/RenameTableHandler.java84
-rw-r--r--extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/messages/Messages.java34
-rw-r--r--extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/messages/messages.properties3
-rw-r--r--extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/providers/TablePropertyTester.java85
-rw-r--r--extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/queries/GetContainedTables.java65
-rw-r--r--extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/queries/GetTableIcon.java33
-rw-r--r--extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/queries/GetTableName.java31
-rw-r--r--extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/queries/IsTableContainer.java63
-rw-r--r--extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.ui/.classpath7
-rw-r--r--extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.ui/.project28
-rw-r--r--extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.ui/.settings/org.eclipse.jdt.core.prefs (renamed from extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/.settings/org.eclipse.jdt.core.prefs)0
-rw-r--r--extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.ui/META-INF/MANIFEST.MF21
-rw-r--r--extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.ui/about.html28
-rw-r--r--extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.ui/build.properties5
-rw-r--r--extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.ui/icons/UMLModelFile.gifbin0 -> 363 bytes
-rw-r--r--extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.ui/icons/papyrus_compare_16x16.pngbin0 -> 622 bytes
-rw-r--r--extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.ui/icons/papyrus_compare_32x32.pngbin0 -> 1022 bytes
-rw-r--r--extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.ui/icons/papyrus_compare_editor.gifbin0 -> 956 bytes
-rw-r--r--extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.ui/plugin.properties4
-rw-r--r--extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.ui/plugin.xml56
-rw-r--r--extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.ui/src/org/eclipse/papyrus/uml/compare/ui/Activator.java64
-rw-r--r--extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.ui/src/org/eclipse/papyrus/uml/compare/ui/provider/PapyrusCompareAdapterFactory.java76
742 files changed, 65856 insertions, 9197 deletions
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile/img/adl.png b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile/img/adl.png
new file mode 100644
index 00000000000..597790b0c2d
--- /dev/null
+++ b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile/img/adl.png
Binary files differ
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile/img/adl.svg b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile/img/adl.svg
new file mode 100644
index 00000000000..bffe0c3e0f5
--- /dev/null
+++ b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile/img/adl.svg
@@ -0,0 +1,355 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ version="1.2"
+ width="460.62991"
+ height="283.46457"
+ id="svg2"
+ inkscape:version="0.48.4 r9939"
+ sodipodi:docname="papyrus.svg">
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1306"
+ inkscape:window-height="767"
+ id="namedview53"
+ showgrid="false"
+ inkscape:zoom="0.76200001"
+ inkscape:cx="176.05836"
+ inkscape:cy="233.31647"
+ inkscape:window-x="493"
+ inkscape:window-y="93"
+ inkscape:window-maximized="0"
+ inkscape:current-layer="svg2" />
+ <defs
+ id="defs4">
+ <linearGradient
+ id="linearGradient3908">
+ <stop
+ style="stop-color:#1a171a;stop-opacity:1;"
+ offset="0"
+ id="stop3910" />
+ <stop
+ style="stop-color:#9c9e9f;stop-opacity:1;"
+ offset="1"
+ id="stop3912" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3818">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop3820" />
+ <stop
+ style="stop-color:#98bf06;stop-opacity:1;"
+ offset="1"
+ id="stop3822" />
+ </linearGradient>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3818"
+ id="radialGradient3832"
+ cx="622.66229"
+ cy="107.15185"
+ fx="622.66229"
+ fy="107.15185"
+ r="125.38313"
+ gradientUnits="userSpaceOnUse" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3818-1"
+ id="radialGradient3832-3"
+ cx="622.66229"
+ cy="107.15185"
+ fx="622.66229"
+ fy="107.15185"
+ r="125.38313"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ id="linearGradient3818-1">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop3820-6" />
+ <stop
+ style="stop-color:#009bba;stop-opacity:1;"
+ offset="1"
+ id="stop3822-8" />
+ </linearGradient>
+ <radialGradient
+ r="125.38313"
+ fy="107.15185"
+ fx="622.66229"
+ cy="107.15185"
+ cx="622.66229"
+ gradientUnits="userSpaceOnUse"
+ id="radialGradient3849"
+ xlink:href="#linearGradient3818-1"
+ inkscape:collect="always" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3908"
+ id="linearGradient3914"
+ x1="549.05366"
+ y1="177.90893"
+ x2="824.32955"
+ y2="177.90893"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3908"
+ id="linearGradient3916"
+ gradientUnits="userSpaceOnUse"
+ x1="549.05366"
+ y1="177.90893"
+ x2="824.32955"
+ y2="177.90893" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3908"
+ id="linearGradient3918"
+ gradientUnits="userSpaceOnUse"
+ x1="549.05366"
+ y1="177.90893"
+ x2="824.32955"
+ y2="177.90893" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3908"
+ id="linearGradient3920"
+ gradientUnits="userSpaceOnUse"
+ x1="549.05366"
+ y1="177.90893"
+ x2="824.32955"
+ y2="177.90893" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3908"
+ id="linearGradient3922"
+ gradientUnits="userSpaceOnUse"
+ x1="549.05366"
+ y1="177.90893"
+ x2="824.32955"
+ y2="177.90893" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3908"
+ id="linearGradient3925"
+ gradientUnits="userSpaceOnUse"
+ x1="549.05366"
+ y1="177.90893"
+ x2="824.32955"
+ y2="177.90893"
+ gradientTransform="matrix(-1,0,0,-1,1373.3832,351.87403)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3908"
+ id="linearGradient3928"
+ gradientUnits="userSpaceOnUse"
+ x1="549.05366"
+ y1="177.90893"
+ x2="824.32955"
+ y2="177.90893"
+ gradientTransform="matrix(-1,0,0,-1,1373.3832,351.87403)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3908"
+ id="linearGradient3931"
+ gradientUnits="userSpaceOnUse"
+ x1="549.05366"
+ y1="177.90893"
+ x2="824.32955"
+ y2="177.90893"
+ gradientTransform="matrix(-1,0,0,-1,1373.3832,351.87403)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3908"
+ id="linearGradient3934"
+ gradientUnits="userSpaceOnUse"
+ x1="549.05366"
+ y1="177.90893"
+ x2="824.32955"
+ y2="177.90893"
+ gradientTransform="matrix(-1,0,0,-1,1373.3832,351.87403)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3908"
+ id="linearGradient3940"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(-1,0,0,-1,945.59288,317.53945)"
+ x1="549.05366"
+ y1="177.90893"
+ x2="824.32955"
+ y2="177.90893" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3908"
+ id="linearGradient3946"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(-1,0,0,-1,945.59288,317.53945)"
+ x1="549.05366"
+ y1="177.90893"
+ x2="824.32955"
+ y2="177.90893" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3908"
+ id="linearGradient3952"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(-1,0,0,-1,945.59288,317.53945)"
+ x1="549.05366"
+ y1="177.90893"
+ x2="824.32955"
+ y2="177.90893" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3908"
+ id="linearGradient3958"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(-1,0,0,-1,945.59288,317.53945)"
+ x1="549.05366"
+ y1="177.90893"
+ x2="824.32955"
+ y2="177.90893" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3818-1"
+ id="radialGradient3970"
+ gradientUnits="userSpaceOnUse"
+ cx="622.66229"
+ cy="107.15185"
+ fx="622.66229"
+ fy="107.15185"
+ r="125.38313" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3818"
+ id="radialGradient3972"
+ gradientUnits="userSpaceOnUse"
+ cx="622.66229"
+ cy="107.15185"
+ fx="622.66229"
+ fy="107.15185"
+ r="125.38313" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3908"
+ id="linearGradient3974"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(-1,0,0,-1,945.59288,317.53945)"
+ x1="549.05366"
+ y1="177.90893"
+ x2="824.32955"
+ y2="177.90893" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3908"
+ id="linearGradient3976"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(-1,0,0,-1,945.59288,317.53945)"
+ x1="549.05366"
+ y1="177.90893"
+ x2="824.32955"
+ y2="177.90893" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3908"
+ id="linearGradient3978"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(-1,0,0,-1,945.59288,317.53945)"
+ x1="549.05366"
+ y1="177.90893"
+ x2="824.32955"
+ y2="177.90893" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3908"
+ id="linearGradient3980"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(-1,0,0,-1,945.59288,317.53945)"
+ x1="549.05366"
+ y1="177.90893"
+ x2="824.32955"
+ y2="177.90893" />
+ </defs>
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ transform="translate(0,-768.89631)"
+ id="layer2" />
+ <g
+ id="g3960"
+ transform="matrix(0.93318676,0,0,0.93318676,8.4148818,11.649074)"
+ inkscape:export-xdpi="5.8753209"
+ inkscape:export-ydpi="5.8753209">
+ <path
+ d="m 796.19109,174.89305 c 0,65.08738 -52.76374,117.85113 -117.85112,117.85113 -65.08738,0 -117.85113,-52.76375 -117.85113,-117.85113 0,-65.08738 52.76375,-117.851126 117.85113,-117.851126 65.08738,0 117.85112,52.763746 117.85112,117.851126 z"
+ sodipodi:ry="117.85113"
+ sodipodi:rx="117.85113"
+ sodipodi:cy="174.89305"
+ sodipodi:cx="678.33997"
+ id="path3030-8"
+ style="opacity:0.98999999;fill:url(#radialGradient3970);fill-opacity:1;stroke:none"
+ sodipodi:type="arc"
+ transform="translate(-451.91733,-35.262539)" />
+ <path
+ transform="translate(-437.79032,-35.262539)"
+ d="m 796.19109,174.89305 c 0,65.08738 -52.76374,117.85113 -117.85112,117.85113 -65.08738,0 -117.85113,-52.76375 -117.85113,-117.85113 0,-65.08738 52.76375,-117.851126 117.85113,-117.851126 65.08738,0 117.85112,52.763746 117.85112,117.851126 z"
+ sodipodi:ry="117.85113"
+ sodipodi:rx="117.85113"
+ sodipodi:cy="174.89305"
+ sodipodi:cx="678.33997"
+ id="path3030"
+ style="opacity:0.98999999;fill:url(#radialGradient3972);fill-opacity:1;stroke:none"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:nodetypes="ccccc"
+ inkscape:connector-curvature="0"
+ id="path3868"
+ d="m 125.32217,164.47792 c 0.48084,2.47664 1.1607,4.92485 1.82692,7.375 l 244.0633,0 0,-7.375 z"
+ style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:url(#linearGradient3974);fill-opacity:1;stroke:none;stroke-width:7.36382484;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+ <path
+ sodipodi:nodetypes="ccccc"
+ inkscape:connector-curvature="0"
+ id="path3868-2"
+ d="m 122.84277,145.44667 c 0.0647,2.45833 0.31139,4.91667 0.56547,7.375 l 247.80415,0 0,-7.375 z"
+ style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:url(#linearGradient3976);fill-opacity:1;stroke:none;stroke-width:7.36382484;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+ <path
+ sodipodi:nodetypes="ccccc"
+ inkscape:connector-curvature="0"
+ id="path3868-7"
+ d="m 123.42274,126.44667 c -0.33255,2.44792 -0.44679,4.89583 -0.59447,7.34375 l 248.38412,0 0,-7.34375 z"
+ style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:url(#linearGradient3978);fill-opacity:1;stroke:none;stroke-width:7.36382484;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+ <path
+ sodipodi:nodetypes="ccccc"
+ inkscape:connector-curvature="0"
+ id="path3868-71"
+ d="m 127.14909,107.41542 c -0.76224,2.48347 -1.29841,4.92927 -1.83417,7.375 l 245.89747,0 0,-7.375 z"
+ style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:url(#linearGradient3980);fill-opacity:1;stroke:none;stroke-width:7.36382484;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+ </g>
+</svg>
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile/plugin.xml b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile/plugin.xml
index def080bbc37..5c136eb316b 100644
--- a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile/plugin.xml
+++ b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile/plugin.xml
@@ -14,9 +14,10 @@
point="org.eclipse.papyrus.uml.extensionpoints.UMLProfile">
<profile
description="ADL4Eclipse profile"
+ iconpath="img/adl.png"
name="ADL4Eclipse"
path="pathmap://ADL4ECLIPSE_PROFILES/adl4eclipse.profile.uml"
provider="Eclipse.org">
</profile>
</extension>
-</plugin> \ No newline at end of file
+</plugin>
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/plugin.xml b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/plugin.xml
index 3ba9bd4b24c..bc567661bd3 100644
--- a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/plugin.xml
+++ b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/plugin.xml
@@ -85,7 +85,7 @@
point="org.eclipse.ui.importWizards">
<category
id="org.eclipse.papyrus.editor.category"
- name="papyrus">
+ name="Papyrus">
</category>
<wizard
category="org.eclipse.papyrus.editor.category"
@@ -96,6 +96,13 @@
</wizard>
<wizard
category="org.eclipse.papyrus.editor.category"
+ class="org.eclipse.papyrus.adl4eclipsetool.assistant.AdvancePluginImport"
+ icon="img/adl.png"
+ id="org.eclipse.papyrus.adl4eclipsetool.assistant.wizard1"
+ name="Advanced Plugins architecture snapshot">
+ </wizard>
+ <wizard
+ category="org.eclipse.papyrus.editor.category"
class="org.eclipse.papyrus.adl4eclipsetool.assistant.SimpleFeatureImport"
icon="img/adl.png"
id="org.eclipse.papyrus.adl4eclipsetool.assistant.wizard1"
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/src/org/eclipse/papyrus/adl4eclipsetool/assistant/AdvancePluginImport.java b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/src/org/eclipse/papyrus/adl4eclipsetool/assistant/AdvancePluginImport.java
new file mode 100644
index 00000000000..6bc31b2c56f
--- /dev/null
+++ b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/src/org/eclipse/papyrus/adl4eclipsetool/assistant/AdvancePluginImport.java
@@ -0,0 +1,149 @@
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Patrick Tessier (CEA LIST) patrick.tessier@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.adl4eclipsetool.assistant;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.papyrus.adltool.command.CompletePluginsArchitectureSnapshotCommand;
+import org.eclipse.papyrus.adltool.command.SimplePluginsArchitectureSnapshotCommand;
+import org.eclipse.papyrus.adltool.designer.ArchitectureSnapshotDesigner;
+import org.eclipse.papyrus.adltool.designer.wizard.BundleSelectionPage;
+import org.eclipse.papyrus.editor.PapyrusMultiDiagramEditor;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForSelection;
+import org.eclipse.ui.IImportWizard;
+import org.eclipse.ui.ISelectionService;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.Package;
+
+/**
+ * this class is used to do the retro engineering from workspaceplugin. It adds only in the platform dependencies.
+ *
+ */
+public class AdvancePluginImport extends Wizard implements IImportWizard {
+
+ protected BundleSelectionPage bundleSelectionPage;
+ protected TransactionalEditingDomain transactionalEditingDomain=null;
+ protected PapyrusMultiDiagramEditor papyrusEditor;
+ protected ModelSet modelSet;
+
+ /**
+ *
+ * Constructor.
+ *
+ */
+ public AdvancePluginImport() {
+ super();
+ setNeedsProgressMonitor(true);
+ }
+
+ @Override
+ public void addPages() {
+ //look for all plugins from the workspace
+ ArrayList<Object> bundleList= new ArrayList<Object>();
+ bundleList.addAll(ArchitectureSnapshotDesigner.getLoadedBundles());
+ bundleSelectionPage = new BundleSelectionPage(bundleList);
+ addPage(bundleSelectionPage);
+ }
+
+ /**
+ *
+ * @return the list of selected bundle from the page
+ */
+ public ArrayList<Object> getSelectedBundle(){
+ return bundleSelectionPage.getResult();
+ }
+ @Override
+ public boolean performFinish() {
+
+ // one bundle must be selected
+ if(getSelectedBundle().size()>0){
+ // get the domain in order to launche the command
+ TransactionalEditingDomain dom = modelSet.getTransactionalEditingDomain();
+ ArrayList<Element> selection=getSelectionSet();
+
+ if( (selection.size()==1) &&(selection.get(0)instanceof Package)){
+ //launch the simple retro engineering
+ CompletePluginsArchitectureSnapshotCommand comd= new CompletePluginsArchitectureSnapshotCommand(dom, (Package)selection.get(0), getSelectedBundle());
+ dom.getCommandStack().execute(comd);
+ }
+ return true;
+ }
+ return false;
+ }
+
+ public void init(IWorkbench workbench, IStructuredSelection selection) {
+
+ //get the service registry of papyrus from the selection
+ ServicesRegistry registry=null;
+ try {
+ registry = ServiceUtilsForSelection.getInstance().getServiceRegistry(selection);
+ } catch (ServiceException e1) {
+ e1.printStackTrace();
+ }
+ try {
+ modelSet = registry.getService(ModelSet.class);
+ } catch (ServiceException e) {
+ e.printStackTrace();
+ }
+
+ }
+
+ /**
+ * getSelected element in the diagram or in the model explorer
+ * @return Element or null
+ */
+ protected ArrayList<Element> getSelectionSet(){
+ ArrayList<Element> selectedSet =new ArrayList<Element>();
+ ISelectionService selectionService = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService();
+ ISelection selection = selectionService.getSelection();
+
+
+ if(selection instanceof IStructuredSelection) {
+ @SuppressWarnings("rawtypes")
+ Iterator selectedobjectIteractor = ((IStructuredSelection)selection).iterator();
+ while (selectedobjectIteractor.hasNext()) {
+ Object currentSelection = selectedobjectIteractor.next();
+ if(currentSelection instanceof GraphicalEditPart) {
+ Object graphicalElement = ((GraphicalEditPart)currentSelection).getModel();
+ if((graphicalElement instanceof View) && ((View)graphicalElement).getElement() instanceof org.eclipse.uml2.uml.Element) {
+ selectedSet.add( (org.eclipse.uml2.uml.Element)((View)graphicalElement).getElement());
+ }
+ }
+ else if(currentSelection instanceof IAdaptable) {
+ EObject selectedEObject = (EObject)((IAdaptable)currentSelection).getAdapter(EObject.class);
+ if (selectedEObject instanceof org.eclipse.uml2.uml.Element){
+ selectedSet.add((Element)selectedEObject);
+ }
+ }
+ }
+
+ }
+ return selectedSet;
+ }
+
+}
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/designer/ArchitectureSnapshotDesigner.java b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/designer/ArchitectureSnapshotDesigner.java
index 2f43ecd34d9..313b3f69519 100644
--- a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/designer/ArchitectureSnapshotDesigner.java
+++ b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/designer/ArchitectureSnapshotDesigner.java
@@ -63,7 +63,7 @@ public abstract class ArchitectureSnapshotDesigner{
protected BundleDesignerRegistry bundleDesignerRegistry=null;
protected int dependenciesN=0;
protected ArrayList<Object>bundleInitialList=null;
- protected int dependencyLevelMax=15;
+ protected int dependencyLevelMax=1;
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/designer/CompleteArchitectureSnapshotDesigner.java b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/designer/CompleteArchitectureSnapshotDesigner.java
index ad342151c70..73a714482ce 100644
--- a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/designer/CompleteArchitectureSnapshotDesigner.java
+++ b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/designer/CompleteArchitectureSnapshotDesigner.java
@@ -33,6 +33,7 @@ import org.eclipse.uml2.uml.Package;
*/
public CompleteArchitectureSnapshotDesigner(Package rootPackage, ArrayList<Object>bundleInitialList) {
super(rootPackage, bundleInitialList);
+ dependencyLevelMax=30;
}
@Override
protected void initModel() {
diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.core/META-INF/MANIFEST.MF b/extraplugins/cdo/org.eclipse.papyrus.cdo.core/META-INF/MANIFEST.MF
index 514c6b8739f..ad2a18cef65 100644
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.core/META-INF/MANIFEST.MF
+++ b/extraplugins/cdo/org.eclipse.papyrus.cdo.core/META-INF/MANIFEST.MF
@@ -46,7 +46,7 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.gmf.runtime.notation;bundle-version="[1.5.0,2.0.0)",
org.eclipse.equinox.security;bundle-version="[1.1.100,2.0.0)",
org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)",
- com.google.guava;bundle-version="[11.0.2,12.0.0)",
+ com.google.guava;bundle-version="11.0.0",
org.eclipse.papyrus.infra.services.controlmode;bundle-version="1.0.0",
org.eclipse.gmf.runtime.emf.commands.core;bundle-version="[1.7.0,2.0.0)",
org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.7.0,2.0.0)",
diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/META-INF/MANIFEST.MF b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/META-INF/MANIFEST.MF
index 4c20dd45e60..005867d19c9 100644
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/META-INF/MANIFEST.MF
+++ b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.emf.edit.ui;bundle-version="2.8.0",
org.eclipse.papyrus.infra.emf;bundle-version="1.0.0",
org.eclipse.papyrus.cdo.ui;bundle-version="1.0.0",
- com.google.guava;bundle-version="[11.0.2,12.0.0)"
+ com.google.guava;bundle-version="11.0.0"
Export-Package: org.eclipse.papyrus.cdo.internal.ui.customization.properties;x-internal:=true,
org.eclipse.papyrus.cdo.internal.ui.customization.properties.messages;x-internal:=true,
org.eclipse.papyrus.cdo.internal.ui.customization.properties.storage;x-internal:=true,
diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui/META-INF/MANIFEST.MF b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui/META-INF/MANIFEST.MF
index ffc0d354603..deb42190269 100644
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui/META-INF/MANIFEST.MF
+++ b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui/META-INF/MANIFEST.MF
@@ -18,7 +18,7 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.papyrus.cdo.validation.problems.edit;bundle-version="1.0.0",
org.eclipse.papyrus.editor;bundle-version="1.0.0",
org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.0.0",
- com.google.guava;bundle-version="[11.0.0,12.0.0)",
+ com.google.guava;bundle-version="11.0.0",
org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.0",
org.eclipse.papyrus.infra.services.controlmode;bundle-version="1.0.0",
org.eclipse.ui.navigator;bundle-version="3.5.300",
diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui/META-INF/MANIFEST.MF b/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui/META-INF/MANIFEST.MF
index f224092f44a..01768f13c09 100644
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui/META-INF/MANIFEST.MF
+++ b/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.papyrus.cdo.core;bundle-version="1.0.0",
org.eclipse.papyrus.cdo.ui;bundle-version="1.0.0",
org.eclipse.papyrus.uml.diagram.wizards;bundle-version="1.0.0",
- com.google.guava;bundle-version="[11.0.2,12.0.0)"
+ com.google.guava;bundle-version="11.0.0"
Export-Package: org.eclipse.papyrus.cdo.uml.diagram.internal.ui;x-internal:=true,
org.eclipse.papyrus.cdo.uml.diagram.internal.ui.handlers;x-internal:=true,
org.eclipse.papyrus.cdo.uml.diagram.internal.ui.l10n;x-internal:=true,
diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.ui/META-INF/MANIFEST.MF b/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.ui/META-INF/MANIFEST.MF
index 2d3f9fe26b9..dd7d9916a4a 100644
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.ui/META-INF/MANIFEST.MF
+++ b/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.ui/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.papyrus.uml.tools;bundle-version="1.0.0",
org.eclipse.papyrus.cdo.ui;bundle-version="1.0.0",
org.eclipse.papyrus.infra.widgets;bundle-version="1.0.0",
- com.google.guava;bundle-version="[11.0.2,12.0.0)"
+ com.google.guava;bundle-version="11.0.0"
Export-Package: org.eclipse.papyrus.cdo.uml.internal.ui;x-friends:="org.eclipse.papyrus.cdo.uml.ui.tests",
org.eclipse.papyrus.cdo.uml.internal.ui.importsources;x-friends:="org.eclipse.papyrus.cdo.uml.ui.tests",
org.eclipse.papyrus.cdo.uml.internal.ui.l10n;x-internal:=true
diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/.classpath b/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/.classpath
index 64c5e31b7a2..ad32c83a788 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/.classpath
+++ b/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/META-INF/MANIFEST.MF b/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/META-INF/MANIFEST.MF
index 663015a1a72..86e6151d55d 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/META-INF/MANIFEST.MF
+++ b/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/META-INF/MANIFEST.MF
@@ -16,5 +16,5 @@ Bundle-Localization: plugin
Bundle-ManifestVersion: 2
Bundle-Activator: org.eclipse.papyrus.acceleo.debug.Activator
Bundle-SymbolicName: org.eclipse.papyrus.acceleo.debug;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo/.classpath b/extraplugins/codegen/org.eclipse.papyrus.acceleo/.classpath
index 64c5e31b7a2..ad32c83a788 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.acceleo/.classpath
+++ b/extraplugins/codegen/org.eclipse.papyrus.acceleo/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo/META-INF/MANIFEST.MF b/extraplugins/codegen/org.eclipse.papyrus.acceleo/META-INF/MANIFEST.MF
index 5f57aa5e78e..499998899e0 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.acceleo/META-INF/MANIFEST.MF
+++ b/extraplugins/codegen/org.eclipse.papyrus.acceleo/META-INF/MANIFEST.MF
@@ -13,5 +13,5 @@ Bundle-Localization: plugin
Bundle-ManifestVersion: 2
Bundle-Activator: org.eclipse.papyrus.acceleo.Activator
Bundle-SymbolicName: org.eclipse.papyrus.acceleo
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo/src/org/eclipse/papyrus/acceleo/GenUtils.java b/extraplugins/codegen/org.eclipse.papyrus.acceleo/src/org/eclipse/papyrus/acceleo/GenUtils.java
index 9377370ea35..7fff24f5e75 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.acceleo/src/org/eclipse/papyrus/acceleo/GenUtils.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.acceleo/src/org/eclipse/papyrus/acceleo/GenUtils.java
@@ -607,7 +607,8 @@ public class GenUtils {
/**
* Return the relative path of ne2 as seen from ne1
* (might not always be useful, if includes are always done from a common root)
- *
+ * TODO: incomplete, currently unused
+ *
* @param ne1 a named element
* @param ne2 a named element
* @return
@@ -615,15 +616,15 @@ public class GenUtils {
public static String getRelativePath(NamedElement ne1, NamedElement ne2) {
// get common prefix
EList<Namespace> ne1namespaces = ne1.allNamespaces();
- String path = "";
+ String path = ""; //$NON-NLS-1$
for (Namespace ns : ne2.allNamespaces()) {
if (ne1namespaces.contains(ns)) {
// ns is a common prefix
return ne2.getName();
}
- path += "../";
+ path += "../"; //$NON-NLS-1$
}
- return null;
+ return path;
}
/**
diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo/src/org/eclipse/papyrus/acceleo/Messages.java b/extraplugins/codegen/org.eclipse.papyrus.acceleo/src/org/eclipse/papyrus/acceleo/Messages.java
new file mode 100644
index 00000000000..a3867d5466d
--- /dev/null
+++ b/extraplugins/codegen/org.eclipse.papyrus.acceleo/src/org/eclipse/papyrus/acceleo/Messages.java
@@ -0,0 +1,15 @@
+package org.eclipse.papyrus.acceleo;
+
+import org.eclipse.osgi.util.NLS;
+
+public class Messages extends NLS {
+ private static final String BUNDLE_NAME = "org.eclipse.papyrus.acceleo.messages"; //$NON-NLS-1$
+ public static String ModelElementsCreator_UnsupportedModelElement;
+ static {
+ // initialize resource bundle
+ NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+ }
+
+ private Messages() {
+ }
+}
diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo/src/org/eclipse/papyrus/acceleo/ModelElementsCreator.java b/extraplugins/codegen/org.eclipse.papyrus.acceleo/src/org/eclipse/papyrus/acceleo/ModelElementsCreator.java
index 63180eb5ace..bcd1e2a6c19 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.acceleo/src/org/eclipse/papyrus/acceleo/ModelElementsCreator.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.acceleo/src/org/eclipse/papyrus/acceleo/ModelElementsCreator.java
@@ -28,12 +28,15 @@ import org.eclipse.emf.common.util.EList;
import org.eclipse.uml2.uml.Classifier;
import org.eclipse.uml2.uml.Element;
import org.eclipse.uml2.uml.Enumeration;
+import org.eclipse.uml2.uml.InstanceSpecification;
import org.eclipse.uml2.uml.NamedElement;
import org.eclipse.uml2.uml.Namespace;
import org.eclipse.uml2.uml.Package;
import org.eclipse.uml2.uml.PackageableElement;
import org.eclipse.uml2.uml.PrimitiveType;
import org.eclipse.uml2.uml.Relationship;
+import org.eclipse.uml2.uml.Signal;
+import org.eclipse.uml2.uml.SignalEvent;
import org.eclipse.uml2.uml.Usage;
@@ -136,8 +139,18 @@ abstract public class ModelElementsCreator {
}
else if(element instanceof Relationship) {
// no code generation for relationships
- } else {
- throw new RuntimeException("C++ code generator: unsupported model element " + element); //$NON-NLS-1$
+ }
+ else if(element instanceof Signal) {
+ // TODO: not supported, but do nothing
+ }
+ else if(element instanceof SignalEvent) {
+ // TODO: not supported, but do nothing
+ }
+ else if(element instanceof InstanceSpecification) {
+ // TODO: not supported, but do nothing
+ }
+ else {
+ throw new RuntimeException(String.format(Messages.ModelElementsCreator_UnsupportedModelElement, element));
}
}
diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo/src/org/eclipse/papyrus/acceleo/messages.properties b/extraplugins/codegen/org.eclipse.papyrus.acceleo/src/org/eclipse/papyrus/acceleo/messages.properties
new file mode 100644
index 00000000000..ad6e5a9fa79
--- /dev/null
+++ b/extraplugins/codegen/org.eclipse.papyrus.acceleo/src/org/eclipse/papyrus/acceleo/messages.properties
@@ -0,0 +1 @@
+ModelElementsCreator_UnsupportedModelElement=code generator: unsupported model element %s
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui/.classpath b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui/.classpath
index 64c5e31b7a2..ad32c83a788 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui/.classpath
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui/META-INF/MANIFEST.MF b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui/META-INF/MANIFEST.MF
index 0b09718ae8c..0cd45562962 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui/META-INF/MANIFEST.MF
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui/META-INF/MANIFEST.MF
@@ -22,5 +22,5 @@ Bundle-ManifestVersion: 2
Bundle-Activator: org.eclipse.papyrus.cpp.codegen.ui.Activator
Bundle-SymbolicName: org.eclipse.papyrus.cpp.codegen.ui;singleton:=tru
e
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/.classpath b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/.classpath
index 64c5e31b7a2..ad32c83a788 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/.classpath
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/META-INF/MANIFEST.MF b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/META-INF/MANIFEST.MF
index 95054e461c8..c403755bd37 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/META-INF/MANIFEST.MF
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/META-INF/MANIFEST.MF
@@ -27,5 +27,5 @@ Bundle-Localization: plugin
Bundle-ManifestVersion: 2
Bundle-Activator: org.eclipse.papyrus.cpp.codegen.Activator
Bundle-SymbolicName: org.eclipse.papyrus.cpp.codegen;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/build.properties b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/build.properties
index 1a5433d5c75..4054b530c9f 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/build.properties
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/build.properties
@@ -3,7 +3,6 @@
bin.includes = META-INF/,\
.,\
plugin.xml,\
- templates/,\
plugin.properties,\
about.html,\
build.acceleo,\
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/Constants.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/Constants.java
index 34ebf025224..ff479ae30f3 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/Constants.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/Constants.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006 - 2012 CEA LIST.
+ * Copyright (c) 2006 - 2013 CEA LIST.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -18,21 +18,22 @@ package org.eclipse.papyrus.cpp.codegen;
*/
public class Constants {
- public static final String includeHFile = "// include associated header file";
+ public static final String includeHFile = "// include associated header file"; //$NON-NLS-1$
- public static final String cppIncPreBodyStart = "// Include from CppInclude stereotype (pre-body)";
+ public static final String cppIncPreBodyStart = "// Include from CppInclude stereotype (pre-body)"; //$NON-NLS-1$
- public static final String cppIncPreBodyEnd = "// End of CppInclude stereotype (pre-body)";
+ public static final String cppIncPreBodyEnd = "// End of CppInclude stereotype (pre-body)"; //$NON-NLS-1$
- public static final String cppIncBodyStart = "// Include from CppInclude declaration (body)";
+ public static final String cppIncBodyStart = "// Include from CppInclude declaration (body)"; //$NON-NLS-1$
- public static final String cppIncBodyEnd = "// End of CppInclude stereotype (body)";
+ public static final String cppIncBodyEnd = "// End of CppInclude stereotype (body)";//$NON-NLS-1$
- public static final String derivedIncludes = "// Derived includes directives";
+ public static final String derivedIncludes = "// Derived includes directives";//$NON-NLS-1$
- public static final String forwardDecl = "// forward declarations";
+ public static final String forwardDecl = "// forward declarations"; //$NON-NLS-1$
- public static final String staticAttributes = "// static attributes (if any)";
+ public static final String staticAttributes = "// static attributes (if any)"; //$NON-NLS-1$
+
+ public static final String undefinedType = "undefined"; //$NON-NLS-1$
- public static final String undefinedType = "undefined";
}
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/Messages.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/Messages.java
new file mode 100644
index 00000000000..3260b816524
--- /dev/null
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/Messages.java
@@ -0,0 +1,15 @@
+package org.eclipse.papyrus.cpp.codegen;
+
+import org.eclipse.osgi.util.NLS;
+
+public class Messages extends NLS {
+ private static final String BUNDLE_NAME = "org.eclipse.papyrus.cpp.codegen.messages"; //$NON-NLS-1$
+ public static String CppModelElementsCreator_CannotFormatContent;
+ static {
+ // initialize resource bundle
+ NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+ }
+
+ private Messages() {
+ }
+}
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/StdStereo.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/StdStereo.java
index 16e8aec7fed..e70c7807870 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/StdStereo.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/StdStereo.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006 - 2012 CEA LIST.
+ * Copyright (c) 2006 - 2013 CEA LIST.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -13,17 +13,22 @@ package org.eclipse.papyrus.cpp.codegen;
import org.eclipse.papyrus.acceleo.GenUtils;
import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.Namespace;
public class StdStereo {
- public final static String create = "Create";
+ public final static String create = "Create"; //$NON-NLS-1$
- public final static String destroy = "Destroy";
+
+ public final static String destroy = "Destroy"; //$NON-NLS-1$
/**
* In the UML 2.4 plugin, the Standard profile is split into an L2 and an L3 profile
*/
- public final static String[] namespaces = { "Standard", "StandardProfileL2" };
+ public final static String[] namespaces = {
+ "Standard", //$NON-NLS-1$
+ "StandardProfileL2" //$NON-NLS-1$
+ };
/**
* Check whether a stereotype of the standard profile is applied
@@ -37,7 +42,7 @@ public class StdStereo {
*/
public static boolean isApplied(Element element, String stdName) {
for(String namespace : namespaces) {
- if(GenUtils.hasStereotype(element, namespace + "::" + stdName)) {
+ if(GenUtils.hasStereotype(element, namespace + Namespace.SEPARATOR + stdName)) {
return true;
}
}
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppClassHeader.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppClassHeader.emtl
index dce9463f9ea..ede664e1865 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppClassHeader.emtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppClassHeader.emtl
@@ -19,6 +19,7 @@
<imports href="util/clazz/CppClassAttributesDeclaration.emtl#/0"/>
<imports href="util/clazz/CppClassOperationsDeclaration.emtl#/0"/>
<imports href="util/clazz/CppClassOperationsImplementation.emtl#/0"/>
+ <imports href="util/operation/CppOperations.emtl#/0"/>
<imports href="util/CppTemplates.emtl#/0"/>
<imports href="util/CppDocumentation.emtl#/0"/>
<ownedModuleElement xsi:type="mtl:Template" name="classUnionOrStruct" visibility="Public">
@@ -76,127 +77,158 @@
</parameter>
</ownedModuleElement>
<ownedModuleElement xsi:type="mtl:Comment">
- <body startPosition="1590" endPosition="1758" value=" default initializer for non-static attributes with a default value&#xA;TODO: should be disabled by default, since non-static members can be initialized directly&#xA;in C++ 011"/>
+ <body startPosition="1676" endPosition="1844" value=" default initializer for non-static attributes with a default value&#xA;TODO: should be disabled by default, since non-static members can be initialized directly&#xA;in C++ 011"/>
</ownedModuleElement>
<ownedModuleElement xsi:type="mtl:Template" name="defaultInitializer" visibility="Public">
- <body xsi:type="mtl:LetBlock">
- <body xsi:type="mtl:IfBlock">
- <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#x9;"/>
- <body xsi:type="ocl.ecore:PropertyCallExp">
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- <source xsi:type="ocl.ecore:VariableExp" name="classifier" referredVariable="/0/defaultInitializer/classifier">
- <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
- </source>
- <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>
- </body>
- <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="() : "/>
- <body xsi:type="mtl:ForBlock">
+ <body xsi:type="mtl:IfBlock">
+ <body xsi:type="mtl:LetBlock">
+ <body xsi:type="mtl:IfBlock">
+ <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=" &#x9;"/>
<body xsi:type="ocl.ecore:PropertyCallExp">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/23">
- <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property"/>
+ <source xsi:type="ocl.ecore:VariableExp" name="classifier" referredVariable="/0/defaultInitializer/classifier">
+ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
</source>
<referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>
</body>
- <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="("/>
- <body xsi:type="ocl.ecore:OperationCallExp">
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- <source xsi:type="ocl.ecore:PropertyCallExp">
- <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//ValueSpecification"/>
+ <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="() : "/>
+ <body xsi:type="mtl:ForBlock">
+ <body xsi:type="ocl.ecore:PropertyCallExp">
+ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
<source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/24">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property"/>
</source>
- <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/defaultValue"/>
- </source>
- <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/uml2/4.0.0/UML#//ValueSpecification/stringValue"/>
+ <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>
+ </body>
+ <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="("/>
+ <body xsi:type="ocl.ecore:OperationCallExp">
+ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
+ <source xsi:type="ocl.ecore:PropertyCallExp">
+ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//ValueSpecification"/>
+ <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/25">
+ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property"/>
+ </source>
+ <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/defaultValue"/>
+ </source>
+ <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/uml2/4.0.0/UML#//ValueSpecification/stringValue"/>
+ </body>
+ <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=")"/>
+ <loopVariable name="a">
+ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property"/>
+ </loopVariable>
+ <iterSet xsi:type="ocl.ecore:VariableExp" name="attributeList" eType="/16/Set(Property)" referredVariable="/0/defaultInitializer/%/%/attributeList"/>
+ <each xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=", ">
+ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
+ </each>
</body>
- <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=")"/>
- <loopVariable name="a">
- <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property"/>
- </loopVariable>
- <iterSet xsi:type="ocl.ecore:VariableExp" name="attributeList" eType="/16/Set(Property)" referredVariable="/0/defaultInitializer/%/attributeList"/>
- <each xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=", ">
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- </each>
- </body>
- <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=" {}&#xA;"/>
- <ifExpr xsi:type="ocl.ecore:OperationCallExp">
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
- <source xsi:type="ocl.ecore:OperationCallExp">
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
- <source xsi:type="ocl.ecore:VariableExp" name="attributeList" eType="/16/Set(Property)" referredVariable="/0/defaultInitializer/%/attributeList"/>
- <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Set(T)_Class/isEmpty"/>
- </source>
- <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean_Class/not"/>
- </ifExpr>
- </body>
- <letVariable name="attributeList" eType="/16/Set(Property)">
- <initExpression xsi:type="ocl.ecore:IteratorExp" name="select" eType="/16/Set(Property)">
- <source xsi:type="ocl.ecore:PropertyCallExp" eType="/16/Set(Property)">
- <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/17">
- <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
- </source>
- <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/attribute"/>
- </source>
- <body xsi:type="ocl.ecore:OperationCallExp">
+ <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=" {}&#xA;"/>
+ <ifExpr xsi:type="ocl.ecore:OperationCallExp">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
<source xsi:type="ocl.ecore:OperationCallExp">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
+ <source xsi:type="ocl.ecore:VariableExp" name="attributeList" eType="/16/Set(Property)" referredVariable="/0/defaultInitializer/%/%/attributeList"/>
+ <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Set(T)_Class/isEmpty"/>
+ </source>
+ <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean_Class/not"/>
+ </ifExpr>
+ </body>
+ <letVariable name="attributeList" eType="/16/Set(Property)">
+ <initExpression xsi:type="ocl.ecore:IteratorExp" name="select" eType="/16/Set(Property)">
+ <source xsi:type="ocl.ecore:PropertyCallExp" eType="/16/Set(Property)">
+ <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/18">
+ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
+ </source>
+ <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/attribute"/>
+ </source>
+ <body xsi:type="ocl.ecore:OperationCallExp">
+ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
<source xsi:type="ocl.ecore:OperationCallExp">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
- <source xsi:type="ocl.ecore:PropertyCallExp">
+ <source xsi:type="ocl.ecore:OperationCallExp">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
- <source xsi:type="ocl.ecore:VariableExp" name="temp1" referredVariable="/0/defaultInitializer/%/attributeList/select/temp1">
- <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property"/>
+ <source xsi:type="ocl.ecore:PropertyCallExp">
+ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
+ <source xsi:type="ocl.ecore:VariableExp" name="temp1" referredVariable="/0/defaultInitializer/%/%/attributeList/select/temp1">
+ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property"/>
+ </source>
+ <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Feature/isStatic"/>
</source>
- <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Feature/isStatic"/>
+ <argument xsi:type="ocl.ecore:BooleanLiteralExp" booleanSymbol="false">
+ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
+ </argument>
+ <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean_Class/="/>
</source>
- <argument xsi:type="ocl.ecore:BooleanLiteralExp" booleanSymbol="false">
+ <argument xsi:type="ocl.ecore:OperationCallExp">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
+ <source xsi:type="ocl.ecore:PropertyCallExp">
+ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//ValueSpecification"/>
+ <source xsi:type="ocl.ecore:VariableExp" name="temp1" referredVariable="/0/defaultInitializer/%/%/attributeList/select/temp1">
+ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property"/>
+ </source>
+ <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/defaultValue"/>
+ </source>
+ <argument xsi:type="ocl.ecore:NullLiteralExp">
+ <eType xsi:type="ocl.ecore:VoidType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclVoid"/>
+ </argument>
+ <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/%3C%3E"/>
</argument>
- <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean_Class/="/>
+ <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean_Class/and"/>
</source>
<argument xsi:type="ocl.ecore:OperationCallExp">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
- <source xsi:type="ocl.ecore:PropertyCallExp">
- <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//ValueSpecification"/>
- <source xsi:type="ocl.ecore:VariableExp" name="temp1" referredVariable="/0/defaultInitializer/%/attributeList/select/temp1">
- <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property"/>
+ <source xsi:type="ocl.ecore:OperationCallExp">
+ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
+ <source xsi:type="ocl.ecore:PropertyCallExp">
+ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//ValueSpecification"/>
+ <source xsi:type="ocl.ecore:VariableExp" name="temp1" referredVariable="/0/defaultInitializer/%/%/attributeList/select/temp1">
+ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property"/>
+ </source>
+ <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/defaultValue"/>
</source>
- <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/defaultValue"/>
+ <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/uml2/4.0.0/UML#//ValueSpecification/stringValue"/>
</source>
<argument xsi:type="ocl.ecore:NullLiteralExp">
<eType xsi:type="ocl.ecore:VoidType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclVoid"/>
</argument>
- <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/%3C%3E"/>
+ <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String_Class/%3C%3E"/>
</argument>
<referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean_Class/and"/>
- </source>
- <argument xsi:type="ocl.ecore:OperationCallExp">
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
- <source xsi:type="ocl.ecore:OperationCallExp">
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- <source xsi:type="ocl.ecore:PropertyCallExp">
- <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//ValueSpecification"/>
- <source xsi:type="ocl.ecore:VariableExp" name="temp1" referredVariable="/0/defaultInitializer/%/attributeList/select/temp1">
- <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property"/>
- </source>
- <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/defaultValue"/>
- </source>
- <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/uml2/4.0.0/UML#//ValueSpecification/stringValue"/>
- </source>
- <argument xsi:type="ocl.ecore:NullLiteralExp">
- <eType xsi:type="ocl.ecore:VoidType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclVoid"/>
- </argument>
- <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String_Class/%3C%3E"/>
+ </body>
+ <iterator xsi:type="ocl.ecore:Variable" name="temp1">
+ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property"/>
+ </iterator>
+ </initExpression>
+ </letVariable>
+ </body>
+ <ifExpr xsi:type="ocl.ecore:OperationCallExp">
+ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
+ <source xsi:type="ocl.ecore:IteratorExp" name="any">
+ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
+ <source xsi:type="mtl:QueryInvocation" eType="/16/Sequence(Operation)">
+ <definition href="util/operation/CppOperations.emtl#/0/getOwnedOperations"/>
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/17">
+ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
+ </argument>
+ </source>
+ <body xsi:type="mtl:QueryInvocation">
+ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
+ <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/>
+ <argument xsi:type="ocl.ecore:VariableExp" name="temp1" referredVariable="/0/defaultInitializer/%/%.1/any/temp2">
+ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
+ </argument>
+ <argument xsi:type="ocl.ecore:TypeExp" eType="/6/Create">
+ <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML/Profile/L2#//Create"/>
</argument>
- <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean_Class/and"/>
</body>
- <iterator xsi:type="ocl.ecore:Variable" name="temp1">
- <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property"/>
+ <iterator xsi:type="ocl.ecore:Variable" name="temp2">
+ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
</iterator>
- </initExpression>
- </letVariable>
+ </source>
+ <argument xsi:type="ocl.ecore:NullLiteralExp">
+ <eType xsi:type="ocl.ecore:VoidType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclVoid"/>
+ </argument>
+ <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/="/>
+ </ifExpr>
</body>
<parameter name="classifier">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
@@ -214,7 +246,7 @@
<body xsi:type="mtl:QueryInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
<definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getFullNameUC"/>
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/31">
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/32">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
</argument>
</body>
@@ -222,7 +254,7 @@
<body xsi:type="mtl:QueryInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
<definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getFullNameUC"/>
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/32">
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/33">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
</argument>
</body>
@@ -240,7 +272,7 @@
<definition href="util/clazz/CppClassIncludeClassDeclaration.emtl#/0/CppOwnerPackageIncludeDeclaration"/>
<argument xsi:type="ocl.ecore:PropertyCallExp">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Package"/>
- <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/34">
+ <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/35">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
</source>
<referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Type/package"/>
@@ -250,7 +282,7 @@
<body xsi:type="mtl:TemplateInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
<definition href="util/clazz/CppClassIncludeClassDeclaration.emtl#/0/CppClassAllIncludesDeclaration"/>
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/35">
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/36">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
</argument>
</body>
@@ -258,7 +290,7 @@
<body xsi:type="mtl:TemplateInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
<definition href="CppIncludeUtils.emtl#/0/CppIncludeHeader"/>
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/36">
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/37">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
</argument>
</body>
@@ -266,7 +298,7 @@
<body xsi:type="mtl:QueryInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
<definition href="../utils/CppGenUtils.emtl#/0/openNS"/>
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/37">
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/38">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
</argument>
</body>
@@ -274,7 +306,7 @@
<body xsi:type="mtl:TemplateInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
<definition href="util/CppDocumentation.emtl#/0/CppElementDoc"/>
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/38">
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/39">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
</argument>
</body>
@@ -282,13 +314,13 @@
<body xsi:type="mtl:TemplateInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
<definition href="util/CppTemplates.emtl#/0/templateSignature"/>
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/39">
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/40">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
</argument>
</body>
<body xsi:type="mtl:TemplateInvocation" definition="/0/classUnionOrStruct">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/40">
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/41">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
</argument>
</body>
@@ -303,7 +335,7 @@
<body xsi:type="mtl:TemplateInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
<definition href="util/clazz/CppClassInheritedDeclarations.emtl#/0/CppClassInheritedDeclarations"/>
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/42">
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/43">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
</argument>
</body>
@@ -311,14 +343,14 @@
<body xsi:type="mtl:TemplateInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
<definition href="util/clazz/CppClassFriendDeclaration.emtl#/0/CppClassIncludeFriendDeclaration"/>
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/43">
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/44">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
</argument>
</body>
<body xsi:type="mtl:TemplateInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
<definition href="util/clazz/CppClassTypeAndEnum.emtl#/0/CppClassTypeAndEnum"/>
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/44">
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/45">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
</argument>
</body>
@@ -332,7 +364,7 @@
</argument>
<argument xsi:type="mtl:TemplateInvocation" definition="/0/defaultInitializer">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/45">
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/46">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
</argument>
</argument>
@@ -348,7 +380,7 @@
<argument xsi:type="mtl:TemplateInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
<definition href="util/clazz/CppClassAttributesDeclaration.emtl#/0/CppClassAttributesDeclaration"/>
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/46">
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/47">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
</argument>
<argument xsi:type="ocl.ecore:EnumLiteralExp">
@@ -368,7 +400,7 @@
<argument xsi:type="mtl:TemplateInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
<definition href="util/clazz/CppClassOperationsDeclaration.emtl#/0/CppClassOperationsDeclaration"/>
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/47">
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/48">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
</argument>
<argument xsi:type="ocl.ecore:EnumLiteralExp">
@@ -388,7 +420,7 @@
<argument xsi:type="mtl:TemplateInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
<definition href="util/clazz/CppClassAttributesDeclaration.emtl#/0/CppClassAttributesDeclaration"/>
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/48">
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/49">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
</argument>
<argument xsi:type="ocl.ecore:EnumLiteralExp">
@@ -408,7 +440,7 @@
<argument xsi:type="mtl:TemplateInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
<definition href="util/clazz/CppClassOperationsDeclaration.emtl#/0/CppClassOperationsDeclaration"/>
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/49">
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/50">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
</argument>
<argument xsi:type="ocl.ecore:EnumLiteralExp">
@@ -428,7 +460,7 @@
<argument xsi:type="mtl:TemplateInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
<definition href="util/clazz/CppClassAttributesDeclaration.emtl#/0/CppClassAttributesDeclaration"/>
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/50">
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/51">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
</argument>
<argument xsi:type="ocl.ecore:EnumLiteralExp">
@@ -448,7 +480,7 @@
<argument xsi:type="mtl:TemplateInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
<definition href="util/clazz/CppClassOperationsDeclaration.emtl#/0/CppClassOperationsDeclaration"/>
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/51">
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/52">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
</argument>
<argument xsi:type="ocl.ecore:EnumLiteralExp">
@@ -461,7 +493,7 @@
<body xsi:type="mtl:TemplateInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
<definition href="util/clazz/CppClassAttributesDeclaration.emtl#/0/CppClassAttributesDeclaration"/>
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/52">
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/53">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
</argument>
<argument xsi:type="ocl.ecore:EnumLiteralExp">
@@ -473,7 +505,7 @@
<body xsi:type="mtl:TemplateInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
<definition href="util/clazz/CppClassOperationsDeclaration.emtl#/0/CppClassOperationsDeclaration"/>
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/53">
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/54">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
</argument>
<argument xsi:type="ocl.ecore:EnumLiteralExp">
@@ -487,7 +519,7 @@
<body xsi:type="mtl:TemplateInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
<definition href="util/clazz/CppClassOperationsImplementation.emtl#/0/CppClassOperationsImplementation"/>
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/55">
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/56">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
</argument>
<argument xsi:type="ocl.ecore:BooleanLiteralExp" booleanSymbol="false">
@@ -498,7 +530,7 @@
<ifExpr xsi:type="mtl:QueryInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
<definition href="util/CppTemplates.emtl#/0/isTemplate"/>
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/54">
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/55">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
</argument>
</ifExpr>
@@ -507,7 +539,7 @@
<body xsi:type="mtl:TemplateInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
<definition href="util/clazz/CppClassOperationsImplementation.emtl#/0/CppClassOperationsImplementation"/>
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/56">
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/57">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
</argument>
<argument xsi:type="ocl.ecore:BooleanLiteralExp" booleanSymbol="true">
@@ -518,7 +550,7 @@
<body xsi:type="mtl:QueryInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
<definition href="../utils/CppGenUtils.emtl#/0/closeNS"/>
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/57">
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/58">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
</argument>
</body>
@@ -781,6 +813,18 @@
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
</eParameters>
</eOperations>
+ <eOperations name="getOwnedOperations">
+ <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
+ <contents xsi:type="ocl.ecore:Constraint"/>
+ </eAnnotations>
+ <eAnnotations source="MTL">
+ <references href="util/operation/CppOperations.emtl#/0/getOwnedOperations"/>
+ </eAnnotations>
+ <eType xsi:type="ocl.ecore:SequenceType" href="util/operation/CppOperations.emtl#/3/Sequence(Operation)"/>
+ <eParameters name="cl">
+ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
+ </eParameters>
+ </eOperations>
<eOperations name="isTemplate">
<eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
<contents xsi:type="ocl.ecore:Constraint"/>
@@ -933,6 +977,9 @@
<eClassifiers xsi:type="ocl.ecore:TypeType" name="DataType">
<referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//DataType"/>
</eClassifiers>
+ <eClassifiers xsi:type="ocl.ecore:TypeType" name="Create">
+ <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML/Profile/L2#//Create"/>
+ </eClassifiers>
</ecore:EPackage>
<ocl.ecore:Variable name="self">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
@@ -962,6 +1009,9 @@
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
</ocl.ecore:Variable>
<ecore:EPackage name="collections">
+ <eClassifiers xsi:type="ocl.ecore:SequenceType" name="Sequence(Operation)" instanceClassName="java.util.List">
+ <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
+ </eClassifiers>
<eClassifiers xsi:type="ocl.ecore:SetType" name="Set(Property)" instanceClassName="java.util.Set">
<elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property"/>
</eClassifiers>
@@ -982,6 +1032,9 @@
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
</ocl.ecore:Variable>
<ocl.ecore:Variable name="self">
+ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
+ </ocl.ecore:Variable>
+ <ocl.ecore:Variable name="self">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property"/>
</ocl.ecore:Variable>
<ocl.ecore:Variable name="self">
@@ -1097,23 +1150,23 @@
</ocl.ecore:Variable>
<ecore:EAnnotation source="positions">
<eAnnotations source="positions.0" references="/0/classUnionOrStruct">
- <details key="start" value="1268"/>
- <details key="end" value="1580"/>
+ <details key="start" value="1354"/>
+ <details key="end" value="1666"/>
<details key="line" value="18"/>
</eAnnotations>
<eAnnotations source="positions.1" references="/0/classUnionOrStruct/%">
- <details key="start" value="1330"/>
- <details key="end" value="1568"/>
+ <details key="start" value="1416"/>
+ <details key="end" value="1654"/>
<details key="line" value="19"/>
</eAnnotations>
<eAnnotations source="positions.2" references="/0/classUnionOrStruct/%/%">
- <details key="start" value="1365"/>
- <details key="end" value="1377"/>
+ <details key="start" value="1451"/>
+ <details key="end" value="1463"/>
<details key="line" value="20"/>
</eAnnotations>
<eAnnotations source="positions.3" references="/0/classUnionOrStruct/%/%.1">
- <details key="start" value="1334"/>
- <details key="end" value="1363"/>
+ <details key="start" value="1420"/>
+ <details key="end" value="1449"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.4" references="/0/classUnionOrStruct/%/%.1/self">
@@ -1122,43 +1175,43 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.5" references="/0/classUnionOrStruct/%/%.1/%">
- <details key="start" value="1349"/>
- <details key="end" value="1361"/>
+ <details key="start" value="1435"/>
+ <details key="end" value="1447"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.6" references="/0/classUnionOrStruct/%/%.2">
- <details key="start" value="1377"/>
- <details key="end" value="1563"/>
+ <details key="start" value="1463"/>
+ <details key="end" value="1649"/>
<details key="line" value="21"/>
</eAnnotations>
<eAnnotations source="positions.7" references="/0/classUnionOrStruct/%/%.2/%">
- <details key="start" value="1385"/>
- <details key="end" value="1562"/>
+ <details key="start" value="1471"/>
+ <details key="end" value="1648"/>
<details key="line" value="22"/>
</eAnnotations>
<eAnnotations source="positions.8" references="/0/classUnionOrStruct/%/%.2/%/%">
- <details key="start" value="1414"/>
- <details key="end" value="1422"/>
+ <details key="start" value="1500"/>
+ <details key="end" value="1508"/>
<details key="line" value="23"/>
</eAnnotations>
<eAnnotations source="positions.9" references="/0/classUnionOrStruct/%/%.2/%/%.1">
- <details key="start" value="1423"/>
- <details key="end" value="1463"/>
+ <details key="start" value="1509"/>
+ <details key="end" value="1549"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.10" references="/0/classUnionOrStruct/%/%.2/%/%.1/%">
- <details key="start" value="1423"/>
- <details key="end" value="1445"/>
+ <details key="start" value="1509"/>
+ <details key="end" value="1531"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.11" references="/0/classUnionOrStruct/%/%.2/%/%.2">
- <details key="start" value="1465"/>
- <details key="end" value="1481"/>
+ <details key="start" value="1551"/>
+ <details key="end" value="1567"/>
<details key="line" value="24"/>
</eAnnotations>
<eAnnotations source="positions.12" references="/0/classUnionOrStruct/%/%.2/%/%.3">
- <details key="start" value="1389"/>
- <details key="end" value="1412"/>
+ <details key="start" value="1475"/>
+ <details key="end" value="1498"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.13" references="/0/classUnionOrStruct/%/%.2/%/%.3/self">
@@ -1167,824 +1220,874 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.14" references="/0/classUnionOrStruct/%/%.2/%/%.3/%">
- <details key="start" value="1402"/>
- <details key="end" value="1410"/>
+ <details key="start" value="1488"/>
+ <details key="end" value="1496"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.15" references="/0/classUnionOrStruct/%/%.2/%/%.4">
- <details key="start" value="1482"/>
- <details key="end" value="1557"/>
+ <details key="start" value="1568"/>
+ <details key="end" value="1643"/>
<details key="line" value="25"/>
</eAnnotations>
<eAnnotations source="positions.16" references="/0/classUnionOrStruct/%/%.2/%/%.4/%">
- <details key="start" value="1489"/>
- <details key="end" value="1497"/>
+ <details key="start" value="1575"/>
+ <details key="end" value="1583"/>
<details key="line" value="26"/>
</eAnnotations>
<eAnnotations source="positions.17" references="/0/classUnionOrStruct/%/%.2/%/%.4/%.1">
- <details key="start" value="1498"/>
- <details key="end" value="1539"/>
+ <details key="start" value="1584"/>
+ <details key="end" value="1625"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.18" references="/0/classUnionOrStruct/%/%.2/%/%.4/%.1/%">
- <details key="start" value="1498"/>
- <details key="end" value="1521"/>
+ <details key="start" value="1584"/>
+ <details key="end" value="1607"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.19" references="/0/classUnionOrStruct/%/%.2/%/%.4/%.2">
- <details key="start" value="1541"/>
- <details key="end" value="1556"/>
+ <details key="start" value="1627"/>
+ <details key="end" value="1642"/>
<details key="line" value="27"/>
</eAnnotations>
<eAnnotations source="positions.20" references="/0/classUnionOrStruct/classifier">
- <details key="start" value="1304"/>
- <details key="end" value="1327"/>
+ <details key="start" value="1390"/>
+ <details key="end" value="1413"/>
<details key="line" value="18"/>
</eAnnotations>
<eAnnotations source="positions.21" references="/0/%">
- <details key="start" value="1582"/>
- <details key="end" value="1760"/>
+ <details key="start" value="1668"/>
+ <details key="end" value="1846"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.22" references="/0/defaultInitializer">
- <details key="start" value="1761"/>
- <details key="end" value="2169"/>
+ <details key="start" value="1847"/>
+ <details key="end" value="3384"/>
<details key="line" value="35"/>
</eAnnotations>
<eAnnotations source="positions.23" references="/0/defaultInitializer/%">
- <details key="start" value="1836"/>
- <details key="end" value="2157"/>
- <details key="line" value="36"/>
+ <details key="start" value="2948"/>
+ <details key="end" value="3372"/>
+ <details key="line" value="54"/>
</eAnnotations>
<eAnnotations source="positions.24" references="/0/defaultInitializer/%/%">
- <details key="start" value="1985"/>
- <details key="end" value="2151"/>
- <details key="line" value="40"/>
+ <details key="start" value="3017"/>
+ <details key="end" value="3366"/>
+ <details key="line" value="55"/>
</eAnnotations>
<eAnnotations source="positions.25" references="/0/defaultInitializer/%/%/%">
- <details key="start" value="2019"/>
- <details key="end" value="2020"/>
- <details key="line" value="41"/>
+ <details key="start" value="3182"/>
+ <details key="end" value="3360"/>
+ <details key="line" value="59"/>
</eAnnotations>
- <eAnnotations source="positions.26" references="/0/defaultInitializer/%/%/%.1">
- <details key="start" value="2021"/>
- <details key="end" value="2036"/>
+ <eAnnotations source="positions.26" references="/0/defaultInitializer/%/%/%/%">
+ <details key="start" value="3216"/>
+ <details key="end" value="3221"/>
+ <details key="line" value="60"/>
+ </eAnnotations>
+ <eAnnotations source="positions.27" references="/0/defaultInitializer/%/%/%/%.1">
+ <details key="start" value="3222"/>
+ <details key="end" value="3237"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.27" references="/0/defaultInitializer/%/%/%.1/classifier">
- <details key="start" value="2021"/>
- <details key="end" value="2031"/>
+ <eAnnotations source="positions.28" references="/0/defaultInitializer/%/%/%/%.1/classifier">
+ <details key="start" value="3222"/>
+ <details key="end" value="3232"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.28" references="/0/defaultInitializer/%/%/%.2">
- <details key="start" value="2038"/>
- <details key="end" value="2043"/>
- <details key="line" value="41"/>
+ <eAnnotations source="positions.29" references="/0/defaultInitializer/%/%/%/%.2">
+ <details key="start" value="3239"/>
+ <details key="end" value="3244"/>
+ <details key="line" value="60"/>
</eAnnotations>
- <eAnnotations source="positions.29" references="/0/defaultInitializer/%/%/%.3">
- <details key="start" value="2043"/>
- <details key="end" value="2142"/>
- <details key="line" value="41"/>
+ <eAnnotations source="positions.30" references="/0/defaultInitializer/%/%/%/%.3">
+ <details key="start" value="3244"/>
+ <details key="end" value="3347"/>
+ <details key="line" value="60"/>
</eAnnotations>
- <eAnnotations source="positions.30" references="/0/defaultInitializer/%/%/%.3/%">
- <details key="start" value="2099"/>
- <details key="end" value="2103"/>
+ <eAnnotations source="positions.31" references="/0/defaultInitializer/%/%/%/%.3/%">
+ <details key="start" value="3304"/>
+ <details key="end" value="3308"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.31" references="/0/defaultInitializer/%/%/%.3/%/self">
+ <eAnnotations source="positions.32" references="/0/defaultInitializer/%/%/%/%.3/%/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.32" references="/0/defaultInitializer/%/%/%.3/%.1">
- <details key="start" value="2105"/>
- <details key="end" value="2106"/>
- <details key="line" value="42"/>
+ <eAnnotations source="positions.33" references="/0/defaultInitializer/%/%/%/%.3/%.1">
+ <details key="start" value="3310"/>
+ <details key="end" value="3311"/>
+ <details key="line" value="61"/>
</eAnnotations>
- <eAnnotations source="positions.33" references="/0/defaultInitializer/%/%/%.3/%.2">
- <details key="start" value="2107"/>
- <details key="end" value="2133"/>
+ <eAnnotations source="positions.34" references="/0/defaultInitializer/%/%/%/%.3/%.2">
+ <details key="start" value="3312"/>
+ <details key="end" value="3338"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.34" references="/0/defaultInitializer/%/%/%.3/%.2/%">
- <details key="start" value="2107"/>
- <details key="end" value="2119"/>
+ <eAnnotations source="positions.35" references="/0/defaultInitializer/%/%/%/%.3/%.2/%">
+ <details key="start" value="3312"/>
+ <details key="end" value="3324"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.35" references="/0/defaultInitializer/%/%/%.3/%.2/%/self">
+ <eAnnotations source="positions.36" references="/0/defaultInitializer/%/%/%/%.3/%.2/%/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.36" references="/0/defaultInitializer/%/%/%.3/%.3">
- <details key="start" value="2135"/>
- <details key="end" value="2136"/>
- <details key="line" value="42"/>
+ <eAnnotations source="positions.37" references="/0/defaultInitializer/%/%/%/%.3/%.3">
+ <details key="start" value="3340"/>
+ <details key="end" value="3341"/>
+ <details key="line" value="61"/>
</eAnnotations>
- <eAnnotations source="positions.37" references="/0/defaultInitializer/%/%/%.3/a">
- <details key="start" value="2049"/>
- <details key="end" value="2061"/>
- <details key="line" value="41"/>
+ <eAnnotations source="positions.38" references="/0/defaultInitializer/%/%/%/%.3/a">
+ <details key="start" value="3250"/>
+ <details key="end" value="3262"/>
+ <details key="line" value="60"/>
</eAnnotations>
- <eAnnotations source="positions.38" references="/0/defaultInitializer/%/%/%.3/attributeList">
- <details key="start" value="2064"/>
- <details key="end" value="2077"/>
+ <eAnnotations source="positions.39" references="/0/defaultInitializer/%/%/%/%.3/attributeList">
+ <details key="start" value="3265"/>
+ <details key="end" value="3278"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.39" references="/0/defaultInitializer/%/%/%.3/%.4">
- <details key="start" value="2089"/>
- <details key="end" value="2093"/>
+ <eAnnotations source="positions.40" references="/0/defaultInitializer/%/%/%/%.3/%.4">
+ <details key="start" value="3290"/>
+ <details key="end" value="3294"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.40" references="/0/defaultInitializer/%/%/%.4">
- <details key="start" value="2142"/>
- <details key="end" value="2146"/>
- <details key="line" value="42"/>
+ <eAnnotations source="positions.41" references="/0/defaultInitializer/%/%/%/%.4">
+ <details key="start" value="3347"/>
+ <details key="end" value="3351"/>
+ <details key="line" value="61"/>
</eAnnotations>
- <eAnnotations source="positions.41" references="/0/defaultInitializer/%/%/%.5">
- <details key="start" value="1989"/>
- <details key="end" value="2017"/>
+ <eAnnotations source="positions.42" references="/0/defaultInitializer/%/%/%/%.5">
+ <details key="start" value="3186"/>
+ <details key="end" value="3214"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.42" references="/0/defaultInitializer/%/%/%.5/%">
- <details key="start" value="1993"/>
- <details key="end" value="2017"/>
+ <eAnnotations source="positions.43" references="/0/defaultInitializer/%/%/%/%.5/%">
+ <details key="start" value="3190"/>
+ <details key="end" value="3214"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.43" references="/0/defaultInitializer/%/%/%.5/%/attributeList">
- <details key="start" value="1993"/>
- <details key="end" value="2006"/>
+ <eAnnotations source="positions.44" references="/0/defaultInitializer/%/%/%/%.5/%/attributeList">
+ <details key="start" value="3190"/>
+ <details key="end" value="3203"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.44" references="/0/defaultInitializer/%/attributeList">
- <details key="start" value="1841"/>
- <details key="end" value="1983"/>
- <details key="line" value="36"/>
+ <eAnnotations source="positions.45" references="/0/defaultInitializer/%/%/attributeList">
+ <details key="start" value="3022"/>
+ <details key="end" value="3176"/>
+ <details key="line" value="55"/>
</eAnnotations>
- <eAnnotations source="positions.45" references="/0/defaultInitializer/%/attributeList/select">
- <details key="start" value="1874"/>
- <details key="end" value="1984"/>
+ <eAnnotations source="positions.46" references="/0/defaultInitializer/%/%/attributeList/select">
+ <details key="start" value="3055"/>
+ <details key="end" value="3177"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.46" references="/0/defaultInitializer/%/attributeList/select/%">
- <details key="start" value="1874"/>
- <details key="end" value="1883"/>
+ <eAnnotations source="positions.47" references="/0/defaultInitializer/%/%/attributeList/select/%">
+ <details key="start" value="3055"/>
+ <details key="end" value="3064"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.47" references="/0/defaultInitializer/%/attributeList/select/%/self">
+ <eAnnotations source="positions.48" references="/0/defaultInitializer/%/%/attributeList/select/%/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.48" references="/0/defaultInitializer/%/attributeList/select/%.1">
- <details key="start" value="1895"/>
- <details key="end" value="1983"/>
+ <eAnnotations source="positions.49" references="/0/defaultInitializer/%/%/attributeList/select/%.1">
+ <details key="start" value="3080"/>
+ <details key="end" value="3176"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.49" references="/0/defaultInitializer/%/attributeList/select/%.1/%">
- <details key="start" value="1895"/>
- <details key="end" value="1941"/>
+ <eAnnotations source="positions.50" references="/0/defaultInitializer/%/%/attributeList/select/%.1/%">
+ <details key="start" value="3080"/>
+ <details key="end" value="3130"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.50" references="/0/defaultInitializer/%/attributeList/select/%.1/%/%">
- <details key="start" value="1895"/>
- <details key="end" value="1913"/>
+ <eAnnotations source="positions.51" references="/0/defaultInitializer/%/%/attributeList/select/%.1/%/%">
+ <details key="start" value="3080"/>
+ <details key="end" value="3098"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.51" references="/0/defaultInitializer/%/attributeList/select/%.1/%/%/%">
- <details key="start" value="1896"/>
- <details key="end" value="1904"/>
+ <eAnnotations source="positions.52" references="/0/defaultInitializer/%/%/attributeList/select/%.1/%/%/%">
+ <details key="start" value="3081"/>
+ <details key="end" value="3089"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.52" references="/0/defaultInitializer/%/attributeList/select/%.1/%/%/%/temp1">
+ <eAnnotations source="positions.53" references="/0/defaultInitializer/%/%/attributeList/select/%.1/%/%/%/temp1">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.53" references="/0/defaultInitializer/%/attributeList/select/%.1/%/%/%.1">
- <details key="start" value="1907"/>
- <details key="end" value="1912"/>
+ <eAnnotations source="positions.54" references="/0/defaultInitializer/%/%/attributeList/select/%.1/%/%/%.1">
+ <details key="start" value="3092"/>
+ <details key="end" value="3097"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.54" references="/0/defaultInitializer/%/attributeList/select/%.1/%/%.1">
- <details key="start" value="1919"/>
- <details key="end" value="1941"/>
+ <eAnnotations source="positions.55" references="/0/defaultInitializer/%/%/attributeList/select/%.1/%/%.1">
+ <details key="start" value="3108"/>
+ <details key="end" value="3130"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.55" references="/0/defaultInitializer/%/attributeList/select/%.1/%/%.1/%">
- <details key="start" value="1920"/>
- <details key="end" value="1932"/>
+ <eAnnotations source="positions.56" references="/0/defaultInitializer/%/%/attributeList/select/%.1/%/%.1/%">
+ <details key="start" value="3109"/>
+ <details key="end" value="3121"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.56" references="/0/defaultInitializer/%/attributeList/select/%.1/%/%.1/%/temp1">
+ <eAnnotations source="positions.57" references="/0/defaultInitializer/%/%/attributeList/select/%.1/%/%.1/%/temp1">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.57" references="/0/defaultInitializer/%/attributeList/select/%.1/%/%.1/%.1">
- <details key="start" value="1936"/>
- <details key="end" value="1940"/>
+ <eAnnotations source="positions.58" references="/0/defaultInitializer/%/%/attributeList/select/%.1/%/%.1/%.1">
+ <details key="start" value="3125"/>
+ <details key="end" value="3129"/>
+ <details key="line" value="0"/>
+ </eAnnotations>
+ <eAnnotations source="positions.59" references="/0/defaultInitializer/%/%/attributeList/select/%.1/%.1">
+ <details key="start" value="3140"/>
+ <details key="end" value="3176"/>
+ <details key="line" value="0"/>
+ </eAnnotations>
+ <eAnnotations source="positions.60" references="/0/defaultInitializer/%/%/attributeList/select/%.1/%.1/%">
+ <details key="start" value="3141"/>
+ <details key="end" value="3167"/>
+ <details key="line" value="0"/>
+ </eAnnotations>
+ <eAnnotations source="positions.61" references="/0/defaultInitializer/%/%/attributeList/select/%.1/%.1/%/%">
+ <details key="start" value="3141"/>
+ <details key="end" value="3153"/>
+ <details key="line" value="0"/>
+ </eAnnotations>
+ <eAnnotations source="positions.62" references="/0/defaultInitializer/%/%/attributeList/select/%.1/%.1/%/%/temp1">
+ <details key="start" value="-1"/>
+ <details key="end" value="-1"/>
+ <details key="line" value="0"/>
+ </eAnnotations>
+ <eAnnotations source="positions.63" references="/0/defaultInitializer/%/%/attributeList/select/%.1/%.1/%.1">
+ <details key="start" value="3171"/>
+ <details key="end" value="3175"/>
+ <details key="line" value="0"/>
+ </eAnnotations>
+ <eAnnotations source="positions.64" references="/0/defaultInitializer/%/%/attributeList/select/temp1">
+ <details key="start" value="-1"/>
+ <details key="end" value="-1"/>
+ <details key="line" value="0"/>
+ </eAnnotations>
+ <eAnnotations source="positions.65" references="/0/defaultInitializer/%/%.1">
+ <details key="start" value="2952"/>
+ <details key="end" value="3011"/>
+ <details key="line" value="0"/>
+ </eAnnotations>
+ <eAnnotations source="positions.66" references="/0/defaultInitializer/%/%.1/any">
+ <details key="start" value="2952"/>
+ <details key="end" value="3004"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.58" references="/0/defaultInitializer/%/attributeList/select/%.1/%.1">
- <details key="start" value="1947"/>
- <details key="end" value="1983"/>
+ <eAnnotations source="positions.67" references="/0/defaultInitializer/%/%.1/any/%">
+ <details key="start" value="2952"/>
+ <details key="end" value="2972"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.59" references="/0/defaultInitializer/%/attributeList/select/%.1/%.1/%">
- <details key="start" value="1948"/>
- <details key="end" value="1974"/>
+ <eAnnotations source="positions.68" references="/0/defaultInitializer/%/%.1/any/%/self">
+ <details key="start" value="-1"/>
+ <details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.60" references="/0/defaultInitializer/%/attributeList/select/%.1/%.1/%/%">
- <details key="start" value="1948"/>
- <details key="end" value="1960"/>
+ <eAnnotations source="positions.69" references="/0/defaultInitializer/%/%.1/any/%.1">
+ <details key="start" value="2978"/>
+ <details key="end" value="3003"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.61" references="/0/defaultInitializer/%/attributeList/select/%.1/%.1/%/%/temp1">
+ <eAnnotations source="positions.70" references="/0/defaultInitializer/%/%.1/any/%.1/temp1">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.62" references="/0/defaultInitializer/%/attributeList/select/%.1/%.1/%.1">
- <details key="start" value="1978"/>
- <details key="end" value="1982"/>
+ <eAnnotations source="positions.71" references="/0/defaultInitializer/%/%.1/any/%.1/%">
+ <details key="start" value="2992"/>
+ <details key="end" value="3002"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.63" references="/0/defaultInitializer/%/attributeList/select/temp1">
+ <eAnnotations source="positions.72" references="/0/defaultInitializer/%/%.1/any/temp2">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.64" references="/0/defaultInitializer/classifier">
- <details key="start" value="1797"/>
- <details key="end" value="1820"/>
+ <eAnnotations source="positions.73" references="/0/defaultInitializer/%/%.1/%">
+ <details key="start" value="3007"/>
+ <details key="end" value="3011"/>
+ <details key="line" value="0"/>
+ </eAnnotations>
+ <eAnnotations source="positions.74" references="/0/defaultInitializer/classifier">
+ <details key="start" value="1883"/>
+ <details key="end" value="1906"/>
<details key="line" value="35"/>
</eAnnotations>
- <eAnnotations source="positions.65" references="/0/defaultInitializer/%.1">
- <details key="start" value="1827"/>
- <details key="end" value="1833"/>
+ <eAnnotations source="positions.75" references="/0/defaultInitializer/%.1">
+ <details key="start" value="1913"/>
+ <details key="end" value="1919"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.66" references="/0/defaultInitializer/%.1/self">
+ <eAnnotations source="positions.76" references="/0/defaultInitializer/%.1/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.67" references="/0/CppClassHeader">
- <details key="start" value="2172"/>
- <details key="end" value="4287"/>
- <details key="line" value="47"/>
+ <eAnnotations source="positions.77" references="/0/CppClassHeader">
+ <details key="start" value="3387"/>
+ <details key="end" value="5502"/>
+ <details key="line" value="67"/>
</eAnnotations>
- <eAnnotations source="positions.68" references="/0/CppClassHeader/%">
- <details key="start" value="2225"/>
- <details key="end" value="2233"/>
- <details key="line" value="48"/>
+ <eAnnotations source="positions.78" references="/0/CppClassHeader/%">
+ <details key="start" value="3440"/>
+ <details key="end" value="3448"/>
+ <details key="line" value="68"/>
</eAnnotations>
- <eAnnotations source="positions.69" references="/0/CppClassHeader/%.1">
- <details key="start" value="2234"/>
- <details key="end" value="2249"/>
+ <eAnnotations source="positions.79" references="/0/CppClassHeader/%.1">
+ <details key="start" value="3449"/>
+ <details key="end" value="3464"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.70" references="/0/CppClassHeader/%.1/self">
+ <eAnnotations source="positions.80" references="/0/CppClassHeader/%.1/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.71" references="/0/CppClassHeader/%.2">
- <details key="start" value="2251"/>
- <details key="end" value="2262"/>
- <details key="line" value="48"/>
+ <eAnnotations source="positions.81" references="/0/CppClassHeader/%.2">
+ <details key="start" value="3466"/>
+ <details key="end" value="3477"/>
+ <details key="line" value="68"/>
</eAnnotations>
- <eAnnotations source="positions.72" references="/0/CppClassHeader/%.3">
- <details key="start" value="2263"/>
- <details key="end" value="2278"/>
+ <eAnnotations source="positions.82" references="/0/CppClassHeader/%.3">
+ <details key="start" value="3478"/>
+ <details key="end" value="3493"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.73" references="/0/CppClassHeader/%.3/self">
+ <eAnnotations source="positions.83" references="/0/CppClassHeader/%.3/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.74" references="/0/CppClassHeader/%.4">
- <details key="start" value="2280"/>
- <details key="end" value="2360"/>
- <details key="line" value="49"/>
+ <eAnnotations source="positions.84" references="/0/CppClassHeader/%.4">
+ <details key="start" value="3495"/>
+ <details key="end" value="3575"/>
+ <details key="line" value="69"/>
</eAnnotations>
- <eAnnotations source="positions.75" references="/0/CppClassHeader/%.5">
- <details key="start" value="2361"/>
- <details key="end" value="2371"/>
+ <eAnnotations source="positions.85" references="/0/CppClassHeader/%.5">
+ <details key="start" value="3576"/>
+ <details key="end" value="3586"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.76" references="/0/CppClassHeader/%.5/class">
- <details key="start" value="2361"/>
- <details key="end" value="2366"/>
+ <eAnnotations source="positions.86" references="/0/CppClassHeader/%.5/class">
+ <details key="start" value="3576"/>
+ <details key="end" value="3581"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.77" references="/0/CppClassHeader/%.6">
- <details key="start" value="2373"/>
- <details key="end" value="2451"/>
- <details key="line" value="52"/>
+ <eAnnotations source="positions.87" references="/0/CppClassHeader/%.6">
+ <details key="start" value="3588"/>
+ <details key="end" value="3666"/>
+ <details key="line" value="72"/>
</eAnnotations>
- <eAnnotations source="positions.78" references="/0/CppClassHeader/%.7">
- <details key="start" value="2452"/>
- <details key="end" value="2496"/>
+ <eAnnotations source="positions.88" references="/0/CppClassHeader/%.7">
+ <details key="start" value="3667"/>
+ <details key="end" value="3711"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.79" references="/0/CppClassHeader/%.7/%">
- <details key="start" value="2452"/>
- <details key="end" value="2460"/>
+ <eAnnotations source="positions.89" references="/0/CppClassHeader/%.7/%">
+ <details key="start" value="3667"/>
+ <details key="end" value="3675"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.80" references="/0/CppClassHeader/%.7/%/self">
+ <eAnnotations source="positions.90" references="/0/CppClassHeader/%.7/%/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.81" references="/0/CppClassHeader/%.8">
- <details key="start" value="2498"/>
- <details key="end" value="2500"/>
- <details key="line" value="56"/>
+ <eAnnotations source="positions.91" references="/0/CppClassHeader/%.8">
+ <details key="start" value="3713"/>
+ <details key="end" value="3715"/>
+ <details key="line" value="76"/>
</eAnnotations>
- <eAnnotations source="positions.82" references="/0/CppClassHeader/%.9">
- <details key="start" value="2501"/>
- <details key="end" value="2533"/>
+ <eAnnotations source="positions.92" references="/0/CppClassHeader/%.9">
+ <details key="start" value="3716"/>
+ <details key="end" value="3748"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.83" references="/0/CppClassHeader/%.9/self">
+ <eAnnotations source="positions.93" references="/0/CppClassHeader/%.9/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.84" references="/0/CppClassHeader/%.10">
- <details key="start" value="2535"/>
- <details key="end" value="2537"/>
- <details key="line" value="58"/>
+ <eAnnotations source="positions.94" references="/0/CppClassHeader/%.10">
+ <details key="start" value="3750"/>
+ <details key="end" value="3752"/>
+ <details key="line" value="78"/>
</eAnnotations>
- <eAnnotations source="positions.85" references="/0/CppClassHeader/%.11">
- <details key="start" value="2538"/>
- <details key="end" value="2556"/>
+ <eAnnotations source="positions.95" references="/0/CppClassHeader/%.11">
+ <details key="start" value="3753"/>
+ <details key="end" value="3771"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.86" references="/0/CppClassHeader/%.11/self">
+ <eAnnotations source="positions.96" references="/0/CppClassHeader/%.11/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.87" references="/0/CppClassHeader/%.12">
- <details key="start" value="2558"/>
- <details key="end" value="2560"/>
- <details key="line" value="60"/>
+ <eAnnotations source="positions.97" references="/0/CppClassHeader/%.12">
+ <details key="start" value="3773"/>
+ <details key="end" value="3775"/>
+ <details key="line" value="80"/>
</eAnnotations>
- <eAnnotations source="positions.88" references="/0/CppClassHeader/%.13">
- <details key="start" value="2561"/>
- <details key="end" value="2569"/>
+ <eAnnotations source="positions.98" references="/0/CppClassHeader/%.13">
+ <details key="start" value="3776"/>
+ <details key="end" value="3784"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.89" references="/0/CppClassHeader/%.13/self">
+ <eAnnotations source="positions.99" references="/0/CppClassHeader/%.13/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.90" references="/0/CppClassHeader/%.14">
- <details key="start" value="2571"/>
- <details key="end" value="2637"/>
- <details key="line" value="61"/>
+ <eAnnotations source="positions.100" references="/0/CppClassHeader/%.14">
+ <details key="start" value="3786"/>
+ <details key="end" value="3852"/>
+ <details key="line" value="81"/>
</eAnnotations>
- <eAnnotations source="positions.91" references="/0/CppClassHeader/%.15">
- <details key="start" value="2638"/>
- <details key="end" value="2653"/>
+ <eAnnotations source="positions.101" references="/0/CppClassHeader/%.15">
+ <details key="start" value="3853"/>
+ <details key="end" value="3868"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.92" references="/0/CppClassHeader/%.15/self">
+ <eAnnotations source="positions.102" references="/0/CppClassHeader/%.15/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.93" references="/0/CppClassHeader/%.16">
- <details key="start" value="2655"/>
- <details key="end" value="2656"/>
- <details key="line" value="65"/>
+ <eAnnotations source="positions.103" references="/0/CppClassHeader/%.16">
+ <details key="start" value="3870"/>
+ <details key="end" value="3871"/>
+ <details key="line" value="85"/>
</eAnnotations>
- <eAnnotations source="positions.94" references="/0/CppClassHeader/%.17">
- <details key="start" value="2657"/>
- <details key="end" value="2676"/>
+ <eAnnotations source="positions.104" references="/0/CppClassHeader/%.17">
+ <details key="start" value="3872"/>
+ <details key="end" value="3891"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.95" references="/0/CppClassHeader/%.17/self">
+ <eAnnotations source="positions.105" references="/0/CppClassHeader/%.17/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.96" references="/0/CppClassHeader/%.18">
- <details key="start" value="2679"/>
- <details key="end" value="2699"/>
+ <eAnnotations source="positions.106" references="/0/CppClassHeader/%.18">
+ <details key="start" value="3894"/>
+ <details key="end" value="3914"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.97" references="/0/CppClassHeader/%.18/self">
+ <eAnnotations source="positions.107" references="/0/CppClassHeader/%.18/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.98" references="/0/CppClassHeader/%.19">
- <details key="start" value="2701"/>
- <details key="end" value="2702"/>
- <details key="line" value="65"/>
+ <eAnnotations source="positions.108" references="/0/CppClassHeader/%.19">
+ <details key="start" value="3916"/>
+ <details key="end" value="3917"/>
+ <details key="line" value="85"/>
</eAnnotations>
- <eAnnotations source="positions.99" references="/0/CppClassHeader/%.20">
- <details key="start" value="2703"/>
- <details key="end" value="2713"/>
+ <eAnnotations source="positions.109" references="/0/CppClassHeader/%.20">
+ <details key="start" value="3918"/>
+ <details key="end" value="3928"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.100" references="/0/CppClassHeader/%.20/class">
- <details key="start" value="2703"/>
- <details key="end" value="2708"/>
+ <eAnnotations source="positions.110" references="/0/CppClassHeader/%.20/class">
+ <details key="start" value="3918"/>
+ <details key="end" value="3923"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.101" references="/0/CppClassHeader/%.21">
- <details key="start" value="2716"/>
- <details key="end" value="2747"/>
+ <eAnnotations source="positions.111" references="/0/CppClassHeader/%.21">
+ <details key="start" value="3931"/>
+ <details key="end" value="3962"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.102" references="/0/CppClassHeader/%.21/self">
+ <eAnnotations source="positions.112" references="/0/CppClassHeader/%.21/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.103" references="/0/CppClassHeader/%.22">
- <details key="start" value="2749"/>
- <details key="end" value="2752"/>
- <details key="line" value="65"/>
+ <eAnnotations source="positions.113" references="/0/CppClassHeader/%.22">
+ <details key="start" value="3964"/>
+ <details key="end" value="3967"/>
+ <details key="line" value="85"/>
</eAnnotations>
- <eAnnotations source="positions.104" references="/0/CppClassHeader/%.23">
- <details key="start" value="2753"/>
- <details key="end" value="2787"/>
+ <eAnnotations source="positions.114" references="/0/CppClassHeader/%.23">
+ <details key="start" value="3968"/>
+ <details key="end" value="4002"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.105" references="/0/CppClassHeader/%.23/self">
+ <eAnnotations source="positions.115" references="/0/CppClassHeader/%.23/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.106" references="/0/CppClassHeader/%.24">
- <details key="start" value="2790"/>
- <details key="end" value="2811"/>
+ <eAnnotations source="positions.116" references="/0/CppClassHeader/%.24">
+ <details key="start" value="4005"/>
+ <details key="end" value="4026"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.107" references="/0/CppClassHeader/%.24/self">
+ <eAnnotations source="positions.117" references="/0/CppClassHeader/%.24/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.108" references="/0/CppClassHeader/%.25">
- <details key="start" value="2813"/>
- <details key="end" value="2818"/>
- <details key="line" value="67"/>
+ <eAnnotations source="positions.118" references="/0/CppClassHeader/%.25">
+ <details key="start" value="4028"/>
+ <details key="end" value="4033"/>
+ <details key="line" value="87"/>
</eAnnotations>
- <eAnnotations source="positions.109" references="/0/CppClassHeader/%.26">
- <details key="start" value="2819"/>
- <details key="end" value="2874"/>
+ <eAnnotations source="positions.119" references="/0/CppClassHeader/%.26">
+ <details key="start" value="4034"/>
+ <details key="end" value="4089"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.110" references="/0/CppClassHeader/%.26/%">
- <details key="start" value="2819"/>
- <details key="end" value="2841"/>
+ <eAnnotations source="positions.120" references="/0/CppClassHeader/%.26/%">
+ <details key="start" value="4034"/>
+ <details key="end" value="4056"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.111" references="/0/CppClassHeader/%.26/%.1">
- <details key="start" value="2853"/>
- <details key="end" value="2873"/>
+ <eAnnotations source="positions.121" references="/0/CppClassHeader/%.26/%.1">
+ <details key="start" value="4068"/>
+ <details key="end" value="4088"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.112" references="/0/CppClassHeader/%.26/%.1/self">
+ <eAnnotations source="positions.122" references="/0/CppClassHeader/%.26/%.1/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.113" references="/0/CppClassHeader/%.27">
- <details key="start" value="2876"/>
- <details key="end" value="2881"/>
- <details key="line" value="68"/>
+ <eAnnotations source="positions.123" references="/0/CppClassHeader/%.27">
+ <details key="start" value="4091"/>
+ <details key="end" value="4096"/>
+ <details key="line" value="88"/>
</eAnnotations>
- <eAnnotations source="positions.114" references="/0/CppClassHeader/%.28">
- <details key="start" value="2882"/>
- <details key="end" value="2970"/>
+ <eAnnotations source="positions.124" references="/0/CppClassHeader/%.28">
+ <details key="start" value="4097"/>
+ <details key="end" value="4185"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.115" references="/0/CppClassHeader/%.28/%">
- <details key="start" value="2882"/>
- <details key="end" value="2904"/>
+ <eAnnotations source="positions.125" references="/0/CppClassHeader/%.28/%">
+ <details key="start" value="4097"/>
+ <details key="end" value="4119"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.116" references="/0/CppClassHeader/%.28/%.1">
- <details key="start" value="2916"/>
- <details key="end" value="2969"/>
+ <eAnnotations source="positions.126" references="/0/CppClassHeader/%.28/%.1">
+ <details key="start" value="4131"/>
+ <details key="end" value="4184"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.117" references="/0/CppClassHeader/%.28/%.1/self">
+ <eAnnotations source="positions.127" references="/0/CppClassHeader/%.28/%.1/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.118" references="/0/CppClassHeader/%.28/%.1/%">
- <details key="start" value="2946"/>
- <details key="end" value="2968"/>
+ <eAnnotations source="positions.128" references="/0/CppClassHeader/%.28/%.1/%">
+ <details key="start" value="4161"/>
+ <details key="end" value="4183"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.119" references="/0/CppClassHeader/%.29">
- <details key="start" value="2972"/>
- <details key="end" value="2977"/>
- <details key="line" value="69"/>
+ <eAnnotations source="positions.129" references="/0/CppClassHeader/%.29">
+ <details key="start" value="4187"/>
+ <details key="end" value="4192"/>
+ <details key="line" value="89"/>
</eAnnotations>
- <eAnnotations source="positions.120" references="/0/CppClassHeader/%.30">
- <details key="start" value="2978"/>
- <details key="end" value="3066"/>
+ <eAnnotations source="positions.130" references="/0/CppClassHeader/%.30">
+ <details key="start" value="4193"/>
+ <details key="end" value="4281"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.121" references="/0/CppClassHeader/%.30/%">
- <details key="start" value="2978"/>
- <details key="end" value="3000"/>
+ <eAnnotations source="positions.131" references="/0/CppClassHeader/%.30/%">
+ <details key="start" value="4193"/>
+ <details key="end" value="4215"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.122" references="/0/CppClassHeader/%.30/%.1">
- <details key="start" value="3012"/>
- <details key="end" value="3065"/>
+ <eAnnotations source="positions.132" references="/0/CppClassHeader/%.30/%.1">
+ <details key="start" value="4227"/>
+ <details key="end" value="4280"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.123" references="/0/CppClassHeader/%.30/%.1/self">
+ <eAnnotations source="positions.133" references="/0/CppClassHeader/%.30/%.1/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.124" references="/0/CppClassHeader/%.30/%.1/%">
- <details key="start" value="3042"/>
- <details key="end" value="3064"/>
+ <eAnnotations source="positions.134" references="/0/CppClassHeader/%.30/%.1/%">
+ <details key="start" value="4257"/>
+ <details key="end" value="4279"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.125" references="/0/CppClassHeader/%.31">
- <details key="start" value="3068"/>
- <details key="end" value="3074"/>
- <details key="line" value="70"/>
+ <eAnnotations source="positions.135" references="/0/CppClassHeader/%.31">
+ <details key="start" value="4283"/>
+ <details key="end" value="4289"/>
+ <details key="line" value="90"/>
</eAnnotations>
- <eAnnotations source="positions.126" references="/0/CppClassHeader/%.32">
- <details key="start" value="3075"/>
- <details key="end" value="3169"/>
+ <eAnnotations source="positions.136" references="/0/CppClassHeader/%.32">
+ <details key="start" value="4290"/>
+ <details key="end" value="4384"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.127" references="/0/CppClassHeader/%.32/%">
- <details key="start" value="3075"/>
- <details key="end" value="3100"/>
+ <eAnnotations source="positions.137" references="/0/CppClassHeader/%.32/%">
+ <details key="start" value="4290"/>
+ <details key="end" value="4315"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.128" references="/0/CppClassHeader/%.32/%.1">
- <details key="start" value="3112"/>
- <details key="end" value="3168"/>
+ <eAnnotations source="positions.138" references="/0/CppClassHeader/%.32/%.1">
+ <details key="start" value="4327"/>
+ <details key="end" value="4383"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.129" references="/0/CppClassHeader/%.32/%.1/self">
+ <eAnnotations source="positions.139" references="/0/CppClassHeader/%.32/%.1/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.130" references="/0/CppClassHeader/%.32/%.1/%">
- <details key="start" value="3142"/>
- <details key="end" value="3167"/>
+ <eAnnotations source="positions.140" references="/0/CppClassHeader/%.32/%.1/%">
+ <details key="start" value="4357"/>
+ <details key="end" value="4382"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.131" references="/0/CppClassHeader/%.33">
- <details key="start" value="3171"/>
- <details key="end" value="3176"/>
- <details key="line" value="72"/>
+ <eAnnotations source="positions.141" references="/0/CppClassHeader/%.33">
+ <details key="start" value="4386"/>
+ <details key="end" value="4391"/>
+ <details key="line" value="92"/>
</eAnnotations>
- <eAnnotations source="positions.132" references="/0/CppClassHeader/%.34">
- <details key="start" value="3177"/>
- <details key="end" value="3271"/>
+ <eAnnotations source="positions.142" references="/0/CppClassHeader/%.34">
+ <details key="start" value="4392"/>
+ <details key="end" value="4486"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.133" references="/0/CppClassHeader/%.34/%">
- <details key="start" value="3177"/>
- <details key="end" value="3202"/>
+ <eAnnotations source="positions.143" references="/0/CppClassHeader/%.34/%">
+ <details key="start" value="4392"/>
+ <details key="end" value="4417"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.134" references="/0/CppClassHeader/%.34/%.1">
- <details key="start" value="3214"/>
- <details key="end" value="3270"/>
+ <eAnnotations source="positions.144" references="/0/CppClassHeader/%.34/%.1">
+ <details key="start" value="4429"/>
+ <details key="end" value="4485"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.135" references="/0/CppClassHeader/%.34/%.1/self">
+ <eAnnotations source="positions.145" references="/0/CppClassHeader/%.34/%.1/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.136" references="/0/CppClassHeader/%.34/%.1/%">
- <details key="start" value="3244"/>
- <details key="end" value="3269"/>
+ <eAnnotations source="positions.146" references="/0/CppClassHeader/%.34/%.1/%">
+ <details key="start" value="4459"/>
+ <details key="end" value="4484"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.137" references="/0/CppClassHeader/%.35">
- <details key="start" value="3273"/>
- <details key="end" value="3279"/>
- <details key="line" value="73"/>
+ <eAnnotations source="positions.147" references="/0/CppClassHeader/%.35">
+ <details key="start" value="4488"/>
+ <details key="end" value="4494"/>
+ <details key="line" value="93"/>
</eAnnotations>
- <eAnnotations source="positions.138" references="/0/CppClassHeader/%.36">
- <details key="start" value="3280"/>
- <details key="end" value="3370"/>
+ <eAnnotations source="positions.148" references="/0/CppClassHeader/%.36">
+ <details key="start" value="4495"/>
+ <details key="end" value="4585"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.139" references="/0/CppClassHeader/%.36/%">
- <details key="start" value="3280"/>
- <details key="end" value="3303"/>
+ <eAnnotations source="positions.149" references="/0/CppClassHeader/%.36/%">
+ <details key="start" value="4495"/>
+ <details key="end" value="4518"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.140" references="/0/CppClassHeader/%.36/%.1">
- <details key="start" value="3315"/>
- <details key="end" value="3369"/>
+ <eAnnotations source="positions.150" references="/0/CppClassHeader/%.36/%.1">
+ <details key="start" value="4530"/>
+ <details key="end" value="4584"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.141" references="/0/CppClassHeader/%.36/%.1/self">
+ <eAnnotations source="positions.151" references="/0/CppClassHeader/%.36/%.1/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.142" references="/0/CppClassHeader/%.36/%.1/%">
- <details key="start" value="3345"/>
- <details key="end" value="3368"/>
+ <eAnnotations source="positions.152" references="/0/CppClassHeader/%.36/%.1/%">
+ <details key="start" value="4560"/>
+ <details key="end" value="4583"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.143" references="/0/CppClassHeader/%.37">
- <details key="start" value="3372"/>
- <details key="end" value="3377"/>
- <details key="line" value="75"/>
+ <eAnnotations source="positions.153" references="/0/CppClassHeader/%.37">
+ <details key="start" value="4587"/>
+ <details key="end" value="4592"/>
+ <details key="line" value="95"/>
</eAnnotations>
- <eAnnotations source="positions.144" references="/0/CppClassHeader/%.38">
- <details key="start" value="3378"/>
- <details key="end" value="3468"/>
+ <eAnnotations source="positions.154" references="/0/CppClassHeader/%.38">
+ <details key="start" value="4593"/>
+ <details key="end" value="4683"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.145" references="/0/CppClassHeader/%.38/%">
- <details key="start" value="3378"/>
- <details key="end" value="3401"/>
+ <eAnnotations source="positions.155" references="/0/CppClassHeader/%.38/%">
+ <details key="start" value="4593"/>
+ <details key="end" value="4616"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.146" references="/0/CppClassHeader/%.38/%.1">
- <details key="start" value="3413"/>
- <details key="end" value="3467"/>
+ <eAnnotations source="positions.156" references="/0/CppClassHeader/%.38/%.1">
+ <details key="start" value="4628"/>
+ <details key="end" value="4682"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.147" references="/0/CppClassHeader/%.38/%.1/self">
+ <eAnnotations source="positions.157" references="/0/CppClassHeader/%.38/%.1/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.148" references="/0/CppClassHeader/%.38/%.1/%">
- <details key="start" value="3443"/>
- <details key="end" value="3466"/>
+ <eAnnotations source="positions.158" references="/0/CppClassHeader/%.38/%.1/%">
+ <details key="start" value="4658"/>
+ <details key="end" value="4681"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.149" references="/0/CppClassHeader/%.39">
- <details key="start" value="3470"/>
- <details key="end" value="3600"/>
- <details key="line" value="76"/>
+ <eAnnotations source="positions.159" references="/0/CppClassHeader/%.39">
+ <details key="start" value="4685"/>
+ <details key="end" value="4815"/>
+ <details key="line" value="96"/>
</eAnnotations>
- <eAnnotations source="positions.150" references="/0/CppClassHeader/%.40">
- <details key="start" value="3601"/>
- <details key="end" value="3656"/>
+ <eAnnotations source="positions.160" references="/0/CppClassHeader/%.40">
+ <details key="start" value="4816"/>
+ <details key="end" value="4871"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.151" references="/0/CppClassHeader/%.40/self">
+ <eAnnotations source="positions.161" references="/0/CppClassHeader/%.40/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.152" references="/0/CppClassHeader/%.40/%">
- <details key="start" value="3631"/>
- <details key="end" value="3655"/>
+ <eAnnotations source="positions.162" references="/0/CppClassHeader/%.40/%">
+ <details key="start" value="4846"/>
+ <details key="end" value="4870"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.153" references="/0/CppClassHeader/%.41">
- <details key="start" value="3658"/>
- <details key="end" value="3659"/>
- <details key="line" value="80"/>
+ <eAnnotations source="positions.163" references="/0/CppClassHeader/%.41">
+ <details key="start" value="4873"/>
+ <details key="end" value="4874"/>
+ <details key="line" value="100"/>
</eAnnotations>
- <eAnnotations source="positions.154" references="/0/CppClassHeader/%.42">
- <details key="start" value="3660"/>
- <details key="end" value="3715"/>
+ <eAnnotations source="positions.164" references="/0/CppClassHeader/%.42">
+ <details key="start" value="4875"/>
+ <details key="end" value="4930"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.155" references="/0/CppClassHeader/%.42/self">
+ <eAnnotations source="positions.165" references="/0/CppClassHeader/%.42/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.156" references="/0/CppClassHeader/%.42/%">
- <details key="start" value="3690"/>
- <details key="end" value="3714"/>
+ <eAnnotations source="positions.166" references="/0/CppClassHeader/%.42/%">
+ <details key="start" value="4905"/>
+ <details key="end" value="4929"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.157" references="/0/CppClassHeader/%.43">
- <details key="start" value="3717"/>
- <details key="end" value="3782"/>
- <details key="line" value="81"/>
+ <eAnnotations source="positions.167" references="/0/CppClassHeader/%.43">
+ <details key="start" value="4932"/>
+ <details key="end" value="4997"/>
+ <details key="line" value="101"/>
</eAnnotations>
- <eAnnotations source="positions.158" references="/0/CppClassHeader/%.44">
- <details key="start" value="3782"/>
- <details key="end" value="3974"/>
- <details key="line" value="83"/>
+ <eAnnotations source="positions.168" references="/0/CppClassHeader/%.44">
+ <details key="start" value="4997"/>
+ <details key="end" value="5189"/>
+ <details key="line" value="103"/>
</eAnnotations>
- <eAnnotations source="positions.159" references="/0/CppClassHeader/%.44/%">
- <details key="start" value="3800"/>
- <details key="end" value="3926"/>
- <details key="line" value="84"/>
+ <eAnnotations source="positions.169" references="/0/CppClassHeader/%.44/%">
+ <details key="start" value="5015"/>
+ <details key="end" value="5141"/>
+ <details key="line" value="104"/>
</eAnnotations>
- <eAnnotations source="positions.160" references="/0/CppClassHeader/%.44/%.1">
- <details key="start" value="3927"/>
- <details key="end" value="3966"/>
+ <eAnnotations source="positions.170" references="/0/CppClassHeader/%.44/%.1">
+ <details key="start" value="5142"/>
+ <details key="end" value="5181"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.161" references="/0/CppClassHeader/%.44/%.1/self">
+ <eAnnotations source="positions.171" references="/0/CppClassHeader/%.44/%.1/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.162" references="/0/CppClassHeader/%.44/%.1/%">
- <details key="start" value="3960"/>
- <details key="end" value="3965"/>
+ <eAnnotations source="positions.172" references="/0/CppClassHeader/%.44/%.1/%">
+ <details key="start" value="5175"/>
+ <details key="end" value="5180"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.163" references="/0/CppClassHeader/%.44/%.2">
- <details key="start" value="3968"/>
- <details key="end" value="3969"/>
- <details key="line" value="87"/>
+ <eAnnotations source="positions.173" references="/0/CppClassHeader/%.44/%.2">
+ <details key="start" value="5183"/>
+ <details key="end" value="5184"/>
+ <details key="line" value="107"/>
</eAnnotations>
- <eAnnotations source="positions.164" references="/0/CppClassHeader/%.44/%.3">
- <details key="start" value="3786"/>
- <details key="end" value="3798"/>
+ <eAnnotations source="positions.174" references="/0/CppClassHeader/%.44/%.3">
+ <details key="start" value="5001"/>
+ <details key="end" value="5013"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.165" references="/0/CppClassHeader/%.44/%.3/self">
+ <eAnnotations source="positions.175" references="/0/CppClassHeader/%.44/%.3/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.166" references="/0/CppClassHeader/%.45">
- <details key="start" value="3975"/>
- <details key="end" value="4039"/>
- <details key="line" value="88"/>
+ <eAnnotations source="positions.176" references="/0/CppClassHeader/%.45">
+ <details key="start" value="5190"/>
+ <details key="end" value="5254"/>
+ <details key="line" value="108"/>
</eAnnotations>
- <eAnnotations source="positions.167" references="/0/CppClassHeader/%.46">
- <details key="start" value="4040"/>
- <details key="end" value="4078"/>
+ <eAnnotations source="positions.177" references="/0/CppClassHeader/%.46">
+ <details key="start" value="5255"/>
+ <details key="end" value="5293"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.168" references="/0/CppClassHeader/%.46/self">
+ <eAnnotations source="positions.178" references="/0/CppClassHeader/%.46/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.169" references="/0/CppClassHeader/%.46/%">
- <details key="start" value="4073"/>
- <details key="end" value="4077"/>
+ <eAnnotations source="positions.179" references="/0/CppClassHeader/%.46/%">
+ <details key="start" value="5288"/>
+ <details key="end" value="5292"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.170" references="/0/CppClassHeader/%.47">
- <details key="start" value="4080"/>
- <details key="end" value="4081"/>
- <details key="line" value="91"/>
+ <eAnnotations source="positions.180" references="/0/CppClassHeader/%.47">
+ <details key="start" value="5295"/>
+ <details key="end" value="5296"/>
+ <details key="line" value="111"/>
</eAnnotations>
- <eAnnotations source="positions.171" references="/0/CppClassHeader/%.48">
- <details key="start" value="4082"/>
- <details key="end" value="4091"/>
+ <eAnnotations source="positions.181" references="/0/CppClassHeader/%.48">
+ <details key="start" value="5297"/>
+ <details key="end" value="5306"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.172" references="/0/CppClassHeader/%.48/self">
+ <eAnnotations source="positions.182" references="/0/CppClassHeader/%.48/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.173" references="/0/CppClassHeader/%.49">
- <details key="start" value="4093"/>
- <details key="end" value="4178"/>
- <details key="line" value="92"/>
+ <eAnnotations source="positions.183" references="/0/CppClassHeader/%.49">
+ <details key="start" value="5308"/>
+ <details key="end" value="5393"/>
+ <details key="line" value="112"/>
</eAnnotations>
- <eAnnotations source="positions.174" references="/0/CppClassHeader/%.50">
- <details key="start" value="4179"/>
- <details key="end" value="4189"/>
+ <eAnnotations source="positions.184" references="/0/CppClassHeader/%.50">
+ <details key="start" value="5394"/>
+ <details key="end" value="5404"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.175" references="/0/CppClassHeader/%.50/class">
- <details key="start" value="4179"/>
- <details key="end" value="4184"/>
+ <eAnnotations source="positions.185" references="/0/CppClassHeader/%.50/class">
+ <details key="start" value="5394"/>
+ <details key="end" value="5399"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.176" references="/0/CppClassHeader/%.51">
- <details key="start" value="4191"/>
- <details key="end" value="4275"/>
- <details key="line" value="94"/>
+ <eAnnotations source="positions.186" references="/0/CppClassHeader/%.51">
+ <details key="start" value="5406"/>
+ <details key="end" value="5490"/>
+ <details key="line" value="114"/>
</eAnnotations>
- <eAnnotations source="positions.177" references="/0/CppClassHeader/class">
- <details key="start" value="2204"/>
- <details key="end" value="2222"/>
- <details key="line" value="47"/>
+ <eAnnotations source="positions.187" references="/0/CppClassHeader/class">
+ <details key="start" value="3419"/>
+ <details key="end" value="3437"/>
+ <details key="line" value="67"/>
</eAnnotations>
</ecore:EAnnotation>
</xmi:XMI>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppClassHeader.mtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppClassHeader.mtl
index 227947b9fd0..d9b6372d9ed 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppClassHeader.mtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppClassHeader.mtl
@@ -11,10 +11,10 @@
[import org::eclipse::papyrus::cpp::codegen::acceleo::util::clazz::CppClassAttributesDeclaration/]
[import org::eclipse::papyrus::cpp::codegen::acceleo::util::clazz::CppClassOperationsDeclaration/]
[import org::eclipse::papyrus::cpp::codegen::acceleo::util::clazz::CppClassOperationsImplementation/]
+[import org::eclipse::papyrus::cpp::codegen::acceleo::util::operation::CppOperations/]
[import org::eclipse::papyrus::cpp::codegen::acceleo::util::CppTemplates/]
[import org::eclipse::papyrus::cpp::codegen::acceleo::util::CppDocumentation/]
-
[template public classUnionOrStruct(classifier : Classifier)]
[if (hasStereotype(C_Cpp::Union))]
'union'
@@ -33,14 +33,34 @@
TODO: should be disabled by default, since non-static members can be initialized directly
in C++ 011/]
[template public defaultInitializer(classifier : Classifier) post(trim())]
-[let attributeList : Set(Property) = attribute->select(
- (isStatic = false) and
- (defaultValue <> null) and
- (defaultValue.stringValue() <> null))]
-[if not attributeList->isEmpty()]
- [classifier.name/]() : [for (a : Property | attributeList) separator(', ')
- ][name/]([defaultValue.stringValue()/])[/for] {}
-[/if][/let]
+[comment
+Bug 422373: The default initializer should not be generated if there are any user-defined
+ constructors. In plain C++ code, the existence of a constructor with parameters
+ means that the compiler will not synthesize a default one.
+
+ E.g., this would be invalid in plain C++ code:
+ class T1 { };
+ class T2 { public: T(int); };
+ T1 * t1 = new T1; // OK, sythesized default constructor used
+ T2 * t2a = new T2(5); // OK, user-defined constructor used
+ T2 * t2b = new T2; // ERROR, default constructor was not synthesized
+
+ Also, if the user has provided a default constructor in the code, we don't need
+ to generate a second copy here. A default constructor should only be generated
+ here if the compiler would have synthesized one anyhow. Otherwise the default
+ property values should be set in the constructors that are generated by
+ CppClassOperationsDeclaration.
+/]
+[if getOwnedOperations()->any(hasStereotype(l2::Create)) = null]
+ [let attributeList : Set(Property) = attribute->select(
+ (isStatic = false) and
+ (defaultValue <> null) and
+ (defaultValue.stringValue() <> null))]
+ [if not attributeList->isEmpty()]
+ [classifier.name/]() : [for (a : Property | attributeList) separator(', ')
+ ][name/]([defaultValue.stringValue()/])[/for] {}
+ [/if][/let]
+[/if]
[/template]
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppAttribute.mtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppAttribute.mtl
index 4e9c816f748..68cfba58136 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppAttribute.mtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppAttribute.mtl
@@ -36,16 +36,20 @@
[comment
return a list of owned attributes, since this is not supported directly on a classifier/]
[query public getOwnedAttributes(cl : Classifier) : Sequence(Property) =
- if (cl.oclIsKindOf(Class)) then
+ if cl.oclIsKindOf(Class) then
oclAsType(Class).ownedAttribute
else
- if (cl.oclIsKindOf(DataType)) then
+ if cl.oclIsKindOf(DataType) then
oclAsType(DataType).ownedAttribute
else
- if (cl.oclIsKindOf(Interface)) then
+ if cl.oclIsKindOf(Interface) then
oclAsType(Interface).ownedAttribute
else
- Sequence{}
+ if cl.oclIsKindOf(Signal) then
+ oclAsType(Signal).ownedAttribute
+ else
+ Sequence{}
+ endif
endif
endif
endif
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassFriendDeclaration.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassFriendDeclaration.emtl
index 66d52bdae88..d97b19eb266 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassFriendDeclaration.emtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassFriendDeclaration.emtl
@@ -8,12 +8,12 @@
<takesTypesFrom href="http://www.eclipse.org/papyrus/C_Cpp/1#/"/>
</input>
<imports href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0"/>
- <imports href="platform:/plugin/utils/CppGenUtils.emtl#/0"/>
+ <imports href="../../../utils/CppGenUtils.emtl#/0"/>
<ownedModuleElement xsi:type="mtl:Template" name="CppClassFriendDeclaration" visibility="Public">
<body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="friend class "/>
<body xsi:type="mtl:QueryInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- <definition href="platform:/plugin/utils/CppGenUtils.emtl#/0/cppQualifiedName"/>
+ <definition href="../../../utils/CppGenUtils.emtl#/0/cppQualifiedName"/>
<argument xsi:type="ocl.ecore:VariableExp" name="friend" referredVariable="/0/CppClassFriendDeclaration/friend">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
</argument>
@@ -147,7 +147,7 @@
<contents xsi:type="ocl.ecore:Constraint"/>
</eAnnotations>
<eAnnotations source="MTL">
- <references href="platform:/plugin/utils/CppGenUtils.emtl#/0/cppQualifiedName"/>
+ <references href="../../../utils/CppGenUtils.emtl#/0/cppQualifiedName"/>
</eAnnotations>
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
<eParameters name="arg0">
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeClassDeclaration.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeClassDeclaration.emtl
index 182fe336b92..616afb82cc8 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeClassDeclaration.emtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeClassDeclaration.emtl
@@ -8,8 +8,8 @@
<takesTypesFrom href="http://www.eclipse.org/papyrus/C_Cpp/1#/"/>
</input>
<imports href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0"/>
- <imports href="platform:/plugin/utils/CppGenUtils.emtl#/0"/>
- <imports href="platform:/plugin/utils/ClassUtils.emtl#/0"/>
+ <imports href="../../../utils/CppGenUtils.emtl#/0"/>
+ <imports href="../../../utils/ClassUtils.emtl#/0"/>
<imports href="CppClassIncludeDeclaration.emtl#/0"/>
<ownedModuleElement xsi:type="mtl:Comment">
<body startPosition="412" endPosition="421" value=" USED??? "/>
@@ -17,7 +17,7 @@
<ownedModuleElement xsi:type="mtl:Template" name="CppClassIncludeClassDeclarationTemplate" visibility="Public">
<body xsi:type="mtl:QueryInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- <definition href="platform:/plugin/utils/CppGenUtils.emtl#/0/openNS"/>
+ <definition href="../../../utils/CppGenUtils.emtl#/0/openNS"/>
<argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/7">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>
</argument>
@@ -47,7 +47,7 @@
<body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=";&#xA;"/>
<body xsi:type="mtl:QueryInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- <definition href="platform:/plugin/utils/CppGenUtils.emtl#/0/closeNS"/>
+ <definition href="../../../utils/CppGenUtils.emtl#/0/closeNS"/>
<argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/11">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>
</argument>
@@ -115,7 +115,7 @@
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
</argument>
<argument xsi:type="mtl:QueryInvocation" eType="/3/Sequence(Classifier)">
- <definition href="platform:/plugin/utils/ClassUtils.emtl#/0/includedClassifiers"/>
+ <definition href="../../../utils/ClassUtils.emtl#/0/includedClassifiers"/>
<argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/23">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
</argument>
@@ -167,17 +167,35 @@
<body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;"/>
<ifExpr xsi:type="ocl.ecore:OperationCallExp">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
- <source xsi:type="ocl.ecore:PropertyCallExp">
- <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/>
- <source xsi:type="ocl.ecore:VariableExp" name="cl" referredVariable="/0/CppClassAllIncludesDeclaration.1/%/cl">
- <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
+ <source xsi:type="ocl.ecore:OperationCallExp">
+ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
+ <source xsi:type="ocl.ecore:PropertyCallExp">
+ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/>
+ <source xsi:type="ocl.ecore:VariableExp" name="cl" referredVariable="/0/CppClassAllIncludesDeclaration.1/%/cl">
+ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
+ </source>
+ <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/owner"/>
</source>
- <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/owner"/>
+ <argument xsi:type="ocl.ecore:NullLiteralExp">
+ <eType xsi:type="ocl.ecore:VoidType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclVoid"/>
+ </argument>
+ <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/%3C%3E"/>
</source>
- <argument xsi:type="ocl.ecore:TypeExp" eType="/8/Package">
- <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Package"/>
+ <argument xsi:type="ocl.ecore:OperationCallExp">
+ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
+ <source xsi:type="ocl.ecore:PropertyCallExp">
+ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/>
+ <source xsi:type="ocl.ecore:VariableExp" name="cl" referredVariable="/0/CppClassAllIncludesDeclaration.1/%/cl">
+ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
+ </source>
+ <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/owner"/>
+ </source>
+ <argument xsi:type="ocl.ecore:TypeExp" eType="/8/Package">
+ <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Package"/>
+ </argument>
+ <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclIsKindOf"/>
</argument>
- <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclIsKindOf"/>
+ <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean_Class/and"/>
</ifExpr>
</body>
<ifExpr xsi:type="ocl.ecore:OperationCallExp">
@@ -384,7 +402,7 @@
<contents xsi:type="ocl.ecore:Constraint"/>
</eAnnotations>
<eAnnotations source="MTL">
- <references href="platform:/plugin/utils/CppGenUtils.emtl#/0/openNS"/>
+ <references href="../../../utils/CppGenUtils.emtl#/0/openNS"/>
</eAnnotations>
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
<eParameters name="arg0">
@@ -396,7 +414,7 @@
<contents xsi:type="ocl.ecore:Constraint"/>
</eAnnotations>
<eAnnotations source="MTL">
- <references href="platform:/plugin/utils/CppGenUtils.emtl#/0/closeNS"/>
+ <references href="../../../utils/CppGenUtils.emtl#/0/closeNS"/>
</eAnnotations>
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
<eParameters name="arg0">
@@ -408,9 +426,9 @@
<contents xsi:type="ocl.ecore:Constraint"/>
</eAnnotations>
<eAnnotations source="MTL">
- <references href="platform:/plugin/utils/ClassUtils.emtl#/0/includedClassifiers"/>
+ <references href="../../../utils/ClassUtils.emtl#/0/includedClassifiers"/>
</eAnnotations>
- <eType xsi:type="ocl.ecore:SequenceType" href="platform:/plugin/utils/ClassUtils.emtl#/3/Sequence(Classifier)"/>
+ <eType xsi:type="ocl.ecore:SequenceType" href="../../../utils/ClassUtils.emtl#/3/Sequence(Classifier)"/>
<eParameters name="cl">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
</eParameters>
@@ -887,210 +905,235 @@
</eAnnotations>
<eAnnotations source="positions.47" references="/0/CppClassAllIncludesDeclaration.1">
<details key="start" value="1204"/>
- <details key="end" value="2101"/>
+ <details key="end" value="2122"/>
<details key="line" value="32"/>
</eAnnotations>
<eAnnotations source="positions.48" references="/0/CppClassAllIncludesDeclaration.1/%">
<details key="start" value="1303"/>
- <details key="end" value="2089"/>
+ <details key="end" value="2110"/>
<details key="line" value="33"/>
</eAnnotations>
<eAnnotations source="positions.49" references="/0/CppClassAllIncludesDeclaration.1/%/%">
<details key="start" value="1498"/>
- <details key="end" value="2082"/>
+ <details key="end" value="2103"/>
<details key="line" value="36"/>
</eAnnotations>
<eAnnotations source="positions.50" references="/0/CppClassAllIncludesDeclaration.1/%/%/%">
<details key="start" value="1582"/>
- <details key="end" value="2075"/>
+ <details key="end" value="2096"/>
<details key="line" value="37"/>
</eAnnotations>
<eAnnotations source="positions.51" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%">
<details key="start" value="1855"/>
- <details key="end" value="1967"/>
+ <details key="end" value="1988"/>
<details key="line" value="40"/>
</eAnnotations>
<eAnnotations source="positions.52" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%/%">
- <details key="start" value="1893"/>
- <details key="end" value="1956"/>
+ <details key="start" value="1914"/>
+ <details key="end" value="1977"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.53" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%/%/%">
- <details key="start" value="1893"/>
- <details key="end" value="1920"/>
+ <details key="start" value="1914"/>
+ <details key="end" value="1941"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.54" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%/%/%/%">
- <details key="start" value="1893"/>
- <details key="end" value="1901"/>
+ <details key="start" value="1914"/>
+ <details key="end" value="1922"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.55" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%/%/%/%/cl">
- <details key="start" value="1893"/>
- <details key="end" value="1895"/>
+ <details key="start" value="1914"/>
+ <details key="end" value="1916"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.56" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%/%/%/%.1">
- <details key="start" value="1912"/>
- <details key="end" value="1919"/>
+ <details key="start" value="1933"/>
+ <details key="end" value="1940"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.57" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%/%.1">
- <details key="start" value="1958"/>
- <details key="end" value="1959"/>
+ <details key="start" value="1979"/>
+ <details key="end" value="1980"/>
<details key="line" value="42"/>
</eAnnotations>
<eAnnotations source="positions.58" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%/%.2">
<details key="start" value="1859"/>
- <details key="end" value="1890"/>
+ <details key="end" value="1911"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.59" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%/%.2/%">
<details key="start" value="1860"/>
+ <details key="end" value="1876"/>
+ <details key="line" value="0"/>
+ </eAnnotations>
+ <eAnnotations source="positions.60" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%/%.2/%/%">
+ <details key="start" value="1860"/>
<details key="end" value="1868"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.60" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%/%.2/%/cl">
+ <eAnnotations source="positions.61" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%/%.2/%/%/cl">
<details key="start" value="1860"/>
<details key="end" value="1862"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.61" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%/%.2/%.1">
+ <eAnnotations source="positions.62" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%/%.2/%/%.1">
+ <details key="start" value="1872"/>
+ <details key="end" value="1876"/>
+ <details key="line" value="0"/>
+ </eAnnotations>
+ <eAnnotations source="positions.63" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%/%.2/%.1">
<details key="start" value="1881"/>
- <details key="end" value="1888"/>
+ <details key="end" value="1910"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.62" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%.1">
+ <eAnnotations source="positions.64" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%/%.2/%.1/%">
+ <details key="start" value="1881"/>
+ <details key="end" value="1889"/>
+ <details key="line" value="0"/>
+ </eAnnotations>
+ <eAnnotations source="positions.65" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%/%.2/%.1/%/cl">
+ <details key="start" value="1881"/>
+ <details key="end" value="1883"/>
+ <details key="line" value="0"/>
+ </eAnnotations>
+ <eAnnotations source="positions.66" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%/%.2/%.1/%.1">
+ <details key="start" value="1902"/>
+ <details key="end" value="1909"/>
+ <details key="line" value="0"/>
+ </eAnnotations>
+ <eAnnotations source="positions.67" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%.1">
<details key="start" value="1585"/>
<details key="end" value="1641"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.63" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%.1/%">
+ <eAnnotations source="positions.68" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%.1/%">
<details key="start" value="1586"/>
<details key="end" value="1610"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.64" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%.1/%/self">
+ <eAnnotations source="positions.69" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%.1/%/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.65" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%.1/%/%">
+ <eAnnotations source="positions.70" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%.1/%/%">
<details key="start" value="1598"/>
<details key="end" value="1609"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.66" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%.1/%.1">
+ <eAnnotations source="positions.71" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%.1/%.1">
<details key="start" value="1614"/>
<details key="end" value="1640"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.67" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%.1/%.1/self">
+ <eAnnotations source="positions.72" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%.1/%.1/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.68" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%.1/%.1/%">
+ <eAnnotations source="positions.73" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%.1/%.1/%">
<details key="start" value="1626"/>
<details key="end" value="1639"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.69" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%.2">
- <details key="start" value="1970"/>
- <details key="end" value="2070"/>
+ <eAnnotations source="positions.74" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%.2">
+ <details key="start" value="1991"/>
+ <details key="end" value="2091"/>
<details key="line" value="43"/>
</eAnnotations>
- <eAnnotations source="positions.70" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%.2/%">
- <details key="start" value="2037"/>
- <details key="end" value="2065"/>
+ <eAnnotations source="positions.75" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%.2/%">
+ <details key="start" value="2058"/>
+ <details key="end" value="2086"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.71" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%.2/%/self">
+ <eAnnotations source="positions.76" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%.2/%/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.72" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%.2/%.1">
- <details key="start" value="2067"/>
- <details key="end" value="2068"/>
+ <eAnnotations source="positions.77" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%.2/%.1">
+ <details key="start" value="2088"/>
+ <details key="end" value="2089"/>
<details key="line" value="46"/>
</eAnnotations>
- <eAnnotations source="positions.73" references="/0/CppClassAllIncludesDeclaration.1/%/%/%.1">
+ <eAnnotations source="positions.78" references="/0/CppClassAllIncludesDeclaration.1/%/%/%.1">
<details key="start" value="1501"/>
<details key="end" value="1578"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.74" references="/0/CppClassAllIncludesDeclaration.1/%/%/%.1/%">
+ <eAnnotations source="positions.79" references="/0/CppClassAllIncludesDeclaration.1/%/%/%.1/%">
<details key="start" value="1502"/>
<details key="end" value="1550"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.75" references="/0/CppClassAllIncludesDeclaration.1/%/%/%.1/%/%">
+ <eAnnotations source="positions.80" references="/0/CppClassAllIncludesDeclaration.1/%/%/%.1/%/%">
<details key="start" value="1502"/>
<details key="end" value="1515"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.76" references="/0/CppClassAllIncludesDeclaration.1/%/%/%.1/%/%/cl">
+ <eAnnotations source="positions.81" references="/0/CppClassAllIncludesDeclaration.1/%/%/%.1/%/%/cl">
<details key="start" value="1503"/>
<details key="end" value="1505"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.77" references="/0/CppClassAllIncludesDeclaration.1/%/%/%.1/%/%/class">
+ <eAnnotations source="positions.82" references="/0/CppClassAllIncludesDeclaration.1/%/%/%.1/%/%/class">
<details key="start" value="1509"/>
<details key="end" value="1514"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.78" references="/0/CppClassAllIncludesDeclaration.1/%/%/%.1/%/%.1">
+ <eAnnotations source="positions.83" references="/0/CppClassAllIncludesDeclaration.1/%/%/%.1/%/%.1">
<details key="start" value="1520"/>
<details key="end" value="1550"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.79" references="/0/CppClassAllIncludesDeclaration.1/%/%/%.1/%/%.1/%">
+ <eAnnotations source="positions.84" references="/0/CppClassAllIncludesDeclaration.1/%/%/%.1/%/%.1/%">
<details key="start" value="1525"/>
<details key="end" value="1549"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.80" references="/0/CppClassAllIncludesDeclaration.1/%/%/%.1/%/%.1/%/self">
+ <eAnnotations source="positions.85" references="/0/CppClassAllIncludesDeclaration.1/%/%/%.1/%/%.1/%/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.81" references="/0/CppClassAllIncludesDeclaration.1/%/%/%.1/%/%.1/%/%">
+ <eAnnotations source="positions.86" references="/0/CppClassAllIncludesDeclaration.1/%/%/%.1/%/%.1/%/%">
<details key="start" value="1539"/>
<details key="end" value="1548"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.82" references="/0/CppClassAllIncludesDeclaration.1/%/%/%.1/%.1">
+ <eAnnotations source="positions.87" references="/0/CppClassAllIncludesDeclaration.1/%/%/%.1/%.1">
<details key="start" value="1554"/>
<details key="end" value="1577"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.83" references="/0/CppClassAllIncludesDeclaration.1/%/%/%.1/%.1/self">
+ <eAnnotations source="positions.88" references="/0/CppClassAllIncludesDeclaration.1/%/%/%.1/%.1/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.84" references="/0/CppClassAllIncludesDeclaration.1/%/%/%.1/%.1/%">
+ <eAnnotations source="positions.89" references="/0/CppClassAllIncludesDeclaration.1/%/%/%.1/%.1/%">
<details key="start" value="1568"/>
<details key="end" value="1576"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.85" references="/0/CppClassAllIncludesDeclaration.1/%/cl">
+ <eAnnotations source="positions.90" references="/0/CppClassAllIncludesDeclaration.1/%/cl">
<details key="start" value="1309"/>
<details key="end" value="1324"/>
<details key="line" value="33"/>
</eAnnotations>
- <eAnnotations source="positions.86" references="/0/CppClassAllIncludesDeclaration.1/%/list">
+ <eAnnotations source="positions.91" references="/0/CppClassAllIncludesDeclaration.1/%/list">
<details key="start" value="1327"/>
<details key="end" value="1331"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.87" references="/0/CppClassAllIncludesDeclaration.1/class">
+ <eAnnotations source="positions.92" references="/0/CppClassAllIncludesDeclaration.1/class">
<details key="start" value="1252"/>
<details key="end" value="1270"/>
<details key="line" value="32"/>
</eAnnotations>
- <eAnnotations source="positions.88" references="/0/CppClassAllIncludesDeclaration.1/list">
+ <eAnnotations source="positions.93" references="/0/CppClassAllIncludesDeclaration.1/list">
<details key="start" value="1272"/>
<details key="end" value="1299"/>
<details key="line" value="32"/>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeClassDeclaration.mtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeClassDeclaration.mtl
index 29b005e41a8..0cf24ac0874 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeClassDeclaration.mtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeClassDeclaration.mtl
@@ -37,7 +37,7 @@
[if(oclIsKindOf(Enumeration) or oclIsKindOf(PrimitiveType))]
[comment Enumeration is not defined in a separate file, but in the package that owns it
=> include the owning package (might be a duplicate input, if owning package is also the owner of current class/]
- [if (cl.owner.oclIsKindOf(Package))]
+ [if (cl.owner <> null and cl.owner.oclIsKindOf(Package))]
[cl.owner.oclAsType(Package).CppOwnerPackageIncludeDeclaration()/]
[/if]
[else]
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeDeclaration.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeDeclaration.emtl
index 24d14dd0bdb..706b27a273b 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeDeclaration.emtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeDeclaration.emtl
@@ -8,7 +8,7 @@
<takesTypesFrom href="http://www.eclipse.org/papyrus/C_Cpp/1#/"/>
</input>
<imports href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0"/>
- <imports href="platform:/plugin/preferences/CppCodeGenUtils.emtl#/0"/>
+ <imports href="../../../preferences/CppCodeGenUtils.emtl#/0"/>
<ownedModuleElement xsi:type="mtl:Query" name="includeName" visibility="Public">
<parameter name="ne">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement"/>
@@ -119,7 +119,7 @@
</source>
<argument xsi:type="mtl:QueryInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- <definition href="platform:/plugin/preferences/CppCodeGenUtils.emtl#/0/getHeaderSuffix"/>
+ <definition href="../../../preferences/CppCodeGenUtils.emtl#/0/getHeaderSuffix"/>
<argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/5">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement"/>
</argument>
@@ -308,7 +308,7 @@
<contents xsi:type="ocl.ecore:Constraint"/>
</eAnnotations>
<eAnnotations source="MTL">
- <references href="platform:/plugin/preferences/CppCodeGenUtils.emtl#/0/getHeaderSuffix"/>
+ <references href="../../../preferences/CppCodeGenUtils.emtl#/0/getHeaderSuffix"/>
</eAnnotations>
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
</eOperations>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassInheritedDeclarations.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassInheritedDeclarations.emtl
index 08f2e3c32d2..0dbc6af346a 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassInheritedDeclarations.emtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassInheritedDeclarations.emtl
@@ -8,7 +8,7 @@
<takesTypesFrom href="http://www.eclipse.org/papyrus/C_Cpp/1#/"/>
</input>
<imports href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0"/>
- <imports href="platform:/plugin/utils/CppGenUtils.emtl#/0"/>
+ <imports href="../../../utils/CppGenUtils.emtl#/0"/>
<ownedModuleElement xsi:type="mtl:Comment">
<body startPosition="249" endPosition="516" value="&#xA;Return a list of relationships that are either Generalizations or InterfaceRealiazations&#xA;and the target does not point to a classifier that has the no-code-gen Stereotype&#xA;TODO: not sure if it makes sense NOT to declare an inheritance, since we do not generate code.&#xA;"/>
</ownedModuleElement>
@@ -155,7 +155,7 @@
<body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=" "/>
<body xsi:type="mtl:QueryInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- <definition href="platform:/plugin/utils/CppGenUtils.emtl#/0/cppQualifiedName"/>
+ <definition href="../../../utils/CppGenUtils.emtl#/0/cppQualifiedName"/>
<argument xsi:type="ocl.ecore:OperationCallExp">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
<source xsi:type="ocl.ecore:OperationCallExp">
@@ -275,7 +275,7 @@
<contents xsi:type="ocl.ecore:Constraint"/>
</eAnnotations>
<eAnnotations source="MTL">
- <references href="platform:/plugin/utils/CppGenUtils.emtl#/0/cppQualifiedName"/>
+ <references href="../../../utils/CppGenUtils.emtl#/0/cppQualifiedName"/>
</eAnnotations>
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
<eParameters name="arg0">
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassTypeAndEnum.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassTypeAndEnum.emtl
index 3f959ab9cf8..bdf0e257ca7 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassTypeAndEnum.emtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassTypeAndEnum.emtl
@@ -8,7 +8,7 @@
<takesTypesFrom href="http://www.eclipse.org/papyrus/C_Cpp/1#/"/>
</input>
<imports href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0"/>
- <imports href="platform:/plugin/utils/CppGenUtils.emtl#/0"/>
+ <imports href="../../../utils/CppGenUtils.emtl#/0"/>
<imports href="../CppPrimitiveTypes.emtl#/0"/>
<imports href="../CppEnumerations.emtl#/0"/>
<ownedModuleElement xsi:type="mtl:Template" name="TypeAndEnumForVisibility" visibility="Public">
@@ -157,7 +157,7 @@
<body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=" "/>
<body xsi:type="mtl:QueryInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- <definition href="platform:/plugin/utils/CppGenUtils.emtl#/0/getSection"/>
+ <definition href="../../../utils/CppGenUtils.emtl#/0/getSection"/>
<argument xsi:type="ocl.ecore:EnumLiteralExp">
<eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/4.0.0/UML#//VisibilityKind"/>
<referredEnumLiteral xsi:type="ecore:EEnumLiteral" href="http://www.eclipse.org/uml2/4.0.0/UML#//VisibilityKind/public"/>
@@ -176,7 +176,7 @@
<body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA; "/>
<body xsi:type="mtl:QueryInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- <definition href="platform:/plugin/utils/CppGenUtils.emtl#/0/getSection"/>
+ <definition href="../../../utils/CppGenUtils.emtl#/0/getSection"/>
<argument xsi:type="ocl.ecore:EnumLiteralExp">
<eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/4.0.0/UML#//VisibilityKind"/>
<referredEnumLiteral xsi:type="ecore:EEnumLiteral" href="http://www.eclipse.org/uml2/4.0.0/UML#//VisibilityKind/protected"/>
@@ -195,7 +195,7 @@
<body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA; "/>
<body xsi:type="mtl:QueryInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- <definition href="platform:/plugin/utils/CppGenUtils.emtl#/0/getSection"/>
+ <definition href="../../../utils/CppGenUtils.emtl#/0/getSection"/>
<argument xsi:type="ocl.ecore:EnumLiteralExp">
<eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/4.0.0/UML#//VisibilityKind"/>
<referredEnumLiteral xsi:type="ecore:EEnumLiteral" href="http://www.eclipse.org/uml2/4.0.0/UML#//VisibilityKind/private"/>
@@ -328,7 +328,7 @@
<contents xsi:type="ocl.ecore:Constraint"/>
</eAnnotations>
<eAnnotations source="MTL">
- <references href="platform:/plugin/utils/CppGenUtils.emtl#/0/getSection"/>
+ <references href="../../../utils/CppGenUtils.emtl#/0/getSection"/>
</eAnnotations>
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
<eParameters name="arg0">
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppOperations.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppOperations.emtl
index a737be04e7c..7fe38baaebb 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppOperations.emtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppOperations.emtl
@@ -11,8 +11,8 @@
<takesTypesFrom href="http://www.eclipse.org/uml2/4.0.0/UML/Profile/L2#/"/>
</input>
<imports href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0"/>
- <imports href="platform:/plugin/utils/CppGenUtils.emtl#/0"/>
- <imports href="platform:/plugin/utils/Modifier.emtl#/0"/>
+ <imports href="../../../utils/CppGenUtils.emtl#/0"/>
+ <imports href="../../../utils/Modifier.emtl#/0"/>
<imports href="../CppDocumentation.emtl#/0"/>
<imports href="CppParameter.emtl#/0"/>
<imports href="../CppTemplates.emtl#/0"/>
@@ -180,35 +180,47 @@
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
</parameter>
</ownedModuleElement>
+ <ownedModuleElement xsi:type="mtl:Query" name="isConsOrDestructor" visibility="Public">
+ <parameter name="operation">
+ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
+ </parameter>
+ <expression xsi:type="ocl.ecore:OperationCallExp">
+ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
+ <source xsi:type="mtl:QueryInvocation">
+ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
+ <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/>
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/19">
+ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
+ </argument>
+ <argument xsi:type="ocl.ecore:TypeExp" eType="/5/Create">
+ <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML/Profile/L2#//Create"/>
+ </argument>
+ </source>
+ <argument xsi:type="mtl:QueryInvocation">
+ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
+ <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/>
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/19">
+ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
+ </argument>
+ <argument xsi:type="ocl.ecore:TypeExp" eType="/5/Destroy">
+ <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML/Profile/L2#//Destroy"/>
+ </argument>
+ </argument>
+ <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean_Class/or"/>
+ </expression>
+ <type xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
+ </ownedModuleElement>
<ownedModuleElement xsi:type="mtl:Query" name="ConsDestructorOrVoid" visibility="Public">
<parameter name="operation">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
</parameter>
<expression xsi:type="ocl.ecore:IfExp">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- <condition xsi:type="ocl.ecore:OperationCallExp">
+ <condition xsi:type="mtl:QueryInvocation" definition="/0/isConsOrDestructor">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
- <source xsi:type="mtl:QueryInvocation">
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
- <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/>
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/19">
- <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
- </argument>
- <argument xsi:type="ocl.ecore:TypeExp" eType="/5/Create">
- <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML/Profile/L2#//Create"/>
- </argument>
- </source>
- <argument xsi:type="mtl:QueryInvocation">
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
- <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/>
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/19">
- <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
- </argument>
- <argument xsi:type="ocl.ecore:TypeExp" eType="/5/Destroy">
- <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML/Profile/L2#//Destroy"/>
- </argument>
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/22">
+ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
</argument>
- <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean_Class/or"/>
</condition>
<thenExpression xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
@@ -225,15 +237,37 @@
</parameter>
<expression xsi:type="ocl.ecore:IfExp">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- <condition xsi:type="mtl:QueryInvocation">
+ <condition xsi:type="ocl.ecore:OperationCallExp">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
- <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/>
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/22">
- <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
- </argument>
- <argument xsi:type="ocl.ecore:TypeExp" eType="/5/Destroy">
- <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML/Profile/L2#//Destroy"/>
+ <source xsi:type="mtl:QueryInvocation">
+ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
+ <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/>
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/25">
+ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
+ </argument>
+ <argument xsi:type="ocl.ecore:TypeExp" eType="/5/Destroy">
+ <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML/Profile/L2#//Destroy"/>
+ </argument>
+ </source>
+ <argument xsi:type="ocl.ecore:OperationCallExp">
+ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
+ <source xsi:type="ocl.ecore:OperationCallExp">
+ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
+ <source xsi:type="ocl.ecore:PropertyCallExp">
+ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
+ <source xsi:type="ocl.ecore:VariableExp" name="operation" referredVariable="/0/destructor/operation">
+ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
+ </source>
+ <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>
+ </source>
+ <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="~">
+ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
+ </argument>
+ <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String_Class/startsWith"/>
+ </source>
+ <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean_Class/not"/>
</argument>
+ <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean_Class/and"/>
</condition>
<thenExpression xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="~">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
@@ -248,35 +282,45 @@
<body xsi:type="mtl:IfBlock">
<body xsi:type="mtl:QueryInvocation" definition="/0/ConsDestructorOrVoid">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/28">
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/31">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
</argument>
</body>
<ifExpr xsi:type="ocl.ecore:OperationCallExp">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
- <source xsi:type="ocl.ecore:PropertyCallExp">
- <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Type"/>
- <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/27">
- <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
+ <source xsi:type="ocl.ecore:OperationCallExp">
+ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
+ <source xsi:type="ocl.ecore:PropertyCallExp">
+ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Type"/>
+ <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/30">
+ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
+ </source>
+ <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation/type"/>
</source>
- <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation/type"/>
+ <argument xsi:type="ocl.ecore:NullLiteralExp">
+ <eType xsi:type="ocl.ecore:VoidType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclVoid"/>
+ </argument>
+ <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/="/>
</source>
- <argument xsi:type="ocl.ecore:NullLiteralExp">
- <eType xsi:type="ocl.ecore:VoidType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclVoid"/>
+ <argument xsi:type="mtl:QueryInvocation" definition="/0/isConsOrDestructor">
+ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/30">
+ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
+ </argument>
</argument>
- <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/="/>
+ <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean_Class/or"/>
</ifExpr>
<else>
<body xsi:type="ocl.ecore:IteratorExp" name="collect" eType="/3/Bag(String)">
<source xsi:type="ocl.ecore:OperationCallExp" eType="/3/Set(Parameter)">
- <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/29">
+ <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/32">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
</source>
<referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation/returnResult"/>
</source>
<body xsi:type="mtl:QueryInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- <definition href="platform:/plugin/utils/Modifier.emtl#/0/modConst"/>
+ <definition href="../../../utils/Modifier.emtl#/0/modConst"/>
<argument xsi:type="ocl.ecore:VariableExp" name="temp1" referredVariable="/0/CppReturnSpec/%/%.2/collect/temp1">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Parameter"/>
</argument>
@@ -288,10 +332,10 @@
<body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=" "/>
<body xsi:type="mtl:QueryInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- <definition href="platform:/plugin/utils/CppGenUtils.emtl#/0/cppQualifiedName"/>
+ <definition href="../../../utils/CppGenUtils.emtl#/0/cppQualifiedName"/>
<argument xsi:type="ocl.ecore:PropertyCallExp">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Type"/>
- <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/30">
+ <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/33">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
</source>
<referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation/type"/>
@@ -299,14 +343,14 @@
</body>
<body xsi:type="ocl.ecore:IteratorExp" name="collect" eType="/3/Bag(String)">
<source xsi:type="ocl.ecore:OperationCallExp" eType="/3/Set(Parameter)">
- <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/31">
+ <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/34">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
</source>
<referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation/returnResult"/>
</source>
<body xsi:type="mtl:QueryInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- <definition href="platform:/plugin/utils/Modifier.emtl#/0/modPtr"/>
+ <definition href="../../../utils/Modifier.emtl#/0/modPtr"/>
<argument xsi:type="ocl.ecore:VariableExp" name="temp1" referredVariable="/0/CppReturnSpec/%/%.2/collect.1/temp2">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Parameter"/>
</argument>
@@ -317,14 +361,14 @@
</body>
<body xsi:type="ocl.ecore:IteratorExp" name="collect" eType="/3/Bag(String)">
<source xsi:type="ocl.ecore:OperationCallExp" eType="/3/Set(Parameter)">
- <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/32">
+ <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/35">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
</source>
<referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation/returnResult"/>
</source>
<body xsi:type="mtl:QueryInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- <definition href="platform:/plugin/utils/Modifier.emtl#/0/modRef"/>
+ <definition href="../../../utils/Modifier.emtl#/0/modRef"/>
<argument xsi:type="ocl.ecore:VariableExp" name="temp1" referredVariable="/0/CppReturnSpec/%/%.2/collect.2/temp3">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Parameter"/>
</argument>
@@ -348,7 +392,7 @@
<source xsi:type="mtl:QueryInvocation">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Parameter"/>
<definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/returnResult"/>
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/37">
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/40">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Behavior"/>
</argument>
</source>
@@ -360,11 +404,11 @@
<else>
<body xsi:type="mtl:QueryInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- <definition href="platform:/plugin/utils/Modifier.emtl#/0/modConst"/>
+ <definition href="../../../utils/Modifier.emtl#/0/modConst"/>
<argument xsi:type="mtl:QueryInvocation">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Parameter"/>
<definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/returnResult"/>
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/38">
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/41">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Behavior"/>
</argument>
</argument>
@@ -372,13 +416,13 @@
<body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=" "/>
<body xsi:type="mtl:QueryInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- <definition href="platform:/plugin/utils/CppGenUtils.emtl#/0/cppQualifiedName"/>
+ <definition href="../../../utils/CppGenUtils.emtl#/0/cppQualifiedName"/>
<argument xsi:type="ocl.ecore:PropertyCallExp">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Type"/>
<source xsi:type="mtl:QueryInvocation">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Parameter"/>
<definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/returnResult"/>
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/39">
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/42">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Behavior"/>
</argument>
</source>
@@ -387,22 +431,22 @@
</body>
<body xsi:type="mtl:QueryInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- <definition href="platform:/plugin/utils/Modifier.emtl#/0/modPtr"/>
+ <definition href="../../../utils/Modifier.emtl#/0/modPtr"/>
<argument xsi:type="mtl:QueryInvocation">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Parameter"/>
<definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/returnResult"/>
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/40">
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/43">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Behavior"/>
</argument>
</argument>
</body>
<body xsi:type="mtl:QueryInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- <definition href="platform:/plugin/utils/Modifier.emtl#/0/modRef"/>
+ <definition href="../../../utils/Modifier.emtl#/0/modRef"/>
<argument xsi:type="mtl:QueryInvocation">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Parameter"/>
<definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/returnResult"/>
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/41">
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/44">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Behavior"/>
</argument>
</argument>
@@ -420,7 +464,7 @@
<ifExpr xsi:type="mtl:QueryInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
<definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/>
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/46">
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/49">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/>
</argument>
<argument xsi:type="ocl.ecore:TypeExp" eType="/5/Inline">
@@ -437,7 +481,7 @@
<body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="static "/>
<ifExpr xsi:type="ocl.ecore:PropertyCallExp">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
- <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/51">
+ <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/54">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
</source>
<referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Feature/isStatic"/>
@@ -451,38 +495,38 @@
<body xsi:type="mtl:TemplateInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
<definition href="../CppDocumentation.emtl#/0/CppOperationDoc"/>
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/56">
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/59">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
</argument>
</body>
<body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;"/>
<body xsi:type="mtl:TemplateInvocation" definition="/0/InlineTxt">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/57">
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/60">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
</argument>
</body>
<body xsi:type="mtl:TemplateInvocation" definition="/0/virtualTxt">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/58">
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/61">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
</argument>
</body>
<body xsi:type="mtl:TemplateInvocation" definition="/0/staticTxt">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/59">
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/62">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
</argument>
</body>
<body xsi:type="mtl:TemplateInvocation" definition="/0/CppReturnSpec">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/60">
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/63">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
</argument>
</body>
<body xsi:type="mtl:QueryInvocation" definition="/0/destructor">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/61">
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/64">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
</argument>
</body>
@@ -497,7 +541,7 @@
<body xsi:type="mtl:TemplateInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
<definition href="CppParameter.emtl#/0/CppOperationParameters"/>
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/63">
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/66">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
</argument>
<argument xsi:type="ocl.ecore:BooleanLiteralExp" booleanSymbol="true">
@@ -507,14 +551,14 @@
<body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=")"/>
<body xsi:type="mtl:QueryInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- <definition href="platform:/plugin/utils/Modifier.emtl#/0/modConst"/>
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/64">
+ <definition href="../../../utils/Modifier.emtl#/0/modConst"/>
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/67">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
</argument>
</body>
<body xsi:type="mtl:TemplateInvocation" definition="/0/virtualSuffix">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/65">
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/68">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
</argument>
</body>
@@ -527,20 +571,20 @@
<body xsi:type="mtl:TemplateInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
<definition href="../CppDocumentation.emtl#/0/CppBehaviorDoc"/>
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/70">
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/73">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Behavior"/>
</argument>
</body>
<body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;"/>
<body xsi:type="mtl:TemplateInvocation" definition="/0/InlineTxt">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/71">
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/74">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Behavior"/>
</argument>
</body>
<body xsi:type="mtl:TemplateInvocation" definition="/0/CppReturnSpec.1">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/72">
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/75">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Behavior"/>
</argument>
</body>
@@ -555,7 +599,7 @@
<body xsi:type="mtl:TemplateInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
<definition href="CppParameter.emtl#/0/CppBehaviorParameters"/>
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/74">
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/77">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Behavior"/>
</argument>
<argument xsi:type="ocl.ecore:BooleanLiteralExp" booleanSymbol="true">
@@ -565,8 +609,8 @@
<body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=")"/>
<body xsi:type="mtl:QueryInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- <definition href="platform:/plugin/utils/Modifier.emtl#/0/modConst"/>
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/75">
+ <definition href="../../../utils/Modifier.emtl#/0/modConst"/>
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/78">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Behavior"/>
</argument>
</body>
@@ -585,7 +629,7 @@
<source xsi:type="mtl:QueryInvocation">
<eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
<definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getApplication"/>
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/81">
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/84">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
</argument>
<argument xsi:type="ocl.ecore:TypeExp" eType="/5/ConstInit">
@@ -604,7 +648,7 @@
<source xsi:type="mtl:QueryInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
<definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/>
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/80">
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/83">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
</argument>
<argument xsi:type="ocl.ecore:TypeExp" eType="/5/ConstInit">
@@ -614,7 +658,7 @@
<argument xsi:type="mtl:QueryInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
<definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/>
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/80">
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/83">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
</argument>
<argument xsi:type="ocl.ecore:TypeExp" eType="/5/Create">
@@ -629,7 +673,7 @@
</parameter>
</ownedModuleElement>
<ownedModuleElement xsi:type="mtl:Comment">
- <body startPosition="2955" endPosition="3025" value=" wrapper for native query (otherwise Acceleo does not indent properly)"/>
+ <body startPosition="3111" endPosition="3181" value=" wrapper for native query (otherwise Acceleo does not indent properly)"/>
</ownedModuleElement>
<ownedModuleElement xsi:type="mtl:Template" name="getBodyInTemplate" visibility="Public">
<body xsi:type="ocl.ecore:OperationCallExp">
@@ -637,7 +681,7 @@
<source xsi:type="mtl:QueryInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
<definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getBody"/>
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/86">
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/89">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
</argument>
<argument xsi:type="ocl.ecore:VariableExp" name="language" referredVariable="/0/getBodyInTemplate/language">
@@ -659,13 +703,13 @@
<body xsi:type="mtl:ForBlock">
<body xsi:type="ocl.ecore:PropertyCallExp">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/95">
+ <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/98">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Type"/>
</source>
<referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>
</body>
<iterSet xsi:type="ocl.ecore:PropertyCallExp" eType="/3/Set(Type)">
- <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/92">
+ <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/95">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
</source>
<referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature/raisedException"/>
@@ -701,7 +745,7 @@
<body xsi:type="mtl:TemplateInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
<definition href="../CppDocumentation.emtl#/0/CppOperationDoc"/>
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/102">
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/105">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
</argument>
</body>
@@ -709,7 +753,7 @@
<body xsi:type="mtl:IfBlock">
<body xsi:type="mtl:TemplateInvocation" definition="/0/CppReturnSpec">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/104">
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/107">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
</argument>
</body>
@@ -724,7 +768,7 @@
<body xsi:type="mtl:TemplateInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
<definition href="CppParameter.emtl#/0/CppOperationParameters"/>
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/106">
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/109">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
</argument>
<argument xsi:type="ocl.ecore:BooleanLiteralExp" booleanSymbol="false">
@@ -735,7 +779,7 @@
<body xsi:type="mtl:QueryInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
<definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getBody"/>
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/107">
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/110">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
</argument>
<argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="C/C++">
@@ -761,19 +805,19 @@
<body xsi:type="mtl:TemplateInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
<definition href="../CppTemplates.emtl#/0/templateSignature.1"/>
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/108">
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/111">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
</argument>
</body>
<body xsi:type="mtl:TemplateInvocation" definition="/0/InlineTxt">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/109">
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/112">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
</argument>
</body>
<body xsi:type="mtl:TemplateInvocation" definition="/0/CppReturnSpec">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/110">
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/113">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
</argument>
</body>
@@ -798,14 +842,14 @@
<body xsi:type="mtl:TemplateInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
<definition href="../CppTemplates.emtl#/0/templateShortSignature.1"/>
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/112">
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/115">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
</argument>
</body>
<body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="::"/>
<body xsi:type="mtl:QueryInvocation" definition="/0/destructor">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/113">
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/116">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
</argument>
</body>
@@ -820,7 +864,7 @@
<body xsi:type="mtl:TemplateInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
<definition href="CppParameter.emtl#/0/CppOperationParameters"/>
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/115">
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/118">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
</argument>
<argument xsi:type="ocl.ecore:BooleanLiteralExp" booleanSymbol="false">
@@ -830,27 +874,27 @@
<body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=")"/>
<body xsi:type="mtl:TemplateInvocation" definition="/0/throws">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/116">
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/119">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
</argument>
</body>
<body xsi:type="mtl:QueryInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- <definition href="platform:/plugin/utils/Modifier.emtl#/0/modConst"/>
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/117">
+ <definition href="../../../utils/Modifier.emtl#/0/modConst"/>
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/120">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
</argument>
</body>
<body xsi:type="mtl:TemplateInvocation" definition="/0/CppConstInit">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/118">
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/121">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
</argument>
</body>
<body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=" {&#xA;&#x9;"/>
<body xsi:type="mtl:TemplateInvocation" definition="/0/getBodyInTemplate">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/119">
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/122">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
</argument>
<argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="C/C++">
@@ -868,14 +912,14 @@
<body xsi:type="mtl:TemplateInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
<definition href="../CppDocumentation.emtl#/0/CppBehaviorDoc"/>
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/124">
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/127">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//OpaqueBehavior"/>
</argument>
</body>
<body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;"/>
<body xsi:type="mtl:TemplateInvocation" definition="/0/CppReturnSpec.1">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/125">
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/128">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//OpaqueBehavior"/>
</argument>
</body>
@@ -902,7 +946,7 @@
<body xsi:type="mtl:TemplateInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
<definition href="CppParameter.emtl#/0/CppBehaviorParameters"/>
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/128">
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/131">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//OpaqueBehavior"/>
</argument>
<argument xsi:type="ocl.ecore:BooleanLiteralExp" booleanSymbol="false">
@@ -912,8 +956,8 @@
<body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=")"/>
<body xsi:type="mtl:QueryInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- <definition href="platform:/plugin/utils/Modifier.emtl#/0/modConst"/>
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/129">
+ <definition href="../../../utils/Modifier.emtl#/0/modConst"/>
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/132">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//OpaqueBehavior"/>
</argument>
</body>
@@ -921,7 +965,7 @@
<body xsi:type="mtl:QueryInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
<definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getBodyFromOB"/>
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/130">
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/133">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//OpaqueBehavior"/>
</argument>
<argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="C/C++">
@@ -983,6 +1027,16 @@
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
</eParameters>
</eOperations>
+ <eOperations name="isConsOrDestructor">
+ <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
+ <contents xsi:type="ocl.ecore:Constraint"/>
+ </eAnnotations>
+ <eAnnotations source="MTL" references="/0/isConsOrDestructor"/>
+ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
+ <eParameters name="operation">
+ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
+ </eParameters>
+ </eOperations>
<eOperations name="ConsDestructorOrVoid">
<eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
<contents xsi:type="ocl.ecore:Constraint"/>
@@ -1193,7 +1247,7 @@
<contents xsi:type="ocl.ecore:Constraint"/>
</eAnnotations>
<eAnnotations source="MTL">
- <references href="platform:/plugin/utils/CppGenUtils.emtl#/0/cppQualifiedName"/>
+ <references href="../../../utils/CppGenUtils.emtl#/0/cppQualifiedName"/>
</eAnnotations>
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
<eParameters name="arg0">
@@ -1205,7 +1259,7 @@
<contents xsi:type="ocl.ecore:Constraint"/>
</eAnnotations>
<eAnnotations source="MTL">
- <references href="platform:/plugin/utils/Modifier.emtl#/0/modPtr"/>
+ <references href="../../../utils/Modifier.emtl#/0/modPtr"/>
</eAnnotations>
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
<eParameters name="propertyOrParameter">
@@ -1217,7 +1271,7 @@
<contents xsi:type="ocl.ecore:Constraint"/>
</eAnnotations>
<eAnnotations source="MTL">
- <references href="platform:/plugin/utils/Modifier.emtl#/0/modRef"/>
+ <references href="../../../utils/Modifier.emtl#/0/modRef"/>
</eAnnotations>
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
<eParameters name="propertyOrParameter">
@@ -1229,7 +1283,7 @@
<contents xsi:type="ocl.ecore:Constraint"/>
</eAnnotations>
<eAnnotations source="MTL">
- <references href="platform:/plugin/utils/Modifier.emtl#/0/modConst"/>
+ <references href="../../../utils/Modifier.emtl#/0/modConst"/>
</eAnnotations>
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
<eParameters name="propertyOrParameter">
@@ -1517,6 +1571,15 @@
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
</ocl.ecore:Variable>
<ocl.ecore:Variable name="self">
+ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
+ </ocl.ecore:Variable>
+ <ocl.ecore:Variable name="self">
+ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
+ </ocl.ecore:Variable>
+ <ocl.ecore:Variable name="self">
+ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
+ </ocl.ecore:Variable>
+ <ocl.ecore:Variable name="self">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
</ocl.ecore:Variable>
<ocl.ecore:Variable name="self">
@@ -2108,1310 +2171,1375 @@
<details key="end" value="1270"/>
<details key="line" value="33"/>
</eAnnotations>
- <eAnnotations source="positions.54" references="/0/ConsDestructorOrVoid">
+ <eAnnotations source="positions.54" references="/0/isConsOrDestructor">
<details key="start" value="1358"/>
- <details key="end" value="1516"/>
+ <details key="end" value="1484"/>
<details key="line" value="38"/>
</eAnnotations>
- <eAnnotations source="positions.55" references="/0/ConsDestructorOrVoid/operation">
- <details key="start" value="1393"/>
- <details key="end" value="1414"/>
+ <eAnnotations source="positions.55" references="/0/isConsOrDestructor/operation">
+ <details key="start" value="1391"/>
+ <details key="end" value="1412"/>
<details key="line" value="38"/>
</eAnnotations>
- <eAnnotations source="positions.56" references="/0/ConsDestructorOrVoid/%">
- <details key="start" value="1427"/>
- <details key="end" value="1514"/>
+ <eAnnotations source="positions.56" references="/0/isConsOrDestructor/%">
+ <details key="start" value="1426"/>
+ <details key="end" value="1481"/>
+ <details key="line" value="0"/>
+ </eAnnotations>
+ <eAnnotations source="positions.57" references="/0/isConsOrDestructor/%/%">
+ <details key="start" value="1426"/>
+ <details key="end" value="1451"/>
+ <details key="line" value="0"/>
+ </eAnnotations>
+ <eAnnotations source="positions.58" references="/0/isConsOrDestructor/%/%/self">
+ <details key="start" value="-1"/>
+ <details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.57" references="/0/ConsDestructorOrVoid/%/%">
- <details key="start" value="1430"/>
- <details key="end" value="1485"/>
+ <eAnnotations source="positions.59" references="/0/isConsOrDestructor/%/%/%">
+ <details key="start" value="1440"/>
+ <details key="end" value="1450"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.58" references="/0/ConsDestructorOrVoid/%/%/%">
- <details key="start" value="1430"/>
- <details key="end" value="1455"/>
+ <eAnnotations source="positions.60" references="/0/isConsOrDestructor/%/%.1">
+ <details key="start" value="1455"/>
+ <details key="end" value="1481"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.59" references="/0/ConsDestructorOrVoid/%/%/%/self">
+ <eAnnotations source="positions.61" references="/0/isConsOrDestructor/%/%.1/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.60" references="/0/ConsDestructorOrVoid/%/%/%/%">
- <details key="start" value="1444"/>
- <details key="end" value="1454"/>
+ <eAnnotations source="positions.62" references="/0/isConsOrDestructor/%/%.1/%">
+ <details key="start" value="1469"/>
+ <details key="end" value="1480"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.61" references="/0/ConsDestructorOrVoid/%/%/%.1">
- <details key="start" value="1459"/>
- <details key="end" value="1485"/>
+ <eAnnotations source="positions.63" references="/0/ConsDestructorOrVoid">
+ <details key="start" value="1486"/>
+ <details key="end" value="1609"/>
+ <details key="line" value="42"/>
+ </eAnnotations>
+ <eAnnotations source="positions.64" references="/0/ConsDestructorOrVoid/operation">
+ <details key="start" value="1521"/>
+ <details key="end" value="1542"/>
+ <details key="line" value="42"/>
+ </eAnnotations>
+ <eAnnotations source="positions.65" references="/0/ConsDestructorOrVoid/%">
+ <details key="start" value="1555"/>
+ <details key="end" value="1607"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.62" references="/0/ConsDestructorOrVoid/%/%/%.1/self">
+ <eAnnotations source="positions.66" references="/0/ConsDestructorOrVoid/%/%">
+ <details key="start" value="1558"/>
+ <details key="end" value="1578"/>
+ <details key="line" value="0"/>
+ </eAnnotations>
+ <eAnnotations source="positions.67" references="/0/ConsDestructorOrVoid/%/%/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.63" references="/0/ConsDestructorOrVoid/%/%/%.1/%">
- <details key="start" value="1473"/>
- <details key="end" value="1484"/>
+ <eAnnotations source="positions.68" references="/0/ConsDestructorOrVoid/%/%.1">
+ <details key="start" value="1585"/>
+ <details key="end" value="1587"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.64" references="/0/ConsDestructorOrVoid/%/%.1">
- <details key="start" value="1492"/>
- <details key="end" value="1494"/>
+ <eAnnotations source="positions.69" references="/0/ConsDestructorOrVoid/%/%.2">
+ <details key="start" value="1594"/>
+ <details key="end" value="1601"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.65" references="/0/ConsDestructorOrVoid/%/%.2">
- <details key="start" value="1501"/>
- <details key="end" value="1508"/>
- <details key="line" value="0"/>
+ <eAnnotations source="positions.70" references="/0/destructor">
+ <details key="start" value="1612"/>
+ <details key="end" value="1766"/>
+ <details key="line" value="50"/>
</eAnnotations>
- <eAnnotations source="positions.66" references="/0/destructor">
- <details key="start" value="1519"/>
- <details key="end" value="1634"/>
- <details key="line" value="46"/>
+ <eAnnotations source="positions.71" references="/0/destructor/operation">
+ <details key="start" value="1637"/>
+ <details key="end" value="1658"/>
+ <details key="line" value="50"/>
</eAnnotations>
- <eAnnotations source="positions.67" references="/0/destructor/operation">
- <details key="start" value="1544"/>
- <details key="end" value="1565"/>
- <details key="line" value="46"/>
+ <eAnnotations source="positions.72" references="/0/destructor/%">
+ <details key="start" value="1671"/>
+ <details key="end" value="1764"/>
+ <details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.68" references="/0/destructor/%">
- <details key="start" value="1578"/>
- <details key="end" value="1632"/>
+ <eAnnotations source="positions.73" references="/0/destructor/%/%">
+ <details key="start" value="1674"/>
+ <details key="end" value="1739"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.69" references="/0/destructor/%/%">
- <details key="start" value="1581"/>
- <details key="end" value="1607"/>
+ <eAnnotations source="positions.74" references="/0/destructor/%/%/%">
+ <details key="start" value="1674"/>
+ <details key="end" value="1700"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.70" references="/0/destructor/%/%/self">
+ <eAnnotations source="positions.75" references="/0/destructor/%/%/%/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.71" references="/0/destructor/%/%/%">
- <details key="start" value="1595"/>
- <details key="end" value="1606"/>
+ <eAnnotations source="positions.76" references="/0/destructor/%/%/%/%">
+ <details key="start" value="1688"/>
+ <details key="end" value="1699"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.72" references="/0/destructor/%/%.1">
- <details key="start" value="1614"/>
- <details key="end" value="1617"/>
+ <eAnnotations source="positions.77" references="/0/destructor/%/%/%.1">
+ <details key="start" value="1705"/>
+ <details key="end" value="1739"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.73" references="/0/destructor/%/%.2">
- <details key="start" value="1624"/>
- <details key="end" value="1626"/>
+ <eAnnotations source="positions.78" references="/0/destructor/%/%/%.1/%">
+ <details key="start" value="1709"/>
+ <details key="end" value="1739"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.74" references="/0/CppReturnSpec">
- <details key="start" value="1636"/>
- <details key="end" value="1865"/>
- <details key="line" value="53"/>
+ <eAnnotations source="positions.79" references="/0/destructor/%/%/%.1/%/%">
+ <details key="start" value="1709"/>
+ <details key="end" value="1723"/>
+ <details key="line" value="0"/>
+ </eAnnotations>
+ <eAnnotations source="positions.80" references="/0/destructor/%/%/%.1/%/%/operation">
+ <details key="start" value="1709"/>
+ <details key="end" value="1718"/>
+ <details key="line" value="0"/>
+ </eAnnotations>
+ <eAnnotations source="positions.81" references="/0/destructor/%/%/%.1/%/%.1">
+ <details key="start" value="1735"/>
+ <details key="end" value="1738"/>
+ <details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.75" references="/0/CppReturnSpec/%">
- <details key="start" value="1691"/>
- <details key="end" value="1853"/>
- <details key="line" value="54"/>
+ <eAnnotations source="positions.82" references="/0/destructor/%/%.1">
+ <details key="start" value="1746"/>
+ <details key="end" value="1749"/>
+ <details key="line" value="0"/>
+ </eAnnotations>
+ <eAnnotations source="positions.83" references="/0/destructor/%/%.2">
+ <details key="start" value="1756"/>
+ <details key="end" value="1758"/>
+ <details key="line" value="0"/>
+ </eAnnotations>
+ <eAnnotations source="positions.84" references="/0/CppReturnSpec">
+ <details key="start" value="1768"/>
+ <details key="end" value="2021"/>
+ <details key="line" value="57"/>
+ </eAnnotations>
+ <eAnnotations source="positions.85" references="/0/CppReturnSpec/%">
+ <details key="start" value="1823"/>
+ <details key="end" value="2009"/>
+ <details key="line" value="58"/>
</eAnnotations>
- <eAnnotations source="positions.76" references="/0/CppReturnSpec/%/%">
- <details key="start" value="1710"/>
- <details key="end" value="1732"/>
+ <eAnnotations source="positions.86" references="/0/CppReturnSpec/%/%">
+ <details key="start" value="1866"/>
+ <details key="end" value="1888"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.77" references="/0/CppReturnSpec/%/%/self">
+ <eAnnotations source="positions.87" references="/0/CppReturnSpec/%/%/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.78" references="/0/CppReturnSpec/%/%.1">
- <details key="start" value="1695"/>
- <details key="end" value="1708"/>
+ <eAnnotations source="positions.88" references="/0/CppReturnSpec/%/%.1">
+ <details key="start" value="1827"/>
+ <details key="end" value="1864"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.79" references="/0/CppReturnSpec/%/%.1/%">
- <details key="start" value="1696"/>
- <details key="end" value="1700"/>
+ <eAnnotations source="positions.89" references="/0/CppReturnSpec/%/%.1/%">
+ <details key="start" value="1827"/>
+ <details key="end" value="1840"/>
+ <details key="line" value="0"/>
+ </eAnnotations>
+ <eAnnotations source="positions.90" references="/0/CppReturnSpec/%/%.1/%/%">
+ <details key="start" value="1828"/>
+ <details key="end" value="1832"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.80" references="/0/CppReturnSpec/%/%.1/%/self">
+ <eAnnotations source="positions.91" references="/0/CppReturnSpec/%/%.1/%/%/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.81" references="/0/CppReturnSpec/%/%.1/%.1">
- <details key="start" value="1703"/>
- <details key="end" value="1707"/>
+ <eAnnotations source="positions.92" references="/0/CppReturnSpec/%/%.1/%/%.1">
+ <details key="start" value="1835"/>
+ <details key="end" value="1839"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.82" references="/0/CppReturnSpec/%/%.2">
- <details key="start" value="1734"/>
- <details key="end" value="1848"/>
- <details key="line" value="54"/>
+ <eAnnotations source="positions.93" references="/0/CppReturnSpec/%/%.1/%.1">
+ <details key="start" value="1844"/>
+ <details key="end" value="1864"/>
+ <details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.83" references="/0/CppReturnSpec/%/%.2/collect">
- <details key="start" value="1741"/>
- <details key="end" value="1766"/>
+ <eAnnotations source="positions.94" references="/0/CppReturnSpec/%/%.1/%.1/self">
+ <details key="start" value="-1"/>
+ <details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.84" references="/0/CppReturnSpec/%/%.2/collect/%">
- <details key="start" value="1741"/>
- <details key="end" value="1755"/>
+ <eAnnotations source="positions.95" references="/0/CppReturnSpec/%/%.2">
+ <details key="start" value="1890"/>
+ <details key="end" value="2004"/>
+ <details key="line" value="58"/>
+ </eAnnotations>
+ <eAnnotations source="positions.96" references="/0/CppReturnSpec/%/%.2/collect">
+ <details key="start" value="1897"/>
+ <details key="end" value="1922"/>
+ <details key="line" value="0"/>
+ </eAnnotations>
+ <eAnnotations source="positions.97" references="/0/CppReturnSpec/%/%.2/collect/%">
+ <details key="start" value="1897"/>
+ <details key="end" value="1911"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.85" references="/0/CppReturnSpec/%/%.2/collect/%/self">
+ <eAnnotations source="positions.98" references="/0/CppReturnSpec/%/%.2/collect/%/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.86" references="/0/CppReturnSpec/%/%.2/collect/%.1">
+ <eAnnotations source="positions.99" references="/0/CppReturnSpec/%/%.2/collect/%.1">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.87" references="/0/CppReturnSpec/%/%.2/collect/%.1/temp1">
+ <eAnnotations source="positions.100" references="/0/CppReturnSpec/%/%.2/collect/%.1/temp1">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.88" references="/0/CppReturnSpec/%/%.2/collect/temp1">
+ <eAnnotations source="positions.101" references="/0/CppReturnSpec/%/%.2/collect/temp1">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.89" references="/0/CppReturnSpec/%/%.2/%">
- <details key="start" value="1768"/>
- <details key="end" value="1769"/>
- <details key="line" value="54"/>
+ <eAnnotations source="positions.102" references="/0/CppReturnSpec/%/%.2/%">
+ <details key="start" value="1924"/>
+ <details key="end" value="1925"/>
+ <details key="line" value="58"/>
</eAnnotations>
- <eAnnotations source="positions.90" references="/0/CppReturnSpec/%/%.2/%.1">
- <details key="start" value="1770"/>
- <details key="end" value="1793"/>
+ <eAnnotations source="positions.103" references="/0/CppReturnSpec/%/%.2/%.1">
+ <details key="start" value="1926"/>
+ <details key="end" value="1949"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.91" references="/0/CppReturnSpec/%/%.2/%.1/%">
- <details key="start" value="1770"/>
- <details key="end" value="1774"/>
+ <eAnnotations source="positions.104" references="/0/CppReturnSpec/%/%.2/%.1/%">
+ <details key="start" value="1926"/>
+ <details key="end" value="1930"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.92" references="/0/CppReturnSpec/%/%.2/%.1/%/self">
+ <eAnnotations source="positions.105" references="/0/CppReturnSpec/%/%.2/%.1/%/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.93" references="/0/CppReturnSpec/%/%.2/collect.1">
- <details key="start" value="1796"/>
- <details key="end" value="1819"/>
+ <eAnnotations source="positions.106" references="/0/CppReturnSpec/%/%.2/collect.1">
+ <details key="start" value="1952"/>
+ <details key="end" value="1975"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.94" references="/0/CppReturnSpec/%/%.2/collect.1/%">
- <details key="start" value="1796"/>
- <details key="end" value="1810"/>
+ <eAnnotations source="positions.107" references="/0/CppReturnSpec/%/%.2/collect.1/%">
+ <details key="start" value="1952"/>
+ <details key="end" value="1966"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.95" references="/0/CppReturnSpec/%/%.2/collect.1/%/self">
+ <eAnnotations source="positions.108" references="/0/CppReturnSpec/%/%.2/collect.1/%/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.96" references="/0/CppReturnSpec/%/%.2/collect.1/%.1">
+ <eAnnotations source="positions.109" references="/0/CppReturnSpec/%/%.2/collect.1/%.1">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.97" references="/0/CppReturnSpec/%/%.2/collect.1/%.1/temp1">
+ <eAnnotations source="positions.110" references="/0/CppReturnSpec/%/%.2/collect.1/%.1/temp1">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.98" references="/0/CppReturnSpec/%/%.2/collect.1/temp2">
+ <eAnnotations source="positions.111" references="/0/CppReturnSpec/%/%.2/collect.1/temp2">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.99" references="/0/CppReturnSpec/%/%.2/collect.2">
- <details key="start" value="1822"/>
- <details key="end" value="1845"/>
+ <eAnnotations source="positions.112" references="/0/CppReturnSpec/%/%.2/collect.2">
+ <details key="start" value="1978"/>
+ <details key="end" value="2001"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.100" references="/0/CppReturnSpec/%/%.2/collect.2/%">
- <details key="start" value="1822"/>
- <details key="end" value="1836"/>
+ <eAnnotations source="positions.113" references="/0/CppReturnSpec/%/%.2/collect.2/%">
+ <details key="start" value="1978"/>
+ <details key="end" value="1992"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.101" references="/0/CppReturnSpec/%/%.2/collect.2/%/self">
+ <eAnnotations source="positions.114" references="/0/CppReturnSpec/%/%.2/collect.2/%/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.102" references="/0/CppReturnSpec/%/%.2/collect.2/%.1">
+ <eAnnotations source="positions.115" references="/0/CppReturnSpec/%/%.2/collect.2/%.1">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.103" references="/0/CppReturnSpec/%/%.2/collect.2/%.1/temp1">
+ <eAnnotations source="positions.116" references="/0/CppReturnSpec/%/%.2/collect.2/%.1/temp1">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.104" references="/0/CppReturnSpec/%/%.2/collect.2/temp3">
+ <eAnnotations source="positions.117" references="/0/CppReturnSpec/%/%.2/collect.2/temp3">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.105" references="/0/CppReturnSpec/%/%.2/%.2">
- <details key="start" value="1847"/>
- <details key="end" value="1848"/>
- <details key="line" value="54"/>
+ <eAnnotations source="positions.118" references="/0/CppReturnSpec/%/%.2/%.2">
+ <details key="start" value="2003"/>
+ <details key="end" value="2004"/>
+ <details key="line" value="58"/>
</eAnnotations>
- <eAnnotations source="positions.106" references="/0/CppReturnSpec/operation">
- <details key="start" value="1667"/>
- <details key="end" value="1688"/>
- <details key="line" value="53"/>
+ <eAnnotations source="positions.119" references="/0/CppReturnSpec/operation">
+ <details key="start" value="1799"/>
+ <details key="end" value="1820"/>
+ <details key="line" value="57"/>
</eAnnotations>
- <eAnnotations source="positions.107" references="/0/CppReturnSpec.1">
- <details key="start" value="1868"/>
- <details key="end" value="2100"/>
- <details key="line" value="58"/>
+ <eAnnotations source="positions.120" references="/0/CppReturnSpec.1">
+ <details key="start" value="2024"/>
+ <details key="end" value="2256"/>
+ <details key="line" value="62"/>
</eAnnotations>
- <eAnnotations source="positions.108" references="/0/CppReturnSpec.1/%">
- <details key="start" value="1921"/>
- <details key="end" value="2088"/>
- <details key="line" value="59"/>
+ <eAnnotations source="positions.121" references="/0/CppReturnSpec.1/%">
+ <details key="start" value="2077"/>
+ <details key="end" value="2244"/>
+ <details key="line" value="63"/>
</eAnnotations>
- <eAnnotations source="positions.109" references="/0/CppReturnSpec.1/%/%">
- <details key="start" value="1949"/>
- <details key="end" value="1954"/>
- <details key="line" value="59"/>
+ <eAnnotations source="positions.122" references="/0/CppReturnSpec.1/%/%">
+ <details key="start" value="2105"/>
+ <details key="end" value="2110"/>
+ <details key="line" value="63"/>
</eAnnotations>
- <eAnnotations source="positions.110" references="/0/CppReturnSpec.1/%/%.1">
- <details key="start" value="1925"/>
- <details key="end" value="1948"/>
+ <eAnnotations source="positions.123" references="/0/CppReturnSpec.1/%/%.1">
+ <details key="start" value="2081"/>
+ <details key="end" value="2104"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.111" references="/0/CppReturnSpec.1/%/%.1/%">
- <details key="start" value="1926"/>
- <details key="end" value="1940"/>
+ <eAnnotations source="positions.124" references="/0/CppReturnSpec.1/%/%.1/%">
+ <details key="start" value="2082"/>
+ <details key="end" value="2096"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.112" references="/0/CppReturnSpec.1/%/%.1/%/self">
+ <eAnnotations source="positions.125" references="/0/CppReturnSpec.1/%/%.1/%/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.113" references="/0/CppReturnSpec.1/%/%.1/%.1">
- <details key="start" value="1943"/>
- <details key="end" value="1947"/>
+ <eAnnotations source="positions.126" references="/0/CppReturnSpec.1/%/%.1/%.1">
+ <details key="start" value="2099"/>
+ <details key="end" value="2103"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.114" references="/0/CppReturnSpec.1/%/%.2">
- <details key="start" value="1954"/>
- <details key="end" value="2083"/>
- <details key="line" value="59"/>
+ <eAnnotations source="positions.127" references="/0/CppReturnSpec.1/%/%.2">
+ <details key="start" value="2110"/>
+ <details key="end" value="2239"/>
+ <details key="line" value="63"/>
</eAnnotations>
- <eAnnotations source="positions.115" references="/0/CppReturnSpec.1/%/%.2/%">
- <details key="start" value="1961"/>
- <details key="end" value="1986"/>
+ <eAnnotations source="positions.128" references="/0/CppReturnSpec.1/%/%.2/%">
+ <details key="start" value="2117"/>
+ <details key="end" value="2142"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.116" references="/0/CppReturnSpec.1/%/%.2/%/%">
- <details key="start" value="1961"/>
- <details key="end" value="1975"/>
+ <eAnnotations source="positions.129" references="/0/CppReturnSpec.1/%/%.2/%/%">
+ <details key="start" value="2117"/>
+ <details key="end" value="2131"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.117" references="/0/CppReturnSpec.1/%/%.2/%/%/self">
+ <eAnnotations source="positions.130" references="/0/CppReturnSpec.1/%/%.2/%/%/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.118" references="/0/CppReturnSpec.1/%/%.2/%.1">
- <details key="start" value="1988"/>
- <details key="end" value="1989"/>
- <details key="line" value="59"/>
+ <eAnnotations source="positions.131" references="/0/CppReturnSpec.1/%/%.2/%.1">
+ <details key="start" value="2144"/>
+ <details key="end" value="2145"/>
+ <details key="line" value="63"/>
</eAnnotations>
- <eAnnotations source="positions.119" references="/0/CppReturnSpec.1/%/%.2/%.2">
- <details key="start" value="1990"/>
- <details key="end" value="2028"/>
+ <eAnnotations source="positions.132" references="/0/CppReturnSpec.1/%/%.2/%.2">
+ <details key="start" value="2146"/>
+ <details key="end" value="2184"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.120" references="/0/CppReturnSpec.1/%/%.2/%.2/%">
- <details key="start" value="1990"/>
- <details key="end" value="2009"/>
+ <eAnnotations source="positions.133" references="/0/CppReturnSpec.1/%/%.2/%.2/%">
+ <details key="start" value="2146"/>
+ <details key="end" value="2165"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.121" references="/0/CppReturnSpec.1/%/%.2/%.2/%/%">
- <details key="start" value="1990"/>
- <details key="end" value="2004"/>
+ <eAnnotations source="positions.134" references="/0/CppReturnSpec.1/%/%.2/%.2/%/%">
+ <details key="start" value="2146"/>
+ <details key="end" value="2160"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.122" references="/0/CppReturnSpec.1/%/%.2/%.2/%/%/self">
+ <eAnnotations source="positions.135" references="/0/CppReturnSpec.1/%/%.2/%.2/%/%/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.123" references="/0/CppReturnSpec.1/%/%.2/%.3">
- <details key="start" value="2031"/>
- <details key="end" value="2054"/>
+ <eAnnotations source="positions.136" references="/0/CppReturnSpec.1/%/%.2/%.3">
+ <details key="start" value="2187"/>
+ <details key="end" value="2210"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.124" references="/0/CppReturnSpec.1/%/%.2/%.3/%">
- <details key="start" value="2031"/>
- <details key="end" value="2045"/>
+ <eAnnotations source="positions.137" references="/0/CppReturnSpec.1/%/%.2/%.3/%">
+ <details key="start" value="2187"/>
+ <details key="end" value="2201"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.125" references="/0/CppReturnSpec.1/%/%.2/%.3/%/self">
+ <eAnnotations source="positions.138" references="/0/CppReturnSpec.1/%/%.2/%.3/%/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.126" references="/0/CppReturnSpec.1/%/%.2/%.4">
- <details key="start" value="2057"/>
- <details key="end" value="2080"/>
+ <eAnnotations source="positions.139" references="/0/CppReturnSpec.1/%/%.2/%.4">
+ <details key="start" value="2213"/>
+ <details key="end" value="2236"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.127" references="/0/CppReturnSpec.1/%/%.2/%.4/%">
- <details key="start" value="2057"/>
- <details key="end" value="2071"/>
+ <eAnnotations source="positions.140" references="/0/CppReturnSpec.1/%/%.2/%.4/%">
+ <details key="start" value="2213"/>
+ <details key="end" value="2227"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.128" references="/0/CppReturnSpec.1/%/%.2/%.4/%/self">
+ <eAnnotations source="positions.141" references="/0/CppReturnSpec.1/%/%.2/%.4/%/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.129" references="/0/CppReturnSpec.1/%/%.2/%.5">
- <details key="start" value="2082"/>
- <details key="end" value="2083"/>
- <details key="line" value="59"/>
+ <eAnnotations source="positions.142" references="/0/CppReturnSpec.1/%/%.2/%.5">
+ <details key="start" value="2238"/>
+ <details key="end" value="2239"/>
+ <details key="line" value="63"/>
</eAnnotations>
- <eAnnotations source="positions.130" references="/0/CppReturnSpec.1/behavior">
- <details key="start" value="1899"/>
- <details key="end" value="1918"/>
- <details key="line" value="58"/>
+ <eAnnotations source="positions.143" references="/0/CppReturnSpec.1/behavior">
+ <details key="start" value="2055"/>
+ <details key="end" value="2074"/>
+ <details key="line" value="62"/>
</eAnnotations>
- <eAnnotations source="positions.131" references="/0/InlineTxt">
- <details key="start" value="2103"/>
- <details key="end" value="2202"/>
- <details key="line" value="63"/>
+ <eAnnotations source="positions.144" references="/0/InlineTxt">
+ <details key="start" value="2259"/>
+ <details key="end" value="2358"/>
+ <details key="line" value="67"/>
</eAnnotations>
- <eAnnotations source="positions.132" references="/0/InlineTxt/%">
- <details key="start" value="2150"/>
- <details key="end" value="2190"/>
- <details key="line" value="64"/>
+ <eAnnotations source="positions.145" references="/0/InlineTxt/%">
+ <details key="start" value="2306"/>
+ <details key="end" value="2346"/>
+ <details key="line" value="68"/>
</eAnnotations>
- <eAnnotations source="positions.133" references="/0/InlineTxt/%/%">
- <details key="start" value="2178"/>
- <details key="end" value="2185"/>
- <details key="line" value="64"/>
+ <eAnnotations source="positions.146" references="/0/InlineTxt/%/%">
+ <details key="start" value="2334"/>
+ <details key="end" value="2341"/>
+ <details key="line" value="68"/>
</eAnnotations>
- <eAnnotations source="positions.134" references="/0/InlineTxt/%/%.1">
- <details key="start" value="2154"/>
- <details key="end" value="2177"/>
+ <eAnnotations source="positions.147" references="/0/InlineTxt/%/%.1">
+ <details key="start" value="2310"/>
+ <details key="end" value="2333"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.135" references="/0/InlineTxt/%/%.1/self">
+ <eAnnotations source="positions.148" references="/0/InlineTxt/%/%.1/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.136" references="/0/InlineTxt/%/%.1/%">
- <details key="start" value="2169"/>
- <details key="end" value="2175"/>
+ <eAnnotations source="positions.149" references="/0/InlineTxt/%/%.1/%">
+ <details key="start" value="2325"/>
+ <details key="end" value="2331"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.137" references="/0/InlineTxt/element">
- <details key="start" value="2130"/>
- <details key="end" value="2147"/>
- <details key="line" value="63"/>
+ <eAnnotations source="positions.150" references="/0/InlineTxt/element">
+ <details key="start" value="2286"/>
+ <details key="end" value="2303"/>
+ <details key="line" value="67"/>
</eAnnotations>
- <eAnnotations source="positions.138" references="/0/staticTxt">
- <details key="start" value="2205"/>
- <details key="end" value="2295"/>
- <details key="line" value="68"/>
+ <eAnnotations source="positions.151" references="/0/staticTxt">
+ <details key="start" value="2361"/>
+ <details key="end" value="2451"/>
+ <details key="line" value="72"/>
</eAnnotations>
- <eAnnotations source="positions.139" references="/0/staticTxt/%">
- <details key="start" value="2256"/>
- <details key="end" value="2283"/>
- <details key="line" value="69"/>
+ <eAnnotations source="positions.152" references="/0/staticTxt/%">
+ <details key="start" value="2412"/>
+ <details key="end" value="2439"/>
+ <details key="line" value="73"/>
</eAnnotations>
- <eAnnotations source="positions.140" references="/0/staticTxt/%/%">
- <details key="start" value="2271"/>
- <details key="end" value="2278"/>
- <details key="line" value="69"/>
+ <eAnnotations source="positions.153" references="/0/staticTxt/%/%">
+ <details key="start" value="2427"/>
+ <details key="end" value="2434"/>
+ <details key="line" value="73"/>
</eAnnotations>
- <eAnnotations source="positions.141" references="/0/staticTxt/%/%.1">
- <details key="start" value="2260"/>
- <details key="end" value="2270"/>
+ <eAnnotations source="positions.154" references="/0/staticTxt/%/%.1">
+ <details key="start" value="2416"/>
+ <details key="end" value="2426"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.142" references="/0/staticTxt/%/%.1/self">
+ <eAnnotations source="positions.155" references="/0/staticTxt/%/%.1/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.143" references="/0/staticTxt/operation">
- <details key="start" value="2232"/>
- <details key="end" value="2253"/>
- <details key="line" value="68"/>
- </eAnnotations>
- <eAnnotations source="positions.144" references="/0/CppOperationDeclaration">
- <details key="start" value="2297"/>
- <details key="end" value="2553"/>
+ <eAnnotations source="positions.156" references="/0/staticTxt/operation">
+ <details key="start" value="2388"/>
+ <details key="end" value="2409"/>
<details key="line" value="72"/>
</eAnnotations>
- <eAnnotations source="positions.145" references="/0/CppOperationDeclaration/%">
- <details key="start" value="2363"/>
- <details key="end" value="2380"/>
+ <eAnnotations source="positions.157" references="/0/CppOperationDeclaration">
+ <details key="start" value="2453"/>
+ <details key="end" value="2709"/>
+ <details key="line" value="76"/>
+ </eAnnotations>
+ <eAnnotations source="positions.158" references="/0/CppOperationDeclaration/%">
+ <details key="start" value="2519"/>
+ <details key="end" value="2536"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.146" references="/0/CppOperationDeclaration/%/self">
+ <eAnnotations source="positions.159" references="/0/CppOperationDeclaration/%/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.147" references="/0/CppOperationDeclaration/%.1">
- <details key="start" value="2382"/>
- <details key="end" value="2383"/>
- <details key="line" value="74"/>
+ <eAnnotations source="positions.160" references="/0/CppOperationDeclaration/%.1">
+ <details key="start" value="2538"/>
+ <details key="end" value="2539"/>
+ <details key="line" value="78"/>
</eAnnotations>
- <eAnnotations source="positions.148" references="/0/CppOperationDeclaration/%.2">
- <details key="start" value="2384"/>
- <details key="end" value="2395"/>
+ <eAnnotations source="positions.161" references="/0/CppOperationDeclaration/%.2">
+ <details key="start" value="2540"/>
+ <details key="end" value="2551"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.149" references="/0/CppOperationDeclaration/%.2/self">
+ <eAnnotations source="positions.162" references="/0/CppOperationDeclaration/%.2/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.150" references="/0/CppOperationDeclaration/%.3">
- <details key="start" value="2398"/>
- <details key="end" value="2410"/>
+ <eAnnotations source="positions.163" references="/0/CppOperationDeclaration/%.3">
+ <details key="start" value="2554"/>
+ <details key="end" value="2566"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.151" references="/0/CppOperationDeclaration/%.3/self">
+ <eAnnotations source="positions.164" references="/0/CppOperationDeclaration/%.3/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.152" references="/0/CppOperationDeclaration/%.4">
- <details key="start" value="2413"/>
- <details key="end" value="2424"/>
+ <eAnnotations source="positions.165" references="/0/CppOperationDeclaration/%.4">
+ <details key="start" value="2569"/>
+ <details key="end" value="2580"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.153" references="/0/CppOperationDeclaration/%.4/self">
+ <eAnnotations source="positions.166" references="/0/CppOperationDeclaration/%.4/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.154" references="/0/CppOperationDeclaration/%.5">
- <details key="start" value="2427"/>
- <details key="end" value="2442"/>
+ <eAnnotations source="positions.167" references="/0/CppOperationDeclaration/%.5">
+ <details key="start" value="2583"/>
+ <details key="end" value="2598"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.155" references="/0/CppOperationDeclaration/%.5/self">
+ <eAnnotations source="positions.168" references="/0/CppOperationDeclaration/%.5/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.156" references="/0/CppOperationDeclaration/%.6">
- <details key="start" value="2445"/>
- <details key="end" value="2457"/>
+ <eAnnotations source="positions.169" references="/0/CppOperationDeclaration/%.6">
+ <details key="start" value="2601"/>
+ <details key="end" value="2613"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.157" references="/0/CppOperationDeclaration/%.6/self">
+ <eAnnotations source="positions.170" references="/0/CppOperationDeclaration/%.6/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.158" references="/0/CppOperationDeclaration/%.7">
- <details key="start" value="2460"/>
- <details key="end" value="2474"/>
+ <eAnnotations source="positions.171" references="/0/CppOperationDeclaration/%.7">
+ <details key="start" value="2616"/>
+ <details key="end" value="2630"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.159" references="/0/CppOperationDeclaration/%.7/operation">
- <details key="start" value="2460"/>
- <details key="end" value="2469"/>
+ <eAnnotations source="positions.172" references="/0/CppOperationDeclaration/%.7/operation">
+ <details key="start" value="2616"/>
+ <details key="end" value="2625"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.160" references="/0/CppOperationDeclaration/%.8">
- <details key="start" value="2476"/>
- <details key="end" value="2477"/>
- <details key="line" value="74"/>
+ <eAnnotations source="positions.173" references="/0/CppOperationDeclaration/%.8">
+ <details key="start" value="2632"/>
+ <details key="end" value="2633"/>
+ <details key="line" value="78"/>
</eAnnotations>
- <eAnnotations source="positions.161" references="/0/CppOperationDeclaration/%.9">
- <details key="start" value="2478"/>
- <details key="end" value="2506"/>
+ <eAnnotations source="positions.174" references="/0/CppOperationDeclaration/%.9">
+ <details key="start" value="2634"/>
+ <details key="end" value="2662"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.162" references="/0/CppOperationDeclaration/%.9/self">
+ <eAnnotations source="positions.175" references="/0/CppOperationDeclaration/%.9/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.163" references="/0/CppOperationDeclaration/%.9/%">
- <details key="start" value="2501"/>
- <details key="end" value="2505"/>
+ <eAnnotations source="positions.176" references="/0/CppOperationDeclaration/%.9/%">
+ <details key="start" value="2657"/>
+ <details key="end" value="2661"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.164" references="/0/CppOperationDeclaration/%.10">
- <details key="start" value="2508"/>
- <details key="end" value="2509"/>
- <details key="line" value="74"/>
+ <eAnnotations source="positions.177" references="/0/CppOperationDeclaration/%.10">
+ <details key="start" value="2664"/>
+ <details key="end" value="2665"/>
+ <details key="line" value="78"/>
</eAnnotations>
- <eAnnotations source="positions.165" references="/0/CppOperationDeclaration/%.11">
- <details key="start" value="2510"/>
- <details key="end" value="2520"/>
+ <eAnnotations source="positions.178" references="/0/CppOperationDeclaration/%.11">
+ <details key="start" value="2666"/>
+ <details key="end" value="2676"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.166" references="/0/CppOperationDeclaration/%.11/self">
+ <eAnnotations source="positions.179" references="/0/CppOperationDeclaration/%.11/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.167" references="/0/CppOperationDeclaration/%.12">
- <details key="start" value="2523"/>
- <details key="end" value="2538"/>
+ <eAnnotations source="positions.180" references="/0/CppOperationDeclaration/%.12">
+ <details key="start" value="2679"/>
+ <details key="end" value="2694"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.168" references="/0/CppOperationDeclaration/%.12/self">
+ <eAnnotations source="positions.181" references="/0/CppOperationDeclaration/%.12/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.169" references="/0/CppOperationDeclaration/%.13">
- <details key="start" value="2540"/>
- <details key="end" value="2541"/>
- <details key="line" value="74"/>
+ <eAnnotations source="positions.182" references="/0/CppOperationDeclaration/%.13">
+ <details key="start" value="2696"/>
+ <details key="end" value="2697"/>
+ <details key="line" value="78"/>
</eAnnotations>
- <eAnnotations source="positions.170" references="/0/CppOperationDeclaration/operation">
- <details key="start" value="2338"/>
- <details key="end" value="2359"/>
- <details key="line" value="72"/>
+ <eAnnotations source="positions.183" references="/0/CppOperationDeclaration/operation">
+ <details key="start" value="2494"/>
+ <details key="end" value="2515"/>
+ <details key="line" value="76"/>
</eAnnotations>
- <eAnnotations source="positions.171" references="/0/CppBehaviorDeclaration">
- <details key="start" value="2555"/>
- <details key="end" value="2743"/>
- <details key="line" value="77"/>
+ <eAnnotations source="positions.184" references="/0/CppBehaviorDeclaration">
+ <details key="start" value="2711"/>
+ <details key="end" value="2899"/>
+ <details key="line" value="81"/>
</eAnnotations>
- <eAnnotations source="positions.172" references="/0/CppBehaviorDeclaration/%">
- <details key="start" value="2618"/>
- <details key="end" value="2634"/>
+ <eAnnotations source="positions.185" references="/0/CppBehaviorDeclaration/%">
+ <details key="start" value="2774"/>
+ <details key="end" value="2790"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.173" references="/0/CppBehaviorDeclaration/%/self">
+ <eAnnotations source="positions.186" references="/0/CppBehaviorDeclaration/%/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.174" references="/0/CppBehaviorDeclaration/%.1">
- <details key="start" value="2636"/>
- <details key="end" value="2637"/>
- <details key="line" value="79"/>
+ <eAnnotations source="positions.187" references="/0/CppBehaviorDeclaration/%.1">
+ <details key="start" value="2792"/>
+ <details key="end" value="2793"/>
+ <details key="line" value="83"/>
</eAnnotations>
- <eAnnotations source="positions.175" references="/0/CppBehaviorDeclaration/%.2">
- <details key="start" value="2638"/>
- <details key="end" value="2649"/>
+ <eAnnotations source="positions.188" references="/0/CppBehaviorDeclaration/%.2">
+ <details key="start" value="2794"/>
+ <details key="end" value="2805"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.176" references="/0/CppBehaviorDeclaration/%.2/self">
+ <eAnnotations source="positions.189" references="/0/CppBehaviorDeclaration/%.2/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.177" references="/0/CppBehaviorDeclaration/%.3">
- <details key="start" value="2652"/>
- <details key="end" value="2667"/>
+ <eAnnotations source="positions.190" references="/0/CppBehaviorDeclaration/%.3">
+ <details key="start" value="2808"/>
+ <details key="end" value="2823"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.178" references="/0/CppBehaviorDeclaration/%.3/self">
+ <eAnnotations source="positions.191" references="/0/CppBehaviorDeclaration/%.3/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.179" references="/0/CppBehaviorDeclaration/%.4">
- <details key="start" value="2670"/>
- <details key="end" value="2683"/>
+ <eAnnotations source="positions.192" references="/0/CppBehaviorDeclaration/%.4">
+ <details key="start" value="2826"/>
+ <details key="end" value="2839"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.180" references="/0/CppBehaviorDeclaration/%.4/behavior">
- <details key="start" value="2670"/>
- <details key="end" value="2678"/>
+ <eAnnotations source="positions.193" references="/0/CppBehaviorDeclaration/%.4/behavior">
+ <details key="start" value="2826"/>
+ <details key="end" value="2834"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.181" references="/0/CppBehaviorDeclaration/%.5">
- <details key="start" value="2685"/>
- <details key="end" value="2686"/>
- <details key="line" value="79"/>
+ <eAnnotations source="positions.194" references="/0/CppBehaviorDeclaration/%.5">
+ <details key="start" value="2841"/>
+ <details key="end" value="2842"/>
+ <details key="line" value="83"/>
</eAnnotations>
- <eAnnotations source="positions.182" references="/0/CppBehaviorDeclaration/%.6">
- <details key="start" value="2687"/>
- <details key="end" value="2714"/>
+ <eAnnotations source="positions.195" references="/0/CppBehaviorDeclaration/%.6">
+ <details key="start" value="2843"/>
+ <details key="end" value="2870"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.183" references="/0/CppBehaviorDeclaration/%.6/self">
+ <eAnnotations source="positions.196" references="/0/CppBehaviorDeclaration/%.6/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.184" references="/0/CppBehaviorDeclaration/%.6/%">
- <details key="start" value="2709"/>
- <details key="end" value="2713"/>
+ <eAnnotations source="positions.197" references="/0/CppBehaviorDeclaration/%.6/%">
+ <details key="start" value="2865"/>
+ <details key="end" value="2869"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.185" references="/0/CppBehaviorDeclaration/%.7">
- <details key="start" value="2716"/>
- <details key="end" value="2717"/>
- <details key="line" value="79"/>
+ <eAnnotations source="positions.198" references="/0/CppBehaviorDeclaration/%.7">
+ <details key="start" value="2872"/>
+ <details key="end" value="2873"/>
+ <details key="line" value="83"/>
</eAnnotations>
- <eAnnotations source="positions.186" references="/0/CppBehaviorDeclaration/%.8">
- <details key="start" value="2718"/>
- <details key="end" value="2728"/>
+ <eAnnotations source="positions.199" references="/0/CppBehaviorDeclaration/%.8">
+ <details key="start" value="2874"/>
+ <details key="end" value="2884"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.187" references="/0/CppBehaviorDeclaration/%.8/self">
+ <eAnnotations source="positions.200" references="/0/CppBehaviorDeclaration/%.8/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.188" references="/0/CppBehaviorDeclaration/%.9">
- <details key="start" value="2730"/>
- <details key="end" value="2731"/>
- <details key="line" value="79"/>
+ <eAnnotations source="positions.201" references="/0/CppBehaviorDeclaration/%.9">
+ <details key="start" value="2886"/>
+ <details key="end" value="2887"/>
+ <details key="line" value="83"/>
</eAnnotations>
- <eAnnotations source="positions.189" references="/0/CppBehaviorDeclaration/behavior">
- <details key="start" value="2595"/>
- <details key="end" value="2614"/>
- <details key="line" value="77"/>
+ <eAnnotations source="positions.202" references="/0/CppBehaviorDeclaration/behavior">
+ <details key="start" value="2751"/>
+ <details key="end" value="2770"/>
+ <details key="line" value="81"/>
</eAnnotations>
- <eAnnotations source="positions.190" references="/0/CppConstInit">
- <details key="start" value="2745"/>
- <details key="end" value="2944"/>
- <details key="line" value="82"/>
+ <eAnnotations source="positions.203" references="/0/CppConstInit">
+ <details key="start" value="2901"/>
+ <details key="end" value="3100"/>
+ <details key="line" value="86"/>
</eAnnotations>
- <eAnnotations source="positions.191" references="/0/CppConstInit/%">
- <details key="start" value="2799"/>
- <details key="end" value="2932"/>
- <details key="line" value="83"/>
+ <eAnnotations source="positions.204" references="/0/CppConstInit/%">
+ <details key="start" value="2955"/>
+ <details key="end" value="3088"/>
+ <details key="line" value="87"/>
</eAnnotations>
- <eAnnotations source="positions.192" references="/0/CppConstInit/%/%">
- <details key="start" value="2860"/>
- <details key="end" value="2863"/>
- <details key="line" value="83"/>
+ <eAnnotations source="positions.205" references="/0/CppConstInit/%/%">
+ <details key="start" value="3016"/>
+ <details key="end" value="3019"/>
+ <details key="line" value="87"/>
</eAnnotations>
- <eAnnotations source="positions.193" references="/0/CppConstInit/%/%.1">
- <details key="start" value="2864"/>
- <details key="end" value="2925"/>
+ <eAnnotations source="positions.206" references="/0/CppConstInit/%/%.1">
+ <details key="start" value="3020"/>
+ <details key="end" value="3081"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.194" references="/0/CppConstInit/%/%.1/%">
- <details key="start" value="2864"/>
- <details key="end" value="2910"/>
+ <eAnnotations source="positions.207" references="/0/CppConstInit/%/%.1/%">
+ <details key="start" value="3020"/>
+ <details key="end" value="3066"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.195" references="/0/CppConstInit/%/%.1/%/%">
- <details key="start" value="2864"/>
- <details key="end" value="2889"/>
+ <eAnnotations source="positions.208" references="/0/CppConstInit/%/%.1/%/%">
+ <details key="start" value="3020"/>
+ <details key="end" value="3045"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.196" references="/0/CppConstInit/%/%.1/%/%/self">
+ <eAnnotations source="positions.209" references="/0/CppConstInit/%/%.1/%/%/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.197" references="/0/CppConstInit/%/%.1/%/%/%">
- <details key="start" value="2879"/>
- <details key="end" value="2888"/>
+ <eAnnotations source="positions.210" references="/0/CppConstInit/%/%.1/%/%/%">
+ <details key="start" value="3035"/>
+ <details key="end" value="3044"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.198" references="/0/CppConstInit/%/%.1/%/%.1">
- <details key="start" value="2900"/>
- <details key="end" value="2909"/>
+ <eAnnotations source="positions.211" references="/0/CppConstInit/%/%.1/%/%.1">
+ <details key="start" value="3056"/>
+ <details key="end" value="3065"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.199" references="/0/CppConstInit/%/%.2">
- <details key="start" value="2803"/>
- <details key="end" value="2859"/>
+ <eAnnotations source="positions.212" references="/0/CppConstInit/%/%.2">
+ <details key="start" value="2959"/>
+ <details key="end" value="3015"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.200" references="/0/CppConstInit/%/%.2/%">
- <details key="start" value="2804"/>
- <details key="end" value="2828"/>
+ <eAnnotations source="positions.213" references="/0/CppConstInit/%/%.2/%">
+ <details key="start" value="2960"/>
+ <details key="end" value="2984"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.201" references="/0/CppConstInit/%/%.2/%/self">
+ <eAnnotations source="positions.214" references="/0/CppConstInit/%/%.2/%/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.202" references="/0/CppConstInit/%/%.2/%/%">
- <details key="start" value="2818"/>
- <details key="end" value="2827"/>
+ <eAnnotations source="positions.215" references="/0/CppConstInit/%/%.2/%/%">
+ <details key="start" value="2974"/>
+ <details key="end" value="2983"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.203" references="/0/CppConstInit/%/%.2/%.1">
- <details key="start" value="2833"/>
- <details key="end" value="2858"/>
+ <eAnnotations source="positions.216" references="/0/CppConstInit/%/%.2/%.1">
+ <details key="start" value="2989"/>
+ <details key="end" value="3014"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.204" references="/0/CppConstInit/%/%.2/%.1/self">
+ <eAnnotations source="positions.217" references="/0/CppConstInit/%/%.2/%.1/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.205" references="/0/CppConstInit/%/%.2/%.1/%">
- <details key="start" value="2847"/>
- <details key="end" value="2857"/>
+ <eAnnotations source="positions.218" references="/0/CppConstInit/%/%.2/%.1/%">
+ <details key="start" value="3003"/>
+ <details key="end" value="3013"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.206" references="/0/CppConstInit/operation">
- <details key="start" value="2775"/>
- <details key="end" value="2796"/>
- <details key="line" value="82"/>
+ <eAnnotations source="positions.219" references="/0/CppConstInit/operation">
+ <details key="start" value="2931"/>
+ <details key="end" value="2952"/>
+ <details key="line" value="86"/>
</eAnnotations>
- <eAnnotations source="positions.207" references="/0/%.1">
- <details key="start" value="2947"/>
- <details key="end" value="3027"/>
+ <eAnnotations source="positions.220" references="/0/%.1">
+ <details key="start" value="3103"/>
+ <details key="end" value="3183"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.208" references="/0/getBodyInTemplate">
- <details key="start" value="3028"/>
- <details key="end" value="3145"/>
- <details key="line" value="88"/>
+ <eAnnotations source="positions.221" references="/0/getBodyInTemplate">
+ <details key="start" value="3184"/>
+ <details key="end" value="3301"/>
+ <details key="line" value="92"/>
</eAnnotations>
- <eAnnotations source="positions.209" references="/0/getBodyInTemplate/%">
- <details key="start" value="3107"/>
- <details key="end" value="3131"/>
+ <eAnnotations source="positions.222" references="/0/getBodyInTemplate/%">
+ <details key="start" value="3263"/>
+ <details key="end" value="3287"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.210" references="/0/getBodyInTemplate/%/%">
- <details key="start" value="3107"/>
- <details key="end" value="3124"/>
+ <eAnnotations source="positions.223" references="/0/getBodyInTemplate/%/%">
+ <details key="start" value="3263"/>
+ <details key="end" value="3280"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.211" references="/0/getBodyInTemplate/%/%/self">
+ <eAnnotations source="positions.224" references="/0/getBodyInTemplate/%/%/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.212" references="/0/getBodyInTemplate/%/%/language">
- <details key="start" value="3115"/>
- <details key="end" value="3123"/>
+ <eAnnotations source="positions.225" references="/0/getBodyInTemplate/%/%/language">
+ <details key="start" value="3271"/>
+ <details key="end" value="3279"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.213" references="/0/getBodyInTemplate/operation">
- <details key="start" value="3063"/>
- <details key="end" value="3084"/>
- <details key="line" value="88"/>
+ <eAnnotations source="positions.226" references="/0/getBodyInTemplate/operation">
+ <details key="start" value="3219"/>
+ <details key="end" value="3240"/>
+ <details key="line" value="92"/>
</eAnnotations>
- <eAnnotations source="positions.214" references="/0/getBodyInTemplate/language">
- <details key="start" value="3086"/>
- <details key="end" value="3103"/>
- <details key="line" value="88"/>
+ <eAnnotations source="positions.227" references="/0/getBodyInTemplate/language">
+ <details key="start" value="3242"/>
+ <details key="end" value="3259"/>
+ <details key="line" value="92"/>
</eAnnotations>
- <eAnnotations source="positions.215" references="/0/throws">
- <details key="start" value="3148"/>
- <details key="end" value="3316"/>
- <details key="line" value="93"/>
+ <eAnnotations source="positions.228" references="/0/throws">
+ <details key="start" value="3304"/>
+ <details key="end" value="3472"/>
+ <details key="line" value="97"/>
</eAnnotations>
- <eAnnotations source="positions.216" references="/0/throws/%">
- <details key="start" value="3195"/>
- <details key="end" value="3304"/>
- <details key="line" value="94"/>
+ <eAnnotations source="positions.229" references="/0/throws/%">
+ <details key="start" value="3351"/>
+ <details key="end" value="3460"/>
+ <details key="line" value="98"/>
</eAnnotations>
- <eAnnotations source="positions.217" references="/0/throws/%/%">
- <details key="start" value="3240"/>
- <details key="end" value="3247"/>
- <details key="line" value="95"/>
+ <eAnnotations source="positions.230" references="/0/throws/%/%">
+ <details key="start" value="3396"/>
+ <details key="end" value="3403"/>
+ <details key="line" value="99"/>
</eAnnotations>
- <eAnnotations source="positions.218" references="/0/throws/%/%.1">
- <details key="start" value="3247"/>
- <details key="end" value="3298"/>
- <details key="line" value="95"/>
+ <eAnnotations source="positions.231" references="/0/throws/%/%.1">
+ <details key="start" value="3403"/>
+ <details key="end" value="3454"/>
+ <details key="line" value="99"/>
</eAnnotations>
- <eAnnotations source="positions.219" references="/0/throws/%/%.1/%">
- <details key="start" value="3286"/>
- <details key="end" value="3290"/>
+ <eAnnotations source="positions.232" references="/0/throws/%/%.1/%">
+ <details key="start" value="3442"/>
+ <details key="end" value="3446"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.220" references="/0/throws/%/%.1/%/self">
+ <eAnnotations source="positions.233" references="/0/throws/%/%.1/%/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.221" references="/0/throws/%/%.1/%.1">
- <details key="start" value="3253"/>
- <details key="end" value="3268"/>
+ <eAnnotations source="positions.234" references="/0/throws/%/%.1/%.1">
+ <details key="start" value="3409"/>
+ <details key="end" value="3424"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.222" references="/0/throws/%/%.1/%.1/self">
+ <eAnnotations source="positions.235" references="/0/throws/%/%.1/%.1/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.223" references="/0/throws/%/%.1/%.2">
- <details key="start" value="3280"/>
- <details key="end" value="3283"/>
+ <eAnnotations source="positions.236" references="/0/throws/%/%.1/%.2">
+ <details key="start" value="3436"/>
+ <details key="end" value="3439"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.224" references="/0/throws/%/%.2">
- <details key="start" value="3298"/>
- <details key="end" value="3299"/>
- <details key="line" value="96"/>
+ <eAnnotations source="positions.237" references="/0/throws/%/%.2">
+ <details key="start" value="3454"/>
+ <details key="end" value="3455"/>
+ <details key="line" value="100"/>
</eAnnotations>
- <eAnnotations source="positions.225" references="/0/throws/%/%.3">
- <details key="start" value="3199"/>
- <details key="end" value="3238"/>
+ <eAnnotations source="positions.238" references="/0/throws/%/%.3">
+ <details key="start" value="3355"/>
+ <details key="end" value="3394"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.226" references="/0/throws/%/%.3/%">
- <details key="start" value="3200"/>
- <details key="end" value="3233"/>
+ <eAnnotations source="positions.239" references="/0/throws/%/%.3/%">
+ <details key="start" value="3356"/>
+ <details key="end" value="3389"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.227" references="/0/throws/%/%.3/%/%">
- <details key="start" value="3200"/>
- <details key="end" value="3225"/>
+ <eAnnotations source="positions.240" references="/0/throws/%/%.3/%/%">
+ <details key="start" value="3356"/>
+ <details key="end" value="3381"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.228" references="/0/throws/%/%.3/%/%/operation">
- <details key="start" value="3200"/>
- <details key="end" value="3209"/>
+ <eAnnotations source="positions.241" references="/0/throws/%/%.3/%/%/operation">
+ <details key="start" value="3356"/>
+ <details key="end" value="3365"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.229" references="/0/throws/%/%.3/%.1">
- <details key="start" value="3236"/>
- <details key="end" value="3237"/>
+ <eAnnotations source="positions.242" references="/0/throws/%/%.3/%.1">
+ <details key="start" value="3392"/>
+ <details key="end" value="3393"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.230" references="/0/throws/operation">
- <details key="start" value="3172"/>
- <details key="end" value="3192"/>
- <details key="line" value="93"/>
+ <eAnnotations source="positions.243" references="/0/throws/operation">
+ <details key="start" value="3328"/>
+ <details key="end" value="3348"/>
+ <details key="line" value="97"/>
</eAnnotations>
- <eAnnotations source="positions.231" references="/0/CppOperationImplementation">
- <details key="start" value="3319"/>
- <details key="end" value="3821"/>
- <details key="line" value="100"/>
+ <eAnnotations source="positions.244" references="/0/CppOperationImplementation">
+ <details key="start" value="3475"/>
+ <details key="end" value="3977"/>
+ <details key="line" value="104"/>
</eAnnotations>
- <eAnnotations source="positions.232" references="/0/CppOperationImplementation/%">
- <details key="start" value="3388"/>
- <details key="end" value="3405"/>
+ <eAnnotations source="positions.245" references="/0/CppOperationImplementation/%">
+ <details key="start" value="3544"/>
+ <details key="end" value="3561"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.233" references="/0/CppOperationImplementation/%/self">
+ <eAnnotations source="positions.246" references="/0/CppOperationImplementation/%/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.234" references="/0/CppOperationImplementation/%.1">
- <details key="start" value="3407"/>
- <details key="end" value="3408"/>
- <details key="line" value="102"/>
+ <eAnnotations source="positions.247" references="/0/CppOperationImplementation/%.1">
+ <details key="start" value="3563"/>
+ <details key="end" value="3564"/>
+ <details key="line" value="106"/>
</eAnnotations>
- <eAnnotations source="positions.235" references="/0/CppOperationImplementation/%.2">
- <details key="start" value="3408"/>
- <details key="end" value="3809"/>
- <details key="line" value="102"/>
+ <eAnnotations source="positions.248" references="/0/CppOperationImplementation/%.2">
+ <details key="start" value="3564"/>
+ <details key="end" value="3965"/>
+ <details key="line" value="106"/>
</eAnnotations>
- <eAnnotations source="positions.236" references="/0/CppOperationImplementation/%.2/%">
- <details key="start" value="3440"/>
- <details key="end" value="3455"/>
+ <eAnnotations source="positions.249" references="/0/CppOperationImplementation/%.2/%">
+ <details key="start" value="3596"/>
+ <details key="end" value="3611"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.237" references="/0/CppOperationImplementation/%.2/%/self">
+ <eAnnotations source="positions.250" references="/0/CppOperationImplementation/%.2/%/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.238" references="/0/CppOperationImplementation/%.2/%.1">
- <details key="start" value="3458"/>
- <details key="end" value="3472"/>
+ <eAnnotations source="positions.251" references="/0/CppOperationImplementation/%.2/%.1">
+ <details key="start" value="3614"/>
+ <details key="end" value="3628"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.239" references="/0/CppOperationImplementation/%.2/%.1/operation">
- <details key="start" value="3458"/>
- <details key="end" value="3467"/>
+ <eAnnotations source="positions.252" references="/0/CppOperationImplementation/%.2/%.1/operation">
+ <details key="start" value="3614"/>
+ <details key="end" value="3623"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.240" references="/0/CppOperationImplementation/%.2/%.2">
- <details key="start" value="3474"/>
- <details key="end" value="3475"/>
- <details key="line" value="103"/>
+ <eAnnotations source="positions.253" references="/0/CppOperationImplementation/%.2/%.2">
+ <details key="start" value="3630"/>
+ <details key="end" value="3631"/>
+ <details key="line" value="107"/>
</eAnnotations>
- <eAnnotations source="positions.241" references="/0/CppOperationImplementation/%.2/%.3">
- <details key="start" value="3476"/>
- <details key="end" value="3505"/>
+ <eAnnotations source="positions.254" references="/0/CppOperationImplementation/%.2/%.3">
+ <details key="start" value="3632"/>
+ <details key="end" value="3661"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.242" references="/0/CppOperationImplementation/%.2/%.3/self">
+ <eAnnotations source="positions.255" references="/0/CppOperationImplementation/%.2/%.3/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.243" references="/0/CppOperationImplementation/%.2/%.3/%">
- <details key="start" value="3499"/>
- <details key="end" value="3504"/>
+ <eAnnotations source="positions.256" references="/0/CppOperationImplementation/%.2/%.3/%">
+ <details key="start" value="3655"/>
+ <details key="end" value="3660"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.244" references="/0/CppOperationImplementation/%.2/%.4">
- <details key="start" value="3507"/>
- <details key="end" value="3512"/>
- <details key="line" value="103"/>
+ <eAnnotations source="positions.257" references="/0/CppOperationImplementation/%.2/%.4">
+ <details key="start" value="3663"/>
+ <details key="end" value="3668"/>
+ <details key="line" value="107"/>
</eAnnotations>
- <eAnnotations source="positions.245" references="/0/CppOperationImplementation/%.2/%.5">
- <details key="start" value="3513"/>
- <details key="end" value="3529"/>
+ <eAnnotations source="positions.258" references="/0/CppOperationImplementation/%.2/%.5">
+ <details key="start" value="3669"/>
+ <details key="end" value="3685"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.246" references="/0/CppOperationImplementation/%.2/%.5/self">
+ <eAnnotations source="positions.259" references="/0/CppOperationImplementation/%.2/%.5/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.247" references="/0/CppOperationImplementation/%.2/%.5/%">
- <details key="start" value="3521"/>
- <details key="end" value="3528"/>
+ <eAnnotations source="positions.260" references="/0/CppOperationImplementation/%.2/%.5/%">
+ <details key="start" value="3677"/>
+ <details key="end" value="3684"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.248" references="/0/CppOperationImplementation/%.2/%.6">
- <details key="start" value="3531"/>
- <details key="end" value="3534"/>
- <details key="line" value="105"/>
+ <eAnnotations source="positions.261" references="/0/CppOperationImplementation/%.2/%.6">
+ <details key="start" value="3687"/>
+ <details key="end" value="3690"/>
+ <details key="line" value="109"/>
</eAnnotations>
- <eAnnotations source="positions.249" references="/0/CppOperationImplementation/%.2/%.7">
- <details key="start" value="3412"/>
- <details key="end" value="3437"/>
+ <eAnnotations source="positions.262" references="/0/CppOperationImplementation/%.2/%.7">
+ <details key="start" value="3568"/>
+ <details key="end" value="3593"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.250" references="/0/CppOperationImplementation/%.2/%.7/%">
- <details key="start" value="3413"/>
- <details key="end" value="3427"/>
+ <eAnnotations source="positions.263" references="/0/CppOperationImplementation/%.2/%.7/%">
+ <details key="start" value="3569"/>
+ <details key="end" value="3583"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.251" references="/0/CppOperationImplementation/%.2/%.7/%/operation">
- <details key="start" value="3413"/>
- <details key="end" value="3422"/>
+ <eAnnotations source="positions.264" references="/0/CppOperationImplementation/%.2/%.7/%/operation">
+ <details key="start" value="3569"/>
+ <details key="end" value="3578"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.252" references="/0/CppOperationImplementation/%.2/%.7/%.1">
- <details key="start" value="3430"/>
- <details key="end" value="3436"/>
+ <eAnnotations source="positions.265" references="/0/CppOperationImplementation/%.2/%.7/%.1">
+ <details key="start" value="3586"/>
+ <details key="end" value="3592"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.253" references="/0/CppOperationImplementation/%.2/%.8">
- <details key="start" value="3534"/>
- <details key="end" value="3804"/>
- <details key="line" value="106"/>
+ <eAnnotations source="positions.266" references="/0/CppOperationImplementation/%.2/%.8">
+ <details key="start" value="3690"/>
+ <details key="end" value="3960"/>
+ <details key="line" value="110"/>
</eAnnotations>
- <eAnnotations source="positions.254" references="/0/CppOperationImplementation/%.2/%.8/%">
- <details key="start" value="3542"/>
- <details key="end" value="3561"/>
+ <eAnnotations source="positions.267" references="/0/CppOperationImplementation/%.2/%.8/%">
+ <details key="start" value="3698"/>
+ <details key="end" value="3717"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.255" references="/0/CppOperationImplementation/%.2/%.8/%/self">
+ <eAnnotations source="positions.268" references="/0/CppOperationImplementation/%.2/%.8/%/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.256" references="/0/CppOperationImplementation/%.2/%.8/%.1">
- <details key="start" value="3564"/>
- <details key="end" value="3575"/>
+ <eAnnotations source="positions.269" references="/0/CppOperationImplementation/%.2/%.8/%.1">
+ <details key="start" value="3720"/>
+ <details key="end" value="3731"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.257" references="/0/CppOperationImplementation/%.2/%.8/%.1/self">
+ <eAnnotations source="positions.270" references="/0/CppOperationImplementation/%.2/%.8/%.1/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.258" references="/0/CppOperationImplementation/%.2/%.8/%.2">
- <details key="start" value="3578"/>
- <details key="end" value="3593"/>
+ <eAnnotations source="positions.271" references="/0/CppOperationImplementation/%.2/%.8/%.2">
+ <details key="start" value="3734"/>
+ <details key="end" value="3749"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.259" references="/0/CppOperationImplementation/%.2/%.8/%.2/self">
+ <eAnnotations source="positions.272" references="/0/CppOperationImplementation/%.2/%.8/%.2/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.260" references="/0/CppOperationImplementation/%.2/%.8/collect">
- <details key="start" value="3596"/>
- <details key="end" value="3630"/>
+ <eAnnotations source="positions.273" references="/0/CppOperationImplementation/%.2/%.8/collect">
+ <details key="start" value="3752"/>
+ <details key="end" value="3786"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.261" references="/0/CppOperationImplementation/%.2/%.8/collect/%">
- <details key="start" value="3596"/>
- <details key="end" value="3625"/>
+ <eAnnotations source="positions.274" references="/0/CppOperationImplementation/%.2/%.8/collect/%">
+ <details key="start" value="3752"/>
+ <details key="end" value="3781"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.262" references="/0/CppOperationImplementation/%.2/%.8/collect/%/operation">
- <details key="start" value="3596"/>
- <details key="end" value="3605"/>
+ <eAnnotations source="positions.275" references="/0/CppOperationImplementation/%.2/%.8/collect/%/operation">
+ <details key="start" value="3752"/>
+ <details key="end" value="3761"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.263" references="/0/CppOperationImplementation/%.2/%.8/collect/%.1">
- <details key="start" value="3626"/>
- <details key="end" value="3630"/>
+ <eAnnotations source="positions.276" references="/0/CppOperationImplementation/%.2/%.8/collect/%.1">
+ <details key="start" value="3782"/>
+ <details key="end" value="3786"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.264" references="/0/CppOperationImplementation/%.2/%.8/collect/%.1/temp1">
+ <eAnnotations source="positions.277" references="/0/CppOperationImplementation/%.2/%.8/collect/%.1/temp1">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.265" references="/0/CppOperationImplementation/%.2/%.8/collect/temp4">
+ <eAnnotations source="positions.278" references="/0/CppOperationImplementation/%.2/%.8/collect/temp4">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.266" references="/0/CppOperationImplementation/%.2/%.8/%.3">
- <details key="start" value="3633"/>
- <details key="end" value="3657"/>
+ <eAnnotations source="positions.279" references="/0/CppOperationImplementation/%.2/%.8/%.3">
+ <details key="start" value="3789"/>
+ <details key="end" value="3813"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.267" references="/0/CppOperationImplementation/%.2/%.8/%.3/self">
+ <eAnnotations source="positions.280" references="/0/CppOperationImplementation/%.2/%.8/%.3/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.268" references="/0/CppOperationImplementation/%.2/%.8/%.4">
- <details key="start" value="3659"/>
- <details key="end" value="3661"/>
- <details key="line" value="107"/>
+ <eAnnotations source="positions.281" references="/0/CppOperationImplementation/%.2/%.8/%.4">
+ <details key="start" value="3815"/>
+ <details key="end" value="3817"/>
+ <details key="line" value="111"/>
</eAnnotations>
- <eAnnotations source="positions.269" references="/0/CppOperationImplementation/%.2/%.8/%.5">
- <details key="start" value="3662"/>
- <details key="end" value="3674"/>
+ <eAnnotations source="positions.282" references="/0/CppOperationImplementation/%.2/%.8/%.5">
+ <details key="start" value="3818"/>
+ <details key="end" value="3830"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.270" references="/0/CppOperationImplementation/%.2/%.8/%.5/self">
+ <eAnnotations source="positions.283" references="/0/CppOperationImplementation/%.2/%.8/%.5/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.271" references="/0/CppOperationImplementation/%.2/%.8/%.6">
- <details key="start" value="3677"/>
- <details key="end" value="3691"/>
+ <eAnnotations source="positions.284" references="/0/CppOperationImplementation/%.2/%.8/%.6">
+ <details key="start" value="3833"/>
+ <details key="end" value="3847"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.272" references="/0/CppOperationImplementation/%.2/%.8/%.6/operation">
- <details key="start" value="3677"/>
- <details key="end" value="3686"/>
+ <eAnnotations source="positions.285" references="/0/CppOperationImplementation/%.2/%.8/%.6/operation">
+ <details key="start" value="3833"/>
+ <details key="end" value="3842"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.273" references="/0/CppOperationImplementation/%.2/%.8/%.7">
- <details key="start" value="3693"/>
- <details key="end" value="3694"/>
- <details key="line" value="107"/>
+ <eAnnotations source="positions.286" references="/0/CppOperationImplementation/%.2/%.8/%.7">
+ <details key="start" value="3849"/>
+ <details key="end" value="3850"/>
+ <details key="line" value="111"/>
</eAnnotations>
- <eAnnotations source="positions.274" references="/0/CppOperationImplementation/%.2/%.8/%.8">
- <details key="start" value="3695"/>
- <details key="end" value="3724"/>
+ <eAnnotations source="positions.287" references="/0/CppOperationImplementation/%.2/%.8/%.8">
+ <details key="start" value="3851"/>
+ <details key="end" value="3880"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.275" references="/0/CppOperationImplementation/%.2/%.8/%.8/self">
+ <eAnnotations source="positions.288" references="/0/CppOperationImplementation/%.2/%.8/%.8/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.276" references="/0/CppOperationImplementation/%.2/%.8/%.8/%">
- <details key="start" value="3718"/>
- <details key="end" value="3723"/>
+ <eAnnotations source="positions.289" references="/0/CppOperationImplementation/%.2/%.8/%.8/%">
+ <details key="start" value="3874"/>
+ <details key="end" value="3879"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.277" references="/0/CppOperationImplementation/%.2/%.8/%.9">
- <details key="start" value="3726"/>
- <details key="end" value="3727"/>
- <details key="line" value="107"/>
+ <eAnnotations source="positions.290" references="/0/CppOperationImplementation/%.2/%.8/%.9">
+ <details key="start" value="3882"/>
+ <details key="end" value="3883"/>
+ <details key="line" value="111"/>
</eAnnotations>
- <eAnnotations source="positions.278" references="/0/CppOperationImplementation/%.2/%.8/%.10">
- <details key="start" value="3728"/>
- <details key="end" value="3736"/>
+ <eAnnotations source="positions.291" references="/0/CppOperationImplementation/%.2/%.8/%.10">
+ <details key="start" value="3884"/>
+ <details key="end" value="3892"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.279" references="/0/CppOperationImplementation/%.2/%.8/%.10/self">
+ <eAnnotations source="positions.292" references="/0/CppOperationImplementation/%.2/%.8/%.10/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.280" references="/0/CppOperationImplementation/%.2/%.8/%.11">
- <details key="start" value="3739"/>
- <details key="end" value="3749"/>
+ <eAnnotations source="positions.293" references="/0/CppOperationImplementation/%.2/%.8/%.11">
+ <details key="start" value="3895"/>
+ <details key="end" value="3905"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.281" references="/0/CppOperationImplementation/%.2/%.8/%.11/self">
+ <eAnnotations source="positions.294" references="/0/CppOperationImplementation/%.2/%.8/%.11/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.282" references="/0/CppOperationImplementation/%.2/%.8/%.12">
- <details key="start" value="3752"/>
- <details key="end" value="3766"/>
+ <eAnnotations source="positions.295" references="/0/CppOperationImplementation/%.2/%.8/%.12">
+ <details key="start" value="3908"/>
+ <details key="end" value="3922"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.283" references="/0/CppOperationImplementation/%.2/%.8/%.12/self">
+ <eAnnotations source="positions.296" references="/0/CppOperationImplementation/%.2/%.8/%.12/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.284" references="/0/CppOperationImplementation/%.2/%.8/%.13">
- <details key="start" value="3768"/>
- <details key="end" value="3772"/>
- <details key="line" value="107"/>
+ <eAnnotations source="positions.297" references="/0/CppOperationImplementation/%.2/%.8/%.13">
+ <details key="start" value="3924"/>
+ <details key="end" value="3928"/>
+ <details key="line" value="111"/>
</eAnnotations>
- <eAnnotations source="positions.285" references="/0/CppOperationImplementation/%.2/%.8/%.14">
- <details key="start" value="3773"/>
- <details key="end" value="3799"/>
+ <eAnnotations source="positions.298" references="/0/CppOperationImplementation/%.2/%.8/%.14">
+ <details key="start" value="3929"/>
+ <details key="end" value="3955"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.286" references="/0/CppOperationImplementation/%.2/%.8/%.14/self">
+ <eAnnotations source="positions.299" references="/0/CppOperationImplementation/%.2/%.8/%.14/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.287" references="/0/CppOperationImplementation/%.2/%.8/%.14/%">
- <details key="start" value="3791"/>
- <details key="end" value="3798"/>
+ <eAnnotations source="positions.300" references="/0/CppOperationImplementation/%.2/%.8/%.14/%">
+ <details key="start" value="3947"/>
+ <details key="end" value="3954"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.288" references="/0/CppOperationImplementation/%.2/%.8/%.15">
- <details key="start" value="3801"/>
- <details key="end" value="3804"/>
- <details key="line" value="109"/>
+ <eAnnotations source="positions.301" references="/0/CppOperationImplementation/%.2/%.8/%.15">
+ <details key="start" value="3957"/>
+ <details key="end" value="3960"/>
+ <details key="line" value="113"/>
</eAnnotations>
- <eAnnotations source="positions.289" references="/0/CppOperationImplementation/operation">
- <details key="start" value="3363"/>
- <details key="end" value="3384"/>
- <details key="line" value="100"/>
+ <eAnnotations source="positions.302" references="/0/CppOperationImplementation/operation">
+ <details key="start" value="3519"/>
+ <details key="end" value="3540"/>
+ <details key="line" value="104"/>
</eAnnotations>
- <eAnnotations source="positions.290" references="/0/CppBehaviorImplementation">
- <details key="start" value="3824"/>
- <details key="end" value="4065"/>
- <details key="line" value="114"/>
+ <eAnnotations source="positions.303" references="/0/CppBehaviorImplementation">
+ <details key="start" value="3980"/>
+ <details key="end" value="4221"/>
+ <details key="line" value="118"/>
</eAnnotations>
- <eAnnotations source="positions.291" references="/0/CppBehaviorImplementation/%">
- <details key="start" value="3896"/>
- <details key="end" value="3912"/>
+ <eAnnotations source="positions.304" references="/0/CppBehaviorImplementation/%">
+ <details key="start" value="4052"/>
+ <details key="end" value="4068"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.292" references="/0/CppBehaviorImplementation/%/self">
+ <eAnnotations source="positions.305" references="/0/CppBehaviorImplementation/%/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.293" references="/0/CppBehaviorImplementation/%.1">
- <details key="start" value="3914"/>
- <details key="end" value="3915"/>
- <details key="line" value="116"/>
+ <eAnnotations source="positions.306" references="/0/CppBehaviorImplementation/%.1">
+ <details key="start" value="4070"/>
+ <details key="end" value="4071"/>
+ <details key="line" value="120"/>
</eAnnotations>
- <eAnnotations source="positions.294" references="/0/CppBehaviorImplementation/%.2">
- <details key="start" value="3916"/>
- <details key="end" value="3931"/>
+ <eAnnotations source="positions.307" references="/0/CppBehaviorImplementation/%.2">
+ <details key="start" value="4072"/>
+ <details key="end" value="4087"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.295" references="/0/CppBehaviorImplementation/%.2/self">
+ <eAnnotations source="positions.308" references="/0/CppBehaviorImplementation/%.2/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.296" references="/0/CppBehaviorImplementation/%.3">
- <details key="start" value="3934"/>
- <details key="end" value="3956"/>
+ <eAnnotations source="positions.309" references="/0/CppBehaviorImplementation/%.3">
+ <details key="start" value="4090"/>
+ <details key="end" value="4112"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.297" references="/0/CppBehaviorImplementation/%.3/%">
- <details key="start" value="3934"/>
- <details key="end" value="3951"/>
+ <eAnnotations source="positions.310" references="/0/CppBehaviorImplementation/%.3/%">
+ <details key="start" value="4090"/>
+ <details key="end" value="4107"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.298" references="/0/CppBehaviorImplementation/%.3/%/behavior">
- <details key="start" value="3934"/>
- <details key="end" value="3942"/>
+ <eAnnotations source="positions.311" references="/0/CppBehaviorImplementation/%.3/%/behavior">
+ <details key="start" value="4090"/>
+ <details key="end" value="4098"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.299" references="/0/CppBehaviorImplementation/%.4">
- <details key="start" value="3958"/>
- <details key="end" value="3960"/>
- <details key="line" value="116"/>
+ <eAnnotations source="positions.312" references="/0/CppBehaviorImplementation/%.4">
+ <details key="start" value="4114"/>
+ <details key="end" value="4116"/>
+ <details key="line" value="120"/>
</eAnnotations>
- <eAnnotations source="positions.300" references="/0/CppBehaviorImplementation/%.5">
- <details key="start" value="3961"/>
- <details key="end" value="3974"/>
+ <eAnnotations source="positions.313" references="/0/CppBehaviorImplementation/%.5">
+ <details key="start" value="4117"/>
+ <details key="end" value="4130"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.301" references="/0/CppBehaviorImplementation/%.5/behavior">
- <details key="start" value="3961"/>
- <details key="end" value="3969"/>
+ <eAnnotations source="positions.314" references="/0/CppBehaviorImplementation/%.5/behavior">
+ <details key="start" value="4117"/>
+ <details key="end" value="4125"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.302" references="/0/CppBehaviorImplementation/%.6">
- <details key="start" value="3976"/>
- <details key="end" value="3977"/>
- <details key="line" value="116"/>
+ <eAnnotations source="positions.315" references="/0/CppBehaviorImplementation/%.6">
+ <details key="start" value="4132"/>
+ <details key="end" value="4133"/>
+ <details key="line" value="120"/>
</eAnnotations>
- <eAnnotations source="positions.303" references="/0/CppBehaviorImplementation/%.7">
- <details key="start" value="3978"/>
- <details key="end" value="4006"/>
+ <eAnnotations source="positions.316" references="/0/CppBehaviorImplementation/%.7">
+ <details key="start" value="4134"/>
+ <details key="end" value="4162"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.304" references="/0/CppBehaviorImplementation/%.7/self">
+ <eAnnotations source="positions.317" references="/0/CppBehaviorImplementation/%.7/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.305" references="/0/CppBehaviorImplementation/%.7/%">
- <details key="start" value="4000"/>
- <details key="end" value="4005"/>
+ <eAnnotations source="positions.318" references="/0/CppBehaviorImplementation/%.7/%">
+ <details key="start" value="4156"/>
+ <details key="end" value="4161"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.306" references="/0/CppBehaviorImplementation/%.8">
- <details key="start" value="4008"/>
- <details key="end" value="4009"/>
- <details key="line" value="116"/>
+ <eAnnotations source="positions.319" references="/0/CppBehaviorImplementation/%.8">
+ <details key="start" value="4164"/>
+ <details key="end" value="4165"/>
+ <details key="line" value="120"/>
</eAnnotations>
- <eAnnotations source="positions.307" references="/0/CppBehaviorImplementation/%.9">
- <details key="start" value="4010"/>
- <details key="end" value="4020"/>
+ <eAnnotations source="positions.320" references="/0/CppBehaviorImplementation/%.9">
+ <details key="start" value="4166"/>
+ <details key="end" value="4176"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.308" references="/0/CppBehaviorImplementation/%.9/self">
+ <eAnnotations source="positions.321" references="/0/CppBehaviorImplementation/%.9/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.309" references="/0/CppBehaviorImplementation/%.10">
- <details key="start" value="4022"/>
- <details key="end" value="4026"/>
- <details key="line" value="116"/>
+ <eAnnotations source="positions.322" references="/0/CppBehaviorImplementation/%.10">
+ <details key="start" value="4178"/>
+ <details key="end" value="4182"/>
+ <details key="line" value="120"/>
</eAnnotations>
- <eAnnotations source="positions.310" references="/0/CppBehaviorImplementation/%.11">
- <details key="start" value="4027"/>
- <details key="end" value="4049"/>
+ <eAnnotations source="positions.323" references="/0/CppBehaviorImplementation/%.11">
+ <details key="start" value="4183"/>
+ <details key="end" value="4205"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.311" references="/0/CppBehaviorImplementation/%.11/self">
+ <eAnnotations source="positions.324" references="/0/CppBehaviorImplementation/%.11/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.312" references="/0/CppBehaviorImplementation/%.11/%">
- <details key="start" value="4041"/>
- <details key="end" value="4048"/>
+ <eAnnotations source="positions.325" references="/0/CppBehaviorImplementation/%.11/%">
+ <details key="start" value="4197"/>
+ <details key="end" value="4204"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.313" references="/0/CppBehaviorImplementation/%.12">
- <details key="start" value="4051"/>
- <details key="end" value="4053"/>
- <details key="line" value="118"/>
+ <eAnnotations source="positions.326" references="/0/CppBehaviorImplementation/%.12">
+ <details key="start" value="4207"/>
+ <details key="end" value="4209"/>
+ <details key="line" value="122"/>
</eAnnotations>
- <eAnnotations source="positions.314" references="/0/CppBehaviorImplementation/behavior">
- <details key="start" value="3867"/>
- <details key="end" value="3892"/>
- <details key="line" value="114"/>
+ <eAnnotations source="positions.327" references="/0/CppBehaviorImplementation/behavior">
+ <details key="start" value="4023"/>
+ <details key="end" value="4048"/>
+ <details key="line" value="118"/>
</eAnnotations>
</ecore:EAnnotation>
</xmi:XMI>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppOperations.mtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppOperations.mtl
index 94a303227b6..ca8faf76b87 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppOperations.mtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppOperations.mtl
@@ -35,8 +35,12 @@ return a list of owned operations, since this is not supported directly on a cla
[/template]
+[query public isConsOrDestructor(operation : Operation) : Boolean =
+hasStereotype(l2::Create) or hasStereotype(l2::Destroy)
+/]
+
[query public ConsDestructorOrVoid(operation : Operation) : String =
-if hasStereotype(l2::Create) or hasStereotype(l2::Destroy) then
+if isConsOrDestructor() then
''
else
'void '
@@ -44,14 +48,14 @@ endif/]
[query public destructor(operation : Operation) : String =
-if hasStereotype(l2::Destroy) then
+if hasStereotype(l2::Destroy) and not operation.name.startsWith('~') then
'~'
else
''
endif/]
[template public CppReturnSpec(operation : Operation)]
-[if (type = null)][ConsDestructorOrVoid()/][else][returnResult().modConst()/] [type.cppQualifiedName()/][returnResult().modPtr()/][returnResult().modRef()/] [/if]
+[if (type = null) or isConsOrDestructor()][ConsDestructorOrVoid()/][else][returnResult().modConst()/] [type.cppQualifiedName()/][returnResult().modPtr()/][returnResult().modRef()/] [/if]
[/template]
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppParameter.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppParameter.emtl
index edfd311aa77..d6ecc01b121 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppParameter.emtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppParameter.emtl
@@ -8,8 +8,8 @@
<takesTypesFrom href="http://www.eclipse.org/papyrus/C_Cpp/1#/"/>
</input>
<imports href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0"/>
- <imports href="platform:/plugin/utils/CppGenUtils.emtl#/0"/>
- <imports href="platform:/plugin/utils/Modifier.emtl#/0"/>
+ <imports href="../../../utils/CppGenUtils.emtl#/0"/>
+ <imports href="../../../utils/Modifier.emtl#/0"/>
<ownedModuleElement xsi:type="mtl:Template" name="defaultValue" visibility="Public">
<body xsi:type="mtl:IfBlock">
<body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=" = "/>
@@ -49,14 +49,14 @@
<ownedModuleElement xsi:type="mtl:Template" name="CppParameter" visibility="Public">
<body xsi:type="mtl:QueryInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- <definition href="platform:/plugin/utils/Modifier.emtl#/0/modConst"/>
+ <definition href="../../../utils/Modifier.emtl#/0/modConst"/>
<argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/12">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Parameter"/>
</argument>
</body>
<body xsi:type="mtl:QueryInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- <definition href="platform:/plugin/utils/CppGenUtils.emtl#/0/cppQualifiedName"/>
+ <definition href="../../../utils/CppGenUtils.emtl#/0/cppQualifiedName"/>
<argument xsi:type="ocl.ecore:PropertyCallExp">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Type"/>
<source xsi:type="ocl.ecore:VariableExp" name="parameter" referredVariable="/0/CppParameter/parameter">
@@ -67,14 +67,14 @@
</body>
<body xsi:type="mtl:QueryInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- <definition href="platform:/plugin/utils/Modifier.emtl#/0/modPtr"/>
+ <definition href="../../../utils/Modifier.emtl#/0/modPtr"/>
<argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/14">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Parameter"/>
</argument>
</body>
<body xsi:type="mtl:QueryInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- <definition href="platform:/plugin/utils/Modifier.emtl#/0/modRef"/>
+ <definition href="../../../utils/Modifier.emtl#/0/modRef"/>
<argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/15">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Parameter"/>
</argument>
@@ -89,7 +89,7 @@
</body>
<body xsi:type="mtl:QueryInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- <definition href="platform:/plugin/utils/Modifier.emtl#/0/modArray"/>
+ <definition href="../../../utils/Modifier.emtl#/0/modArray"/>
<argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/17">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Parameter"/>
</argument>
@@ -286,7 +286,7 @@
<contents xsi:type="ocl.ecore:Constraint"/>
</eAnnotations>
<eAnnotations source="MTL">
- <references href="platform:/plugin/utils/CppGenUtils.emtl#/0/cppQualifiedName"/>
+ <references href="../../../utils/CppGenUtils.emtl#/0/cppQualifiedName"/>
</eAnnotations>
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
<eParameters name="arg0">
@@ -298,7 +298,7 @@
<contents xsi:type="ocl.ecore:Constraint"/>
</eAnnotations>
<eAnnotations source="MTL">
- <references href="platform:/plugin/utils/Modifier.emtl#/0/modPtr"/>
+ <references href="../../../utils/Modifier.emtl#/0/modPtr"/>
</eAnnotations>
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
<eParameters name="propertyOrParameter">
@@ -310,7 +310,7 @@
<contents xsi:type="ocl.ecore:Constraint"/>
</eAnnotations>
<eAnnotations source="MTL">
- <references href="platform:/plugin/utils/Modifier.emtl#/0/modRef"/>
+ <references href="../../../utils/Modifier.emtl#/0/modRef"/>
</eAnnotations>
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
<eParameters name="propertyOrParameter">
@@ -322,7 +322,7 @@
<contents xsi:type="ocl.ecore:Constraint"/>
</eAnnotations>
<eAnnotations source="MTL">
- <references href="platform:/plugin/utils/Modifier.emtl#/0/modArray"/>
+ <references href="../../../utils/Modifier.emtl#/0/modArray"/>
</eAnnotations>
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
<eParameters name="propertyOrParameter">
@@ -334,7 +334,7 @@
<contents xsi:type="ocl.ecore:Constraint"/>
</eAnnotations>
<eAnnotations source="MTL">
- <references href="platform:/plugin/utils/Modifier.emtl#/0/modConst"/>
+ <references href="../../../utils/Modifier.emtl#/0/modConst"/>
</eAnnotations>
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
<eParameters name="propertyOrParameter">
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/messages.properties b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/messages.properties
new file mode 100644
index 00000000000..0d1e512b8fb
--- /dev/null
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/messages.properties
@@ -0,0 +1 @@
+CppModelElementsCreator_CannotFormatContent=Cannot format content
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/preferences/CppCodeGenConstants.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/preferences/CppCodeGenConstants.java
index 27adfd59abb..6da7ce34190 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/preferences/CppCodeGenConstants.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/preferences/CppCodeGenConstants.java
@@ -16,21 +16,21 @@ public class CppCodeGenConstants {
/**
* Suffix for generated header files
*/
- public static final String P_HEADER_SUFFIX = "headSuffix";
+ public static final String P_HEADER_SUFFIX = "headSuffix"; //$NON-NLS-1$
/**
* Suffix for generated body/implementation files
*/
- public static final String P_IMPLEM_SUFFIX = "implSuffix";
+ public static final String P_IMPLEM_SUFFIX = "implSuffix"; //$NON-NLS-1$
/**
* Suffix for generated body/implementation files
*/
- public static final String P_OUT_INOUT_OP = "outInoutOp";
+ public static final String P_OUT_INOUT_OP = "outInoutOp"; //$NON-NLS-1$
/**
* User defined comment header in generated files
*/
- public static final String P_COMMENT_HEADER = "commentHeader";
+ public static final String P_COMMENT_HEADER = "commentHeader"; //$NON-NLS-1$
}
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/preferences/CppCodeGenPreferenceInitializer.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/preferences/CppCodeGenPreferenceInitializer.java
index 0de1976c2a8..86a582619b5 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/preferences/CppCodeGenPreferenceInitializer.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/preferences/CppCodeGenPreferenceInitializer.java
@@ -25,13 +25,16 @@ public class CppCodeGenPreferenceInitializer extends AbstractPreferenceInitializ
*/
public void initializeDefaultPreferences() {
IPreferenceStore store = Activator.getDefault().getPreferenceStore();
- store.setDefault(CppCodeGenConstants.P_HEADER_SUFFIX, "h");
- store.setDefault(CppCodeGenConstants.P_IMPLEM_SUFFIX, "cpp");
- store.setDefault(CppCodeGenConstants.P_OUT_INOUT_OP, "*");
+ store.setDefault(CppCodeGenConstants.P_HEADER_SUFFIX, "h"); //$NON-NLS-1$
+ store.setDefault(CppCodeGenConstants.P_IMPLEM_SUFFIX, "cpp"); //$NON-NLS-1$
+ store.setDefault(CppCodeGenConstants.P_OUT_INOUT_OP, "*"); //$NON-NLS-1$
// Default value for P_COMMENT_HEADER
- String NL = System.getProperties().getProperty("line.separator");
- String defaultValue = "" + "// --------------------------------------------------------" + NL + "// Code generated by Papyrus C++" + NL + "// --------------------------------------------------------" + NL + NL;
+ String NL = System.getProperties().getProperty("line.separator"); //$NON-NLS-1$
+ String defaultValue =
+ "// --------------------------------------------------------" + NL + //$NON-NLS-1$
+ "// Code generated by Papyrus C++" + NL + //$NON-NLS-1$
+ "// --------------------------------------------------------" + NL + NL; //$NON-NLS-1$
store.setDefault(CppCodeGenConstants.P_COMMENT_HEADER, defaultValue);
}
}
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/transformation/CppModelElementsCreator.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/transformation/CppModelElementsCreator.java
index 754c05c0f1e..30f04b36594 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/transformation/CppModelElementsCreator.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/transformation/CppModelElementsCreator.java
@@ -35,9 +35,11 @@ import org.eclipse.papyrus.acceleo.AcceleoException;
import org.eclipse.papyrus.acceleo.GenUtils;
import org.eclipse.papyrus.acceleo.ModelElementsCreator;
import org.eclipse.papyrus.cpp.codegen.Activator;
+import org.eclipse.papyrus.cpp.codegen.Messages;
import org.eclipse.papyrus.cpp.codegen.preferences.CppCodeGenUtils;
import org.eclipse.text.edits.MalformedTreeException;
import org.eclipse.text.edits.TextEdit;
+import org.eclipse.uml2.uml.Association;
import org.eclipse.uml2.uml.Class;
import org.eclipse.uml2.uml.Classifier;
import org.eclipse.uml2.uml.Element;
@@ -140,11 +142,11 @@ public class CppModelElementsCreator extends ModelElementsCreator {
// Only generate when no CppNoCodeGen stereotype is applied to the class
else if((!noCodeGen(classifier)) &&
- (!GenUtils.hasStereotype(classifier, Template.class))) {
+ (!GenUtils.hasStereotype(classifier, Template.class)) &&
+ (!(classifier instanceof Association))) {
// Template Bound Class
if(GenUtils.isTemplateBoundElement(classifier)) {
- // TODO: Acceleo template is only defined for class (not for all classifiers)
String fileContent = commentHeader + AcceleoDriver.evaluateURI(CppBindHeader, classifier);
createFile(container, classifier.getName() + DOT + hppExt, fileContent, true);
@@ -187,7 +189,7 @@ public class CppModelElementsCreator extends ModelElementsCreator {
TextEdit edit = codeFormatter.format(CodeFormatter.K_TRANSLATION_UNIT, doc.get(), 0, doc.get().length(), 0, null);
if (edit == null) {
- Activator.log.debug("Cannot format content");
+ Activator.log.debug(Messages.CppModelElementsCreator_CannotFormatContent);
return content;
}
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/CppGenUtils.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/CppGenUtils.java
index 1e8e83c440e..42d87d5fd4d 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/CppGenUtils.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/CppGenUtils.java
@@ -298,7 +298,7 @@ public class CppGenUtils {
private static boolean visibilityStale = false;
private static VisibilityKind currVisibility = null;
- private static final Pattern EmptySectionRegex = Pattern.compile("^\\s*$");
+ private static final Pattern EmptySectionRegex = Pattern.compile("^\\s*$"); //$NON-NLS-1$
/**
* Update the current visibility to the specified value without writing this value to
@@ -322,7 +322,7 @@ public class CppGenUtils {
// Filter out empty sections.
Matcher m = EmptySectionRegex.matcher(content);
if (content.isEmpty() || m.matches()) {
- return "";
+ return ""; //$NON-NLS-1$
}
// Don't write duplicate visibility modifiers.
@@ -331,6 +331,6 @@ public class CppGenUtils {
}
visibilityStale = false;
- return currVisibility.toString() + ":\n" + content;
+ return currVisibility.toString() + ":\n" + content; //$NON-NLS-1$
}
}
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/.classpath b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/.classpath
index 64c5e31b7a2..ad32c83a788 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/.classpath
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/META-INF/MANIFEST.MF b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/META-INF/MANIFEST.MF
index 8e2d90659f4..71fe671010a 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/META-INF/MANIFEST.MF
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/META-INF/MANIFEST.MF
@@ -18,5 +18,5 @@ Bundle-Localization: plugin
Bundle-ManifestVersion: 2
Bundle-Activator: org.eclipse.papyrus.cpp.profile.Activator
Bundle-SymbolicName: org.eclipse.papyrus.cpp.profile;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.genmodel b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.genmodel
index c6277d7e0ae..5699bcbf6af 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.genmodel
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.genmodel
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
- xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.papyrus.cpp.profile/src" modelPluginID="org.eclipse.papyrus.cpp.profile"
- modelName="C_Cpp" importerID="org.eclipse.emf.importer.ecore" complianceLevel="6.0"
- copyrightFields="false" usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/plugin/org.eclipse.uml2.types/model/Types.genmodel#//types platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml">
+ xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2013 CEA LIST&#xA;&#xA;All rights reserved. This program and the accompanying materials are&#xA;made available under the terms of the Eclipse Public License v1.0 which&#xA;accompanies this distribution, and is available at&#xA;http://www.eclipse.org/legal/epl-v10.html&#xA;&#xA;Contributors:&#xA; CEA LIST - Initial API and implementation&#xA;"
+ modelDirectory="/org.eclipse.papyrus.cpp.profile/src" modelPluginID="org.eclipse.papyrus.cpp.profile"
+ modelName="C_Cpp" nonNLSMarkers="true" importerID="org.eclipse.emf.importer.ecore"
+ complianceLevel="6.0" copyrightFields="false" usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/plugin/org.eclipse.uml2.types/model/Types.genmodel#//types platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml">
<foreignModel>C_Cpp.ecore</foreignModel>
<genPackages prefix="C_Cpp" basePackage="org.eclipse.papyrus" resource="XML" disposableProviderFactory="true"
ecorePackage="C_Cpp.ecore#/">
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Array.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Array.java
index d82c567d1d6..dca4e830bcc 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Array.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Array.java
@@ -1,4 +1,14 @@
/**
+ * Copyright (c) 2013 CEA LIST
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
*/
package org.eclipse.papyrus.C_Cpp;
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/C_CppFactory.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/C_CppFactory.java
index 2fed909c509..c391b9c0505 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/C_CppFactory.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/C_CppFactory.java
@@ -1,4 +1,14 @@
/**
+ * Copyright (c) 2013 CEA LIST
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
*/
package org.eclipse.papyrus.C_Cpp;
@@ -49,67 +59,67 @@ public interface C_CppFactory extends EFactory {
ManualGeneration createManualGeneration();
/**
- * Returns a new object of class '<em>Array</em>'.
+ * Returns a new object of class '<em>Extern Library</em>'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return a new object of class '<em>Array</em>'.
+ * @return a new object of class '<em>Extern Library</em>'.
* @generated
*/
- Array createArray();
+ ExternLibrary createExternLibrary();
/**
- * Returns a new object