Bug 581963 - [Robotics] Data type use in templates
- Replace ROS2 primitive types with AnsiC types in the component-definition model template
This is a workaround for a better solution in the future that
might add language specific imports
Change-Id: I57988f4457d22e3862bc66d761b5756a550c97a6
Signed-off-by: aradermache <ansgar.radermacher@cea.fr>
diff --git a/plugins/customization/org.eclipse.papyrus.robotics.wizards/templates/robotics.compdef.notation b/plugins/customization/org.eclipse.papyrus.robotics.wizards/templates/robotics.compdef.notation
index 8f440a9..a334ff3 100644
--- a/plugins/customization/org.eclipse.papyrus.robotics.wizards/templates/robotics.compdef.notation
+++ b/plugins/customization/org.eclipse.papyrus.robotics.wizards/templates/robotics.compdef.notation
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_e0O2cOpxEemV7bO6y5lBrw" type="CompositeStructure" name="[modelNameUC]" measurementUnit="Pixel">
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.3/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_e0O2cOpxEemV7bO6y5lBrw" type="CompositeStructure" name="[modelNameUC]" measurementUnit="Pixel">
<children xmi:type="notation:Shape" xmi:id="_frMToOpxEemV7bO6y5lBrw" type="Class_Shape">
<children xmi:type="notation:DecorationNode" xmi:id="_frOv4OpxEemV7bO6y5lBrw" type="Class_NameLabel"/>
<children xmi:type="notation:DecorationNode" xmi:id="_frOv4epxEemV7bO6y5lBrw" type="Class_FloatingNameLabel">
diff --git a/plugins/customization/org.eclipse.papyrus.robotics.wizards/templates/robotics.compdef.uml b/plugins/customization/org.eclipse.papyrus.robotics.wizards/templates/robotics.compdef.uml
index 13fd75c..30a87c6 100644
--- a/plugins/customization/org.eclipse.papyrus.robotics.wizards/templates/robotics.compdef.uml
+++ b/plugins/customization/org.eclipse.papyrus.robotics.wizards/templates/robotics.compdef.uml
@@ -4,8 +4,8 @@
<packageImport xmi:type="uml:PackageImport" xmi:id="_9orREEvVEeiD6o8-tlgjlw">
<importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
</packageImport>
- <packageImport xmi:type="uml:PackageImport" xmi:id="_83fDsK46EeqUtcwmzJZaUA">
- <importedPackage xmi:type="uml:Model" href="pathmap://ROS2_LIBRARY/ros2.primitive.uml#_T7frkG-0EeiX6ta975XXMg"/>
+ <packageImport xmi:type="uml:PackageImport" xmi:id="_ex860PlEEe2fZpg0VAA_Vg">
+ <importedPackage xmi:type="uml:Model" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_DV8nkBv8EduZN5aJJITI5w"/>
</packageImport>
<packagedElement xmi:type="uml:Class" xmi:id="_frEX0OpxEemV7bO6y5lBrw" name="[modelNameUC]">
<nestedClassifier xmi:type="uml:Class" xmi:id="_RdEFEO5jEempga7VuRI4jg"/>
