Bug 568448 - [Robotics, ROS2] Respect ROS2 conventions with respect code formatting/author information
- Change name of "simple" service definition to "simple_msgs" in order to respect ROS2 conventions
=> impact on all testmodels and on generated code
- Configure code formatter according to ROS2 specifications: indent by 2 characters and use spaces instead of tabs
=> impact on generated code
- Use P_, Q_, S_ and E_ prefix to better align with existing ROS2 libraries
- Adapt expected results in tests accordingly
- Include author and maintainer information in generated code.
Change-Id: If1a446df3b51bf69e9c5c94cc11c48e711ef7ebd
Signed-off-by: Ansgar Radermacher <ansgar.radermacher@cea.fr>
diff --git a/plugins/customization/org.eclipse.papyrus.robotics.library/src/org/eclipse/papyrus/robotics/library/advice/EventCommPatternAdvice.java b/plugins/customization/org.eclipse.papyrus.robotics.library/src/org/eclipse/papyrus/robotics/library/advice/EventCommPatternAdvice.java
index fcc2cc3..927d17f 100644
--- a/plugins/customization/org.eclipse.papyrus.robotics.library/src/org/eclipse/papyrus/robotics/library/advice/EventCommPatternAdvice.java
+++ b/plugins/customization/org.eclipse.papyrus.robotics.library/src/org/eclipse/papyrus/robotics/library/advice/EventCommPatternAdvice.java
@@ -108,7 +108,7 @@
TemplateSignature signature = eventCommPattern.getOwnedTemplateSignature();
TemplateBinding binding = classifier.createTemplateBinding(signature);
- String name = "Event";
+ String name = "E"; // E for event
// loop on template parameters;
for (TemplateParameter tp : signature.getOwnedParameters()) {
diff --git a/plugins/customization/org.eclipse.papyrus.robotics.library/src/org/eclipse/papyrus/robotics/library/advice/PushCommPatternAdvice.java b/plugins/customization/org.eclipse.papyrus.robotics.library/src/org/eclipse/papyrus/robotics/library/advice/PushCommPatternAdvice.java
index 9dbde4f..70f3ac6 100644
--- a/plugins/customization/org.eclipse.papyrus.robotics.library/src/org/eclipse/papyrus/robotics/library/advice/PushCommPatternAdvice.java
+++ b/plugins/customization/org.eclipse.papyrus.robotics.library/src/org/eclipse/papyrus/robotics/library/advice/PushCommPatternAdvice.java
@@ -88,7 +88,7 @@
TemplateSignature signature = pushCommPattern.getOwnedTemplateSignature();
TemplateBinding binding = classifier.createTemplateBinding(signature);
- String name = "Push";
+ String name = "P"; // for push
// loop on template parameters;
for (TemplateParameter parameter : signature.getOwnedParameters()) {
diff --git a/plugins/customization/org.eclipse.papyrus.robotics.library/src/org/eclipse/papyrus/robotics/library/advice/QueryCommPatternAdvice.java b/plugins/customization/org.eclipse.papyrus.robotics.library/src/org/eclipse/papyrus/robotics/library/advice/QueryCommPatternAdvice.java
index 61def98..005844c 100644
--- a/plugins/customization/org.eclipse.papyrus.robotics.library/src/org/eclipse/papyrus/robotics/library/advice/QueryCommPatternAdvice.java
+++ b/plugins/customization/org.eclipse.papyrus.robotics.library/src/org/eclipse/papyrus/robotics/library/advice/QueryCommPatternAdvice.java
@@ -97,7 +97,7 @@
TemplateSignature signature = queryCommPattern.getOwnedTemplateSignature();
TemplateBinding binding = classifier.createTemplateBinding(signature);
- String name = "Query";
+ String name = "Q"; // Q for query
// loop on template parameters;
for (TemplateParameter parameter : signature.getOwnedParameters()) {
diff --git a/plugins/customization/org.eclipse.papyrus.robotics.library/src/org/eclipse/papyrus/robotics/library/advice/SendCommPatternAdvice.java b/plugins/customization/org.eclipse.papyrus.robotics.library/src/org/eclipse/papyrus/robotics/library/advice/SendCommPatternAdvice.java
index 756854c..30774ba 100644
--- a/plugins/customization/org.eclipse.papyrus.robotics.library/src/org/eclipse/papyrus/robotics/library/advice/SendCommPatternAdvice.java
+++ b/plugins/customization/org.eclipse.papyrus.robotics.library/src/org/eclipse/papyrus/robotics/library/advice/SendCommPatternAdvice.java
@@ -86,7 +86,7 @@
TemplateSignature signature = sendCommPattern.getOwnedTemplateSignature();
TemplateBinding binding = classifier.createTemplateBinding(signature);
- String name = "Send";
+ String name = "S"; // for send
// loop on template parameters;
for (TemplateParameter parameter : signature.getOwnedParameters()) {
diff --git a/plugins/customization/org.eclipse.papyrus.robotics.simplifiedui/META-INF/MANIFEST.MF b/plugins/customization/org.eclipse.papyrus.robotics.simplifiedui/META-INF/MANIFEST.MF
index 11f6e83..2f704b0 100644
--- a/plugins/customization/org.eclipse.papyrus.robotics.simplifiedui/META-INF/MANIFEST.MF
+++ b/plugins/customization/org.eclipse.papyrus.robotics.simplifiedui/META-INF/MANIFEST.MF
@@ -44,7 +44,8 @@
org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="[3.1.0,5.0.0)",
org.eclipse.papyrus.emf.facet.util.emf.core;bundle-version="[1.2.0,4.0.0)",
org.eclipse.papyrus.infra.ui.emf;bundle-version="[2.2.0,4.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.tooling.runtime;bundle-version="[3.1.0,5.0.0)"
+ org.eclipse.papyrus.infra.gmfdiag.tooling.runtime;bundle-version="[3.1.0,5.0.0)",
+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="[2.0.0,4.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %Bundle-Vendor
diff --git a/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/models/dummy_robot/models/components/dummy_laser.compdef.notation b/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/models/dummy_robot/models/components/dummy_laser.compdef.notation
index 5f26645..65a1f96 100644
--- a/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/models/dummy_robot/models/components/dummy_laser.compdef.notation
+++ b/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/models/dummy_robot/models/components/dummy_laser.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.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="_tVNhEA9nEeq4SdRfpcPmcg" type="CompositeStructure" name="dummy_laser diagram" 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.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="_tVNhEA9nEeq4SdRfpcPmcg" type="CompositeStructure" name="dummy_laser diagram" measurementUnit="Pixel">
<children xmi:type="notation:Shape" xmi:id="_uDJlIA9nEeq4SdRfpcPmcg" type="Class_Shape">
<children xmi:type="notation:DecorationNode" xmi:id="_uDJlIg9nEeq4SdRfpcPmcg" type="Class_NameLabel"/>
<children xmi:type="notation:DecorationNode" xmi:id="_uDJlIw9nEeq4SdRfpcPmcg" type="Class_FloatingNameLabel">
diff --git a/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/models/dummy_robot/models/components/dummy_map_server.compdef.notation b/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/models/dummy_robot/models/components/dummy_map_server.compdef.notation
index 7099875..c410ddd 100644
--- a/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/models/dummy_robot/models/components/dummy_map_server.compdef.notation
+++ b/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/models/dummy_robot/models/components/dummy_map_server.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.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="_IaJ4oA9pEeq4SdRfpcPmcg" type="CompositeStructure" name="dummy_map_server diagram" 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.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="_IaJ4oA9pEeq4SdRfpcPmcg" type="CompositeStructure" name="dummy_map_server diagram" measurementUnit="Pixel">
<children xmi:type="notation:Shape" xmi:id="_M1QyAA9pEeq4SdRfpcPmcg" type="Class_Shape">
<children xmi:type="notation:DecorationNode" xmi:id="_M1QyAg9pEeq4SdRfpcPmcg" type="Class_NameLabel"/>
<children xmi:type="notation:DecorationNode" xmi:id="_M1QyAw9pEeq4SdRfpcPmcg" type="Class_FloatingNameLabel">
diff --git a/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/models/mara/models/components/MARAClient.compdef.notation b/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/models/mara/models/components/MARAClient.compdef.notation
index 2c6e8dc..85f41a7 100644
--- a/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/models/mara/models/components/MARAClient.compdef.notation
+++ b/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/models/mara/models/components/MARAClient.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.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="_TcGqsNAREemsvtLt7dgtCQ" type="CompositeStructure" name="MARAClient diagram" 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.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="_TcGqsNAREemsvtLt7dgtCQ" type="CompositeStructure" name="MARAClient diagram" measurementUnit="Pixel">
<children xmi:type="notation:Shape" xmi:id="_dtVp8NAREemsvtLt7dgtCQ" type="Class_Shape">
<children xmi:type="notation:DecorationNode" xmi:id="_dtWRANAREemsvtLt7dgtCQ" type="Class_NameLabel"/>
<children xmi:type="notation:DecorationNode" xmi:id="_dtWRAdAREemsvtLt7dgtCQ" type="Class_FloatingNameLabel">
diff --git a/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/models/mara/models/components/RotaryServo.compdef.notation b/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/models/mara/models/components/RotaryServo.compdef.notation
index 9a96402..4a2177f 100644
--- a/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/models/mara/models/components/RotaryServo.compdef.notation
+++ b/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/models/mara/models/components/RotaryServo.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.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="_80NbUNAREemsvtLt7dgtCQ" type="CompositeStructure" name="RotaryServo diagram" 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.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="_80NbUNAREemsvtLt7dgtCQ" type="CompositeStructure" name="RotaryServo diagram" measurementUnit="Pixel">
<children xmi:type="notation:Shape" xmi:id="_HfQowNASEemsvtLt7dgtCQ" type="Class_Shape">
<children xmi:type="notation:DecorationNode" xmi:id="_HfRP0NASEemsvtLt7dgtCQ" type="Class_NameLabel"/>
<children xmi:type="notation:DecorationNode" xmi:id="_HfR24NASEemsvtLt7dgtCQ" type="Class_FloatingNameLabel">
diff --git a/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/models/rviz/models/components/rviz.compdef.notation b/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/models/rviz/models/components/rviz.compdef.notation
index 7f7a534..8f7c423 100644
--- a/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/models/rviz/models/components/rviz.compdef.notation
+++ b/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/models/rviz/models/components/rviz.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.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="_lXehkA9_EeqYjOkV1WinKg" type="CompositeStructure" name="rviz diagram" 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.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="_lXehkA9_EeqYjOkV1WinKg" type="CompositeStructure" name="rviz diagram" measurementUnit="Pixel">
<children xmi:type="notation:Shape" xmi:id="_oMltgA9_EeqYjOkV1WinKg" type="Class_Shape">
<children xmi:type="notation:DecorationNode" xmi:id="_oMm7oA9_EeqYjOkV1WinKg" type="Class_NameLabel"/>
<children xmi:type="notation:DecorationNode" xmi:id="_oMm7oQ9_EeqYjOkV1WinKg" type="Class_FloatingNameLabel">
diff --git a/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/testmodels/clientServer/models/components/addClient.compdef.notation b/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/testmodels/clientServer/models/components/addClient.compdef.notation
index cc0c08c..b9ca060 100644
--- a/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/testmodels/clientServer/models/components/addClient.compdef.notation
+++ b/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/testmodels/clientServer/models/components/addClient.compdef.notation
@@ -36,13 +36,13 @@
<element xmi:type="uml:Class" href="addClient.compdef.uml#_XIHIcIO1EeqvFNZCXiiVuA"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_XOQzwYO1EeqvFNZCXiiVuA" x="14"/>
</children>
- <children xmi:type="notation:Shape" xmi:id="_MmxNQKgrEeqREZyOpEdqSw" type="StereotypeComment">
- <styles xmi:type="notation:TitleStyle" xmi:id="_MmxNQagrEeqREZyOpEdqSw"/>
- <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MmxNQ6grEeqREZyOpEdqSw" name="BASE_ELEMENT">
+ <children xmi:type="notation:Shape" xmi:id="_d_bDMxnOEeu8ps5-obE9qA" type="StereotypeComment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_d_bDNBnOEeu8ps5-obE9qA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_d_bDNhnOEeu8ps5-obE9qA" name="BASE_ELEMENT">
<eObjectValue xmi:type="uml:Class" href="addClient.compdef.uml#_XIHIcIO1EeqvFNZCXiiVuA"/>
</styles>
<element xsi:nil="true"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MmxNQqgrEeqREZyOpEdqSw" x="214"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_d_bDNRnOEeu8ps5-obE9qA" x="214"/>
</children>
<styles xmi:type="notation:TitleStyle" xmi:id="_T7JEVPWmEemhCpo2nwBldA"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_T7JEVfWmEemhCpo2nwBldA"/>
@@ -909,6 +909,30 @@
<element xsi:nil="true"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_Mm_PsqgrEeqREZyOpEdqSw" x="100" y="100"/>
</children>
+ <children xmi:type="notation:Shape" xmi:id="_d_RSQxnOEeu8ps5-obE9qA" type="StereotypeComment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_d_RSRBnOEeu8ps5-obE9qA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_d_RSRhnOEeu8ps5-obE9qA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="addClient.compdef.uml#_kiyUIEiHEeiAtInRNnLmIQ"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_d_RSRRnOEeu8ps5-obE9qA" x="434" y="20"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_d_WKwBnOEeu8ps5-obE9qA" type="StereotypeComment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_d_WKwRnOEeu8ps5-obE9qA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_d_WKwxnOEeu8ps5-obE9qA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="addClient.compdef.uml#_DNyKEHX0EeirHb2XH36K_A"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_d_WKwhnOEeu8ps5-obE9qA" x="314" y="100"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_d_fUoBnOEeu8ps5-obE9qA" type="StereotypeComment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_d_fUoRnOEeu8ps5-obE9qA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_d_fUoxnOEeu8ps5-obE9qA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Port" href="addClient.compdef.uml#_Fv2rwHq2EeikT4nAmbXssQ"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_d_fUohnOEeu8ps5-obE9qA" x="331" y="50"/>
+ </children>
<styles xmi:type="notation:TitleStyle" xmi:id="_dtWRBNAREemsvtLt7dgtCQ"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_dtWRBdAREemsvtLt7dgtCQ"/>
</children>
@@ -1480,13 +1504,29 @@
<element xsi:nil="true"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_MnNSIqgrEeqREZyOpEdqSw" x="671" y="215"/>
</children>
- <children xmi:type="notation:Shape" xmi:id="_O1cEQ6grEeqREZyOpEdqSw" type="StereotypeComment">
- <styles xmi:type="notation:TitleStyle" xmi:id="_O1cERKgrEeqREZyOpEdqSw"/>
- <styles xmi:type="notation:EObjectValueStyle" xmi:id="_O1cERqgrEeqREZyOpEdqSw" name="BASE_ELEMENT">
+ <children xmi:type="notation:Shape" xmi:id="_d_Nn0BnOEeu8ps5-obE9qA" type="StereotypeComment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_d_Nn0RnOEeu8ps5-obE9qA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_d_Nn0xnOEeu8ps5-obE9qA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="addClient.compdef.uml#_-9MoUEiFEeiAtInRNnLmIQ"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_d_Nn0hnOEeu8ps5-obE9qA" x="240" y="60"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_d_kNIBnOEeu8ps5-obE9qA" type="StereotypeComment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_d_kNIRnOEeu8ps5-obE9qA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_d_kNIxnOEeu8ps5-obE9qA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Port" href="addClient.compdef.uml#_6SlXMHq1EeikT4nAmbXssQ"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_d_kNIhnOEeu8ps5-obE9qA" x="551" y="190"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_d_pssBnOEeu8ps5-obE9qA" type="StereotypeComment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_d_pssRnOEeu8ps5-obE9qA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_d_qTwBnOEeu8ps5-obE9qA" name="BASE_ELEMENT">
<eObjectValue xmi:type="uml:Connector" href="addClient.compdef.uml#_OrKG4KgrEeqREZyOpEdqSw"/>
</styles>
<element xsi:nil="true"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_O1cERagrEeqREZyOpEdqSw" x="671" y="115"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_d_psshnOEeu8ps5-obE9qA" x="551" y="90"/>
</children>
<styles xmi:type="notation:StringValueStyle" xmi:id="_TcGqsdAREemsvtLt7dgtCQ" name="diagram_compatibility_version" stringValue="1.4.0"/>
<styles xmi:type="notation:DiagramStyle" xmi:id="_TcGqstAREemsvtLt7dgtCQ"/>
@@ -2741,16 +2781,6 @@
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Mmqfp6grEeqREZyOpEdqSw"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MmqfqKgrEeqREZyOpEdqSw"/>
</edges>
- <edges xmi:type="notation:Connector" xmi:id="_MmxNRKgrEeqREZyOpEdqSw" type="StereotypeCommentLink" source="_XOQzwIO1EeqvFNZCXiiVuA" target="_MmxNQKgrEeqREZyOpEdqSw">
- <styles xmi:type="notation:FontStyle" xmi:id="_MmxNRagrEeqREZyOpEdqSw"/>
- <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MmxNSagrEeqREZyOpEdqSw" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:Class" href="addClient.compdef.uml#_XIHIcIO1EeqvFNZCXiiVuA"/>
- </styles>
- <element xsi:nil="true"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MmxNRqgrEeqREZyOpEdqSw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MmxNR6grEeqREZyOpEdqSw"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MmxNSKgrEeqREZyOpEdqSw"/>
- </edges>
<edges xmi:type="notation:Connector" xmi:id="_Mm369KgrEeqREZyOpEdqSw" type="StereotypeCommentLink" source="_ZBhvUPWmEemhCpo2nwBldA" target="_Mm368KgrEeqREZyOpEdqSw">
<styles xmi:type="notation:FontStyle" xmi:id="_Mm369agrEeqREZyOpEdqSw"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_Mm36-agrEeqREZyOpEdqSw" name="BASE_ELEMENT">
@@ -2793,14 +2823,74 @@
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Ov_jkqgrEeqREZyOpEdqSw" points="[391, 255, -643984, -643984]$[301, 255, -643984, -643984]"/>
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_O5JfkKgrEeqREZyOpEdqSw" id="(0.15,0.5)"/>
</edges>
- <edges xmi:type="notation:Connector" xmi:id="_O1cER6grEeqREZyOpEdqSw" type="StereotypeCommentLink" source="_Ov_jkKgrEeqREZyOpEdqSw" target="_O1cEQ6grEeqREZyOpEdqSw">
- <styles xmi:type="notation:FontStyle" xmi:id="_O1cESKgrEeqREZyOpEdqSw"/>
- <styles xmi:type="notation:EObjectValueStyle" xmi:id="_O1crUKgrEeqREZyOpEdqSw" name="BASE_ELEMENT">
+ <edges xmi:type="notation:Connector" xmi:id="_d_Nn1BnOEeu8ps5-obE9qA" type="StereotypeCommentLink" source="_dtVp8NAREemsvtLt7dgtCQ" target="_d_Nn0BnOEeu8ps5-obE9qA">
+ <styles xmi:type="notation:FontStyle" xmi:id="_d_Nn1RnOEeu8ps5-obE9qA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_d_Nn2RnOEeu8ps5-obE9qA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="addClient.compdef.uml#_-9MoUEiFEeiAtInRNnLmIQ"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_d_Nn1hnOEeu8ps5-obE9qA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_d_Nn1xnOEeu8ps5-obE9qA"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_d_Nn2BnOEeu8ps5-obE9qA"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_d_RSRxnOEeu8ps5-obE9qA" type="StereotypeCommentLink" source="_NgzeIPWmEemhCpo2nwBldA" target="_d_RSQxnOEeu8ps5-obE9qA">
+ <styles xmi:type="notation:FontStyle" xmi:id="_d_RSSBnOEeu8ps5-obE9qA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_d_R5QhnOEeu8ps5-obE9qA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="addClient.compdef.uml#_kiyUIEiHEeiAtInRNnLmIQ"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_d_RSSRnOEeu8ps5-obE9qA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_d_R5QBnOEeu8ps5-obE9qA"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_d_R5QRnOEeu8ps5-obE9qA"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_d_WKxBnOEeu8ps5-obE9qA" type="StereotypeCommentLink" source="_T7IdQPWmEemhCpo2nwBldA" target="_d_WKwBnOEeu8ps5-obE9qA">
+ <styles xmi:type="notation:FontStyle" xmi:id="_d_WKxRnOEeu8ps5-obE9qA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_d_WKyRnOEeu8ps5-obE9qA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="addClient.compdef.uml#_DNyKEHX0EeirHb2XH36K_A"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_d_WKxhnOEeu8ps5-obE9qA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_d_WKxxnOEeu8ps5-obE9qA"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_d_WKyBnOEeu8ps5-obE9qA"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_d_bDNxnOEeu8ps5-obE9qA" type="StereotypeCommentLink" source="_XOQzwIO1EeqvFNZCXiiVuA" target="_d_bDMxnOEeu8ps5-obE9qA">
+ <styles xmi:type="notation:FontStyle" xmi:id="_d_bDOBnOEeu8ps5-obE9qA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_d_bDPBnOEeu8ps5-obE9qA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="addClient.compdef.uml#_XIHIcIO1EeqvFNZCXiiVuA"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_d_bDORnOEeu8ps5-obE9qA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_d_bDOhnOEeu8ps5-obE9qA"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_d_bDOxnOEeu8ps5-obE9qA"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_d_fUpBnOEeu8ps5-obE9qA" type="StereotypeCommentLink" source="_ZBhvUPWmEemhCpo2nwBldA" target="_d_fUoBnOEeu8ps5-obE9qA">
+ <styles xmi:type="notation:FontStyle" xmi:id="_d_fUpRnOEeu8ps5-obE9qA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_d_fUqRnOEeu8ps5-obE9qA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Port" href="addClient.compdef.uml#_Fv2rwHq2EeikT4nAmbXssQ"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_d_fUphnOEeu8ps5-obE9qA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_d_fUpxnOEeu8ps5-obE9qA"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_d_fUqBnOEeu8ps5-obE9qA"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_d_kNJBnOEeu8ps5-obE9qA" type="StereotypeCommentLink" source="_gyNJINAREemsvtLt7dgtCQ" target="_d_kNIBnOEeu8ps5-obE9qA">
+ <styles xmi:type="notation:FontStyle" xmi:id="_d_kNJRnOEeu8ps5-obE9qA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_d_k0MBnOEeu8ps5-obE9qA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Port" href="addClient.compdef.uml#_6SlXMHq1EeikT4nAmbXssQ"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_d_kNJhnOEeu8ps5-obE9qA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_d_kNJxnOEeu8ps5-obE9qA"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_d_kNKBnOEeu8ps5-obE9qA"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_d_qTwRnOEeu8ps5-obE9qA" type="StereotypeCommentLink" source="_Ov_jkKgrEeqREZyOpEdqSw" target="_d_pssBnOEeu8ps5-obE9qA">
+ <styles xmi:type="notation:FontStyle" xmi:id="_d_qTwhnOEeu8ps5-obE9qA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_d_qTxhnOEeu8ps5-obE9qA" name="BASE_ELEMENT">
<eObjectValue xmi:type="uml:Connector" href="addClient.compdef.uml#_OrKG4KgrEeqREZyOpEdqSw"/>
</styles>
<element xsi:nil="true"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_O1cESagrEeqREZyOpEdqSw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_O1cESqgrEeqREZyOpEdqSw"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_O1cES6grEeqREZyOpEdqSw"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_d_qTwxnOEeu8ps5-obE9qA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_d_qTxBnOEeu8ps5-obE9qA"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_d_qTxRnOEeu8ps5-obE9qA"/>
</edges>
</notation:Diagram>
diff --git a/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/testmodels/clientServer/models/components/addClient.compdef.uml b/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/testmodels/clientServer/models/components/addClient.compdef.uml
index 2b22817..a5b9d82 100644
--- a/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/testmodels/clientServer/models/components/addClient.compdef.uml
+++ b/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/testmodels/clientServer/models/components/addClient.compdef.uml
@@ -18,7 +18,7 @@
<importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
</packageImport>
<packageImport xmi:type="uml:PackageImport" xmi:id="_VwyNkPV1EemSEqXywHKEEA">
- <importedPackage xmi:type="uml:Model" href="pathmap://ROS2_TESTMODELS/simple/models/services/simple.servicedef.uml#_6nSQsEfEEeiwO_ETU0BG9A"/>
+ <importedPackage xmi:type="uml:Model" href="pathmap://ROS2_TESTMODELS/simple_msgs/models/services/simple_msgs.servicedef.uml#_6nSQsEfEEeiwO_ETU0BG9A"/>
</packageImport>
<packagedElement xmi:type="uml:Class" xmi:id="_-9MoUEiFEeiAtInRNnLmIQ" name="AddClient">
<ownedAttribute xmi:type="uml:Property" xmi:id="_DPbI0HX0EeirHb2XH36K_A" name="activity2" type="_DNyKEHX0EeirHb2XH36K_A"/>
@@ -44,7 +44,7 @@
<packagedElement xmi:type="uml:OpaqueBehavior" xmi:id="_4IFoAHXzEeirHb2XH36K_A" name="fCallAdd" isAbstract="true">
<language>C++</language>
<body>auto request = std::make_shared<
- simple::srv::AddServiceDef::Request>();
+ simple_msgs::srv::AddServiceDef::Request>();
request->x = 2;
request->y = 3;
@@ -67,7 +67,7 @@
std::bind(&AddClient::fResultCallback, this, std::placeholders::_1));</body>
</packagedElement>
<packagedElement xmi:type="uml:Usage" xmi:id="_u0gz8PV5EemIj9SnfMX-0g" client="_ZYcQwPV1EemSEqXywHKEEA">
- <supplier xmi:type="uml:Interface" href="pathmap://ROS2_TESTMODELS/simple/models/services/simple.servicedef.uml#_aTuOIHoWEeif1855zzC59A"/>
+ <supplier xmi:type="uml:Interface" href="pathmap://ROS2_TESTMODELS/simple_msgs/models/services/simple_msgs.servicedef.uml#_aTuOIHoWEeif1855zzC59A"/>
</packagedElement>
<packagedElement xmi:type="uml:OpaqueBehavior" xmi:id="_DLeYEIGKEeqBWvhpPyY2CQ" name="fResultCallback">
<language>C++</language>
@@ -78,7 +78,7 @@
<language>C++</language>
<body>RCLCPP_INFO(get_logger(), "periodic, call \"add\" directly");
fCallAdd();
-timer_->cancel();
+timer_CallAdd_->cancel();
</body>
</packagedElement>
<packagedElement xmi:type="uml:OpaqueBehavior" xmi:id="_zSavgIQMEeqvFNZCXiiVuA" name="fOnActivate">
diff --git a/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/testmodels/clientServer/models/components/addServer.compdef.uml b/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/testmodels/clientServer/models/components/addServer.compdef.uml
index fbe25fc..ea3b0e1 100644
--- a/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/testmodels/clientServer/models/components/addServer.compdef.uml
+++ b/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/testmodels/clientServer/models/components/addServer.compdef.uml
@@ -16,7 +16,7 @@
<importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
</packageImport>
<packageImport xmi:type="uml:PackageImport" xmi:id="_Ly9vAPV0EemY0fA4lBhwJQ">
- <importedPackage xmi:type="uml:Model" href="pathmap://ROS2_TESTMODELS/simple/models/services/simple.servicedef.uml#_6nSQsEfEEeiwO_ETU0BG9A"/>
+ <importedPackage xmi:type="uml:Model" href="pathmap://ROS2_TESTMODELS/simple_msgs/models/services/simple_msgs.servicedef.uml#_6nSQsEfEEeiwO_ETU0BG9A"/>
</packageImport>
<packagedElement xmi:type="uml:Class" xmi:id="_3m3NQHq0EeikT4nAmbXssQ" name="AddServer">
<ownedAttribute xmi:type="uml:Port" xmi:id="_4jVckHq0EeikT4nAmbXssQ" name="addSvc" type="_wOweAPVxEemY0fA4lBhwJQ" aggregation="composite"/>
@@ -34,8 +34,8 @@
</nestedClassifier>
<nestedClassifier xmi:type="uml:Class" xmi:id="_wOweAPVxEemY0fA4lBhwJQ">
<interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_7VyPsBdFEeqyMYRxepXoOA" client="_wOweAPVxEemY0fA4lBhwJQ">
- <supplier xmi:type="uml:Interface" href="pathmap://ROS2_TESTMODELS/simple/models/services/simple.servicedef.uml#_aTuOIHoWEeif1855zzC59A"/>
- <contract xmi:type="uml:Interface" href="pathmap://ROS2_TESTMODELS/simple/models/services/simple.servicedef.uml#_aTuOIHoWEeif1855zzC59A"/>
+ <supplier xmi:type="uml:Interface" href="pathmap://ROS2_TESTMODELS/simple_msgs/models/services/simple_msgs.servicedef.uml#_aTuOIHoWEeif1855zzC59A"/>
+ <contract xmi:type="uml:Interface" href="pathmap://ROS2_TESTMODELS/simple_msgs/models/services/simple_msgs.servicedef.uml#_aTuOIHoWEeif1855zzC59A"/>
</interfaceRealization>
</nestedClassifier>
<nestedClassifier xmi:type="uml:Class" xmi:id="_M63DAPWnEemhCpo2nwBldA"/>
diff --git a/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/testmodels/publishSubscribe/models/components/periodicPublisher.compdef.notation b/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/testmodels/publishSubscribe/models/components/periodicPublisher.compdef.notation
index 5684e8f..4c32423 100644
--- a/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/testmodels/publishSubscribe/models/components/periodicPublisher.compdef.notation
+++ b/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/testmodels/publishSubscribe/models/components/periodicPublisher.compdef.notation
@@ -148,6 +148,14 @@
<element xsi:nil="true"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_EOKcPaguEeqREZyOpEdqSw" x="234"/>
</children>
+ <children xmi:type="notation:Shape" xmi:id="_4XE-UBnMEeu8ps5-obE9qA" type="StereotypeComment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_4XE-URnMEeu8ps5-obE9qA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_4XE-UxnMEeu8ps5-obE9qA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="periodicPublisher.compdef.uml#_MAGsEAoNEeq2kcvPXHB4lg"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4XE-UhnMEeu8ps5-obE9qA" x="234"/>
+ </children>
<styles xmi:type="notation:TitleStyle" xmi:id="_DVUhkfWmEemhCpo2nwBldA"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_DVUhkvWmEemhCpo2nwBldA"/>
</children>
@@ -843,6 +851,38 @@
<element xsi:nil="true"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_EOUNMqguEeqREZyOpEdqSw" x="100" y="100"/>
</children>
+ <children xmi:type="notation:Shape" xmi:id="_4W7NUxnMEeu8ps5-obE9qA" type="StereotypeComment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_4W7NVBnMEeu8ps5-obE9qA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_4W7NVhnMEeu8ps5-obE9qA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="periodicPublisher.compdef.uml#_ZKz0sEfWEeiuVfmPqBuUBA"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4W7NVRnMEeu8ps5-obE9qA" x="416" y="21"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_4W_e3BnMEeu8ps5-obE9qA" type="StereotypeComment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_4W_e3RnMEeu8ps5-obE9qA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_4W_e3xnMEeu8ps5-obE9qA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="periodicPublisher.compdef.uml#_nunn8EfMEeiuVfmPqBuUBA"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4W_e3hnMEeu8ps5-obE9qA" x="296" y="121"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_4XJPwBnMEeu8ps5-obE9qA" type="StereotypeComment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_4XJPwRnMEeu8ps5-obE9qA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_4XJPwxnMEeu8ps5-obE9qA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Port" href="periodicPublisher.compdef.uml#_r1joIEfMEeiuVfmPqBuUBA"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4XJPwhnMEeu8ps5-obE9qA" x="297" y="51"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_4XOvUBnMEeu8ps5-obE9qA" type="StereotypeComment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_4XOvURnMEeu8ps5-obE9qA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_4XOvUxnMEeu8ps5-obE9qA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Connector" href="periodicPublisher.compdef.uml#_59P2wAbvEeq69tbfZET3mw"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4XOvUhnMEeu8ps5-obE9qA" x="100" y="100"/>
+ </children>
<styles xmi:type="notation:TitleStyle" xmi:id="_HfR249ASEemsvtLt7dgtCQ"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_HfR25NASEemsvtLt7dgtCQ"/>
</children>
@@ -1269,6 +1309,22 @@
<element xsi:nil="true"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_EOfzYqguEeqREZyOpEdqSw" x="573" y="211"/>
</children>
+ <children xmi:type="notation:Shape" xmi:id="_4W27-hnMEeu8ps5-obE9qA" type="StereotypeComment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_4W27-xnMEeu8ps5-obE9qA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_4W27_RnMEeu8ps5-obE9qA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="periodicPublisher.compdef.uml#_VZylsEfMEeiuVfmPqBuUBA"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4W27_BnMEeu8ps5-obE9qA" x="260" y="59"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_4YwZUBnMEeu8ps5-obE9qA" type="StereotypeComment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_4YwZURnMEeu8ps5-obE9qA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_4YwZUxnMEeu8ps5-obE9qA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Port" href="periodicPublisher.compdef.uml#_utA9cEfMEeiuVfmPqBuUBA"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4YwZUhnMEeu8ps5-obE9qA" x="573" y="211"/>
+ </children>
<styles xmi:type="notation:StringValueStyle" xmi:id="_80NbUdAREemsvtLt7dgtCQ" name="diagram_compatibility_version" stringValue="1.4.0"/>
<styles xmi:type="notation:DiagramStyle" xmi:id="_80NbUtAREemsvtLt7dgtCQ"/>
<styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_80NbU9AREemsvtLt7dgtCQ" diagramKindId="org.eclipse.papyrus.robotics.diagram.component">
@@ -2795,4 +2851,74 @@
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EOfzZ6guEeqREZyOpEdqSw"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EOfzaKguEeqREZyOpEdqSw"/>
</edges>
+ <edges xmi:type="notation:Connector" xmi:id="_4W27_hnMEeu8ps5-obE9qA" type="StereotypeCommentLink" source="_HfQowNASEemsvtLt7dgtCQ" target="_4W27-hnMEeu8ps5-obE9qA">
+ <styles xmi:type="notation:FontStyle" xmi:id="_4W27_xnMEeu8ps5-obE9qA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_4W28AxnMEeu8ps5-obE9qA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="periodicPublisher.compdef.uml#_VZylsEfMEeiuVfmPqBuUBA"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_4W28ABnMEeu8ps5-obE9qA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4W28ARnMEeu8ps5-obE9qA"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4W28AhnMEeu8ps5-obE9qA"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_4W7NVxnMEeu8ps5-obE9qA" type="StereotypeCommentLink" source="_9z6HcPWlEemhCpo2nwBldA" target="_4W7NUxnMEeu8ps5-obE9qA">
+ <styles xmi:type="notation:FontStyle" xmi:id="_4W7NWBnMEeu8ps5-obE9qA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_4W7NXBnMEeu8ps5-obE9qA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="periodicPublisher.compdef.uml#_ZKz0sEfWEeiuVfmPqBuUBA"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_4W7NWRnMEeu8ps5-obE9qA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4W7NWhnMEeu8ps5-obE9qA"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4W7NWxnMEeu8ps5-obE9qA"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_4W_e4BnMEeu8ps5-obE9qA" type="StereotypeCommentLink" source="_DVTTcPWmEemhCpo2nwBldA" target="_4W_e3BnMEeu8ps5-obE9qA">
+ <styles xmi:type="notation:FontStyle" xmi:id="_4W_e4RnMEeu8ps5-obE9qA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_4W_e5RnMEeu8ps5-obE9qA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="periodicPublisher.compdef.uml#_nunn8EfMEeiuVfmPqBuUBA"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_4W_e4hnMEeu8ps5-obE9qA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4W_e4xnMEeu8ps5-obE9qA"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4W_e5BnMEeu8ps5-obE9qA"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_4XE-VBnMEeu8ps5-obE9qA" type="StereotypeCommentLink" source="_MEcZgAoNEeq2kcvPXHB4lg" target="_4XE-UBnMEeu8ps5-obE9qA">
+ <styles xmi:type="notation:FontStyle" xmi:id="_4XE-VRnMEeu8ps5-obE9qA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_4XE-WRnMEeu8ps5-obE9qA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="periodicPublisher.compdef.uml#_MAGsEAoNEeq2kcvPXHB4lg"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_4XE-VhnMEeu8ps5-obE9qA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4XE-VxnMEeu8ps5-obE9qA"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4XE-WBnMEeu8ps5-obE9qA"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_4XJPxBnMEeu8ps5-obE9qA" type="StereotypeCommentLink" source="_xlzWYPWmEemhCpo2nwBldA" target="_4XJPwBnMEeu8ps5-obE9qA">
+ <styles xmi:type="notation:FontStyle" xmi:id="_4XJPxRnMEeu8ps5-obE9qA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_4XJPyRnMEeu8ps5-obE9qA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Port" href="periodicPublisher.compdef.uml#_r1joIEfMEeiuVfmPqBuUBA"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_4XJPxhnMEeu8ps5-obE9qA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4XJPxxnMEeu8ps5-obE9qA"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4XJPyBnMEeu8ps5-obE9qA"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_4XOvVBnMEeu8ps5-obE9qA" type="StereotypeCommentLink" source="_5-t2YAbvEeq69tbfZET3mw" target="_4XOvUBnMEeu8ps5-obE9qA">
+ <styles xmi:type="notation:FontStyle" xmi:id="_4XOvVRnMEeu8ps5-obE9qA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_4XOvWRnMEeu8ps5-obE9qA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Connector" href="periodicPublisher.compdef.uml#_59P2wAbvEeq69tbfZET3mw"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_4XOvVhnMEeu8ps5-obE9qA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4XOvVxnMEeu8ps5-obE9qA"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4XOvWBnMEeu8ps5-obE9qA"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_4YwZVBnMEeu8ps5-obE9qA" type="StereotypeCommentLink" source="_JbY-QNASEemsvtLt7dgtCQ" target="_4YwZUBnMEeu8ps5-obE9qA">
+ <styles xmi:type="notation:FontStyle" xmi:id="_4YwZVRnMEeu8ps5-obE9qA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_4YwZWRnMEeu8ps5-obE9qA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Port" href="periodicPublisher.compdef.uml#_utA9cEfMEeiuVfmPqBuUBA"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_4YwZVhnMEeu8ps5-obE9qA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4YwZVxnMEeu8ps5-obE9qA"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4YwZWBnMEeu8ps5-obE9qA"/>
+ </edges>
</notation:Diagram>
diff --git a/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/testmodels/publishSubscribe/models/components/periodicPublisher.compdef.uml b/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/testmodels/publishSubscribe/models/components/periodicPublisher.compdef.uml
index e40e7ac..4d96715 100644
--- a/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/testmodels/publishSubscribe/models/components/periodicPublisher.compdef.uml
+++ b/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/testmodels/publishSubscribe/models/components/periodicPublisher.compdef.uml
@@ -15,7 +15,7 @@
<importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
</packageImport>
<packageImport xmi:type="uml:PackageImport" xmi:id="_HM8JoPV1EemSEqXywHKEEA">
- <importedPackage xmi:type="uml:Model" href="pathmap://ROS2_TESTMODELS/simple/models/services/simple.servicedef.uml#_6nSQsEfEEeiwO_ETU0BG9A"/>
+ <importedPackage xmi:type="uml:Model" href="pathmap://ROS2_TESTMODELS/simple_msgs/models/services/simple_msgs.servicedef.uml#_6nSQsEfEEeiwO_ETU0BG9A"/>
</packageImport>
<packagedElement xmi:type="uml:Class" xmi:id="_VZylsEfMEeiuVfmPqBuUBA" name="PeriodicPublisher">
<ownedAttribute xmi:type="uml:Property" xmi:id="_nvApgEfMEeiuVfmPqBuUBA" name="activity1" type="_nunn8EfMEeiuVfmPqBuUBA"/>
@@ -44,14 +44,14 @@
</nestedClassifier>
<nestedClassifier xmi:type="uml:Class" xmi:id="_bnnZ4EfMEeiuVfmPqBuUBA" name="AcmeMapCS">
<interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_AEP8oGnJEeq2Kssrz1fHHg" client="_bnnZ4EfMEeiuVfmPqBuUBA">
- <supplier xmi:type="uml:Interface" href="pathmap://ROS2_TESTMODELS/simple/models/services/simple.servicedef.uml#_gA3kAEfKEeiuVfmPqBuUBA"/>
- <contract xmi:type="uml:Interface" href="pathmap://ROS2_TESTMODELS/simple/models/services/simple.servicedef.uml#_gA3kAEfKEeiuVfmPqBuUBA"/>
+ <supplier xmi:type="uml:Interface" href="pathmap://ROS2_TESTMODELS/simple_msgs/models/services/simple_msgs.servicedef.uml#_gA3kAEfKEeiuVfmPqBuUBA"/>
+ <contract xmi:type="uml:Interface" href="pathmap://ROS2_TESTMODELS/simple_msgs/models/services/simple_msgs.servicedef.uml#_gA3kAEfKEeiuVfmPqBuUBA"/>
</interfaceRealization>
</nestedClassifier>
</packagedElement>
<packagedElement xmi:type="uml:OpaqueBehavior" xmi:id="_L-tqIG_TEeiz6ZR6GXE5oQ" name="fPublishing" isAbstract="true">
<language>C++</language>
- <body>simple::msg::Map map;
+ <body>simple_msgs::msg::Map map;
map.ogm.width = 16;
map.ogm.height = 16;
map.ogm.resolution = 0.1;
diff --git a/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/testmodels/publishSubscribe/models/components/subscriber.compdef.uml b/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/testmodels/publishSubscribe/models/components/subscriber.compdef.uml
index a0e6326..e02ffa3 100644
--- a/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/testmodels/publishSubscribe/models/components/subscriber.compdef.uml
+++ b/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/testmodels/publishSubscribe/models/components/subscriber.compdef.uml
@@ -15,7 +15,7 @@
<importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
</packageImport>
<packageImport xmi:type="uml:PackageImport" xmi:id="_VwyNkPV1EemSEqXywHKEEA">
- <importedPackage xmi:type="uml:Model" href="pathmap://ROS2_TESTMODELS/simple/models/services/simple.servicedef.uml#_6nSQsEfEEeiwO_ETU0BG9A"/>
+ <importedPackage xmi:type="uml:Model" href="pathmap://ROS2_TESTMODELS/simple_msgs/models/services/simple_msgs.servicedef.uml#_6nSQsEfEEeiwO_ETU0BG9A"/>
</packageImport>
<packagedElement xmi:type="uml:Class" xmi:id="_-9MoUEiFEeiAtInRNnLmIQ" name="Subscriber">
<ownedAttribute xmi:type="uml:Port" xmi:id="_ED_GgEiHEeiAtInRNnLmIQ" name="rMap" type="_bqR30EiGEeiAtInRNnLmIQ" aggregation="composite"/>
@@ -43,7 +43,7 @@
</body>
</packagedElement>
<packagedElement xmi:type="uml:Usage" xmi:id="_u0V00PV5EemIj9SnfMX-0g" client="_bqR30EiGEeiAtInRNnLmIQ">
- <supplier xmi:type="uml:Interface" href="pathmap://ROS2_TESTMODELS/simple/models/services/simple.servicedef.uml#_gA3kAEfKEeiuVfmPqBuUBA"/>
+ <supplier xmi:type="uml:Interface" href="pathmap://ROS2_TESTMODELS/simple_msgs/models/services/simple_msgs.servicedef.uml#_gA3kAEfKEeiuVfmPqBuUBA"/>
</packagedElement>
<profileApplication xmi:type="uml:ProfileApplication" xmi:id="_6voUYEfEEeiwO_ETU0BG9A">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6vqJkEfEEeiwO_ETU0BG9A" source="http://www.eclipse.org/uml2/2.0.0/UML">
diff --git a/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/testmodels/publishSubscribe_extcode/models/components/periodicPublisher.compdef.uml b/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/testmodels/publishSubscribe_extcode/models/components/periodicPublisher.compdef.uml
index fff93c2..a919e0d 100644
--- a/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/testmodels/publishSubscribe_extcode/models/components/periodicPublisher.compdef.uml
+++ b/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/testmodels/publishSubscribe_extcode/models/components/periodicPublisher.compdef.uml
@@ -18,7 +18,7 @@
<importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
</packageImport>
<packageImport xmi:type="uml:PackageImport" xmi:id="_HM8JoPV1EemSEqXywHKEEA">
- <importedPackage xmi:type="uml:Model" href="pathmap://ROS2_TESTMODELS/simple/models/services/simple.servicedef.uml#_6nSQsEfEEeiwO_ETU0BG9A"/>
+ <importedPackage xmi:type="uml:Model" href="pathmap://ROS2_TESTMODELS/simple_msgs/models/services/simple_msgs.servicedef.uml#_6nSQsEfEEeiwO_ETU0BG9A"/>
</packageImport>
<packagedElement xmi:type="uml:Class" xmi:id="_VZylsEfMEeiuVfmPqBuUBA" name="PeriodicPublisher">
<ownedAttribute xmi:type="uml:Property" xmi:id="_nvApgEfMEeiuVfmPqBuUBA" name="activity1" type="_nunn8EfMEeiuVfmPqBuUBA"/>
@@ -47,8 +47,8 @@
</nestedClassifier>
<nestedClassifier xmi:type="uml:Class" xmi:id="_bnnZ4EfMEeiuVfmPqBuUBA" name="AcmeMapCS">
<interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_AEP8oGnJEeq2Kssrz1fHHg" client="_bnnZ4EfMEeiuVfmPqBuUBA">
- <supplier xmi:type="uml:Interface" href="pathmap://ROS2_TESTMODELS/simple/models/services/simple.servicedef.uml#_gA3kAEfKEeiuVfmPqBuUBA"/>
- <contract xmi:type="uml:Interface" href="pathmap://ROS2_TESTMODELS/simple/models/services/simple.servicedef.uml#_gA3kAEfKEeiuVfmPqBuUBA"/>
+ <supplier xmi:type="uml:Interface" href="pathmap://ROS2_TESTMODELS/simple_msgs/models/services/simple_msgs.servicedef.uml#_gA3kAEfKEeiuVfmPqBuUBA"/>
+ <contract xmi:type="uml:Interface" href="pathmap://ROS2_TESTMODELS/simple_msgs/models/services/simple_msgs.servicedef.uml#_gA3kAEfKEeiuVfmPqBuUBA"/>
</interfaceRealization>
</nestedClassifier>
</packagedElement>
diff --git a/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/testmodels/publishSubscribe_extcode/models/components/subscriber.compdef.uml b/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/testmodels/publishSubscribe_extcode/models/components/subscriber.compdef.uml
index 1aa0c95..5e10e08 100644
--- a/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/testmodels/publishSubscribe_extcode/models/components/subscriber.compdef.uml
+++ b/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/testmodels/publishSubscribe_extcode/models/components/subscriber.compdef.uml
@@ -18,7 +18,7 @@
<importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
</packageImport>
<packageImport xmi:type="uml:PackageImport" xmi:id="_VwyNkPV1EemSEqXywHKEEA">
- <importedPackage xmi:type="uml:Model" href="pathmap://ROS2_TESTMODELS/simple/models/services/simple.servicedef.uml#_6nSQsEfEEeiwO_ETU0BG9A"/>
+ <importedPackage xmi:type="uml:Model" href="pathmap://ROS2_TESTMODELS/simple_msgs/models/services/simple_msgs.servicedef.uml#_6nSQsEfEEeiwO_ETU0BG9A"/>
</packageImport>
<packagedElement xmi:type="uml:Class" xmi:id="_-9MoUEiFEeiAtInRNnLmIQ" name="Subscriber">
<ownedAttribute xmi:type="uml:Port" xmi:id="_ED_GgEiHEeiAtInRNnLmIQ" name="rMap" type="_bqR30EiGEeiAtInRNnLmIQ" aggregation="composite"/>
@@ -39,7 +39,7 @@
</packagedElement>
<packagedElement xmi:type="uml:OpaqueBehavior" xmi:id="_4IFoAHXzEeirHb2XH36K_A" name="fListening" isAbstract="true" language="" body=""/>
<packagedElement xmi:type="uml:Usage" xmi:id="_u0V00PV5EemIj9SnfMX-0g" client="_bqR30EiGEeiAtInRNnLmIQ">
- <supplier xmi:type="uml:Interface" href="pathmap://ROS2_TESTMODELS/simple/models/services/simple.servicedef.uml#_gA3kAEfKEeiuVfmPqBuUBA"/>
+ <supplier xmi:type="uml:Interface" href="pathmap://ROS2_TESTMODELS/simple_msgs/models/services/simple_msgs.servicedef.uml#_gA3kAEfKEeiuVfmPqBuUBA"/>
</packagedElement>
<profileApplication xmi:type="uml:ProfileApplication" xmi:id="_6voUYEfEEeiwO_ETU0BG9A">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6vqJkEfEEeiwO_ETU0BG9A" source="http://www.eclipse.org/uml2/2.0.0/UML">
diff --git a/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/testmodels/publishSubscribe_extcode/src/periodicPublisherCompdef/PeriodicPublisher_impl.cpp b/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/testmodels/publishSubscribe_extcode/src/periodicPublisherCompdef/PeriodicPublisher_impl.cpp
index c5c469d..39de8c5 100644
--- a/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/testmodels/publishSubscribe_extcode/src/periodicPublisherCompdef/PeriodicPublisher_impl.cpp
+++ b/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/testmodels/publishSubscribe_extcode/src/periodicPublisherCompdef/PeriodicPublisher_impl.cpp
@@ -33,7 +33,7 @@
*
*/
void PeriodicPublisher_impl::fPublishing() {
- simple::msg::Map map;
+ simple_msgs::msg::Map map;
map.ogm.width = 16;
map.ogm.height = 16;
map.ogm.resolution = 0.1;
diff --git a/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/testmodels/publishSubscribe_extcode/src/subscriberCompdef/Subscriber_impl.cpp b/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/testmodels/publishSubscribe_extcode/src/subscriberCompdef/Subscriber_impl.cpp
index 1dfd878..df334a3 100644
--- a/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/testmodels/publishSubscribe_extcode/src/subscriberCompdef/Subscriber_impl.cpp
+++ b/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/testmodels/publishSubscribe_extcode/src/subscriberCompdef/Subscriber_impl.cpp
@@ -33,7 +33,7 @@
*
* @param map
*/
-void Subscriber_impl::fListening(const simple::msg::Map::SharedPtr /*in*/map) {
+void Subscriber_impl::fListening(const simple_msgs::msg::Map::SharedPtr /*in*/map) {
cout << "got map data" << endl;
cout << "width: " << map->ogm.width << endl;
cout << "height: " << map->ogm.height << endl;
diff --git a/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/testmodels/publishSubscribe_extcode/src/subscriberCompdef/Subscriber_impl.h b/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/testmodels/publishSubscribe_extcode/src/subscriberCompdef/Subscriber_impl.h
index 49f00e5..7d3040e 100644
--- a/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/testmodels/publishSubscribe_extcode/src/subscriberCompdef/Subscriber_impl.h
+++ b/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/testmodels/publishSubscribe_extcode/src/subscriberCompdef/Subscriber_impl.h
@@ -11,7 +11,7 @@
#include "subscriberCompdef/Pkg_subscriberCompdef.h"
-#include "simple/msg/map.hpp"
+#include "simple_msgs/msg/map.hpp"
#include "subscriberCompdef/Subscriber.h"
namespace ros2Library {
@@ -42,7 +42,7 @@
*
* @param map
*/
- void fListening(const simple::msg::Map::SharedPtr /*in*/map);
+ void fListening(const simple_msgs::msg::Map::SharedPtr /*in*/map);
};
/************************************************************/
diff --git a/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/testmodels/sendReceive/models/components/sendClient.compdef.notation b/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/testmodels/sendReceive/models/components/sendClient.compdef.notation
index f49594e..fd598db 100644
--- a/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/testmodels/sendReceive/models/components/sendClient.compdef.notation
+++ b/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/testmodels/sendReceive/models/components/sendClient.compdef.notation
@@ -36,13 +36,13 @@
<element xmi:type="uml:Class" href="sendClient.compdef.uml#_XIHIcIO1EeqvFNZCXiiVuA"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_XOQzwYO1EeqvFNZCXiiVuA" x="14"/>
</children>
- <children xmi:type="notation:Shape" xmi:id="_1JKWgKguEeqREZyOpEdqSw" type="StereotypeComment">
- <styles xmi:type="notation:TitleStyle" xmi:id="_1JKWgaguEeqREZyOpEdqSw"/>
- <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1JKWg6guEeqREZyOpEdqSw" name="BASE_ELEMENT">
+ <children xmi:type="notation:Shape" xmi:id="_HSktQBnNEeu8ps5-obE9qA" type="StereotypeComment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_HSktQRnNEeu8ps5-obE9qA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_HSktQxnNEeu8ps5-obE9qA" name="BASE_ELEMENT">
<eObjectValue xmi:type="uml:Class" href="sendClient.compdef.uml#_XIHIcIO1EeqvFNZCXiiVuA"/>
</styles>
<element xsi:nil="true"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1JKWgqguEeqREZyOpEdqSw" x="214"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HSktQhnNEeu8ps5-obE9qA" x="214"/>
</children>
<styles xmi:type="notation:TitleStyle" xmi:id="_T7JEVPWmEemhCpo2nwBldA"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_T7JEVfWmEemhCpo2nwBldA"/>
@@ -1207,6 +1207,38 @@
<element xsi:nil="true"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_1JUHgqguEeqREZyOpEdqSw" x="100" y="100"/>
</children>
+ <children xmi:type="notation:Shape" xmi:id="_HSZuIxnNEeu8ps5-obE9qA" type="StereotypeComment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_HSZuJBnNEeu8ps5-obE9qA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_HSZuJhnNEeu8ps5-obE9qA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="sendClient.compdef.uml#_kiyUIEiHEeiAtInRNnLmIQ"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HSZuJRnNEeu8ps5-obE9qA" x="434" y="20"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_HSemuhnNEeu8ps5-obE9qA" type="StereotypeComment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_HSemuxnNEeu8ps5-obE9qA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_HSemvRnNEeu8ps5-obE9qA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="sendClient.compdef.uml#_DNyKEHX0EeirHb2XH36K_A"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HSemvBnNEeu8ps5-obE9qA" x="314" y="100"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_HSo-sBnNEeu8ps5-obE9qA" type="StereotypeComment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_HSo-sRnNEeu8ps5-obE9qA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_HSo-sxnNEeu8ps5-obE9qA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Port" href="sendClient.compdef.uml#_Fv2rwHq2EeikT4nAmbXssQ"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HSo-shnNEeu8ps5-obE9qA" x="332" y="45"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_HSvsYBnNEeu8ps5-obE9qA" type="StereotypeComment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_HSvsYRnNEeu8ps5-obE9qA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_HSvsYxnNEeu8ps5-obE9qA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Connector" href="sendClient.compdef.uml#_LCWWgAbwEeq69tbfZET3mw"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HSvsYhnNEeu8ps5-obE9qA" x="100" y="100"/>
+ </children>
<styles xmi:type="notation:TitleStyle" xmi:id="_dtWRBNAREemsvtLt7dgtCQ"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_dtWRBdAREemsvtLt7dgtCQ"/>
</children>
@@ -1911,6 +1943,22 @@
<element xsi:nil="true"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_1JaOIqguEeqREZyOpEdqSw" x="671" y="215"/>
</children>
+ <children xmi:type="notation:Shape" xmi:id="_HSVcsBnNEeu8ps5-obE9qA" type="StereotypeComment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_HSVcsRnNEeu8ps5-obE9qA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_HSVcsxnNEeu8ps5-obE9qA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="sendClient.compdef.uml#_-9MoUEiFEeiAtInRNnLmIQ"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HSVcshnNEeu8ps5-obE9qA" x="240" y="60"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_HS1L8BnNEeu8ps5-obE9qA" type="StereotypeComment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_HS1L8RnNEeu8ps5-obE9qA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_HS1L8xnNEeu8ps5-obE9qA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Port" href="sendClient.compdef.uml#_6SlXMHq1EeikT4nAmbXssQ"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HS1L8hnNEeu8ps5-obE9qA" x="671" y="215"/>
+ </children>
<styles xmi:type="notation:StringValueStyle" xmi:id="_TcGqsdAREemsvtLt7dgtCQ" name="diagram_compatibility_version" stringValue="1.4.0"/>
<styles xmi:type="notation:DiagramStyle" xmi:id="_TcGqstAREemsvtLt7dgtCQ"/>
<styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_TcGqs9AREemsvtLt7dgtCQ" diagramKindId="org.eclipse.papyrus.robotics.diagram.component">
@@ -3884,16 +3932,6 @@
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1JE3E6guEeqREZyOpEdqSw"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1JE3FKguEeqREZyOpEdqSw"/>
</edges>
- <edges xmi:type="notation:Connector" xmi:id="_1JKWhKguEeqREZyOpEdqSw" type="StereotypeCommentLink" source="_XOQzwIO1EeqvFNZCXiiVuA" target="_1JKWgKguEeqREZyOpEdqSw">
- <styles xmi:type="notation:FontStyle" xmi:id="_1JKWhaguEeqREZyOpEdqSw"/>
- <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1JKWiaguEeqREZyOpEdqSw" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:Class" href="sendClient.compdef.uml#_XIHIcIO1EeqvFNZCXiiVuA"/>
- </styles>
- <element xsi:nil="true"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1JKWhqguEeqREZyOpEdqSw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1JKWh6guEeqREZyOpEdqSw"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1JKWiKguEeqREZyOpEdqSw"/>
- </edges>
<edges xmi:type="notation:Connector" xmi:id="_1JOA5KguEeqREZyOpEdqSw" type="StereotypeCommentLink" source="_ZBhvUPWmEemhCpo2nwBldA" target="_1JOA4KguEeqREZyOpEdqSw">
<styles xmi:type="notation:FontStyle" xmi:id="_1JOA5aguEeqREZyOpEdqSw"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_1JOn8KguEeqREZyOpEdqSw" name="BASE_ELEMENT">
@@ -3924,4 +3962,74 @@
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1JaOJ6guEeqREZyOpEdqSw"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1JaOKKguEeqREZyOpEdqSw"/>
</edges>
+ <edges xmi:type="notation:Connector" xmi:id="_HSVctBnNEeu8ps5-obE9qA" type="StereotypeCommentLink" source="_dtVp8NAREemsvtLt7dgtCQ" target="_HSVcsBnNEeu8ps5-obE9qA">
+ <styles xmi:type="notation:FontStyle" xmi:id="_HSVctRnNEeu8ps5-obE9qA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_HSVcuRnNEeu8ps5-obE9qA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="sendClient.compdef.uml#_-9MoUEiFEeiAtInRNnLmIQ"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_HSVcthnNEeu8ps5-obE9qA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HSVctxnNEeu8ps5-obE9qA"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HSVcuBnNEeu8ps5-obE9qA"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_HSZuJxnNEeu8ps5-obE9qA" type="StereotypeCommentLink" source="_NgzeIPWmEemhCpo2nwBldA" target="_HSZuIxnNEeu8ps5-obE9qA">
+ <styles xmi:type="notation:FontStyle" xmi:id="_HSZuKBnNEeu8ps5-obE9qA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_HSZuLBnNEeu8ps5-obE9qA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="sendClient.compdef.uml#_kiyUIEiHEeiAtInRNnLmIQ"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_HSZuKRnNEeu8ps5-obE9qA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HSZuKhnNEeu8ps5-obE9qA"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HSZuKxnNEeu8ps5-obE9qA"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_HSemvhnNEeu8ps5-obE9qA" type="StereotypeCommentLink" source="_T7IdQPWmEemhCpo2nwBldA" target="_HSemuhnNEeu8ps5-obE9qA">
+ <styles xmi:type="notation:FontStyle" xmi:id="_HSemvxnNEeu8ps5-obE9qA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_HSemwxnNEeu8ps5-obE9qA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="sendClient.compdef.uml#_DNyKEHX0EeirHb2XH36K_A"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_HSemwBnNEeu8ps5-obE9qA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HSemwRnNEeu8ps5-obE9qA"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HSemwhnNEeu8ps5-obE9qA"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_HSktRBnNEeu8ps5-obE9qA" type="StereotypeCommentLink" source="_XOQzwIO1EeqvFNZCXiiVuA" target="_HSktQBnNEeu8ps5-obE9qA">
+ <styles xmi:type="notation:FontStyle" xmi:id="_HSktRRnNEeu8ps5-obE9qA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_HSktSRnNEeu8ps5-obE9qA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="sendClient.compdef.uml#_XIHIcIO1EeqvFNZCXiiVuA"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_HSktRhnNEeu8ps5-obE9qA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HSktRxnNEeu8ps5-obE9qA"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HSktSBnNEeu8ps5-obE9qA"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_HSo-tBnNEeu8ps5-obE9qA" type="StereotypeCommentLink" source="_ZBhvUPWmEemhCpo2nwBldA" target="_HSo-sBnNEeu8ps5-obE9qA">
+ <styles xmi:type="notation:FontStyle" xmi:id="_HSo-tRnNEeu8ps5-obE9qA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_HSo-uRnNEeu8ps5-obE9qA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Port" href="sendClient.compdef.uml#_Fv2rwHq2EeikT4nAmbXssQ"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_HSo-thnNEeu8ps5-obE9qA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HSo-txnNEeu8ps5-obE9qA"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HSo-uBnNEeu8ps5-obE9qA"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_HSvsZBnNEeu8ps5-obE9qA" type="StereotypeCommentLink" source="_LE1p0AbwEeq69tbfZET3mw" target="_HSvsYBnNEeu8ps5-obE9qA">
+ <styles xmi:type="notation:FontStyle" xmi:id="_HSvsZRnNEeu8ps5-obE9qA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_HSvsaRnNEeu8ps5-obE9qA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Connector" href="sendClient.compdef.uml#_LCWWgAbwEeq69tbfZET3mw"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_HSvsZhnNEeu8ps5-obE9qA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HSvsZxnNEeu8ps5-obE9qA"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HSvsaBnNEeu8ps5-obE9qA"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_HS1L9BnNEeu8ps5-obE9qA" type="StereotypeCommentLink" source="_gyNJINAREemsvtLt7dgtCQ" target="_HS1L8BnNEeu8ps5-obE9qA">
+ <styles xmi:type="notation:FontStyle" xmi:id="_HS1L9RnNEeu8ps5-obE9qA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_HS1L-RnNEeu8ps5-obE9qA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Port" href="sendClient.compdef.uml#_6SlXMHq1EeikT4nAmbXssQ"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_HS1L9hnNEeu8ps5-obE9qA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HS1L9xnNEeu8ps5-obE9qA"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HS1L-BnNEeu8ps5-obE9qA"/>
+ </edges>
</notation:Diagram>
diff --git a/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/testmodels/sendReceive/models/components/sendClient.compdef.uml b/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/testmodels/sendReceive/models/components/sendClient.compdef.uml
index f94e4f5..e3efbc5 100644
--- a/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/testmodels/sendReceive/models/components/sendClient.compdef.uml
+++ b/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/testmodels/sendReceive/models/components/sendClient.compdef.uml
@@ -19,7 +19,7 @@
<importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
</packageImport>
<packageImport xmi:type="uml:PackageImport" xmi:id="_VwyNkPV1EemSEqXywHKEEA">
- <importedPackage xmi:type="uml:Model" href="pathmap://ROS2_TESTMODELS/simple/models/services/simple.servicedef.uml#_6nSQsEfEEeiwO_ETU0BG9A"/>
+ <importedPackage xmi:type="uml:Model" href="pathmap://ROS2_TESTMODELS/simple_msgs/models/services/simple_msgs.servicedef.uml#_6nSQsEfEEeiwO_ETU0BG9A"/>
</packageImport>
<packagedElement xmi:type="uml:Class" xmi:id="_-9MoUEiFEeiAtInRNnLmIQ" name="SendClient">
<ownedAttribute xmi:type="uml:Property" xmi:id="_DPbI0HX0EeirHb2XH36K_A" name="activity2" type="_DNyKEHX0EeirHb2XH36K_A"/>
@@ -41,7 +41,7 @@
</packagedElement>
<packagedElement xmi:type="uml:OpaqueBehavior" xmi:id="_4IFoAHXzEeirHb2XH36K_A" name="fSendMap" isAbstract="true">
<language>C++</language>
- <body>simple::msg::Map map;
+ <body>simple_msgs::msg::Map map;
map.ogm.width = 16;
map.ogm.height = 16;
map.ogm.resolution = 0.1;
@@ -56,7 +56,7 @@
RCLCPP_INFO(get_logger(), "got map via callback, height = %d", result->ogm.height);</body>
</packagedElement>
<packagedElement xmi:type="uml:Usage" xmi:id="__SqMIIWqEeqv286NAztpSg" client="_ZYcQwPV1EemSEqXywHKEEA">
- <supplier xmi:type="uml:Interface" href="pathmap://ROS2_TESTMODELS/simple/models/services/simple.servicedef.uml#_hO4E4IWpEeqv286NAztpSg"/>
+ <supplier xmi:type="uml:Interface" href="pathmap://ROS2_TESTMODELS/simple_msgs/models/services/simple_msgs.servicedef.uml#_hO4E4IWpEeqv286NAztpSg"/>
</packagedElement>
<profileApplication xmi:type="uml:ProfileApplication" xmi:id="_6voUYEfEEeiwO_ETU0BG9A">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6vqJkEfEEeiwO_ETU0BG9A" source="http://www.eclipse.org/uml2/2.0.0/UML">
diff --git a/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/testmodels/sendReceive/models/components/sendServer.compdef.notation b/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/testmodels/sendReceive/models/components/sendServer.compdef.notation
index e3d0043..be12151 100644
--- a/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/testmodels/sendReceive/models/components/sendServer.compdef.notation
+++ b/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/testmodels/sendReceive/models/components/sendServer.compdef.notation
@@ -753,6 +753,38 @@
<element xsi:nil="true"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_KU5UcqgvEeqREZyOpEdqSw" x="457" y="37"/>
</children>
+ <children xmi:type="notation:Shape" xmi:id="_K8faShnNEeu8ps5-obE9qA" type="StereotypeComment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_K8faSxnNEeu8ps5-obE9qA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_K8faTRnNEeu8ps5-obE9qA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="sendServer.compdef.uml#_kdCx0Hq2EeikT4nAmbXssQ"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_K8faTBnNEeu8ps5-obE9qA" x="297" y="17"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_K8jrsBnNEeu8ps5-obE9qA" type="StereotypeComment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_K8jrsRnNEeu8ps5-obE9qA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_K8jrsxnNEeu8ps5-obE9qA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Port" href="sendServer.compdef.uml#_m-pL4Hq2EeikT4nAmbXssQ"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_K8jrshnNEeu8ps5-obE9qA" x="190" y="10"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_K8pLQBnNEeu8ps5-obE9qA" type="StereotypeComment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_K8pLQRnNEeu8ps5-obE9qA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_K8pLQxnNEeu8ps5-obE9qA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Connector" href="sendServer.compdef.uml#_-ifjkAbvEeq69tbfZET3mw"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_K8pLQhnNEeu8ps5-obE9qA" x="100" y="100"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_K8tcwxnNEeu8ps5-obE9qA" type="StereotypeComment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_K8tcxBnNEeu8ps5-obE9qA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_K8tcxhnNEeu8ps5-obE9qA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="sendServer.compdef.uml#_M63DAPWnEemhCpo2nwBldA"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_K8tcxRnNEeu8ps5-obE9qA" x="457" y="37"/>
+ </children>
<styles xmi:type="notation:TitleStyle" xmi:id="_q5X7htATEemsvtLt7dgtCQ"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_q5X7h9ATEemsvtLt7dgtCQ"/>
</children>
@@ -1216,6 +1248,22 @@
<element xsi:nil="true"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_KU-M8qgvEeqREZyOpEdqSw" x="190" y="66"/>
</children>
+ <children xmi:type="notation:Shape" xmi:id="_K8bwABnNEeu8ps5-obE9qA" type="StereotypeComment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_K8bwARnNEeu8ps5-obE9qA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_K8bwAxnNEeu8ps5-obE9qA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="sendServer.compdef.uml#_3m3NQHq0EeikT4nAmbXssQ"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_K8bwAhnNEeu8ps5-obE9qA" x="280" y="63"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_K8y8QBnNEeu8ps5-obE9qA" type="StereotypeComment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_K8y8QRnNEeu8ps5-obE9qA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_K8y8QxnNEeu8ps5-obE9qA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Port" href="sendServer.compdef.uml#_4jVckHq0EeikT4nAmbXssQ"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_K8y8QhnNEeu8ps5-obE9qA" x="190" y="66"/>
+ </children>
<styles xmi:type="notation:StringValueStyle" xmi:id="_mUFLYdATEemsvtLt7dgtCQ" name="diagram_compatibility_version" stringValue="1.4.0"/>
<styles xmi:type="notation:DiagramStyle" xmi:id="_mUFLYtATEemsvtLt7dgtCQ"/>
<styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_mUFLY9ATEemsvtLt7dgtCQ" diagramKindId="org.eclipse.papyrus.robotics.diagram.component">
@@ -2684,4 +2732,64 @@
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KU-M96gvEeqREZyOpEdqSw"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KU-M-KgvEeqREZyOpEdqSw"/>
</edges>
+ <edges xmi:type="notation:Connector" xmi:id="_K8bwBBnNEeu8ps5-obE9qA" type="StereotypeCommentLink" source="_q5X7gNATEemsvtLt7dgtCQ" target="_K8bwABnNEeu8ps5-obE9qA">
+ <styles xmi:type="notation:FontStyle" xmi:id="_K8bwBRnNEeu8ps5-obE9qA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_K8cW8hnNEeu8ps5-obE9qA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="sendServer.compdef.uml#_3m3NQHq0EeikT4nAmbXssQ"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_K8bwBhnNEeu8ps5-obE9qA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_K8cW8BnNEeu8ps5-obE9qA"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_K8cW8RnNEeu8ps5-obE9qA"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_K8faThnNEeu8ps5-obE9qA" type="StereotypeCommentLink" source="_-7lrwPWmEemhCpo2nwBldA" target="_K8faShnNEeu8ps5-obE9qA">
+ <styles xmi:type="notation:FontStyle" xmi:id="_K8faTxnNEeu8ps5-obE9qA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_K8faUxnNEeu8ps5-obE9qA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="sendServer.compdef.uml#_kdCx0Hq2EeikT4nAmbXssQ"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_K8faUBnNEeu8ps5-obE9qA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_K8faURnNEeu8ps5-obE9qA"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_K8faUhnNEeu8ps5-obE9qA"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_K8jrtBnNEeu8ps5-obE9qA" type="StereotypeCommentLink" source="_DK8BEPWnEemhCpo2nwBldA" target="_K8jrsBnNEeu8ps5-obE9qA">
+ <styles xmi:type="notation:FontStyle" xmi:id="_K8jrtRnNEeu8ps5-obE9qA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_K8jruRnNEeu8ps5-obE9qA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Port" href="sendServer.compdef.uml#_m-pL4Hq2EeikT4nAmbXssQ"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_K8jrthnNEeu8ps5-obE9qA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_K8jrtxnNEeu8ps5-obE9qA"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_K8jruBnNEeu8ps5-obE9qA"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_K8pLRBnNEeu8ps5-obE9qA" type="StereotypeCommentLink" source="_-j540AbvEeq69tbfZET3mw" target="_K8pLQBnNEeu8ps5-obE9qA">
+ <styles xmi:type="notation:FontStyle" xmi:id="_K8pLRRnNEeu8ps5-obE9qA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_K8pLSRnNEeu8ps5-obE9qA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Connector" href="sendServer.compdef.uml#_-ifjkAbvEeq69tbfZET3mw"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_K8pLRhnNEeu8ps5-obE9qA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_K8pLRxnNEeu8ps5-obE9qA"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_K8pLSBnNEeu8ps5-obE9qA"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_K8tcxxnNEeu8ps5-obE9qA" type="StereotypeCommentLink" source="_M88GoPWnEemhCpo2nwBldA" target="_K8tcwxnNEeu8ps5-obE9qA">
+ <styles xmi:type="notation:FontStyle" xmi:id="_K8tcyBnNEeu8ps5-obE9qA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_K8tczBnNEeu8ps5-obE9qA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="sendServer.compdef.uml#_M63DAPWnEemhCpo2nwBldA"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_K8tcyRnNEeu8ps5-obE9qA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_K8tcyhnNEeu8ps5-obE9qA"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_K8tcyxnNEeu8ps5-obE9qA"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_K8y8RBnNEeu8ps5-obE9qA" type="StereotypeCommentLink" source="_s0ar4NATEemsvtLt7dgtCQ" target="_K8y8QBnNEeu8ps5-obE9qA">
+ <styles xmi:type="notation:FontStyle" xmi:id="_K8y8RRnNEeu8ps5-obE9qA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_K8y8SRnNEeu8ps5-obE9qA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Port" href="sendServer.compdef.uml#_4jVckHq0EeikT4nAmbXssQ"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_K8y8RhnNEeu8ps5-obE9qA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_K8y8RxnNEeu8ps5-obE9qA"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_K8y8SBnNEeu8ps5-obE9qA"/>
+ </edges>
</notation:Diagram>
diff --git a/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/testmodels/sendReceive/models/components/sendServer.compdef.uml b/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/testmodels/sendReceive/models/components/sendServer.compdef.uml
index f073776..68c17cc 100644
--- a/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/testmodels/sendReceive/models/components/sendServer.compdef.uml
+++ b/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/testmodels/sendReceive/models/components/sendServer.compdef.uml
@@ -19,7 +19,7 @@
<importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
</packageImport>
<packageImport xmi:type="uml:PackageImport" xmi:id="_Ly9vAPV0EemY0fA4lBhwJQ">
- <importedPackage xmi:type="uml:Model" href="pathmap://ROS2_TESTMODELS/simple/models/services/simple.servicedef.uml#_6nSQsEfEEeiwO_ETU0BG9A"/>
+ <importedPackage xmi:type="uml:Model" href="pathmap://ROS2_TESTMODELS/simple_msgs/models/services/simple_msgs.servicedef.uml#_6nSQsEfEEeiwO_ETU0BG9A"/>
</packageImport>
<packagedElement xmi:type="uml:Class" xmi:id="_3m3NQHq0EeikT4nAmbXssQ" name="SendServer">
<ownedAttribute xmi:type="uml:Port" xmi:id="_4jVckHq0EeikT4nAmbXssQ" name="map" type="_wOweAPVxEemY0fA4lBhwJQ" aggregation="composite"/>
@@ -37,8 +37,8 @@
</nestedClassifier>
<nestedClassifier xmi:type="uml:Class" xmi:id="_wOweAPVxEemY0fA4lBhwJQ">
<interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_TkAooIWvEeqv286NAztpSg" client="_wOweAPVxEemY0fA4lBhwJQ">
- <supplier xmi:type="uml:Interface" href="pathmap://ROS2_TESTMODELS/simple/models/services/simple.servicedef.uml#_hO4E4IWpEeqv286NAztpSg"/>
- <contract xmi:type="uml:Interface" href="pathmap://ROS2_TESTMODELS/simple/models/services/simple.servicedef.uml#_hO4E4IWpEeqv286NAztpSg"/>
+ <supplier xmi:type="uml:Interface" href="pathmap://ROS2_TESTMODELS/simple_msgs/models/services/simple_msgs.servicedef.uml#_hO4E4IWpEeqv286NAztpSg"/>
+ <contract xmi:type="uml:Interface" href="pathmap://ROS2_TESTMODELS/simple_msgs/models/services/simple_msgs.servicedef.uml#_hO4E4IWpEeqv286NAztpSg"/>
</interfaceRealization>
</nestedClassifier>
<nestedClassifier xmi:type="uml:Class" xmi:id="_M63DAPWnEemhCpo2nwBldA"/>
@@ -46,9 +46,9 @@
<packagedElement xmi:type="uml:OpaqueBehavior" xmi:id="_1qacwHq2EeikT4nAmbXssQ" name="fReceive" isAbstract="true">
<language>C++</language>
<body>// the parameter is called as the communication object - "map"
- RCLCPP_INFO(get_logger(), "got map data");
- RCLCPP_INFO(get_logger(), "width: %d, height: %d', resolution: %0.2f",
- map->ogm.width, map->ogm.height, map->ogm.resolution);</body>
+RCLCPP_INFO(get_logger(), "got map data");
+RCLCPP_INFO(get_logger(), "width: %d, height: %d', resolution: %0.2f",
+ map->ogm.width, map->ogm.height, map->ogm.resolution);</body>
</packagedElement>
<profileApplication xmi:type="uml:ProfileApplication" xmi:id="_6voUYEfEEeiwO_ETU0BG9A">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6vqJkEfEEeiwO_ETU0BG9A" source="http://www.eclipse.org/uml2/2.0.0/UML">
diff --git a/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/testmodels/simple/models/services/simple.servicedef.di b/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/testmodels/simple_msgs/models/services/simple_msgs.servicedef.di
similarity index 100%
rename from plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/testmodels/simple/models/services/simple.servicedef.di
rename to plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/testmodels/simple_msgs/models/services/simple_msgs.servicedef.di
diff --git a/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/testmodels/simple/models/services/simple.servicedef.notation b/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/testmodels/simple_msgs/models/services/simple_msgs.servicedef.notation
similarity index 83%
rename from plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/testmodels/simple/models/services/simple.servicedef.notation
rename to plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/testmodels/simple_msgs/models/services/simple_msgs.servicedef.notation
index e56ceb2..88d7791 100644
--- a/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/testmodels/simple/models/services/simple.servicedef.notation
+++ b/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/testmodels/simple_msgs/models/services/simple_msgs.servicedef.notation
@@ -20,15 +20,15 @@
</children>
<children xmi:type="notation:BasicCompartment" xmi:id="_dmN780fJEeiuVfmPqBuUBA" type="DataType_AttributeCompartment">
<children xmi:type="notation:Shape" xmi:id="_hrl14EfJEeiuVfmPqBuUBA" type="Property_DataTypeAttributeLabel">
- <element xmi:type="uml:Property" href="simple.servicedef.uml#_hqtFEEfJEeiuVfmPqBuUBA"/>
+ <element xmi:type="uml:Property" href="simple_msgs.servicedef.uml#_hqtFEEfJEeiuVfmPqBuUBA"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_hrl14UfJEeiuVfmPqBuUBA"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_i_jYIEfJEeiuVfmPqBuUBA" type="Property_DataTypeAttributeLabel">
- <element xmi:type="uml:Property" href="simple.servicedef.uml#_i-ZhkEfJEeiuVfmPqBuUBA"/>
+ <element xmi:type="uml:Property" href="simple_msgs.servicedef.uml#_i-ZhkEfJEeiuVfmPqBuUBA"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_i_jYIUfJEeiuVfmPqBuUBA"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_kPUW4EfJEeiuVfmPqBuUBA" type="Property_DataTypeAttributeLabel">
- <element xmi:type="uml:Property" href="simple.servicedef.uml#_kOX7sEfJEeiuVfmPqBuUBA"/>
+ <element xmi:type="uml:Property" href="simple_msgs.servicedef.uml#_kOX7sEfJEeiuVfmPqBuUBA"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_kPUW4UfJEeiuVfmPqBuUBA"/>
</children>
<styles xmi:type="notation:TitleStyle" xmi:id="_dmN79EfJEeiuVfmPqBuUBA"/>
@@ -42,7 +42,7 @@
<styles xmi:type="notation:FilteringStyle" xmi:id="_dmN7-0fJEeiuVfmPqBuUBA"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_dmN7_EfJEeiuVfmPqBuUBA"/>
</children>
- <element xmi:type="uml:DataType" href="simple.servicedef.uml#_dl7BAEfJEeiuVfmPqBuUBA"/>
+ <element xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_dl7BAEfJEeiuVfmPqBuUBA"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_dmNU4UfJEeiuVfmPqBuUBA" x="40" y="60" width="201" height="161"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_6PWfkEfJEeiuVfmPqBuUBA" type="DataType_Shape">
@@ -52,7 +52,7 @@
</children>
<children xmi:type="notation:BasicCompartment" xmi:id="_6PXGokfJEeiuVfmPqBuUBA" type="DataType_AttributeCompartment">
<children xmi:type="notation:Shape" xmi:id="__r0IQEfJEeiuVfmPqBuUBA" type="Property_DataTypeAttributeLabel">
- <element xmi:type="uml:Property" href="simple.servicedef.uml#__qItQEfJEeiuVfmPqBuUBA"/>
+ <element xmi:type="uml:Property" href="simple_msgs.servicedef.uml#__qItQEfJEeiuVfmPqBuUBA"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="__r0IQUfJEeiuVfmPqBuUBA"/>
</children>
<styles xmi:type="notation:TitleStyle" xmi:id="_6PXGo0fJEeiuVfmPqBuUBA"/>
@@ -66,7 +66,7 @@
<styles xmi:type="notation:FilteringStyle" xmi:id="_6PXGqkfJEeiuVfmPqBuUBA"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_6PXGq0fJEeiuVfmPqBuUBA"/>
</children>
- <element xmi:type="uml:DataType" href="simple.servicedef.uml#_6PC9kEfJEeiuVfmPqBuUBA"/>
+ <element xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_6PC9kEfJEeiuVfmPqBuUBA"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_6PWfkUfJEeiuVfmPqBuUBA" x="280" y="60" width="201" height="161"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_B5Zo4PV0EemY0fA4lBhwJQ" type="StereotypeComment">
@@ -96,7 +96,7 @@
<children xmi:type="notation:Shape" xmi:id="_B7ghsPV0EemY0fA4lBhwJQ" type="StereotypeComment">
<styles xmi:type="notation:TitleStyle" xmi:id="_B7ghsfV0EemY0fA4lBhwJQ"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_B7ghs_V0EemY0fA4lBhwJQ" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_dl7BAEfJEeiuVfmPqBuUBA"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_dl7BAEfJEeiuVfmPqBuUBA"/>
</styles>
<element xsi:nil="true"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_B7ghsvV0EemY0fA4lBhwJQ" x="320" y="400"/>
@@ -110,7 +110,7 @@
<children xmi:type="notation:Shape" xmi:id="_B8we6_V0EemY0fA4lBhwJQ" type="StereotypeComment">
<styles xmi:type="notation:TitleStyle" xmi:id="_B8we7PV0EemY0fA4lBhwJQ"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_B8we7vV0EemY0fA4lBhwJQ" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_6PC9kEfJEeiuVfmPqBuUBA"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_6PC9kEfJEeiuVfmPqBuUBA"/>
</styles>
<element xsi:nil="true"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_B8we7fV0EemY0fA4lBhwJQ" x="320" y="620"/>
@@ -154,7 +154,7 @@
<children xmi:type="notation:Shape" xmi:id="_1mOKkPV0EemSEqXywHKEEA" type="StereotypeComment">
<styles xmi:type="notation:TitleStyle" xmi:id="_1mOKkfV0EemSEqXywHKEEA"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_1mOKk_V0EemSEqXywHKEEA" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_dl7BAEfJEeiuVfmPqBuUBA"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_dl7BAEfJEeiuVfmPqBuUBA"/>
</styles>
<element xsi:nil="true"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_1mOKkvV0EemSEqXywHKEEA" x="320" y="400"/>
@@ -168,7 +168,7 @@
<children xmi:type="notation:Shape" xmi:id="_1nxCsPV0EemSEqXywHKEEA" type="StereotypeComment">
<styles xmi:type="notation:TitleStyle" xmi:id="_1nxCsfV0EemSEqXywHKEEA"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_1nxCs_V0EemSEqXywHKEEA" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_6PC9kEfJEeiuVfmPqBuUBA"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_6PC9kEfJEeiuVfmPqBuUBA"/>
</styles>
<element xsi:nil="true"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_1nxCsvV0EemSEqXywHKEEA" x="320" y="620"/>
@@ -212,7 +212,7 @@
<children xmi:type="notation:Shape" xmi:id="_xSBrUPWREem05q4pz6ZV3w" type="StereotypeComment">
<styles xmi:type="notation:TitleStyle" xmi:id="_xSBrUfWREem05q4pz6ZV3w"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_xSCSYPWREem05q4pz6ZV3w" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_dl7BAEfJEeiuVfmPqBuUBA"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_dl7BAEfJEeiuVfmPqBuUBA"/>
</styles>
<element xsi:nil="true"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_xSBrUvWREem05q4pz6ZV3w" x="320" y="400"/>
@@ -226,7 +226,7 @@
<children xmi:type="notation:Shape" xmi:id="_xTiuQ_WREem05q4pz6ZV3w" type="StereotypeComment">
<styles xmi:type="notation:TitleStyle" xmi:id="_xTiuRPWREem05q4pz6ZV3w"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_xTiuRvWREem05q4pz6ZV3w" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_6PC9kEfJEeiuVfmPqBuUBA"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_6PC9kEfJEeiuVfmPqBuUBA"/>
</styles>
<element xsi:nil="true"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_xTiuRfWREem05q4pz6ZV3w" x="320" y="620"/>
@@ -270,7 +270,7 @@
<children xmi:type="notation:Shape" xmi:id="_1BOkIPWVEem05q4pz6ZV3w" type="StereotypeComment">
<styles xmi:type="notation:TitleStyle" xmi:id="_1BOkIfWVEem05q4pz6ZV3w"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_1BOkI_WVEem05q4pz6ZV3w" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_dl7BAEfJEeiuVfmPqBuUBA"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_dl7BAEfJEeiuVfmPqBuUBA"/>
</styles>
<element xsi:nil="true"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_1BOkIvWVEem05q4pz6ZV3w" x="240" y="400"/>
@@ -284,7 +284,7 @@
<children xmi:type="notation:Shape" xmi:id="_1CjZ0PWVEem05q4pz6ZV3w" type="StereotypeComment">
<styles xmi:type="notation:TitleStyle" xmi:id="_1CjZ0fWVEem05q4pz6ZV3w"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_1CjZ0_WVEem05q4pz6ZV3w" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_6PC9kEfJEeiuVfmPqBuUBA"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_6PC9kEfJEeiuVfmPqBuUBA"/>
</styles>
<element xsi:nil="true"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_1CjZ0vWVEem05q4pz6ZV3w" x="540" y="400"/>
@@ -304,7 +304,7 @@
<children xmi:type="notation:Shape" xmi:id="_BBxk4PWWEem05q4pz6ZV3w" type="StereotypeComment">
<styles xmi:type="notation:TitleStyle" xmi:id="_BBxk4fWWEem05q4pz6ZV3w"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_BBxk4_WWEem05q4pz6ZV3w" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_dl7BAEfJEeiuVfmPqBuUBA"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_dl7BAEfJEeiuVfmPqBuUBA"/>
</styles>
<element xsi:nil="true"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_BBxk4vWWEem05q4pz6ZV3w" x="240" y="400"/>
@@ -336,7 +336,7 @@
<children xmi:type="notation:Shape" xmi:id="_cOMLgPWZEemtrOJxxsRlpA" type="StereotypeComment">
<styles xmi:type="notation:TitleStyle" xmi:id="_cOMLgfWZEemtrOJxxsRlpA"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_cOMLg_WZEemtrOJxxsRlpA" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_dl7BAEfJEeiuVfmPqBuUBA"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_dl7BAEfJEeiuVfmPqBuUBA"/>
</styles>
<element xsi:nil="true"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_cOMLgvWZEemtrOJxxsRlpA" x="240" y="400"/>
@@ -350,7 +350,7 @@
<children xmi:type="notation:Shape" xmi:id="_cPaTgPWZEemtrOJxxsRlpA" type="StereotypeComment">
<styles xmi:type="notation:TitleStyle" xmi:id="_cPaTgfWZEemtrOJxxsRlpA"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_cPaTg_WZEemtrOJxxsRlpA" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_6PC9kEfJEeiuVfmPqBuUBA"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_6PC9kEfJEeiuVfmPqBuUBA"/>
</styles>
<element xsi:nil="true"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_cPaTgvWZEemtrOJxxsRlpA" x="460" y="400"/>
@@ -374,11 +374,11 @@
</children>
<children xmi:type="notation:BasicCompartment" xmi:id="_pdNxkPWZEemtrOJxxsRlpA" type="DataType_AttributeCompartment">
<children xmi:type="notation:Shape" xmi:id="_tyo5sPWZEemtrOJxxsRlpA" type="Property_DataTypeAttributeLabel">
- <element xmi:type="uml:Property" href="simple.servicedef.uml#_nCOmAHqjEeikT4nAmbXssQ"/>
+ <element xmi:type="uml:Property" href="simple_msgs.servicedef.uml#_nCOmAHqjEeikT4nAmbXssQ"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_tyo5sfWZEemtrOJxxsRlpA"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_typgwPWZEemtrOJxxsRlpA" type="Property_DataTypeAttributeLabel">
- <element xmi:type="uml:Property" href="simple.servicedef.uml#_vjW5kHqjEeikT4nAmbXssQ"/>
+ <element xmi:type="uml:Property" href="simple_msgs.servicedef.uml#_vjW5kHqjEeikT4nAmbXssQ"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_typgwfWZEemtrOJxxsRlpA"/>
</children>
<styles xmi:type="notation:TitleStyle" xmi:id="_pdNxkfWZEemtrOJxxsRlpA"/>
@@ -392,7 +392,7 @@
<styles xmi:type="notation:FilteringStyle" xmi:id="_pdNxmPWZEemtrOJxxsRlpA"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_pdNxmfWZEemtrOJxxsRlpA"/>
</children>
- <element xmi:type="uml:DataType" href="simple.servicedef.uml#_fWrPkHqjEeikT4nAmbXssQ"/>
+ <element xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_fWrPkHqjEeikT4nAmbXssQ"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_pdKHMfWZEemtrOJxxsRlpA" x="40" y="250" width="201" height="131"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_qsLfEPWZEemtrOJxxsRlpA" type="DataType_Shape">
@@ -402,7 +402,7 @@
</children>
<children xmi:type="notation:BasicCompartment" xmi:id="_qsMGI_WZEemtrOJxxsRlpA" type="DataType_AttributeCompartment">
<children xmi:type="notation:Shape" xmi:id="_uouNIPWZEemtrOJxxsRlpA" type="Property_DataTypeAttributeLabel">
- <element xmi:type="uml:Property" href="simple.servicedef.uml#_0ggwEHqjEeikT4nAmbXssQ"/>
+ <element xmi:type="uml:Property" href="simple_msgs.servicedef.uml#_0ggwEHqjEeikT4nAmbXssQ"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_uouNIfWZEemtrOJxxsRlpA"/>
</children>
<styles xmi:type="notation:TitleStyle" xmi:id="_qsMGJPWZEemtrOJxxsRlpA"/>
@@ -416,13 +416,13 @@
<styles xmi:type="notation:FilteringStyle" xmi:id="_qsMGK_WZEemtrOJxxsRlpA"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_qsMGLPWZEemtrOJxxsRlpA"/>
</children>
- <element xmi:type="uml:DataType" href="simple.servicedef.uml#_lM1KoHqjEeikT4nAmbXssQ"/>
+ <element xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_lM1KoHqjEeikT4nAmbXssQ"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_qsLfEfWZEemtrOJxxsRlpA" x="284" y="247" width="197" height="134"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_pVGVUPZzEemue_PQ3GOClg" type="StereotypeComment">
<styles xmi:type="notation:TitleStyle" xmi:id="_pVGVUfZzEemue_PQ3GOClg"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_pVGVU_ZzEemue_PQ3GOClg" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_dl7BAEfJEeiuVfmPqBuUBA"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_dl7BAEfJEeiuVfmPqBuUBA"/>
</styles>
<element xsi:nil="true"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_pVGVUvZzEemue_PQ3GOClg" x="240" y="60"/>
@@ -430,7 +430,7 @@
<children xmi:type="notation:Shape" xmi:id="_pVpH4PZzEemue_PQ3GOClg" type="StereotypeComment">
<styles xmi:type="notation:TitleStyle" xmi:id="_pVpH4fZzEemue_PQ3GOClg"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_pVpH4_ZzEemue_PQ3GOClg" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_6PC9kEfJEeiuVfmPqBuUBA"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_6PC9kEfJEeiuVfmPqBuUBA"/>
</styles>
<element xsi:nil="true"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_pVpH4vZzEemue_PQ3GOClg" x="480" y="60"/>
@@ -444,7 +444,7 @@
<children xmi:type="notation:Shape" xmi:id="_mYuCzfZ-Eemue_PQ3GOClg" type="StereotypeComment">
<styles xmi:type="notation:TitleStyle" xmi:id="_mYuCzvZ-Eemue_PQ3GOClg"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_mYuC0PZ-Eemue_PQ3GOClg" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_dl7BAEfJEeiuVfmPqBuUBA"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_dl7BAEfJEeiuVfmPqBuUBA"/>
</styles>
<element xsi:nil="true"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_mYuCz_Z-Eemue_PQ3GOClg" x="240" y="60"/>
@@ -452,7 +452,7 @@
<children xmi:type="notation:Shape" xmi:id="_mZSDcPZ-Eemue_PQ3GOClg" type="StereotypeComment">
<styles xmi:type="notation:TitleStyle" xmi:id="_mZSDcfZ-Eemue_PQ3GOClg"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_mZSDc_Z-Eemue_PQ3GOClg" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_6PC9kEfJEeiuVfmPqBuUBA"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_6PC9kEfJEeiuVfmPqBuUBA"/>
</styles>
<element xsi:nil="true"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_mZSDcvZ-Eemue_PQ3GOClg" x="480" y="60"/>
@@ -466,7 +466,7 @@
<children xmi:type="notation:Shape" xmi:id="_mZjJPfZ-Eemue_PQ3GOClg" type="StereotypeComment">
<styles xmi:type="notation:TitleStyle" xmi:id="_mZjJPvZ-Eemue_PQ3GOClg"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_mZjJQPZ-Eemue_PQ3GOClg" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_fWrPkHqjEeikT4nAmbXssQ"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_fWrPkHqjEeikT4nAmbXssQ"/>
</styles>
<element xsi:nil="true"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_mZjJP_Z-Eemue_PQ3GOClg" x="240" y="250"/>
@@ -474,7 +474,7 @@
<children xmi:type="notation:Shape" xmi:id="_mZmzm_Z-Eemue_PQ3GOClg" type="StereotypeComment">
<styles xmi:type="notation:TitleStyle" xmi:id="_mZmznPZ-Eemue_PQ3GOClg"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_mZmznvZ-Eemue_PQ3GOClg" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_lM1KoHqjEeikT4nAmbXssQ"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_lM1KoHqjEeikT4nAmbXssQ"/>
</styles>
<element xsi:nil="true"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_mZmznfZ-Eemue_PQ3GOClg" x="484" y="247"/>
@@ -482,7 +482,7 @@
<children xmi:type="notation:Shape" xmi:id="_-WlkgAX9EeqS8uQvScHY_A" type="StereotypeComment">
<styles xmi:type="notation:TitleStyle" xmi:id="_-WlkgQX9EeqS8uQvScHY_A"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_-Won0AX9EeqS8uQvScHY_A" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_dl7BAEfJEeiuVfmPqBuUBA"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_dl7BAEfJEeiuVfmPqBuUBA"/>
</styles>
<element xsi:nil="true"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_-WlkggX9EeqS8uQvScHY_A" x="240" y="60"/>
@@ -490,7 +490,7 @@
<children xmi:type="notation:Shape" xmi:id="_-XzFcAX9EeqS8uQvScHY_A" type="StereotypeComment">
<styles xmi:type="notation:TitleStyle" xmi:id="_-XzFcQX9EeqS8uQvScHY_A"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_-XzsgAX9EeqS8uQvScHY_A" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_6PC9kEfJEeiuVfmPqBuUBA"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_6PC9kEfJEeiuVfmPqBuUBA"/>
</styles>
<element xsi:nil="true"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_-XzFcgX9EeqS8uQvScHY_A" x="480" y="60"/>
@@ -504,7 +504,7 @@
<children xmi:type="notation:Shape" xmi:id="_-YXGIAX9EeqS8uQvScHY_A" type="StereotypeComment">
<styles xmi:type="notation:TitleStyle" xmi:id="_-YXGIQX9EeqS8uQvScHY_A"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_-YXtMAX9EeqS8uQvScHY_A" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_fWrPkHqjEeikT4nAmbXssQ"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_fWrPkHqjEeikT4nAmbXssQ"/>
</styles>
<element xsi:nil="true"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_-YXGIgX9EeqS8uQvScHY_A" x="240" y="250"/>
@@ -512,7 +512,7 @@
<children xmi:type="notation:Shape" xmi:id="_-Yg3IAX9EeqS8uQvScHY_A" type="StereotypeComment">
<styles xmi:type="notation:TitleStyle" xmi:id="_-Yg3IQX9EeqS8uQvScHY_A"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_-Yg3IwX9EeqS8uQvScHY_A" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_lM1KoHqjEeikT4nAmbXssQ"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_lM1KoHqjEeikT4nAmbXssQ"/>
</styles>
<element xsi:nil="true"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_-Yg3IgX9EeqS8uQvScHY_A" x="484" y="247"/>
@@ -520,7 +520,7 @@
<children xmi:type="notation:Shape" xmi:id="_9mtWAwiKEeq99cg7VqpEdg" type="StereotypeComment">
<styles xmi:type="notation:TitleStyle" xmi:id="_9mtWBAiKEeq99cg7VqpEdg"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_9mt9EAiKEeq99cg7VqpEdg" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_dl7BAEfJEeiuVfmPqBuUBA"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_dl7BAEfJEeiuVfmPqBuUBA"/>
</styles>
<element xsi:nil="true"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_9mtWBQiKEeq99cg7VqpEdg" x="240" y="60"/>
@@ -528,7 +528,7 @@
<children xmi:type="notation:Shape" xmi:id="_9nXdUAiKEeq99cg7VqpEdg" type="StereotypeComment">
<styles xmi:type="notation:TitleStyle" xmi:id="_9nXdUQiKEeq99cg7VqpEdg"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_9nXdUwiKEeq99cg7VqpEdg" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_6PC9kEfJEeiuVfmPqBuUBA"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_6PC9kEfJEeiuVfmPqBuUBA"/>
</styles>
<element xsi:nil="true"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_9nXdUgiKEeq99cg7VqpEdg" x="480" y="60"/>
@@ -542,7 +542,7 @@
<children xmi:type="notation:Shape" xmi:id="_9ns0iwiKEeq99cg7VqpEdg" type="StereotypeComment">
<styles xmi:type="notation:TitleStyle" xmi:id="_9ns0jAiKEeq99cg7VqpEdg"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_9ns0jgiKEeq99cg7VqpEdg" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_fWrPkHqjEeikT4nAmbXssQ"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_fWrPkHqjEeikT4nAmbXssQ"/>
</styles>
<element xsi:nil="true"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_9ns0jQiKEeq99cg7VqpEdg" x="240" y="250"/>
@@ -550,7 +550,7 @@
<children xmi:type="notation:Shape" xmi:id="_9nyUEwiKEeq99cg7VqpEdg" type="StereotypeComment">
<styles xmi:type="notation:TitleStyle" xmi:id="_9nyUFAiKEeq99cg7VqpEdg"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_9nyUFgiKEeq99cg7VqpEdg" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_lM1KoHqjEeikT4nAmbXssQ"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_lM1KoHqjEeikT4nAmbXssQ"/>
</styles>
<element xsi:nil="true"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_9nyUFQiKEeq99cg7VqpEdg" x="484" y="247"/>
@@ -558,7 +558,7 @@
<children xmi:type="notation:Shape" xmi:id="_IjxfoFoQEeq26shXDzFyiA" type="StereotypeComment">
<styles xmi:type="notation:TitleStyle" xmi:id="_IjxfoVoQEeq26shXDzFyiA"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_IjzU0FoQEeq26shXDzFyiA" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_dl7BAEfJEeiuVfmPqBuUBA"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_dl7BAEfJEeiuVfmPqBuUBA"/>
</styles>
<element xsi:nil="true"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_IjxfoloQEeq26shXDzFyiA" x="240" y="60"/>
@@ -566,7 +566,7 @@
<children xmi:type="notation:Shape" xmi:id="_Ikw-IFoQEeq26shXDzFyiA" type="StereotypeComment">
<styles xmi:type="notation:TitleStyle" xmi:id="_Ikw-IVoQEeq26shXDzFyiA"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_Ikw-I1oQEeq26shXDzFyiA" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_6PC9kEfJEeiuVfmPqBuUBA"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_6PC9kEfJEeiuVfmPqBuUBA"/>
</styles>
<element xsi:nil="true"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ikw-IloQEeq26shXDzFyiA" x="480" y="60"/>
@@ -580,7 +580,7 @@
<children xmi:type="notation:Shape" xmi:id="_IlTJoFoQEeq26shXDzFyiA" type="StereotypeComment">
<styles xmi:type="notation:TitleStyle" xmi:id="_IlTJoVoQEeq26shXDzFyiA"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_IlTJo1oQEeq26shXDzFyiA" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_fWrPkHqjEeikT4nAmbXssQ"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_fWrPkHqjEeikT4nAmbXssQ"/>
</styles>
<element xsi:nil="true"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_IlTJoloQEeq26shXDzFyiA" x="240" y="250"/>
@@ -588,7 +588,7 @@
<children xmi:type="notation:Shape" xmi:id="_IlcTkFoQEeq26shXDzFyiA" type="StereotypeComment">
<styles xmi:type="notation:TitleStyle" xmi:id="_IlcTkVoQEeq26shXDzFyiA"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_IlcTk1oQEeq26shXDzFyiA" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_lM1KoHqjEeikT4nAmbXssQ"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_lM1KoHqjEeikT4nAmbXssQ"/>
</styles>
<element xsi:nil="true"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_IlcTkloQEeq26shXDzFyiA" x="484" y="247"/>
@@ -596,7 +596,7 @@
<children xmi:type="notation:Shape" xmi:id="_CcphoHKAEeqBWa3522s-5Q" type="StereotypeComment">
<styles xmi:type="notation:TitleStyle" xmi:id="_CcphoXKAEeqBWa3522s-5Q"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_Ccpho3KAEeqBWa3522s-5Q" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_dl7BAEfJEeiuVfmPqBuUBA"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_dl7BAEfJEeiuVfmPqBuUBA"/>
</styles>
<element xsi:nil="true"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_CcphonKAEeqBWa3522s-5Q" x="240" y="60"/>
@@ -604,7 +604,7 @@
<children xmi:type="notation:Shape" xmi:id="_CdkHoHKAEeqBWa3522s-5Q" type="StereotypeComment">
<styles xmi:type="notation:TitleStyle" xmi:id="_CdkHoXKAEeqBWa3522s-5Q"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_CdkHo3KAEeqBWa3522s-5Q" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_6PC9kEfJEeiuVfmPqBuUBA"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_6PC9kEfJEeiuVfmPqBuUBA"/>
</styles>
<element xsi:nil="true"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_CdkHonKAEeqBWa3522s-5Q" x="480" y="60"/>
@@ -618,7 +618,7 @@
<children xmi:type="notation:Shape" xmi:id="_CemCYHKAEeqBWa3522s-5Q" type="StereotypeComment">
<styles xmi:type="notation:TitleStyle" xmi:id="_CemCYXKAEeqBWa3522s-5Q"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_CemCY3KAEeqBWa3522s-5Q" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_fWrPkHqjEeikT4nAmbXssQ"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_fWrPkHqjEeikT4nAmbXssQ"/>
</styles>
<element xsi:nil="true"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_CemCYnKAEeqBWa3522s-5Q" x="240" y="250"/>
@@ -626,7 +626,7 @@
<children xmi:type="notation:Shape" xmi:id="_Ce_rA3KAEeqBWa3522s-5Q" type="StereotypeComment">
<styles xmi:type="notation:TitleStyle" xmi:id="_Ce_rBHKAEeqBWa3522s-5Q"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_Ce_rBnKAEeqBWa3522s-5Q" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_lM1KoHqjEeikT4nAmbXssQ"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_lM1KoHqjEeikT4nAmbXssQ"/>
</styles>
<element xsi:nil="true"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ce_rBXKAEeqBWa3522s-5Q" x="484" y="247"/>
@@ -634,7 +634,7 @@
<children xmi:type="notation:Shape" xmi:id="_l-HbMIWpEeqv286NAztpSg" type="StereotypeComment">
<styles xmi:type="notation:TitleStyle" xmi:id="_l-HbMYWpEeqv286NAztpSg"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_l-HbM4WpEeqv286NAztpSg" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_dl7BAEfJEeiuVfmPqBuUBA"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_dl7BAEfJEeiuVfmPqBuUBA"/>
</styles>
<element xsi:nil="true"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_l-HbMoWpEeqv286NAztpSg" x="240" y="60"/>
@@ -642,7 +642,7 @@
<children xmi:type="notation:Shape" xmi:id="_l_G5sIWpEeqv286NAztpSg" type="StereotypeComment">
<styles xmi:type="notation:TitleStyle" xmi:id="_l_G5sYWpEeqv286NAztpSg"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_l_G5s4WpEeqv286NAztpSg" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_6PC9kEfJEeiuVfmPqBuUBA"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_6PC9kEfJEeiuVfmPqBuUBA"/>
</styles>
<element xsi:nil="true"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_l_G5soWpEeqv286NAztpSg" x="480" y="60"/>
@@ -656,7 +656,7 @@
<children xmi:type="notation:Shape" xmi:id="_l_480IWpEeqv286NAztpSg" type="StereotypeComment">
<styles xmi:type="notation:TitleStyle" xmi:id="_l_480YWpEeqv286NAztpSg"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_l_4804WpEeqv286NAztpSg" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_fWrPkHqjEeikT4nAmbXssQ"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_fWrPkHqjEeikT4nAmbXssQ"/>
</styles>
<element xsi:nil="true"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_l_480oWpEeqv286NAztpSg" x="240" y="250"/>
@@ -664,7 +664,7 @@
<children xmi:type="notation:Shape" xmi:id="_mAPiIIWpEeqv286NAztpSg" type="StereotypeComment">
<styles xmi:type="notation:TitleStyle" xmi:id="_mAPiIYWpEeqv286NAztpSg"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_mAPiI4WpEeqv286NAztpSg" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_lM1KoHqjEeikT4nAmbXssQ"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_lM1KoHqjEeikT4nAmbXssQ"/>
</styles>
<element xsi:nil="true"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_mAPiIoWpEeqv286NAztpSg" x="484" y="247"/>
@@ -672,7 +672,7 @@
<children xmi:type="notation:Shape" xmi:id="_rYiUA65PEeqUtcwmzJZaUA" type="StereotypeComment">
<styles xmi:type="notation:TitleStyle" xmi:id="_rYiUBK5PEeqUtcwmzJZaUA"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_rYi7EK5PEeqUtcwmzJZaUA" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_dl7BAEfJEeiuVfmPqBuUBA"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_dl7BAEfJEeiuVfmPqBuUBA"/>
</styles>
<element xsi:nil="true"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_rYiUBa5PEeqUtcwmzJZaUA" x="240" y="60"/>
@@ -680,7 +680,7 @@
<children xmi:type="notation:Shape" xmi:id="_rZevMK5PEeqUtcwmzJZaUA" type="StereotypeComment">
<styles xmi:type="notation:TitleStyle" xmi:id="_rZevMa5PEeqUtcwmzJZaUA"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_rZevM65PEeqUtcwmzJZaUA" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_6PC9kEfJEeiuVfmPqBuUBA"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_6PC9kEfJEeiuVfmPqBuUBA"/>
</styles>
<element xsi:nil="true"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_rZevMq5PEeqUtcwmzJZaUA" x="480" y="60"/>
@@ -688,7 +688,7 @@
<children xmi:type="notation:Shape" xmi:id="_ramwkK5PEeqUtcwmzJZaUA" type="StereotypeComment">
<styles xmi:type="notation:TitleStyle" xmi:id="_ramwka5PEeqUtcwmzJZaUA"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_ramwk65PEeqUtcwmzJZaUA" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_fWrPkHqjEeikT4nAmbXssQ"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_fWrPkHqjEeikT4nAmbXssQ"/>
</styles>
<element xsi:nil="true"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_ramwkq5PEeqUtcwmzJZaUA" x="240" y="250"/>
@@ -696,7 +696,7 @@
<children xmi:type="notation:Shape" xmi:id="_ra_yIK5PEeqUtcwmzJZaUA" type="StereotypeComment">
<styles xmi:type="notation:TitleStyle" xmi:id="_ra_yIa5PEeqUtcwmzJZaUA"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_ra_yI65PEeqUtcwmzJZaUA" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_lM1KoHqjEeikT4nAmbXssQ"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_lM1KoHqjEeikT4nAmbXssQ"/>
</styles>
<element xsi:nil="true"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_ra_yIq5PEeqUtcwmzJZaUA" x="484" y="247"/>
@@ -704,7 +704,7 @@
<children xmi:type="notation:Shape" xmi:id="_Z21uAOz8Eeq8bcM3DpWcNQ" type="StereotypeComment">
<styles xmi:type="notation:TitleStyle" xmi:id="_Z21uAez8Eeq8bcM3DpWcNQ"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_Z21uA-z8Eeq8bcM3DpWcNQ" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_dl7BAEfJEeiuVfmPqBuUBA"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_dl7BAEfJEeiuVfmPqBuUBA"/>
</styles>
<element xsi:nil="true"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z21uAuz8Eeq8bcM3DpWcNQ" x="240" y="60"/>
@@ -712,7 +712,7 @@
<children xmi:type="notation:Shape" xmi:id="_Z376MOz8Eeq8bcM3DpWcNQ" type="StereotypeComment">
<styles xmi:type="notation:TitleStyle" xmi:id="_Z376Mez8Eeq8bcM3DpWcNQ"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_Z376M-z8Eeq8bcM3DpWcNQ" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_6PC9kEfJEeiuVfmPqBuUBA"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_6PC9kEfJEeiuVfmPqBuUBA"/>
</styles>
<element xsi:nil="true"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z376Muz8Eeq8bcM3DpWcNQ" x="480" y="60"/>
@@ -720,7 +720,7 @@
<children xmi:type="notation:Shape" xmi:id="_Z43HQOz8Eeq8bcM3DpWcNQ" type="StereotypeComment">
<styles xmi:type="notation:TitleStyle" xmi:id="_Z43HQez8Eeq8bcM3DpWcNQ"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_Z43HQ-z8Eeq8bcM3DpWcNQ" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_fWrPkHqjEeikT4nAmbXssQ"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_fWrPkHqjEeikT4nAmbXssQ"/>
</styles>
<element xsi:nil="true"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z43HQuz8Eeq8bcM3DpWcNQ" x="240" y="250"/>
@@ -728,21 +728,53 @@
<children xmi:type="notation:Shape" xmi:id="_Z5YEoOz8Eeq8bcM3DpWcNQ" type="StereotypeComment">
<styles xmi:type="notation:TitleStyle" xmi:id="_Z5YEoez8Eeq8bcM3DpWcNQ"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_Z5YEo-z8Eeq8bcM3DpWcNQ" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_lM1KoHqjEeikT4nAmbXssQ"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_lM1KoHqjEeikT4nAmbXssQ"/>
</styles>
<element xsi:nil="true"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z5YEouz8Eeq8bcM3DpWcNQ" x="484" y="247"/>
</children>
+ <children xmi:type="notation:Shape" xmi:id="_g6UD0xnKEeu8ps5-obE9qA" type="StereotypeComment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_g6UD1BnKEeu8ps5-obE9qA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_g6WgEBnKEeu8ps5-obE9qA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_dl7BAEfJEeiuVfmPqBuUBA"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g6UD1RnKEeu8ps5-obE9qA" x="240" y="60"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_g6lJkBnKEeu8ps5-obE9qA" type="StereotypeComment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_g6lJkRnKEeu8ps5-obE9qA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_g6lJkxnKEeu8ps5-obE9qA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_6PC9kEfJEeiuVfmPqBuUBA"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g6lJkhnKEeu8ps5-obE9qA" x="480" y="60"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_g6wvwBnKEeu8ps5-obE9qA" type="StereotypeComment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_g6wvwRnKEeu8ps5-obE9qA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_g6wvwxnKEeu8ps5-obE9qA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_fWrPkHqjEeikT4nAmbXssQ"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g6wvwhnKEeu8ps5-obE9qA" x="240" y="250"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_g655sxnKEeu8ps5-obE9qA" type="StereotypeComment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_g655tBnKEeu8ps5-obE9qA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_g655thnKEeu8ps5-obE9qA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_lM1KoHqjEeikT4nAmbXssQ"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g655tRnKEeu8ps5-obE9qA" x="484" y="247"/>
+ </children>
<styles xmi:type="notation:StringValueStyle" xmi:id="_F7lkkUfHEeiuVfmPqBuUBA" name="diagram_compatibility_version" stringValue="1.4.0"/>
<styles xmi:type="notation:DiagramStyle" xmi:id="_F7lkkkfHEeiuVfmPqBuUBA"/>
<styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_F7lkk0fHEeiuVfmPqBuUBA" diagramKindId="org.eclipse.papyrus.robotics.diagram.data">
- <owner xmi:type="uml:Package" href="simple.servicedef.uml#_T_dkcEfGEeiuVfmPqBuUBA"/>
+ <owner xmi:type="uml:Package" href="simple_msgs.servicedef.uml#_T_dkcEfGEeiuVfmPqBuUBA"/>
</styles>
- <element xmi:type="uml:Package" href="simple.servicedef.uml#_T_dkcEfGEeiuVfmPqBuUBA"/>
+ <element xmi:type="uml:Package" href="simple_msgs.servicedef.uml#_T_dkcEfGEeiuVfmPqBuUBA"/>
<edges xmi:type="notation:Connector" xmi:id="_dm-J6UfJEeiuVfmPqBuUBA" type="StereotypeCommentLink" source="_dmNU4EfJEeiuVfmPqBuUBA">
<styles xmi:type="notation:FontStyle" xmi:id="_dm-J6kfJEeiuVfmPqBuUBA"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_dm-w8kfJEeiuVfmPqBuUBA" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_dl7BAEfJEeiuVfmPqBuUBA"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_dl7BAEfJEeiuVfmPqBuUBA"/>
</styles>
<element xsi:nil="true"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_dm-J60fJEeiuVfmPqBuUBA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
@@ -752,7 +784,7 @@
<edges xmi:type="notation:Connector" xmi:id="_6Pd0V0fJEeiuVfmPqBuUBA" type="StereotypeCommentLink" source="_6PWfkEfJEeiuVfmPqBuUBA">
<styles xmi:type="notation:FontStyle" xmi:id="_6Pd0WEfJEeiuVfmPqBuUBA"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_6Pd0XEfJEeiuVfmPqBuUBA" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_6PC9kEfJEeiuVfmPqBuUBA"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_6PC9kEfJEeiuVfmPqBuUBA"/>
</styles>
<element xsi:nil="true"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_6Pd0WUfJEeiuVfmPqBuUBA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
@@ -762,7 +794,7 @@
<edges xmi:type="notation:Connector" xmi:id="_B7ghtPV0EemY0fA4lBhwJQ" type="StereotypeCommentLink" source="_dmNU4EfJEeiuVfmPqBuUBA" target="_B7ghsPV0EemY0fA4lBhwJQ">
<styles xmi:type="notation:FontStyle" xmi:id="_B7ghtfV0EemY0fA4lBhwJQ"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_B7hIwvV0EemY0fA4lBhwJQ" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_dl7BAEfJEeiuVfmPqBuUBA"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_dl7BAEfJEeiuVfmPqBuUBA"/>
</styles>
<element xsi:nil="true"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_B7ghtvV0EemY0fA4lBhwJQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
@@ -772,7 +804,7 @@
<edges xmi:type="notation:Connector" xmi:id="_B8we7_V0EemY0fA4lBhwJQ" type="StereotypeCommentLink" source="_6PWfkEfJEeiuVfmPqBuUBA" target="_B8we6_V0EemY0fA4lBhwJQ">
<styles xmi:type="notation:FontStyle" xmi:id="_B8we8PV0EemY0fA4lBhwJQ"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_B8we9PV0EemY0fA4lBhwJQ" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_6PC9kEfJEeiuVfmPqBuUBA"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_6PC9kEfJEeiuVfmPqBuUBA"/>
</styles>
<element xsi:nil="true"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_B8we8fV0EemY0fA4lBhwJQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
@@ -782,7 +814,7 @@
<edges xmi:type="notation:Connector" xmi:id="_1mOKlPV0EemSEqXywHKEEA" type="StereotypeCommentLink" source="_dmNU4EfJEeiuVfmPqBuUBA" target="_1mOKkPV0EemSEqXywHKEEA">
<styles xmi:type="notation:FontStyle" xmi:id="_1mOKlfV0EemSEqXywHKEEA"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_1mOKmfV0EemSEqXywHKEEA" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_dl7BAEfJEeiuVfmPqBuUBA"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_dl7BAEfJEeiuVfmPqBuUBA"/>
</styles>
<element xsi:nil="true"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1mOKlvV0EemSEqXywHKEEA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
@@ -792,7 +824,7 @@
<edges xmi:type="notation:Connector" xmi:id="_1nxCtPV0EemSEqXywHKEEA" type="StereotypeCommentLink" source="_6PWfkEfJEeiuVfmPqBuUBA" target="_1nxCsPV0EemSEqXywHKEEA">
<styles xmi:type="notation:FontStyle" xmi:id="_1nxCtfV0EemSEqXywHKEEA"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_1nxCufV0EemSEqXywHKEEA" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_6PC9kEfJEeiuVfmPqBuUBA"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_6PC9kEfJEeiuVfmPqBuUBA"/>
</styles>
<element xsi:nil="true"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1nxCtvV0EemSEqXywHKEEA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
@@ -802,7 +834,7 @@
<edges xmi:type="notation:Connector" xmi:id="_xSCSYfWREem05q4pz6ZV3w" type="StereotypeCommentLink" source="_dmNU4EfJEeiuVfmPqBuUBA" target="_xSBrUPWREem05q4pz6ZV3w">
<styles xmi:type="notation:FontStyle" xmi:id="_xSCSYvWREem05q4pz6ZV3w"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_xSCSZvWREem05q4pz6ZV3w" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_dl7BAEfJEeiuVfmPqBuUBA"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_dl7BAEfJEeiuVfmPqBuUBA"/>
</styles>
<element xsi:nil="true"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xSCSY_WREem05q4pz6ZV3w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
@@ -812,7 +844,7 @@
<edges xmi:type="notation:Connector" xmi:id="_xTiuR_WREem05q4pz6ZV3w" type="StereotypeCommentLink" source="_6PWfkEfJEeiuVfmPqBuUBA" target="_xTiuQ_WREem05q4pz6ZV3w">
<styles xmi:type="notation:FontStyle" xmi:id="_xTiuSPWREem05q4pz6ZV3w"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_xTiuTPWREem05q4pz6ZV3w" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_6PC9kEfJEeiuVfmPqBuUBA"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_6PC9kEfJEeiuVfmPqBuUBA"/>
</styles>
<element xsi:nil="true"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xTiuSfWREem05q4pz6ZV3w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
@@ -822,7 +854,7 @@
<edges xmi:type="notation:Connector" xmi:id="_1BOkJPWVEem05q4pz6ZV3w" type="StereotypeCommentLink" source="_dmNU4EfJEeiuVfmPqBuUBA" target="_1BOkIPWVEem05q4pz6ZV3w">
<styles xmi:type="notation:FontStyle" xmi:id="_1BOkJfWVEem05q4pz6ZV3w"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_1BOkKfWVEem05q4pz6ZV3w" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_dl7BAEfJEeiuVfmPqBuUBA"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_dl7BAEfJEeiuVfmPqBuUBA"/>
</styles>
<element xsi:nil="true"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1BOkJvWVEem05q4pz6ZV3w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
@@ -832,7 +864,7 @@
<edges xmi:type="notation:Connector" xmi:id="_1CjZ1PWVEem05q4pz6ZV3w" type="StereotypeCommentLink" source="_6PWfkEfJEeiuVfmPqBuUBA" target="_1CjZ0PWVEem05q4pz6ZV3w">
<styles xmi:type="notation:FontStyle" xmi:id="_1CjZ1fWVEem05q4pz6ZV3w"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_1CjZ2fWVEem05q4pz6ZV3w" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_6PC9kEfJEeiuVfmPqBuUBA"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_6PC9kEfJEeiuVfmPqBuUBA"/>
</styles>
<element xsi:nil="true"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1CjZ1vWVEem05q4pz6ZV3w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
@@ -842,7 +874,7 @@
<edges xmi:type="notation:Connector" xmi:id="_BBxk5PWWEem05q4pz6ZV3w" type="StereotypeCommentLink" source="_dmNU4EfJEeiuVfmPqBuUBA" target="_BBxk4PWWEem05q4pz6ZV3w">
<styles xmi:type="notation:FontStyle" xmi:id="_BBxk5fWWEem05q4pz6ZV3w"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_BBxk6fWWEem05q4pz6ZV3w" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_dl7BAEfJEeiuVfmPqBuUBA"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_dl7BAEfJEeiuVfmPqBuUBA"/>
</styles>
<element xsi:nil="true"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_BBxk5vWWEem05q4pz6ZV3w" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
@@ -852,7 +884,7 @@
<edges xmi:type="notation:Connector" xmi:id="_cOMLhPWZEemtrOJxxsRlpA" type="StereotypeCommentLink" source="_dmNU4EfJEeiuVfmPqBuUBA" target="_cOMLgPWZEemtrOJxxsRlpA">
<styles xmi:type="notation:FontStyle" xmi:id="_cOMLhfWZEemtrOJxxsRlpA"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_cOMLifWZEemtrOJxxsRlpA" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_dl7BAEfJEeiuVfmPqBuUBA"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_dl7BAEfJEeiuVfmPqBuUBA"/>
</styles>
<element xsi:nil="true"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_cOMLhvWZEemtrOJxxsRlpA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
@@ -862,7 +894,7 @@
<edges xmi:type="notation:Connector" xmi:id="_cPaThPWZEemtrOJxxsRlpA" type="StereotypeCommentLink" source="_6PWfkEfJEeiuVfmPqBuUBA" target="_cPaTgPWZEemtrOJxxsRlpA">
<styles xmi:type="notation:FontStyle" xmi:id="_cPaThfWZEemtrOJxxsRlpA"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_cPaTifWZEemtrOJxxsRlpA" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_6PC9kEfJEeiuVfmPqBuUBA"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_6PC9kEfJEeiuVfmPqBuUBA"/>
</styles>
<element xsi:nil="true"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_cPaThvWZEemtrOJxxsRlpA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
@@ -872,7 +904,7 @@
<edges xmi:type="notation:Connector" xmi:id="_pdW7h_WZEemtrOJxxsRlpA" type="StereotypeCommentLink" source="_pdKHMPWZEemtrOJxxsRlpA">
<styles xmi:type="notation:FontStyle" xmi:id="_pdW7iPWZEemtrOJxxsRlpA"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_pdW7jPWZEemtrOJxxsRlpA" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_fWrPkHqjEeikT4nAmbXssQ"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_fWrPkHqjEeikT4nAmbXssQ"/>
</styles>
<element xsi:nil="true"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_pdW7ifWZEemtrOJxxsRlpA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
@@ -882,7 +914,7 @@
<edges xmi:type="notation:Connector" xmi:id="_qsQ-p_WZEemtrOJxxsRlpA" type="StereotypeCommentLink" source="_qsLfEPWZEemtrOJxxsRlpA">
<styles xmi:type="notation:FontStyle" xmi:id="_qsQ-qPWZEemtrOJxxsRlpA"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_qsQ-rPWZEemtrOJxxsRlpA" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_lM1KoHqjEeikT4nAmbXssQ"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_lM1KoHqjEeikT4nAmbXssQ"/>
</styles>
<element xsi:nil="true"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_qsQ-qfWZEemtrOJxxsRlpA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
@@ -892,7 +924,7 @@
<edges xmi:type="notation:Connector" xmi:id="_pVGVVPZzEemue_PQ3GOClg" type="StereotypeCommentLink" source="_dmNU4EfJEeiuVfmPqBuUBA" target="_pVGVUPZzEemue_PQ3GOClg">
<styles xmi:type="notation:FontStyle" xmi:id="_pVGVVfZzEemue_PQ3GOClg"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_pVGVWfZzEemue_PQ3GOClg" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_dl7BAEfJEeiuVfmPqBuUBA"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_dl7BAEfJEeiuVfmPqBuUBA"/>
</styles>
<element xsi:nil="true"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_pVGVVvZzEemue_PQ3GOClg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
@@ -902,7 +934,7 @@
<edges xmi:type="notation:Connector" xmi:id="_pVpH5PZzEemue_PQ3GOClg" type="StereotypeCommentLink" source="_6PWfkEfJEeiuVfmPqBuUBA" target="_pVpH4PZzEemue_PQ3GOClg">
<styles xmi:type="notation:FontStyle" xmi:id="_pVpH5fZzEemue_PQ3GOClg"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_pVpH6fZzEemue_PQ3GOClg" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_6PC9kEfJEeiuVfmPqBuUBA"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_6PC9kEfJEeiuVfmPqBuUBA"/>
</styles>
<element xsi:nil="true"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_pVpH5vZzEemue_PQ3GOClg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
@@ -912,7 +944,7 @@
<edges xmi:type="notation:Connector" xmi:id="_mYuC0fZ-Eemue_PQ3GOClg" type="StereotypeCommentLink" source="_dmNU4EfJEeiuVfmPqBuUBA" target="_mYuCzfZ-Eemue_PQ3GOClg">
<styles xmi:type="notation:FontStyle" xmi:id="_mYuC0vZ-Eemue_PQ3GOClg"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_mYuC1vZ-Eemue_PQ3GOClg" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_dl7BAEfJEeiuVfmPqBuUBA"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_dl7BAEfJEeiuVfmPqBuUBA"/>
</styles>
<element xsi:nil="true"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mYuC0_Z-Eemue_PQ3GOClg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
@@ -922,7 +954,7 @@
<edges xmi:type="notation:Connector" xmi:id="_mZSDdPZ-Eemue_PQ3GOClg" type="StereotypeCommentLink" source="_6PWfkEfJEeiuVfmPqBuUBA" target="_mZSDcPZ-Eemue_PQ3GOClg">
<styles xmi:type="notation:FontStyle" xmi:id="_mZSDdfZ-Eemue_PQ3GOClg"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_mZSDefZ-Eemue_PQ3GOClg" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_6PC9kEfJEeiuVfmPqBuUBA"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_6PC9kEfJEeiuVfmPqBuUBA"/>
</styles>
<element xsi:nil="true"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mZSDdvZ-Eemue_PQ3GOClg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
@@ -932,7 +964,7 @@
<edges xmi:type="notation:Connector" xmi:id="_mZjJQfZ-Eemue_PQ3GOClg" type="StereotypeCommentLink" source="_pdKHMPWZEemtrOJxxsRlpA" target="_mZjJPfZ-Eemue_PQ3GOClg">
<styles xmi:type="notation:FontStyle" xmi:id="_mZjJQvZ-Eemue_PQ3GOClg"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_mZjJRvZ-Eemue_PQ3GOClg" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_fWrPkHqjEeikT4nAmbXssQ"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_fWrPkHqjEeikT4nAmbXssQ"/>
</styles>
<element xsi:nil="true"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mZjJQ_Z-Eemue_PQ3GOClg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
@@ -942,7 +974,7 @@
<edges xmi:type="notation:Connector" xmi:id="_mZmzn_Z-Eemue_PQ3GOClg" type="StereotypeCommentLink" source="_qsLfEPWZEemtrOJxxsRlpA" target="_mZmzm_Z-Eemue_PQ3GOClg">
<styles xmi:type="notation:FontStyle" xmi:id="_mZmzoPZ-Eemue_PQ3GOClg"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_mZmzpPZ-Eemue_PQ3GOClg" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_lM1KoHqjEeikT4nAmbXssQ"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_lM1KoHqjEeikT4nAmbXssQ"/>
</styles>
<element xsi:nil="true"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mZmzofZ-Eemue_PQ3GOClg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
@@ -952,7 +984,7 @@
<edges xmi:type="notation:Connector" xmi:id="_-Won0QX9EeqS8uQvScHY_A" type="StereotypeCommentLink" source="_dmNU4EfJEeiuVfmPqBuUBA" target="_-WlkgAX9EeqS8uQvScHY_A">
<styles xmi:type="notation:FontStyle" xmi:id="_-Won0gX9EeqS8uQvScHY_A"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_-WpO4gX9EeqS8uQvScHY_A" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_dl7BAEfJEeiuVfmPqBuUBA"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_dl7BAEfJEeiuVfmPqBuUBA"/>
</styles>
<element xsi:nil="true"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_-Won0wX9EeqS8uQvScHY_A" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
@@ -962,7 +994,7 @@
<edges xmi:type="notation:Connector" xmi:id="_-XzsgQX9EeqS8uQvScHY_A" type="StereotypeCommentLink" source="_6PWfkEfJEeiuVfmPqBuUBA" target="_-XzFcAX9EeqS8uQvScHY_A">
<styles xmi:type="notation:FontStyle" xmi:id="_-XzsggX9EeqS8uQvScHY_A"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_-XzshgX9EeqS8uQvScHY_A" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_6PC9kEfJEeiuVfmPqBuUBA"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_6PC9kEfJEeiuVfmPqBuUBA"/>
</styles>
<element xsi:nil="true"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_-XzsgwX9EeqS8uQvScHY_A" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
@@ -972,7 +1004,7 @@
<edges xmi:type="notation:Connector" xmi:id="_-YXtMQX9EeqS8uQvScHY_A" type="StereotypeCommentLink" source="_pdKHMPWZEemtrOJxxsRlpA" target="_-YXGIAX9EeqS8uQvScHY_A">
<styles xmi:type="notation:FontStyle" xmi:id="_-YXtMgX9EeqS8uQvScHY_A"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_-YXtNgX9EeqS8uQvScHY_A" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_fWrPkHqjEeikT4nAmbXssQ"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_fWrPkHqjEeikT4nAmbXssQ"/>
</styles>
<element xsi:nil="true"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_-YXtMwX9EeqS8uQvScHY_A" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
@@ -982,7 +1014,7 @@
<edges xmi:type="notation:Connector" xmi:id="_-YheMAX9EeqS8uQvScHY_A" type="StereotypeCommentLink" source="_qsLfEPWZEemtrOJxxsRlpA" target="_-Yg3IAX9EeqS8uQvScHY_A">
<styles xmi:type="notation:FontStyle" xmi:id="_-YheMQX9EeqS8uQvScHY_A"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_-YheNQX9EeqS8uQvScHY_A" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_lM1KoHqjEeikT4nAmbXssQ"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_lM1KoHqjEeikT4nAmbXssQ"/>
</styles>
<element xsi:nil="true"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_-YheMgX9EeqS8uQvScHY_A" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
@@ -992,7 +1024,7 @@
<edges xmi:type="notation:Connector" xmi:id="_9mt9EQiKEeq99cg7VqpEdg" type="StereotypeCommentLink" source="_dmNU4EfJEeiuVfmPqBuUBA" target="_9mtWAwiKEeq99cg7VqpEdg">
<styles xmi:type="notation:FontStyle" xmi:id="_9mt9EgiKEeq99cg7VqpEdg"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_9mt9FgiKEeq99cg7VqpEdg" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_dl7BAEfJEeiuVfmPqBuUBA"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_dl7BAEfJEeiuVfmPqBuUBA"/>
</styles>
<element xsi:nil="true"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_9mt9EwiKEeq99cg7VqpEdg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
@@ -1002,7 +1034,7 @@
<edges xmi:type="notation:Connector" xmi:id="_9nXdVAiKEeq99cg7VqpEdg" type="StereotypeCommentLink" source="_6PWfkEfJEeiuVfmPqBuUBA" target="_9nXdUAiKEeq99cg7VqpEdg">
<styles xmi:type="notation:FontStyle" xmi:id="_9nXdVQiKEeq99cg7VqpEdg"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_9nXdWQiKEeq99cg7VqpEdg" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_6PC9kEfJEeiuVfmPqBuUBA"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_6PC9kEfJEeiuVfmPqBuUBA"/>
</styles>
<element xsi:nil="true"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_9nXdVgiKEeq99cg7VqpEdg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
@@ -1012,7 +1044,7 @@
<edges xmi:type="notation:Connector" xmi:id="_9ntbkAiKEeq99cg7VqpEdg" type="StereotypeCommentLink" source="_pdKHMPWZEemtrOJxxsRlpA" target="_9ns0iwiKEeq99cg7VqpEdg">
<styles xmi:type="notation:FontStyle" xmi:id="_9ntbkQiKEeq99cg7VqpEdg"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_9ntblQiKEeq99cg7VqpEdg" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_fWrPkHqjEeikT4nAmbXssQ"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_fWrPkHqjEeikT4nAmbXssQ"/>
</styles>
<element xsi:nil="true"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_9ntbkgiKEeq99cg7VqpEdg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
@@ -1022,7 +1054,7 @@
<edges xmi:type="notation:Connector" xmi:id="_9nyUFwiKEeq99cg7VqpEdg" type="StereotypeCommentLink" source="_qsLfEPWZEemtrOJxxsRlpA" target="_9nyUEwiKEeq99cg7VqpEdg">
<styles xmi:type="notation:FontStyle" xmi:id="_9nyUGAiKEeq99cg7VqpEdg"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_9ny7IAiKEeq99cg7VqpEdg" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_lM1KoHqjEeikT4nAmbXssQ"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_lM1KoHqjEeikT4nAmbXssQ"/>
</styles>
<element xsi:nil="true"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_9nyUGQiKEeq99cg7VqpEdg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
@@ -1032,7 +1064,7 @@
<edges xmi:type="notation:Connector" xmi:id="_Ijz74FoQEeq26shXDzFyiA" type="StereotypeCommentLink" source="_dmNU4EfJEeiuVfmPqBuUBA" target="_IjxfoFoQEeq26shXDzFyiA">
<styles xmi:type="notation:FontStyle" xmi:id="_Ijz74VoQEeq26shXDzFyiA"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_Ijz75VoQEeq26shXDzFyiA" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_dl7BAEfJEeiuVfmPqBuUBA"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_dl7BAEfJEeiuVfmPqBuUBA"/>
</styles>
<element xsi:nil="true"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Ijz74loQEeq26shXDzFyiA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
@@ -1042,7 +1074,7 @@
<edges xmi:type="notation:Connector" xmi:id="_Ikw-JFoQEeq26shXDzFyiA" type="StereotypeCommentLink" source="_6PWfkEfJEeiuVfmPqBuUBA" target="_Ikw-IFoQEeq26shXDzFyiA">
<styles xmi:type="notation:FontStyle" xmi:id="_Ikw-JVoQEeq26shXDzFyiA"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_IkxlMFoQEeq26shXDzFyiA" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_6PC9kEfJEeiuVfmPqBuUBA"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_6PC9kEfJEeiuVfmPqBuUBA"/>
</styles>
<element xsi:nil="true"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Ikw-JloQEeq26shXDzFyiA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
@@ -1052,7 +1084,7 @@
<edges xmi:type="notation:Connector" xmi:id="_IlTJpFoQEeq26shXDzFyiA" type="StereotypeCommentLink" source="_pdKHMPWZEemtrOJxxsRlpA" target="_IlTJoFoQEeq26shXDzFyiA">
<styles xmi:type="notation:FontStyle" xmi:id="_IlTJpVoQEeq26shXDzFyiA"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_IlTwsFoQEeq26shXDzFyiA" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_fWrPkHqjEeikT4nAmbXssQ"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_fWrPkHqjEeikT4nAmbXssQ"/>
</styles>
<element xsi:nil="true"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_IlTJploQEeq26shXDzFyiA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
@@ -1062,7 +1094,7 @@
<edges xmi:type="notation:Connector" xmi:id="_IlcTlFoQEeq26shXDzFyiA" type="StereotypeCommentLink" source="_qsLfEPWZEemtrOJxxsRlpA" target="_IlcTkFoQEeq26shXDzFyiA">
<styles xmi:type="notation:FontStyle" xmi:id="_IlcTlVoQEeq26shXDzFyiA"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_IlcTmVoQEeq26shXDzFyiA" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_lM1KoHqjEeikT4nAmbXssQ"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_lM1KoHqjEeikT4nAmbXssQ"/>
</styles>
<element xsi:nil="true"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_IlcTlloQEeq26shXDzFyiA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
@@ -1072,7 +1104,7 @@
<edges xmi:type="notation:Connector" xmi:id="_CcphpHKAEeqBWa3522s-5Q" type="StereotypeCommentLink" source="_dmNU4EfJEeiuVfmPqBuUBA" target="_CcphoHKAEeqBWa3522s-5Q">
<styles xmi:type="notation:FontStyle" xmi:id="_CcphpXKAEeqBWa3522s-5Q"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_CcphqXKAEeqBWa3522s-5Q" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_dl7BAEfJEeiuVfmPqBuUBA"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_dl7BAEfJEeiuVfmPqBuUBA"/>
</styles>
<element xsi:nil="true"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_CcphpnKAEeqBWa3522s-5Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
@@ -1082,7 +1114,7 @@
<edges xmi:type="notation:Connector" xmi:id="_CdkHpHKAEeqBWa3522s-5Q" type="StereotypeCommentLink" source="_6PWfkEfJEeiuVfmPqBuUBA" target="_CdkHoHKAEeqBWa3522s-5Q">
<styles xmi:type="notation:FontStyle" xmi:id="_CdkHpXKAEeqBWa3522s-5Q"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_CdkHqXKAEeqBWa3522s-5Q" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_6PC9kEfJEeiuVfmPqBuUBA"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_6PC9kEfJEeiuVfmPqBuUBA"/>
</styles>
<element xsi:nil="true"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_CdkHpnKAEeqBWa3522s-5Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
@@ -1092,7 +1124,7 @@
<edges xmi:type="notation:Connector" xmi:id="_CemCZHKAEeqBWa3522s-5Q" type="StereotypeCommentLink" source="_pdKHMPWZEemtrOJxxsRlpA" target="_CemCYHKAEeqBWa3522s-5Q">
<styles xmi:type="notation:FontStyle" xmi:id="_CemCZXKAEeqBWa3522s-5Q"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_CemCaXKAEeqBWa3522s-5Q" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_fWrPkHqjEeikT4nAmbXssQ"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_fWrPkHqjEeikT4nAmbXssQ"/>
</styles>
<element xsi:nil="true"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_CemCZnKAEeqBWa3522s-5Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
@@ -1102,7 +1134,7 @@
<edges xmi:type="notation:Connector" xmi:id="_Ce_rB3KAEeqBWa3522s-5Q" type="StereotypeCommentLink" source="_qsLfEPWZEemtrOJxxsRlpA" target="_Ce_rA3KAEeqBWa3522s-5Q">
<styles xmi:type="notation:FontStyle" xmi:id="_Ce_rCHKAEeqBWa3522s-5Q"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_Ce_rDHKAEeqBWa3522s-5Q" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_lM1KoHqjEeikT4nAmbXssQ"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_lM1KoHqjEeikT4nAmbXssQ"/>
</styles>
<element xsi:nil="true"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Ce_rCXKAEeqBWa3522s-5Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
@@ -1112,7 +1144,7 @@
<edges xmi:type="notation:Connector" xmi:id="_l-HbNIWpEeqv286NAztpSg" type="StereotypeCommentLink" source="_dmNU4EfJEeiuVfmPqBuUBA" target="_l-HbMIWpEeqv286NAztpSg">
<styles xmi:type="notation:FontStyle" xmi:id="_l-HbNYWpEeqv286NAztpSg"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_l-HbOYWpEeqv286NAztpSg" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_dl7BAEfJEeiuVfmPqBuUBA"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_dl7BAEfJEeiuVfmPqBuUBA"/>
</styles>
<element xsi:nil="true"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l-HbNoWpEeqv286NAztpSg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
@@ -1122,7 +1154,7 @@
<edges xmi:type="notation:Connector" xmi:id="_l_G5tIWpEeqv286NAztpSg" type="StereotypeCommentLink" source="_6PWfkEfJEeiuVfmPqBuUBA" target="_l_G5sIWpEeqv286NAztpSg">
<styles xmi:type="notation:FontStyle" xmi:id="_l_G5tYWpEeqv286NAztpSg"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_l_G5uYWpEeqv286NAztpSg" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_6PC9kEfJEeiuVfmPqBuUBA"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_6PC9kEfJEeiuVfmPqBuUBA"/>
</styles>
<element xsi:nil="true"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l_G5toWpEeqv286NAztpSg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
@@ -1132,7 +1164,7 @@
<edges xmi:type="notation:Connector" xmi:id="_l_481IWpEeqv286NAztpSg" type="StereotypeCommentLink" source="_pdKHMPWZEemtrOJxxsRlpA" target="_l_480IWpEeqv286NAztpSg">
<styles xmi:type="notation:FontStyle" xmi:id="_l_481YWpEeqv286NAztpSg"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_l_482YWpEeqv286NAztpSg" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_fWrPkHqjEeikT4nAmbXssQ"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_fWrPkHqjEeikT4nAmbXssQ"/>
</styles>
<element xsi:nil="true"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l_481oWpEeqv286NAztpSg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
@@ -1142,7 +1174,7 @@
<edges xmi:type="notation:Connector" xmi:id="_mAPiJIWpEeqv286NAztpSg" type="StereotypeCommentLink" source="_qsLfEPWZEemtrOJxxsRlpA" target="_mAPiIIWpEeqv286NAztpSg">
<styles xmi:type="notation:FontStyle" xmi:id="_mAPiJYWpEeqv286NAztpSg"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_mAPiKYWpEeqv286NAztpSg" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_lM1KoHqjEeikT4nAmbXssQ"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_lM1KoHqjEeikT4nAmbXssQ"/>
</styles>
<element xsi:nil="true"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mAPiJoWpEeqv286NAztpSg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
@@ -1152,7 +1184,7 @@
<edges xmi:type="notation:Connector" xmi:id="_rYi7Ea5PEeqUtcwmzJZaUA" type="StereotypeCommentLink" source="_dmNU4EfJEeiuVfmPqBuUBA" target="_rYiUA65PEeqUtcwmzJZaUA">
<styles xmi:type="notation:FontStyle" xmi:id="_rYi7Eq5PEeqUtcwmzJZaUA"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_rYi7Fq5PEeqUtcwmzJZaUA" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_dl7BAEfJEeiuVfmPqBuUBA"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_dl7BAEfJEeiuVfmPqBuUBA"/>
</styles>
<element xsi:nil="true"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_rYi7E65PEeqUtcwmzJZaUA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
@@ -1162,7 +1194,7 @@
<edges xmi:type="notation:Connector" xmi:id="_rZevNK5PEeqUtcwmzJZaUA" type="StereotypeCommentLink" source="_6PWfkEfJEeiuVfmPqBuUBA" target="_rZevMK5PEeqUtcwmzJZaUA">
<styles xmi:type="notation:FontStyle" xmi:id="_rZevNa5PEeqUtcwmzJZaUA"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_rZevOa5PEeqUtcwmzJZaUA" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_6PC9kEfJEeiuVfmPqBuUBA"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_6PC9kEfJEeiuVfmPqBuUBA"/>
</styles>
<element xsi:nil="true"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_rZevNq5PEeqUtcwmzJZaUA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
@@ -1172,7 +1204,7 @@
<edges xmi:type="notation:Connector" xmi:id="_ramwlK5PEeqUtcwmzJZaUA" type="StereotypeCommentLink" source="_pdKHMPWZEemtrOJxxsRlpA" target="_ramwkK5PEeqUtcwmzJZaUA">
<styles xmi:type="notation:FontStyle" xmi:id="_ramwla5PEeqUtcwmzJZaUA"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_ramwma5PEeqUtcwmzJZaUA" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_fWrPkHqjEeikT4nAmbXssQ"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_fWrPkHqjEeikT4nAmbXssQ"/>
</styles>
<element xsi:nil="true"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ramwlq5PEeqUtcwmzJZaUA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
@@ -1182,7 +1214,7 @@
<edges xmi:type="notation:Connector" xmi:id="_ra_yJK5PEeqUtcwmzJZaUA" type="StereotypeCommentLink" source="_qsLfEPWZEemtrOJxxsRlpA" target="_ra_yIK5PEeqUtcwmzJZaUA">
<styles xmi:type="notation:FontStyle" xmi:id="_ra_yJa5PEeqUtcwmzJZaUA"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_ra_yKa5PEeqUtcwmzJZaUA" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_lM1KoHqjEeikT4nAmbXssQ"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_lM1KoHqjEeikT4nAmbXssQ"/>
</styles>
<element xsi:nil="true"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ra_yJq5PEeqUtcwmzJZaUA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
@@ -1192,7 +1224,7 @@
<edges xmi:type="notation:Connector" xmi:id="_Z21uBOz8Eeq8bcM3DpWcNQ" type="StereotypeCommentLink" source="_dmNU4EfJEeiuVfmPqBuUBA" target="_Z21uAOz8Eeq8bcM3DpWcNQ">
<styles xmi:type="notation:FontStyle" xmi:id="_Z21uBez8Eeq8bcM3DpWcNQ"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_Z21uCez8Eeq8bcM3DpWcNQ" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_dl7BAEfJEeiuVfmPqBuUBA"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_dl7BAEfJEeiuVfmPqBuUBA"/>
</styles>
<element xsi:nil="true"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Z21uBuz8Eeq8bcM3DpWcNQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
@@ -1202,7 +1234,7 @@
<edges xmi:type="notation:Connector" xmi:id="_Z376NOz8Eeq8bcM3DpWcNQ" type="StereotypeCommentLink" source="_6PWfkEfJEeiuVfmPqBuUBA" target="_Z376MOz8Eeq8bcM3DpWcNQ">
<styles xmi:type="notation:FontStyle" xmi:id="_Z376Nez8Eeq8bcM3DpWcNQ"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_Z376Oez8Eeq8bcM3DpWcNQ" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_6PC9kEfJEeiuVfmPqBuUBA"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_6PC9kEfJEeiuVfmPqBuUBA"/>
</styles>
<element xsi:nil="true"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Z376Nuz8Eeq8bcM3DpWcNQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
@@ -1212,7 +1244,7 @@
<edges xmi:type="notation:Connector" xmi:id="_Z43HROz8Eeq8bcM3DpWcNQ" type="StereotypeCommentLink" source="_pdKHMPWZEemtrOJxxsRlpA" target="_Z43HQOz8Eeq8bcM3DpWcNQ">
<styles xmi:type="notation:FontStyle" xmi:id="_Z43HRez8Eeq8bcM3DpWcNQ"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_Z43HSez8Eeq8bcM3DpWcNQ" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_fWrPkHqjEeikT4nAmbXssQ"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_fWrPkHqjEeikT4nAmbXssQ"/>
</styles>
<element xsi:nil="true"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Z43HRuz8Eeq8bcM3DpWcNQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
@@ -1222,13 +1254,53 @@
<edges xmi:type="notation:Connector" xmi:id="_Z5YEpOz8Eeq8bcM3DpWcNQ" type="StereotypeCommentLink" source="_qsLfEPWZEemtrOJxxsRlpA" target="_Z5YEoOz8Eeq8bcM3DpWcNQ">
<styles xmi:type="notation:FontStyle" xmi:id="_Z5YEpez8Eeq8bcM3DpWcNQ"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_Z5YEqez8Eeq8bcM3DpWcNQ" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:DataType" href="simple.servicedef.uml#_lM1KoHqjEeikT4nAmbXssQ"/>
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_lM1KoHqjEeikT4nAmbXssQ"/>
</styles>
<element xsi:nil="true"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Z5YEpuz8Eeq8bcM3DpWcNQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Z5YEp-z8Eeq8bcM3DpWcNQ"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Z5YEqOz8Eeq8bcM3DpWcNQ"/>
</edges>
+ <edges xmi:type="notation:Connector" xmi:id="_g6WgERnKEeu8ps5-obE9qA" type="StereotypeCommentLink" source="_dmNU4EfJEeiuVfmPqBuUBA" target="_g6UD0xnKEeu8ps5-obE9qA">
+ <styles xmi:type="notation:FontStyle" xmi:id="_g6WgEhnKEeu8ps5-obE9qA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_g6WgFhnKEeu8ps5-obE9qA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_dl7BAEfJEeiuVfmPqBuUBA"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_g6WgExnKEeu8ps5-obE9qA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_g6WgFBnKEeu8ps5-obE9qA"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_g6WgFRnKEeu8ps5-obE9qA"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_g6lJlBnKEeu8ps5-obE9qA" type="StereotypeCommentLink" source="_6PWfkEfJEeiuVfmPqBuUBA" target="_g6lJkBnKEeu8ps5-obE9qA">
+ <styles xmi:type="notation:FontStyle" xmi:id="_g6lJlRnKEeu8ps5-obE9qA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_g6lJmRnKEeu8ps5-obE9qA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_6PC9kEfJEeiuVfmPqBuUBA"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_g6lJlhnKEeu8ps5-obE9qA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_g6lJlxnKEeu8ps5-obE9qA"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_g6lJmBnKEeu8ps5-obE9qA"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_g6wvxBnKEeu8ps5-obE9qA" type="StereotypeCommentLink" source="_pdKHMPWZEemtrOJxxsRlpA" target="_g6wvwBnKEeu8ps5-obE9qA">
+ <styles xmi:type="notation:FontStyle" xmi:id="_g6wvxRnKEeu8ps5-obE9qA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_g6wvyRnKEeu8ps5-obE9qA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_fWrPkHqjEeikT4nAmbXssQ"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_g6wvxhnKEeu8ps5-obE9qA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_g6wvxxnKEeu8ps5-obE9qA"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_g6wvyBnKEeu8ps5-obE9qA"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_g66gwBnKEeu8ps5-obE9qA" type="StereotypeCommentLink" source="_qsLfEPWZEemtrOJxxsRlpA" target="_g655sxnKEeu8ps5-obE9qA">
+ <styles xmi:type="notation:FontStyle" xmi:id="_g66gwRnKEeu8ps5-obE9qA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_g66gxRnKEeu8ps5-obE9qA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:DataType" href="simple_msgs.servicedef.uml#_lM1KoHqjEeikT4nAmbXssQ"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_g66gwhnKEeu8ps5-obE9qA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_g66gwxnKEeu8ps5-obE9qA"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_g66gxBnKEeu8ps5-obE9qA"/>
+ </edges>
</notation:Diagram>
<notation:Diagram xmi:id="_BrezAAiLEeq99cg7VqpEdg" type="PapyrusUMLClassDiagram" name="NewServiceDefinitionDiagram" measurementUnit="Pixel">
<children xmi:type="notation:Shape" xmi:id="_DBN24AiLEeq99cg7VqpEdg" type="Interface_Shape">
@@ -1254,7 +1326,7 @@
<styles xmi:type="notation:FilteringStyle" xmi:id="_DBVLqAiLEeq99cg7VqpEdg"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_DBVLqQiLEeq99cg7VqpEdg"/>
</children>
- <element xmi:type="uml:Interface" href="simple.servicedef.uml#_gA3kAEfKEeiuVfmPqBuUBA"/>
+ <element xmi:type="uml:Interface" href="simple_msgs.servicedef.uml#_gA3kAEfKEeiuVfmPqBuUBA"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_DBN24QiLEeq99cg7VqpEdg" x="81" y="44" width="180" height="77"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_EKhBQAiLEeq99cg7VqpEdg" type="Interface_Shape">
@@ -1280,13 +1352,13 @@
<styles xmi:type="notation:FilteringStyle" xmi:id="_EKiPaAiLEeq99cg7VqpEdg"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_EKiPaQiLEeq99cg7VqpEdg"/>
</children>
- <element xmi:type="uml:Interface" href="simple.servicedef.uml#_aTuOIHoWEeif1855zzC59A"/>
+ <element xmi:type="uml:Interface" href="simple_msgs.servicedef.uml#_aTuOIHoWEeif1855zzC59A"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_EKhBQQiLEeq99cg7VqpEdg" x="83" y="282" width="178" height="79"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_93PYk3KGEeqBWa3522s-5Q" type="StereotypeComment">
<styles xmi:type="notation:TitleStyle" xmi:id="_93PYlHKGEeqBWa3522s-5Q"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_93PYlnKGEeqBWa3522s-5Q" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:Interface" href="simple.servicedef.uml#_gA3kAEfKEeiuVfmPqBuUBA"/>
+ <eObjectValue xmi:type="uml:Interface" href="simple_msgs.servicedef.uml#_gA3kAEfKEeiuVfmPqBuUBA"/>
</styles>
<element xsi:nil="true"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_93PYlXKGEeqBWa3522s-5Q" x="281" y="44"/>
@@ -1300,25 +1372,25 @@
<children xmi:type="notation:Shape" xmi:id="_93YigHKGEeqBWa3522s-5Q" type="StereotypeComment">
<styles xmi:type="notation:TitleStyle" xmi:id="_93YigXKGEeqBWa3522s-5Q"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_93Yig3KGEeqBWa3522s-5Q" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:Interface" href="simple.servicedef.uml#_aTuOIHoWEeif1855zzC59A"/>
+ <eObjectValue xmi:type="uml:Interface" href="simple_msgs.servicedef.uml#_aTuOIHoWEeif1855zzC59A"/>
</styles>
<element xsi:nil="true"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_93YignKGEeqBWa3522s-5Q" x="283" y="282"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_A-KGMHKHEeqBWa3522s-5Q" type="Comment_Shape">
<children xmi:type="notation:DecorationNode" xmi:id="_A-KGMnKHEeqBWa3522s-5Q" type="Comment_BodyLabel"/>
- <element xmi:type="uml:Comment" href="simple.servicedef.uml#_A-EmoHKHEeqBWa3522s-5Q"/>
+ <element xmi:type="uml:Comment" href="simple_msgs.servicedef.uml#_A-EmoHKHEeqBWa3522s-5Q"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_A-KGMXKHEeqBWa3522s-5Q" x="340" y="40" width="201" height="61"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_KQ4OwHKHEeqBWa3522s-5Q" type="Comment_Shape">
<children xmi:type="notation:DecorationNode" xmi:id="_KQ410HKHEeqBWa3522s-5Q" type="Comment_BodyLabel"/>
- <element xmi:type="uml:Comment" href="simple.servicedef.uml#_KQyIIHKHEeqBWa3522s-5Q"/>
+ <element xmi:type="uml:Comment" href="simple_msgs.servicedef.uml#_KQyIIHKHEeqBWa3522s-5Q"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_KQ4OwXKHEeqBWa3522s-5Q" x="340" y="300" width="161"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_eCLfYIWpEeqv286NAztpSg" type="StereotypeComment">
<styles xmi:type="notation:TitleStyle" xmi:id="_eCLfYYWpEeqv286NAztpSg"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_eCLfY4WpEeqv286NAztpSg" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:Interface" href="simple.servicedef.uml#_gA3kAEfKEeiuVfmPqBuUBA"/>
+ <eObjectValue xmi:type="uml:Interface" href="simple_msgs.servicedef.uml#_gA3kAEfKEeiuVfmPqBuUBA"/>
</styles>
<element xsi:nil="true"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_eCLfYoWpEeqv286NAztpSg" x="281" y="44"/>
@@ -1332,7 +1404,7 @@
<children xmi:type="notation:Shape" xmi:id="_eCTbMIWpEeqv286NAztpSg" type="StereotypeComment">
<styles xmi:type="notation:TitleStyle" xmi:id="_eCTbMYWpEeqv286NAztpSg"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_eCTbM4WpEeqv286NAztpSg" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:Interface" href="simple.servicedef.uml#_aTuOIHoWEeif1855zzC59A"/>
+ <eObjectValue xmi:type="uml:Interface" href="simple_msgs.servicedef.uml#_aTuOIHoWEeif1855zzC59A"/>
</styles>
<element xsi:nil="true"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_eCTbMoWpEeqv286NAztpSg" x="283" y="282"/>
@@ -1360,18 +1432,18 @@
<styles xmi:type="notation:FilteringStyle" xmi:id="_jw7K7YWpEeqv286NAztpSg"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_jw7K7oWpEeqv286NAztpSg"/>
</children>
- <element xmi:type="uml:Interface" href="simple.servicedef.uml#_hO4E4IWpEeqv286NAztpSg"/>
+ <element xmi:type="uml:Interface" href="simple_msgs.servicedef.uml#_hO4E4IWpEeqv286NAztpSg"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_jw5VsYWpEeqv286NAztpSg" x="80" y="160" width="181" height="81"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_-w70kIWpEeqv286NAztpSg" type="Comment_Shape">
<children xmi:type="notation:DecorationNode" xmi:id="_-w8boIWpEeqv286NAztpSg" type="Comment_BodyLabel"/>
- <element xmi:type="uml:Comment" href="simple.servicedef.uml#_-w5YUIWpEeqv286NAztpSg"/>
+ <element xmi:type="uml:Comment" href="simple_msgs.servicedef.uml#_-w5YUIWpEeqv286NAztpSg"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_-w70kYWpEeqv286NAztpSg" x="340" y="160" width="201" height="81"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_Wr7RMOz8Eeq8bcM3DpWcNQ" type="StereotypeComment">
<styles xmi:type="notation:TitleStyle" xmi:id="_Wr7RMez8Eeq8bcM3DpWcNQ"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_Wr7RM-z8Eeq8bcM3DpWcNQ" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:Interface" href="simple.servicedef.uml#_gA3kAEfKEeiuVfmPqBuUBA"/>
+ <eObjectValue xmi:type="uml:Interface" href="simple_msgs.servicedef.uml#_gA3kAEfKEeiuVfmPqBuUBA"/>
</styles>
<element xsi:nil="true"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_Wr7RMuz8Eeq8bcM3DpWcNQ" x="281" y="44"/>
@@ -1379,7 +1451,7 @@
<children xmi:type="notation:Shape" xmi:id="_WsBX0-z8Eeq8bcM3DpWcNQ" type="StereotypeComment">
<styles xmi:type="notation:TitleStyle" xmi:id="_WsBX1Oz8Eeq8bcM3DpWcNQ"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_WsB-4Oz8Eeq8bcM3DpWcNQ" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:Interface" href="simple.servicedef.uml#_aTuOIHoWEeif1855zzC59A"/>
+ <eObjectValue xmi:type="uml:Interface" href="simple_msgs.servicedef.uml#_aTuOIHoWEeif1855zzC59A"/>
</styles>
<element xsi:nil="true"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_WsBX1ez8Eeq8bcM3DpWcNQ" x="283" y="282"/>
@@ -1387,7 +1459,7 @@
<children xmi:type="notation:Shape" xmi:id="_WsIskOz8Eeq8bcM3DpWcNQ" type="StereotypeComment">
<styles xmi:type="notation:TitleStyle" xmi:id="_WsIskez8Eeq8bcM3DpWcNQ"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_WsIsk-z8Eeq8bcM3DpWcNQ" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:Interface" href="simple.servicedef.uml#_hO4E4IWpEeqv286NAztpSg"/>
+ <eObjectValue xmi:type="uml:Interface" href="simple_msgs.servicedef.uml#_hO4E4IWpEeqv286NAztpSg"/>
</styles>
<element xsi:nil="true"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_WsIskuz8Eeq8bcM3DpWcNQ" x="280" y="160"/>
@@ -1395,13 +1467,13 @@
<styles xmi:type="notation:StringValueStyle" xmi:id="_BrezAQiLEeq99cg7VqpEdg" name="diagram_compatibility_version" stringValue="1.4.0"/>
<styles xmi:type="notation:DiagramStyle" xmi:id="_BrezAgiLEeq99cg7VqpEdg"/>
<styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_BrezAwiLEeq99cg7VqpEdg" diagramKindId="org.eclipse.papyrus.robotics.diagram.service">
- <owner xmi:type="uml:Package" href="simple.servicedef.uml#_sX1S8EfFEeiuVfmPqBuUBA"/>
+ <owner xmi:type="uml:Package" href="simple_msgs.servicedef.uml#_sX1S8EfFEeiuVfmPqBuUBA"/>
</styles>
- <element xmi:type="uml:Package" href="simple.servicedef.uml#_sX1S8EfFEeiuVfmPqBuUBA"/>
+ <element xmi:type="uml:Package" href="simple_msgs.servicedef.uml#_sX1S8EfFEeiuVfmPqBuUBA"/>
<edges xmi:type="notation:Connector" xmi:id="_DCBvNAiLEeq99cg7VqpEdg" type="StereotypeCommentLink" source="_DBN24AiLEeq99cg7VqpEdg">
<styles xmi:type="notation:FontStyle" xmi:id="_DCBvNQiLEeq99cg7VqpEdg"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_DCCWQAiLEeq99cg7VqpEdg" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:Interface" href="simple.servicedef.uml#_gA3kAEfKEeiuVfmPqBuUBA"/>
+ <eObjectValue xmi:type="uml:Interface" href="simple_msgs.servicedef.uml#_gA3kAEfKEeiuVfmPqBuUBA"/>
</styles>
<element xsi:nil="true"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_DCBvNgiLEeq99cg7VqpEdg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
@@ -1411,7 +1483,7 @@
<edges xmi:type="notation:Connector" xmi:id="_EKsAZwiLEeq99cg7VqpEdg" type="StereotypeCommentLink" source="_EKhBQAiLEeq99cg7VqpEdg">
<styles xmi:type="notation:FontStyle" xmi:id="_EKsAaAiLEeq99cg7VqpEdg"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_EKsAbAiLEeq99cg7VqpEdg" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:Interface" href="simple.servicedef.uml#_aTuOIHoWEeif1855zzC59A"/>
+ <eObjectValue xmi:type="uml:Interface" href="simple_msgs.servicedef.uml#_aTuOIHoWEeif1855zzC59A"/>
</styles>
<element xsi:nil="true"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EKsAaQiLEeq99cg7VqpEdg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
@@ -1421,7 +1493,7 @@
<edges xmi:type="notation:Connector" xmi:id="_93PYl3KGEeqBWa3522s-5Q" type="StereotypeCommentLink" source="_DBN24AiLEeq99cg7VqpEdg" target="_93PYk3KGEeqBWa3522s-5Q">
<styles xmi:type="notation:FontStyle" xmi:id="_93PYmHKGEeqBWa3522s-5Q"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_93PYnHKGEeqBWa3522s-5Q" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:Interface" href="simple.servicedef.uml#_gA3kAEfKEeiuVfmPqBuUBA"/>
+ <eObjectValue xmi:type="uml:Interface" href="simple_msgs.servicedef.uml#_gA3kAEfKEeiuVfmPqBuUBA"/>
</styles>
<element xsi:nil="true"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_93PYmXKGEeqBWa3522s-5Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
@@ -1431,7 +1503,7 @@
<edges xmi:type="notation:Connector" xmi:id="_93YihHKGEeqBWa3522s-5Q" type="StereotypeCommentLink" source="_EKhBQAiLEeq99cg7VqpEdg" target="_93YigHKGEeqBWa3522s-5Q">
<styles xmi:type="notation:FontStyle" xmi:id="_93YihXKGEeqBWa3522s-5Q"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_93YiiXKGEeqBWa3522s-5Q" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:Interface" href="simple.servicedef.uml#_aTuOIHoWEeif1855zzC59A"/>
+ <eObjectValue xmi:type="uml:Interface" href="simple_msgs.servicedef.uml#_aTuOIHoWEeif1855zzC59A"/>
</styles>
<element xsi:nil="true"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_93YihnKGEeqBWa3522s-5Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
@@ -1455,7 +1527,7 @@
<edges xmi:type="notation:Connector" xmi:id="_eCLfZIWpEeqv286NAztpSg" type="StereotypeCommentLink" source="_DBN24AiLEeq99cg7VqpEdg" target="_eCLfYIWpEeqv286NAztpSg">
<styles xmi:type="notation:FontStyle" xmi:id="_eCLfZYWpEeqv286NAztpSg"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_eCLfaYWpEeqv286NAztpSg" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:Interface" href="simple.servicedef.uml#_gA3kAEfKEeiuVfmPqBuUBA"/>
+ <eObjectValue xmi:type="uml:Interface" href="simple_msgs.servicedef.uml#_gA3kAEfKEeiuVfmPqBuUBA"/>
</styles>
<element xsi:nil="true"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_eCLfZoWpEeqv286NAztpSg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
@@ -1465,7 +1537,7 @@
<edges xmi:type="notation:Connector" xmi:id="_eCTbNIWpEeqv286NAztpSg" type="StereotypeCommentLink" source="_EKhBQAiLEeq99cg7VqpEdg" target="_eCTbMIWpEeqv286NAztpSg">
<styles xmi:type="notation:FontStyle" xmi:id="_eCTbNYWpEeqv286NAztpSg"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_eCTbOYWpEeqv286NAztpSg" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:Interface" href="simple.servicedef.uml#_aTuOIHoWEeif1855zzC59A"/>
+ <eObjectValue xmi:type="uml:Interface" href="simple_msgs.servicedef.uml#_aTuOIHoWEeif1855zzC59A"/>
</styles>
<element xsi:nil="true"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_eCTbNoWpEeqv286NAztpSg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
@@ -1482,7 +1554,7 @@
<edges xmi:type="notation:Connector" xmi:id="_Wr7RNOz8Eeq8bcM3DpWcNQ" type="StereotypeCommentLink" source="_DBN24AiLEeq99cg7VqpEdg" target="_Wr7RMOz8Eeq8bcM3DpWcNQ">
<styles xmi:type="notation:FontStyle" xmi:id="_Wr7RNez8Eeq8bcM3DpWcNQ"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_Wr7ROez8Eeq8bcM3DpWcNQ" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:Interface" href="simple.servicedef.uml#_gA3kAEfKEeiuVfmPqBuUBA"/>
+ <eObjectValue xmi:type="uml:Interface" href="simple_msgs.servicedef.uml#_gA3kAEfKEeiuVfmPqBuUBA"/>
</styles>
<element xsi:nil="true"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Wr7RNuz8Eeq8bcM3DpWcNQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
@@ -1492,7 +1564,7 @@
<edges xmi:type="notation:Connector" xmi:id="_WsB-4ez8Eeq8bcM3DpWcNQ" type="StereotypeCommentLink" source="_EKhBQAiLEeq99cg7VqpEdg" target="_WsBX0-z8Eeq8bcM3DpWcNQ">
<styles xmi:type="notation:FontStyle" xmi:id="_WsB-4uz8Eeq8bcM3DpWcNQ"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_WsB-5uz8Eeq8bcM3DpWcNQ" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:Interface" href="simple.servicedef.uml#_aTuOIHoWEeif1855zzC59A"/>
+ <eObjectValue xmi:type="uml:Interface" href="simple_msgs.servicedef.uml#_aTuOIHoWEeif1855zzC59A"/>
</styles>
<element xsi:nil="true"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_WsB-4-z8Eeq8bcM3DpWcNQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
@@ -1502,7 +1574,7 @@
<edges xmi:type="notation:Connector" xmi:id="_WsIslOz8Eeq8bcM3DpWcNQ" type="StereotypeCommentLink" source="_jw5VsIWpEeqv286NAztpSg" target="_WsIskOz8Eeq8bcM3DpWcNQ">
<styles xmi:type="notation:FontStyle" xmi:id="_WsIslez8Eeq8bcM3DpWcNQ"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_WsJToOz8Eeq8bcM3DpWcNQ" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:Interface" href="simple.servicedef.uml#_hO4E4IWpEeqv286NAztpSg"/>
+ <eObjectValue xmi:type="uml:Interface" href="simple_msgs.servicedef.uml#_hO4E4IWpEeqv286NAztpSg"/>
</styles>
<element xsi:nil="true"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_WsIsluz8Eeq8bcM3DpWcNQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
diff --git a/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/testmodels/simple/models/services/simple.servicedef.uml b/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/testmodels/simple_msgs/models/services/simple_msgs.servicedef.uml
similarity index 98%
rename from plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/testmodels/simple/models/services/simple.servicedef.uml
rename to plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/testmodels/simple_msgs/models/services/simple_msgs.servicedef.uml
index 5f86b45..417daa1 100644
--- a/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/testmodels/simple/models/services/simple.servicedef.uml
+++ b/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/testmodels/simple_msgs/models/services/simple_msgs.servicedef.uml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:robotics.commobject="http://www.eclipse.org/papyrus/robotics/commobject/1" xmlns:robotics.services="http://www.eclipse.org/papyrus/robotics/services/1" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/robotics/commobject/1 http://www.eclipse.org/papyrus/robotics/1#//commobject http://www.eclipse.org/papyrus/robotics/services/1 http://www.eclipse.org/papyrus/robotics/1#//services">
- <uml:Model xmi:id="_6nSQsEfEEeiwO_ETU0BG9A" name="simple">
+ <uml:Model xmi:id="_6nSQsEfEEeiwO_ETU0BG9A" name="simple_msgs">
<packageImport xmi:type="uml:PackageImport" xmi:id="_vPI0sExOEei_Sui04GqxlQ">
<importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
</packageImport>
@@ -167,6 +167,6 @@
<robotics.services:ServiceDefinition xmi:id="_aTzGoHoWEeif1855zzC59A" base_Interface="_aTuOIHoWEeif1855zzC59A"/>
<robotics.commobject:CommunicationObject xmi:id="_fWzLYHqjEeikT4nAmbXssQ" base_DataType="_fWrPkHqjEeikT4nAmbXssQ"/>
<robotics.commobject:CommunicationObject xmi:id="_lM7RQHqjEeikT4nAmbXssQ" base_DataType="_lM1KoHqjEeikT4nAmbXssQ"/>
- <robotics.services:ServiceDefinitionModel xmi:id="_nqivUPVzEemY0fA4lBhwJQ" base_Package="_6nSQsEfEEeiwO_ETU0BG9A"/>
+ <robotics.services:ServiceDefinitionModel xmi:id="_nqivUPVzEemY0fA4lBhwJQ" description="Simple message package" base_Package="_6nSQsEfEEeiwO_ETU0BG9A"/>
<robotics.services:ServiceDefinition xmi:id="_jwP1cIWpEeqv286NAztpSg" base_Interface="_hO4E4IWpEeqv286NAztpSg"/>
</xmi:XMI>
diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.cdteditor/src/org/eclipse/papyrus/robotics/ros2/cdteditor/sync/SyncParametersToModel.java b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.cdteditor/src/org/eclipse/papyrus/robotics/ros2/cdteditor/sync/SyncParametersToModel.java
index bf97a05..a00a5e2 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.cdteditor/src/org/eclipse/papyrus/robotics/ros2/cdteditor/sync/SyncParametersToModel.java
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.cdteditor/src/org/eclipse/papyrus/robotics/ros2/cdteditor/sync/SyncParametersToModel.java
@@ -2,11 +2,11 @@
import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.papyrus.commands.Activator;
import org.eclipse.papyrus.robotics.core.commands.PortCommands;
import org.eclipse.papyrus.robotics.core.utils.InteractionUtils;
import org.eclipse.papyrus.robotics.core.utils.ParameterUtils;
import org.eclipse.papyrus.robotics.profile.robotics.parameters.ParameterEntry;
+import org.eclipse.papyrus.robotics.ros2.cdteditor.Activator;
import org.eclipse.papyrus.robotics.ros2.reverse.ParamInfo;
import org.eclipse.papyrus.robotics.ros2.reverse.PortInfo;
import org.eclipse.papyrus.robotics.ros2.reverse.fromfile.ReverseParametersFromSource;
diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.cdteditor/src/org/eclipse/papyrus/robotics/ros2/cdteditor/sync/SyncPortsToModel.java b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.cdteditor/src/org/eclipse/papyrus/robotics/ros2/cdteditor/sync/SyncPortsToModel.java
index ca8167c..c4720ce 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.cdteditor/src/org/eclipse/papyrus/robotics/ros2/cdteditor/sync/SyncPortsToModel.java
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.cdteditor/src/org/eclipse/papyrus/robotics/ros2/cdteditor/sync/SyncPortsToModel.java
@@ -6,10 +6,10 @@
import org.eclipse.cdt.core.model.ITranslationUnit;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.emf.common.util.URI;
-import org.eclipse.papyrus.commands.Activator;
import org.eclipse.papyrus.robotics.core.commands.PortCommands;
import org.eclipse.papyrus.robotics.core.utils.InteractionUtils;
import org.eclipse.papyrus.robotics.profile.robotics.components.ComponentPort;
+import org.eclipse.papyrus.robotics.ros2.cdteditor.Activator;
import org.eclipse.papyrus.robotics.ros2.reverse.PortInfo;
import org.eclipse.papyrus.robotics.ros2.reverse.fromfile.ReversePortsFromSource;
import org.eclipse.papyrus.robotics.ros2.reverse.utils.CreatePortUtils;
diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/META-INF/MANIFEST.MF b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/META-INF/MANIFEST.MF
index 0650c06..6321b66 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/META-INF/MANIFEST.MF
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/META-INF/MANIFEST.MF
@@ -41,4 +41,3 @@
Bundle-Localization: plugin
Automatic-Module-Name: org.eclipse.papyrus.robotics.ros2.codegen.tests
Import-Package: org.eclipse.papyrus.designer.transformation.profile
-Bundle-Activator: org.eclipse.papyrus.robotics.ros2.codegen.tests.Activator
diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/clientServer/CMakeLists.txt b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/clientServer/CMakeLists.txt
index 90028eb..9ed2923 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/clientServer/CMakeLists.txt
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/clientServer/CMakeLists.txt
@@ -13,7 +13,7 @@
find_package(ament_cmake REQUIRED)
find_package(rclcpp REQUIRED)
find_package(rclcpp_lifecycle REQUIRED)
-find_package(simple REQUIRED)
+find_package(simple_msgs REQUIRED)
include_directories(
# assure that generated .h files are found
@@ -28,7 +28,7 @@
ament_target_dependencies(AddClient
rclcpp
rclcpp_lifecycle
- simple
+ simple_msgs
)
add_executable(AddServer
@@ -38,7 +38,7 @@
ament_target_dependencies(AddServer
rclcpp
rclcpp_lifecycle
- simple
+ simple_msgs
)
diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/clientServer/package.xml b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/clientServer/package.xml
index d08973d..c8c3219 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/clientServer/package.xml
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/clientServer/package.xml
@@ -6,17 +6,17 @@
<maintainer email="info-list@cea.fr">CEA LIST</maintainer>
<license>Apache2.0</license>
<url type="website">https://eclipse.org/papyrus</url>
- <author email="ansgar.radermacher@cea.fr">author@somewhere.net</author>
+ <author email="ansgar.radermacher@cea.fr">author</author>
<buildtool_depend>ament_cmake</buildtool_depend>
<build_depend>rclcpp</build_depend>
<build_depend>rclcpp_lifecycle</build_depend>
- <build_depend>simple</build_depend>
+ <build_depend>simple_msgs</build_depend>
<exec_depend>rclcpp</exec_depend>
<exec_depend>rclcpp_lifecycle</exec_depend>
- <exec_depend>simple</exec_depend>
+ <exec_depend>simple_msgs</exec_depend>
<export>
<build_type>ament_cmake</build_type>
diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/clientServer/src-gen/addClientCompdef/AddClient.cpp b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/clientServer/src-gen/addClientCompdef/AddClient.cpp
index 42f508b..9dcac08 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/clientServer/src-gen/addClientCompdef/AddClient.cpp
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/clientServer/src-gen/addClientCompdef/AddClient.cpp
@@ -1,4 +1,12 @@
// --------------------------------------------------------
+// Copyright (c) 2020
+//
+// contributions by Ansgar
+// ansgar.radermacher@cea.fr
+// maintained by CEA LIST
+// info-list@cea.fr
+
+// --------------------------------------------------------
// Code generated by Papyrus C++
// --------------------------------------------------------
@@ -28,37 +36,36 @@
*
*/
void AddClient::fOnActivate() {
- RCLCPP_INFO(get_logger(), "on activate, call \"add\" in a new thread");
- std::thread { std::bind(&AddClient::fCallAdd, this) }.detach();
+ RCLCPP_INFO(get_logger(), "on activate, call \"add\" in a new thread");
+ std::thread { std::bind(&AddClient::fCallAdd, this) }.detach();
}
/**
*
*/
void AddClient::fCallAdd() {
- auto request = std::make_shared<simple::srv::AddServiceDef::Request>();
- request->x = 2;
- request->y = 3;
+ auto request = std::make_shared<simple_msgs::srv::AddServiceDef::Request>();
+ request->x = 2;
+ request->y = 3;
- RCLCPP_INFO(get_logger(), "doing request");
+ RCLCPP_INFO(get_logger(), "doing request");
- // use a call in which the future is polled first
- auto result_future = useAdd_client_->async_send_request(request);
+ // use a call in which the future is polled first
+ auto result_future = useAdd_client_->async_send_request(request);
- if (result_future.wait_for(std::chrono::seconds(5s))
- != std::future_status::ready) {
- RCLCPP_ERROR(get_logger(),
- "service call failed. This happens, since the call is executed within the periodic timer call");
- } else {
- auto result = result_future.get();
- RCLCPP_INFO(get_logger(), "result via polling = %d", result->sum);
- }
+ if (result_future.wait_for(std::chrono::seconds(5s))
+ != std::future_status::ready) {
+ RCLCPP_ERROR(get_logger(),
+ "service call failed. This happens, since the call is executed within the periodic timer call");
+ } else {
+ auto result = result_future.get();
+ RCLCPP_INFO(get_logger(), "result via polling = %d", result->sum);
+ }
- // now make a call referencing a callback (by calling a member function, a lambda would have been
- // possible as well)
- useAdd_client_->async_send_request(request,
- std::bind(&AddClient::fResultCallback, this,
- std::placeholders::_1));
+ // now make a call referencing a callback (by calling a member function, a lambda would have been
+ // possible as well)
+ useAdd_client_->async_send_request(request,
+ std::bind(&AddClient::fResultCallback, this, std::placeholders::_1));
}
/**
@@ -66,18 +73,18 @@
* @param future
*/
void AddClient::fResultCallback(
- rclcpp::Client<simple::srv::AddServiceDef>::SharedFuture /*in*/future) {
- auto result = future.get();
- RCLCPP_INFO(get_logger(), "result via callback = %d", result->sum);
+ rclcpp::Client<simple_msgs::srv::AddServiceDef>::SharedFuture /*in*/future) {
+ auto result = future.get();
+ RCLCPP_INFO(get_logger(), "result via callback = %d", result->sum);
}
/**
*
*/
void AddClient::fPeriodic() {
- RCLCPP_INFO(get_logger(), "periodic, call \"add\" directly");
- fCallAdd();
- timer_->cancel();
+ RCLCPP_INFO(get_logger(), "periodic, call \"add\" directly");
+ fCallAdd();
+ timer_CallAdd_->cancel();
}
/**
@@ -85,8 +92,9 @@
* @param options
*/
AddClient::AddClient(rclcpp::NodeOptions /*in*/options) :
- rclcpp_lifecycle::LifecycleNode("AddClient", options) {
- useAdd_client_ = create_client<simple::srv::AddServiceDef>("AddServiceDef");
+ rclcpp_lifecycle::LifecycleNode("AddClient", options) {
+ useAdd_client_ = create_client < simple_msgs::srv::AddServiceDef
+ > ("AddServiceDef");
}
diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/clientServer/src-gen/addClientCompdef/AddClient.h b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/clientServer/src-gen/addClientCompdef/AddClient.h
index d189cc2..a16e225 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/clientServer/src-gen/addClientCompdef/AddClient.h
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/clientServer/src-gen/addClientCompdef/AddClient.h
@@ -1,4 +1,12 @@
// --------------------------------------------------------
+// Copyright (c) 2020
+//
+// contributions by Ansgar
+// ansgar.radermacher@cea.fr
+// maintained by CEA LIST
+// info-list@cea.fr
+
+// --------------------------------------------------------
// Code generated by Papyrus C++
// --------------------------------------------------------
@@ -12,7 +20,7 @@
#include "addClientCompdef/Pkg_addClientCompdef.h"
#include "rclcpp_lifecycle/lifecycle_node.hpp"
-#include "simple/srv/add_service_def.hpp"
+#include "simple_msgs/srv/add_service_def.hpp"
// Include from Include stereotype (header)
#include <rclcpp/rclcpp.hpp>
@@ -46,43 +54,43 @@
class AddClient: public rclcpp_lifecycle::LifecycleNode {
public:
- /**
- *
- */
- rclcpp::TimerBase::SharedPtr timer_CallAdd_;
+ /**
+ *
+ */
+ rclcpp::TimerBase::SharedPtr timer_CallAdd_;
- /**
- *
- */
- rclcpp::Client<simple::srv::AddServiceDef>::SharedPtr useAdd_client_;
+ /**
+ *
+ */
+ rclcpp::Client<simple_msgs::srv::AddServiceDef>::SharedPtr useAdd_client_;
- /**
- *
- */
- void fOnActivate();
+ /**
+ *
+ */
+ void fOnActivate();
- /**
- *
- */
- void fCallAdd();
+ /**
+ *
+ */
+ void fCallAdd();
- /**
- *
- * @param future
- */
- void fResultCallback(
- rclcpp::Client<simple::srv::AddServiceDef>::SharedFuture /*in*/future);
+ /**
+ *
+ * @param future
+ */
+ void fResultCallback(
+ rclcpp::Client<simple_msgs::srv::AddServiceDef>::SharedFuture /*in*/future);
- /**
- *
- */
- void fPeriodic();
+ /**
+ *
+ */
+ void fPeriodic();
- /**
- *
- * @param options
- */
- AddClient(rclcpp::NodeOptions /*in*/options);
+ /**
+ *
+ * @param options
+ */
+ AddClient(rclcpp::NodeOptions /*in*/options);
};
/************************************************************/
diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/clientServer/src-gen/addClientCompdef/AddClient_main.cpp b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/clientServer/src-gen/addClientCompdef/AddClient_main.cpp
index e257457..ee2f9d3 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/clientServer/src-gen/addClientCompdef/AddClient_main.cpp
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/clientServer/src-gen/addClientCompdef/AddClient_main.cpp
@@ -1,4 +1,12 @@
// --------------------------------------------------------
+// Copyright (c) 2020
+//
+// contributions by Ansgar
+// ansgar.radermacher@cea.fr
+// maintained by CEA LIST
+// info-list@cea.fr
+
+// --------------------------------------------------------
// Code generated by Papyrus C++
// --------------------------------------------------------
@@ -9,43 +17,40 @@
rclcpp::NodeOptions addclient_options;
int main(int argc, char **argv) {
- rclcpp::init(argc, argv);
+ rclcpp::init(argc, argv);
- auto addclient = std::make_shared<addClientCompdef::AddClient>(
- addclient_options);
+ auto addclient = std::make_shared < addClientCompdef::AddClient
+ > (addclient_options);
- RCLCPP_INFO(addclient->get_logger(), "AddClient has been initialized");
+ RCLCPP_INFO(addclient->get_logger(), "AddClient has been initialized");
- addclient->register_on_activate(
- [addclient](const rclcpp_lifecycle::State&) {
- addclient->fOnActivate();
- // periodic execution (1s) using a wall timer
- addclient->timer_CallAdd_ = addclient->create_wall_timer(1s,
- std::bind(&addClientCompdef::AddClient::fPeriodic,
- addclient));
- return rclcpp_lifecycle::node_interfaces::LifecycleNodeInterface::CallbackReturn::SUCCESS;
- }
- );
- addclient->register_on_deactivate(
- [addclient](const rclcpp_lifecycle::State&) {
- // stop timer
- addclient->timer_CallAdd_->cancel();
- return rclcpp_lifecycle::node_interfaces::LifecycleNodeInterface::CallbackReturn::SUCCESS;
- }
- );
- addclient->register_on_shutdown(
- [addclient](const rclcpp_lifecycle::State&) {
- // stop timer
- addclient->timer_CallAdd_->cancel();
- return rclcpp_lifecycle::node_interfaces::LifecycleNodeInterface::CallbackReturn::SUCCESS;
- }
- );
+ addclient->register_on_activate([addclient](const rclcpp_lifecycle::State&) {
+ addclient->fOnActivate();
+ // periodic execution (1s) using a wall timer
+ addclient->timer_CallAdd_ = addclient->create_wall_timer(1s, std::bind(&addClientCompdef::AddClient::fPeriodic, addclient));
+ return rclcpp_lifecycle::node_interfaces::LifecycleNodeInterface::CallbackReturn::SUCCESS;
+ }
+ );
+ addclient->register_on_deactivate(
+ [addclient](const rclcpp_lifecycle::State&) {
+ // stop timer
+ addclient->timer_CallAdd_->cancel();
+ return rclcpp_lifecycle::node_interfaces::LifecycleNodeInterface::CallbackReturn::SUCCESS;
+ }
+ );
+ addclient->register_on_shutdown(
+ [addclient](const rclcpp_lifecycle::State&) {
+ // stop timer
+ addclient->timer_CallAdd_->cancel();
+ return rclcpp_lifecycle::node_interfaces::LifecycleNodeInterface::CallbackReturn::SUCCESS;
+ }
+ );
- rclcpp::executors::MultiThreadedExecutor executor;
+ rclcpp::executors::MultiThreadedExecutor executor;
- executor.add_node(addclient->get_node_base_interface());
+ executor.add_node(addclient->get_node_base_interface());
- executor.spin();
- rclcpp::shutdown();
+ executor.spin();
+ rclcpp::shutdown();
}
diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/clientServer/src-gen/addClientCompdef/AddClient_main.h b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/clientServer/src-gen/addClientCompdef/AddClient_main.h
index 923c5d1..bce7bf4 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/clientServer/src-gen/addClientCompdef/AddClient_main.h
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/clientServer/src-gen/addClientCompdef/AddClient_main.h
@@ -1,4 +1,12 @@
// --------------------------------------------------------
+// Copyright (c) 2020
+//
+// contributions by Ansgar
+// ansgar.radermacher@cea.fr
+// maintained by CEA LIST
+// info-list@cea.fr
+
+// --------------------------------------------------------
// Code generated by Papyrus C++
// --------------------------------------------------------
diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/clientServer/src-gen/addClientCompdef/Pkg_addClientCompdef.h b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/clientServer/src-gen/addClientCompdef/Pkg_addClientCompdef.h
index 3a9c55b..ff287ea 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/clientServer/src-gen/addClientCompdef/Pkg_addClientCompdef.h
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/clientServer/src-gen/addClientCompdef/Pkg_addClientCompdef.h
@@ -1,3 +1,11 @@
+// --------------------------------------------------------
+// Copyright (c) 2020
+//
+// contributions by Ansgar
+// ansgar.radermacher@cea.fr
+// maintained by CEA LIST
+// info-list@cea.fr
+
#ifndef PKG_ADDCLIENTCOMPDEF
#define PKG_ADDCLIENTCOMPDEF
diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/clientServer/src-gen/addServerCompdef/AddServer.cpp b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/clientServer/src-gen/addServerCompdef/AddServer.cpp
index 6a0125f..2368b8b 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/clientServer/src-gen/addServerCompdef/AddServer.cpp
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/clientServer/src-gen/addServerCompdef/AddServer.cpp
@@ -1,4 +1,12 @@
// --------------------------------------------------------
+// Copyright (c) 2020
+//
+// contributions by Ansgar
+// ansgar.radermacher@cea.fr
+// maintained by CEA LIST
+// info-list@cea.fr
+
+// --------------------------------------------------------
// Code generated by Papyrus C++
// --------------------------------------------------------
@@ -26,14 +34,14 @@
* @return ret
*/
bool AddServer::fAdder(
- const simple::srv::AddServiceDef::Request::SharedPtr /*in*/request,
- const simple::srv::AddServiceDef::Response::SharedPtr /*in*/response) {
- response->sum = request->x + request->y;
- RCLCPP_INFO(get_logger(), "request: x=%ld, y=%ld", (long int ) request->x,
- (long int ) request->y);
- RCLCPP_INFO(get_logger(), "sending back response: [%ld]",
- (long int ) response->sum);
- return true;
+ const simple_msgs::srv::AddServiceDef::Request::SharedPtr /*in*/request,
+ const simple_msgs::srv::AddServiceDef::Response::SharedPtr /*in*/response) {
+ response->sum = request->x + request->y;
+ RCLCPP_INFO(get_logger(), "request: x=%ld, y=%ld", (long int) request->x,
+ (long int) request->y);
+ RCLCPP_INFO(get_logger(), "sending back response: [%ld]",
+ (long int) response->sum);
+ return true;
}
/**
@@ -41,10 +49,10 @@
* @param options
*/
AddServer::AddServer(rclcpp::NodeOptions /*in*/options) :
- rclcpp_lifecycle::LifecycleNode("AddServer", options) {
- addSvc_srv_ = create_service<simple::srv::AddServiceDef>("AddServiceDef",
- std::bind(&addServerCompdef::AddServer::fAdder, (AddServer*) this,
- std::placeholders::_1, std::placeholders::_2));
+ rclcpp_lifecycle::LifecycleNode("AddServer", options) {
+ addSvc_srv_ = create_service < simple_msgs::srv::AddServiceDef
+ > ("AddServiceDef", std::bind(&addServerCompdef::AddServer::fAdder,
+ (AddServer*) this, std::placeholders::_1, std::placeholders::_2));
}
diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/clientServer/src-gen/addServerCompdef/AddServer.h b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/clientServer/src-gen/addServerCompdef/AddServer.h
index 38ca2dc..d8b102b 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/clientServer/src-gen/addServerCompdef/AddServer.h
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/clientServer/src-gen/addServerCompdef/AddServer.h
@@ -1,4 +1,12 @@
// --------------------------------------------------------
+// Copyright (c) 2020
+//
+// contributions by Ansgar
+// ansgar.radermacher@cea.fr
+// maintained by CEA LIST
+// info-list@cea.fr
+
+// --------------------------------------------------------
// Code generated by Papyrus C++
// --------------------------------------------------------
@@ -12,7 +20,7 @@
#include "addServerCompdef/Pkg_addServerCompdef.h"
#include "rclcpp_lifecycle/lifecycle_node.hpp"
-#include "simple/srv/add_service_def.hpp"
+#include "simple_msgs/srv/add_service_def.hpp"
// Include from Include stereotype (header)
#include <rclcpp/rclcpp.hpp>
@@ -39,26 +47,26 @@
class AddServer: public rclcpp_lifecycle::LifecycleNode {
public:
- /**
- *
- */
- rclcpp::Service<simple::srv::AddServiceDef>::SharedPtr addSvc_srv_;
+ /**
+ *
+ */
+ rclcpp::Service<simple_msgs::srv::AddServiceDef>::SharedPtr addSvc_srv_;
- /**
- *
- * @param request
- * @param response
- * @return ret
- */
- bool fAdder(
- const simple::srv::AddServiceDef::Request::SharedPtr /*in*/request,
- const simple::srv::AddServiceDef::Response::SharedPtr /*in*/response);
+ /**
+ *
+ * @param request
+ * @param response
+ * @return ret
+ */
+ bool fAdder(
+ const simple_msgs::srv::AddServiceDef::Request::SharedPtr /*in*/request,
+ const simple_msgs::srv::AddServiceDef::Response::SharedPtr /*in*/response);
- /**
- *
- * @param options
- */
- AddServer(rclcpp::NodeOptions /*in*/options);
+ /**
+ *
+ * @param options
+ */
+ AddServer(rclcpp::NodeOptions /*in*/options);
};
/************************************************************/
diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/clientServer/src-gen/addServerCompdef/AddServer_main.cpp b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/clientServer/src-gen/addServerCompdef/AddServer_main.cpp
index 3479f86..eaf3792 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/clientServer/src-gen/addServerCompdef/AddServer_main.cpp
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/clientServer/src-gen/addServerCompdef/AddServer_main.cpp
@@ -1,4 +1,12 @@
// --------------------------------------------------------
+// Copyright (c) 2020
+//
+// contributions by Ansgar
+// ansgar.radermacher@cea.fr
+// maintained by CEA LIST
+// info-list@cea.fr
+
+// --------------------------------------------------------
// Code generated by Papyrus C++
// --------------------------------------------------------
@@ -8,18 +16,18 @@
rclcpp::NodeOptions addserver_options;
int main(int argc, char **argv) {
- rclcpp::init(argc, argv);
+ rclcpp::init(argc, argv);
- auto addserver = std::make_shared<addServerCompdef::AddServer>(
- addserver_options);
+ auto addserver = std::make_shared < addServerCompdef::AddServer
+ > (addserver_options);
- RCLCPP_INFO(addserver->get_logger(), "AddServer has been initialized");
+ RCLCPP_INFO(addserver->get_logger(), "AddServer has been initialized");
- rclcpp::executors::MultiThreadedExecutor executor;
+ rclcpp::executors::MultiThreadedExecutor executor;
- executor.add_node(addserver->get_node_base_interface());
+ executor.add_node(addserver->get_node_base_interface());
- executor.spin();
- rclcpp::shutdown();
+ executor.spin();
+ rclcpp::shutdown();
}
diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/clientServer/src-gen/addServerCompdef/AddServer_main.h b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/clientServer/src-gen/addServerCompdef/AddServer_main.h
index 923c5d1..bce7bf4 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/clientServer/src-gen/addServerCompdef/AddServer_main.h
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/clientServer/src-gen/addServerCompdef/AddServer_main.h
@@ -1,4 +1,12 @@
// --------------------------------------------------------
+// Copyright (c) 2020
+//
+// contributions by Ansgar
+// ansgar.radermacher@cea.fr
+// maintained by CEA LIST
+// info-list@cea.fr
+
+// --------------------------------------------------------
// Code generated by Papyrus C++
// --------------------------------------------------------
diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/clientServer/src-gen/addServerCompdef/Pkg_addServerCompdef.h b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/clientServer/src-gen/addServerCompdef/Pkg_addServerCompdef.h
index b5638bc..01b3cad 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/clientServer/src-gen/addServerCompdef/Pkg_addServerCompdef.h
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/clientServer/src-gen/addServerCompdef/Pkg_addServerCompdef.h
@@ -1,3 +1,11 @@
+// --------------------------------------------------------
+// Copyright (c) 2020
+//
+// contributions by Ansgar
+// ansgar.radermacher@cea.fr
+// maintained by CEA LIST
+// info-list@cea.fr
+
#ifndef PKG_ADDSERVERCOMPDEF
#define PKG_ADDSERVERCOMPDEF
diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe/CMakeLists.txt b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe/CMakeLists.txt
index e289d43..c411d78 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe/CMakeLists.txt
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe/CMakeLists.txt
@@ -13,7 +13,7 @@
find_package(ament_cmake REQUIRED)
find_package(rclcpp REQUIRED)
find_package(rclcpp_lifecycle REQUIRED)
-find_package(simple REQUIRED)
+find_package(simple_msgs REQUIRED)
include_directories(
# assure that generated .h files are found
@@ -28,7 +28,7 @@
ament_target_dependencies(PeriodicPublisher
rclcpp
rclcpp_lifecycle
- simple
+ simple_msgs
)
add_executable(Subscriber
@@ -38,7 +38,7 @@
ament_target_dependencies(Subscriber
rclcpp
rclcpp_lifecycle
- simple
+ simple_msgs
)
diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe/package.xml b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe/package.xml
index 7a487de..4ac8849 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe/package.xml
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe/package.xml
@@ -6,17 +6,17 @@
<maintainer email="info-list@cea.fr">CEA LIST</maintainer>
<license>Apache2.0</license>
<url type="website">https://eclipse.org/papyrus</url>
- <author email="author@somewhere.net">author@somewhere.net</author>
+ <author email="author@somewhere.net">author</author>
<buildtool_depend>ament_cmake</buildtool_depend>
<build_depend>rclcpp</build_depend>
<build_depend>rclcpp_lifecycle</build_depend>
- <build_depend>simple</build_depend>
+ <build_depend>simple_msgs</build_depend>
<exec_depend>rclcpp</exec_depend>
<exec_depend>rclcpp_lifecycle</exec_depend>
- <exec_depend>simple</exec_depend>
+ <exec_depend>simple_msgs</exec_depend>
<export>
<build_type>ament_cmake</build_type>
diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe/src-gen/PrimitiveTypes/Pkg_PrimitiveTypes.h b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe/src-gen/PrimitiveTypes/Pkg_PrimitiveTypes.h
index 8c8e87a..12ce3f9 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe/src-gen/PrimitiveTypes/Pkg_PrimitiveTypes.h
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe/src-gen/PrimitiveTypes/Pkg_PrimitiveTypes.h
@@ -1,3 +1,11 @@
+// --------------------------------------------------------
+// Copyright (c) 2020
+//
+// contributions by author
+// author@somewhere.net
+// maintained by maintainer
+// maintainer@somewhere.net
+
#ifndef PKG_PRIMITIVETYPES
#define PKG_PRIMITIVETYPES
diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe/src-gen/periodicPublisherCompdef/PeriodicPublisher.cpp b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe/src-gen/periodicPublisherCompdef/PeriodicPublisher.cpp
index 87d77b7..eb0c7b5 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe/src-gen/periodicPublisherCompdef/PeriodicPublisher.cpp
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe/src-gen/periodicPublisherCompdef/PeriodicPublisher.cpp
@@ -1,4 +1,12 @@
// --------------------------------------------------------
+// Copyright (c) 2020
+//
+// contributions by author
+// author@somewhere.net
+// maintained by CEA LIST
+// info-list@cea.fr
+
+// --------------------------------------------------------
// Code generated by Papyrus C++
// --------------------------------------------------------
@@ -23,14 +31,14 @@
*
*/
void PeriodicPublisher::fPublishing() {
- simple::msg::Map map;
- map.ogm.width = 16;
- map.ogm.height = 16;
- map.ogm.resolution = 0.1;
+ simple_msgs::msg::Map map;
+ map.ogm.width = 16;
+ map.ogm.height = 16;
+ map.ogm.resolution = 0.1;
- RCLCPP_INFO(get_logger(), "now publishing");
+ RCLCPP_INFO(get_logger(), "now publishing");
- pMap_pub_->publish(map);
+ pMap_pub_->publish(map);
}
@@ -39,10 +47,10 @@
* @param options
*/
PeriodicPublisher::PeriodicPublisher(rclcpp::NodeOptions /*in*/options) :
- rclcpp_lifecycle::LifecycleNode("PeriodicPublisher", options) {
- pMap_pub_ = create_publisher<simple::msg::Map>("pMap", 1);
- // directly activate a publisher
- pMap_pub_->on_activate();
+ rclcpp_lifecycle::LifecycleNode("PeriodicPublisher", options) {
+ pMap_pub_ = create_publisher < simple_msgs::msg::Map > ("pMap", 1);
+ // directly activate a publisher
+ pMap_pub_->on_activate();
}
@@ -50,16 +58,16 @@
*
*/
void PeriodicPublisher::declareParameters() {
- declare_parameter("indoor", rclcpp::ParameterValue(true));
- declare_parameter("noOfScans", rclcpp::ParameterValue(5));
+ declare_parameter("indoor", rclcpp::ParameterValue(true));
+ declare_parameter("noOfScans", rclcpp::ParameterValue(5));
}
/**
*
*/
void PeriodicPublisher::initParameterVars() {
- get_parameter("indoor", indoor_);
- get_parameter("noOfScans", noOfScans_);
+ get_parameter("indoor", indoor_);
+ get_parameter("noOfScans", noOfScans_);
}
} // of namespace periodicPublisherCompdef
diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe/src-gen/periodicPublisherCompdef/PeriodicPublisher.h b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe/src-gen/periodicPublisherCompdef/PeriodicPublisher.h
index 4c3fbd3..e288e29 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe/src-gen/periodicPublisherCompdef/PeriodicPublisher.h
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe/src-gen/periodicPublisherCompdef/PeriodicPublisher.h
@@ -1,4 +1,12 @@
// --------------------------------------------------------
+// Copyright (c) 2020
+//
+// contributions by author
+// author@somewhere.net
+// maintained by CEA LIST
+// info-list@cea.fr
+
+// --------------------------------------------------------
// Code generated by Papyrus C++
// --------------------------------------------------------
@@ -13,7 +21,7 @@
#include "PrimitiveTypes/Pkg_PrimitiveTypes.h"
#include "rclcpp_lifecycle/lifecycle_node.hpp"
-#include "simple/msg/map.hpp"
+#include "simple_msgs/msg/map.hpp"
// Include from Include stereotype (header)
#include <rclcpp/rclcpp.hpp>
@@ -42,46 +50,46 @@
class PeriodicPublisher: public rclcpp_lifecycle::LifecycleNode {
public:
- /**
- *
- */
- rclcpp::TimerBase::SharedPtr timer_Activity1_;
+ /**
+ *
+ */
+ rclcpp::TimerBase::SharedPtr timer_Activity1_;
- /**
- *
- */
- rclcpp_lifecycle::LifecyclePublisher<simple::msg::Map>::SharedPtr pMap_pub_;
+ /**
+ *
+ */
+ rclcpp_lifecycle::LifecyclePublisher<simple_msgs::msg::Map>::SharedPtr pMap_pub_;
- /**
- *
- */
- ::PrimitiveTypes::Boolean indoor_;
+ /**
+ *
+ */
+ ::PrimitiveTypes::Boolean indoor_;
- /**
- *
- */
- ::PrimitiveTypes::Integer noOfScans_;
+ /**
+ *
+ */
+ ::PrimitiveTypes::Integer noOfScans_;
- /**
- *
- */
- void fPublishing();
+ /**
+ *
+ */
+ void fPublishing();
- /**
- *
- * @param options
- */
- PeriodicPublisher(rclcpp::NodeOptions /*in*/options);
+ /**
+ *
+ * @param options
+ */
+ PeriodicPublisher(rclcpp::NodeOptions /*in*/options);
- /**
- *
- */
- void declareParameters();
+ /**
+ *
+ */
+ void declareParameters();
- /**
- *
- */
- void initParameterVars();
+ /**
+ *
+ */
+ void initParameterVars();
};
/************************************************************/
diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe/src-gen/periodicPublisherCompdef/PeriodicPublisher_main.cpp b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe/src-gen/periodicPublisherCompdef/PeriodicPublisher_main.cpp
index 12ce185..e1c19db 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe/src-gen/periodicPublisherCompdef/PeriodicPublisher_main.cpp
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe/src-gen/periodicPublisherCompdef/PeriodicPublisher_main.cpp
@@ -1,4 +1,12 @@
// --------------------------------------------------------
+// Copyright (c) 2020
+//
+// contributions by author
+// author@somewhere.net
+// maintained by CEA LIST
+// info-list@cea.fr
+
+// --------------------------------------------------------
// Code generated by Papyrus C++
// --------------------------------------------------------
@@ -9,48 +17,48 @@
rclcpp::NodeOptions periodicpublisher_options;
int main(int argc, char **argv) {
- rclcpp::init(argc, argv);
+ rclcpp::init(argc, argv);
- auto periodicpublisher = std::make_shared
- < periodicPublisherCompdef::PeriodicPublisher
- > (periodicpublisher_options);
+ auto periodicpublisher = std::make_shared
+ < periodicPublisherCompdef::PeriodicPublisher
+ > (periodicpublisher_options);
- RCLCPP_INFO(periodicpublisher->get_logger(),
- "PeriodicPublisher has been initialized");
+ RCLCPP_INFO(periodicpublisher->get_logger(),
+ "PeriodicPublisher has been initialized");
- periodicpublisher->register_on_activate(
- [periodicpublisher](const rclcpp_lifecycle::State&) {
- // periodic execution (250ms) using a wall timer
- periodicpublisher->timer_Activity1_ =
- periodicpublisher->create_wall_timer(250ms,
- std::bind(
- &periodicPublisherCompdef::PeriodicPublisher::fPublishing,
- periodicpublisher));
- return rclcpp_lifecycle::node_interfaces::LifecycleNodeInterface::CallbackReturn::SUCCESS;
- }
- );
- periodicpublisher->register_on_deactivate(
- [periodicpublisher](const rclcpp_lifecycle::State&) {
- // stop timer
- periodicpublisher->timer_Activity1_->cancel();
- return rclcpp_lifecycle::node_interfaces::LifecycleNodeInterface::CallbackReturn::SUCCESS;
- }
- );
- periodicpublisher->register_on_shutdown(
- [periodicpublisher](const rclcpp_lifecycle::State&) {
- // stop timer
- periodicpublisher->timer_Activity1_->cancel();
- return rclcpp_lifecycle::node_interfaces::LifecycleNodeInterface::CallbackReturn::SUCCESS;
- }
- );
- periodicpublisher->declareParameters();
- periodicpublisher->initParameterVars();
+ periodicpublisher->register_on_activate(
+ [periodicpublisher](const rclcpp_lifecycle::State&) {
+ // periodic execution (250ms) using a wall timer
+ periodicpublisher->timer_Activity1_ =
+ periodicpublisher->create_wall_timer(250ms,
+ std::bind(
+ &periodicPublisherCompdef::PeriodicPublisher::fPublishing,
+ periodicpublisher));
+ return rclcpp_lifecycle::node_interfaces::LifecycleNodeInterface::CallbackReturn::SUCCESS;
+ }
+ );
+ periodicpublisher->register_on_deactivate(
+ [periodicpublisher](const rclcpp_lifecycle::State&) {
+ // stop timer
+ periodicpublisher->timer_Activity1_->cancel();
+ return rclcpp_lifecycle::node_interfaces::LifecycleNodeInterface::CallbackReturn::SUCCESS;
+ }
+ );
+ periodicpublisher->register_on_shutdown(
+ [periodicpublisher](const rclcpp_lifecycle::State&) {
+ // stop timer
+ periodicpublisher->timer_Activity1_->cancel();
+ return rclcpp_lifecycle::node_interfaces::LifecycleNodeInterface::CallbackReturn::SUCCESS;
+ }
+ );
+ periodicpublisher->declareParameters();
+ periodicpublisher->initParameterVars();
- rclcpp::executors::MultiThreadedExecutor executor;
+ rclcpp::executors::MultiThreadedExecutor executor;
- executor.add_node(periodicpublisher->get_node_base_interface());
+ executor.add_node(periodicpublisher->get_node_base_interface());
- executor.spin();
- rclcpp::shutdown();
+ executor.spin();
+ rclcpp::shutdown();
}
diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe/src-gen/periodicPublisherCompdef/PeriodicPublisher_main.h b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe/src-gen/periodicPublisherCompdef/PeriodicPublisher_main.h
index 923c5d1..95467e3 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe/src-gen/periodicPublisherCompdef/PeriodicPublisher_main.h
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe/src-gen/periodicPublisherCompdef/PeriodicPublisher_main.h
@@ -1,4 +1,12 @@
// --------------------------------------------------------
+// Copyright (c) 2020
+//
+// contributions by author
+// author@somewhere.net
+// maintained by CEA LIST
+// info-list@cea.fr
+
+// --------------------------------------------------------
// Code generated by Papyrus C++
// --------------------------------------------------------
diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe/src-gen/periodicPublisherCompdef/Pkg_periodicPublisherCompdef.h b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe/src-gen/periodicPublisherCompdef/Pkg_periodicPublisherCompdef.h
index cf6cb13..697edf7 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe/src-gen/periodicPublisherCompdef/Pkg_periodicPublisherCompdef.h
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe/src-gen/periodicPublisherCompdef/Pkg_periodicPublisherCompdef.h
@@ -1,3 +1,11 @@
+// --------------------------------------------------------
+// Copyright (c) 2020
+//
+// contributions by author
+// author@somewhere.net
+// maintained by CEA LIST
+// info-list@cea.fr
+
#ifndef PKG_PERIODICPUBLISHERCOMPDEF
#define PKG_PERIODICPUBLISHERCOMPDEF
diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe/src-gen/subscriberCompdef/Pkg_subscriberCompdef.h b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe/src-gen/subscriberCompdef/Pkg_subscriberCompdef.h
index 8bd5482..d26b488 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe/src-gen/subscriberCompdef/Pkg_subscriberCompdef.h
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe/src-gen/subscriberCompdef/Pkg_subscriberCompdef.h
@@ -1,3 +1,11 @@
+// --------------------------------------------------------
+// Copyright (c) 2020
+//
+// contributions by author
+// author@somewhere.net
+// maintained by maintainer
+// maintainer@somewhere.net
+
#ifndef PKG_SUBSCRIBERCOMPDEF
#define PKG_SUBSCRIBERCOMPDEF
diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe/src-gen/subscriberCompdef/Subscriber.cpp b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe/src-gen/subscriberCompdef/Subscriber.cpp
index b53a71d..a95dfa5 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe/src-gen/subscriberCompdef/Subscriber.cpp
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe/src-gen/subscriberCompdef/Subscriber.cpp
@@ -1,4 +1,12 @@
// --------------------------------------------------------
+// Copyright (c) 2020
+//
+// contributions by author
+// author@somewhere.net
+// maintained by maintainer
+// maintainer@somewhere.net
+
+// --------------------------------------------------------
// Code generated by Papyrus C++
// --------------------------------------------------------
@@ -28,11 +36,11 @@
*
* @param map
*/
-void Subscriber::fListening(const simple::msg::Map::SharedPtr /*in*/map) {
- cout << "got map data" << endl;
- cout << "width: " << map->ogm.width << endl;
- cout << "height: " << map->ogm.height << endl;
- cout << "resolution: " << map->ogm.resolution << endl;
+void Subscriber::fListening(const simple_msgs::msg::Map::SharedPtr /*in*/map) {
+ cout << "got map data" << endl;
+ cout << "width: " << map->ogm.width << endl;
+ cout << "height: " << map->ogm.height << endl;
+ cout << "resolution: " << map->ogm.resolution << endl;
}
/**
@@ -40,11 +48,11 @@
* @param options
*/
Subscriber::Subscriber(rclcpp::NodeOptions /*in*/options) :
- rclcpp_lifecycle::LifecycleNode("Subscriber", options) {
- rMap_sub_ = create_subscription<simple::msg::Map>("rMap",
- rclcpp::QoS(rclcpp::KeepLast(100)).best_effort(),
- std::bind(&subscriberCompdef::Subscriber::fListening,
- (Subscriber*) this, std::placeholders::_1));
+ rclcpp_lifecycle::LifecycleNode("Subscriber", options) {
+ rMap_sub_ = create_subscription < simple_msgs::msg::Map
+ > ("rMap", rclcpp::QoS(rclcpp::KeepLast(100)).best_effort(), std::bind(
+ &subscriberCompdef::Subscriber::fListening, (Subscriber*) this,
+ std::placeholders::_1));
}
diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe/src-gen/subscriberCompdef/Subscriber.h b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe/src-gen/subscriberCompdef/Subscriber.h
index 4763e1e..ba7bab4 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe/src-gen/subscriberCompdef/Subscriber.h
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe/src-gen/subscriberCompdef/Subscriber.h
@@ -1,4 +1,12 @@
// --------------------------------------------------------
+// Copyright (c) 2020
+//
+// contributions by author
+// author@somewhere.net
+// maintained by maintainer
+// maintainer@somewhere.net
+
+// --------------------------------------------------------
// Code generated by Papyrus C++
// --------------------------------------------------------
@@ -12,7 +20,7 @@
#include "subscriberCompdef/Pkg_subscriberCompdef.h"
#include "rclcpp_lifecycle/lifecycle_node.hpp"
-#include "simple/msg/map.hpp"
+#include "simple_msgs/msg/map.hpp"
// Include from Include stereotype (header)
#include <rclcpp/rclcpp.hpp>
@@ -39,22 +47,22 @@
class Subscriber: public rclcpp_lifecycle::LifecycleNode {
public:
- /**
- *
- */
- rclcpp::Subscription<simple::msg::Map>::SharedPtr rMap_sub_;
+ /**
+ *
+ */
+ rclcpp::Subscription<simple_msgs::msg::Map>::SharedPtr rMap_sub_;
- /**
- *
- * @param map
- */
- void fListening(const simple::msg::Map::SharedPtr /*in*/map);
+ /**
+ *
+ * @param map
+ */
+ void fListening(const simple_msgs::msg::Map::SharedPtr /*in*/map);
- /**
- *
- * @param options
- */
- Subscriber(rclcpp::NodeOptions /*in*/options);
+ /**
+ *
+ * @param options
+ */
+ Subscriber(rclcpp::NodeOptions /*in*/options);
};
/************************************************************/
diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe/src-gen/subscriberCompdef/Subscriber_main.cpp b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe/src-gen/subscriberCompdef/Subscriber_main.cpp
index c182eb2..1a4ac9a 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe/src-gen/subscriberCompdef/Subscriber_main.cpp
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe/src-gen/subscriberCompdef/Subscriber_main.cpp
@@ -1,4 +1,12 @@
// --------------------------------------------------------
+// Copyright (c) 2020
+//
+// contributions by author
+// author@somewhere.net
+// maintained by maintainer
+// maintainer@somewhere.net
+
+// --------------------------------------------------------
// Code generated by Papyrus C++
// --------------------------------------------------------
@@ -8,18 +16,18 @@
rclcpp::NodeOptions subscriber_options;
int main(int argc, char **argv) {
- rclcpp::init(argc, argv);
+ rclcpp::init(argc, argv);
- auto subscriber = std::make_shared < subscriberCompdef::Subscriber
- > (subscriber_options);
+ auto subscriber = std::make_shared < subscriberCompdef::Subscriber
+ > (subscriber_options);
- RCLCPP_INFO(subscriber->get_logger(), "Subscriber has been initialized");
+ RCLCPP_INFO(subscriber->get_logger(), "Subscriber has been initialized");
- rclcpp::executors::MultiThreadedExecutor executor;
+ rclcpp::executors::MultiThreadedExecutor executor;
- executor.add_node(subscriber->get_node_base_interface());
+ executor.add_node(subscriber->get_node_base_interface());
- executor.spin();
- rclcpp::shutdown();
+ executor.spin();
+ rclcpp::shutdown();
}
diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe/src-gen/subscriberCompdef/Subscriber_main.h b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe/src-gen/subscriberCompdef/Subscriber_main.h
index 923c5d1..90c8916 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe/src-gen/subscriberCompdef/Subscriber_main.h
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe/src-gen/subscriberCompdef/Subscriber_main.h
@@ -1,4 +1,12 @@
// --------------------------------------------------------
+// Copyright (c) 2020
+//
+// contributions by author
+// author@somewhere.net
+// maintained by maintainer
+// maintainer@somewhere.net
+
+// --------------------------------------------------------
// Code generated by Papyrus C++
// --------------------------------------------------------
diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe_extcode/CMakeLists.txt b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe_extcode/CMakeLists.txt
index 894d47d..c574636 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe_extcode/CMakeLists.txt
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe_extcode/CMakeLists.txt
@@ -13,7 +13,7 @@
find_package(ament_cmake REQUIRED)
find_package(rclcpp REQUIRED)
find_package(rclcpp_lifecycle REQUIRED)
-find_package(simple REQUIRED)
+find_package(simple_msgs REQUIRED)
include_directories(
# assure that generated .h files are found
@@ -29,7 +29,7 @@
ament_target_dependencies(PeriodicPublisher
rclcpp
rclcpp_lifecycle
- simple
+ simple_msgs
)
add_executable(Subscriber
@@ -40,7 +40,7 @@
ament_target_dependencies(Subscriber
rclcpp
rclcpp_lifecycle
- simple
+ simple_msgs
)
diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe_extcode/package.xml b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe_extcode/package.xml
index 71a1ea8..d58c3fe 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe_extcode/package.xml
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe_extcode/package.xml
@@ -6,17 +6,17 @@
<maintainer email="info-list@cea.fr">CEA LIST</maintainer>
<license>Apache2.0</license>
<url type="website">https://eclipse.org/papyrus</url>
- <author email="author@somewhere.net">author@somewhere.net</author>
+ <author email="author@somewhere.net">author</author>
<buildtool_depend>ament_cmake</buildtool_depend>
<build_depend>rclcpp</build_depend>
<build_depend>rclcpp_lifecycle</build_depend>
- <build_depend>simple</build_depend>
+ <build_depend>simple_msgs</build_depend>
<exec_depend>rclcpp</exec_depend>
<exec_depend>rclcpp_lifecycle</exec_depend>
- <exec_depend>simple</exec_depend>
+ <exec_depend>simple_msgs</exec_depend>
<export>
<build_type>ament_cmake</build_type>
diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe_extcode/src-gen/PrimitiveTypes/Pkg_PrimitiveTypes.h b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe_extcode/src-gen/PrimitiveTypes/Pkg_PrimitiveTypes.h
index 8c8e87a..12ce3f9 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe_extcode/src-gen/PrimitiveTypes/Pkg_PrimitiveTypes.h
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe_extcode/src-gen/PrimitiveTypes/Pkg_PrimitiveTypes.h
@@ -1,3 +1,11 @@
+// --------------------------------------------------------
+// Copyright (c) 2020
+//
+// contributions by author
+// author@somewhere.net
+// maintained by maintainer
+// maintainer@somewhere.net
+
#ifndef PKG_PRIMITIVETYPES
#define PKG_PRIMITIVETYPES
diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe_extcode/src-gen/periodicPublisherCompdef/PeriodicPublisher.cpp b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe_extcode/src-gen/periodicPublisherCompdef/PeriodicPublisher.cpp
index ad5d61d..83f4262 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe_extcode/src-gen/periodicPublisherCompdef/PeriodicPublisher.cpp
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe_extcode/src-gen/periodicPublisherCompdef/PeriodicPublisher.cpp
@@ -1,4 +1,12 @@
// --------------------------------------------------------
+// Copyright (c) 2020
+//
+// contributions by author
+// author@somewhere.net
+// maintained by CEA LIST
+// info-list@cea.fr
+
+// --------------------------------------------------------
// Code generated by Papyrus C++
// --------------------------------------------------------
@@ -25,10 +33,10 @@
* @param options
*/
PeriodicPublisher::PeriodicPublisher(rclcpp::NodeOptions /*in*/options) :
- rclcpp_lifecycle::LifecycleNode("PeriodicPublisher", options) {
- pMap_pub_ = create_publisher<simple::msg::Map>("pMap", 1);
- // directly activate a publisher
- pMap_pub_->on_activate();
+ rclcpp_lifecycle::LifecycleNode("PeriodicPublisher", options) {
+ pMap_pub_ = create_publisher < simple_msgs::msg::Map > ("pMap", 1);
+ // directly activate a publisher
+ pMap_pub_->on_activate();
}
@@ -36,16 +44,16 @@
*
*/
void PeriodicPublisher::declareParameters() {
- declare_parameter("indoor", rclcpp::ParameterValue(true));
- declare_parameter("noOfScans", rclcpp::ParameterValue(5));
+ declare_parameter("indoor", rclcpp::ParameterValue(true));
+ declare_parameter("noOfScans", rclcpp::ParameterValue(5));
}
/**
*
*/
void PeriodicPublisher::initParameterVars() {
- get_parameter("indoor", indoor_);
- get_parameter("noOfScans", noOfScans_);
+ get_parameter("indoor", indoor_);
+ get_parameter("noOfScans", noOfScans_);
}
} // of namespace periodicPublisherCompdef
diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe_extcode/src-gen/periodicPublisherCompdef/PeriodicPublisher.h b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe_extcode/src-gen/periodicPublisherCompdef/PeriodicPublisher.h
index 2e1b442..40b4bc8 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe_extcode/src-gen/periodicPublisherCompdef/PeriodicPublisher.h
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe_extcode/src-gen/periodicPublisherCompdef/PeriodicPublisher.h
@@ -1,4 +1,12 @@
// --------------------------------------------------------
+// Copyright (c) 2020
+//
+// contributions by author
+// author@somewhere.net
+// maintained by CEA LIST
+// info-list@cea.fr
+
+// --------------------------------------------------------
// Code generated by Papyrus C++
// --------------------------------------------------------
@@ -13,7 +21,7 @@
#include "PrimitiveTypes/Pkg_PrimitiveTypes.h"
#include "rclcpp_lifecycle/lifecycle_node.hpp"
-#include "simple/msg/map.hpp"
+#include "simple_msgs/msg/map.hpp"
// Include from Include stereotype (header)
#include <rclcpp/rclcpp.hpp>
@@ -42,41 +50,41 @@
class PeriodicPublisher: public rclcpp_lifecycle::LifecycleNode {
public:
- /**
- *
- */
- rclcpp::TimerBase::SharedPtr timer_Activity1_;
+ /**
+ *
+ */
+ rclcpp::TimerBase::SharedPtr timer_Activity1_;
- /**
- *
- */
- rclcpp_lifecycle::LifecyclePublisher<simple::msg::Map>::SharedPtr pMap_pub_;
+ /**
+ *
+ */
+ rclcpp_lifecycle::LifecyclePublisher<simple_msgs::msg::Map>::SharedPtr pMap_pub_;
- /**
- *
- */
- ::PrimitiveTypes::Boolean indoor_;
+ /**
+ *
+ */
+ ::PrimitiveTypes::Boolean indoor_;
- /**
- *
- */
- ::PrimitiveTypes::Integer noOfScans_;
+ /**
+ *
+ */
+ ::PrimitiveTypes::Integer noOfScans_;
- /**
- *
- * @param options
- */
- PeriodicPublisher(rclcpp::NodeOptions /*in*/options);
+ /**
+ *
+ * @param options
+ */
+ PeriodicPublisher(rclcpp::NodeOptions /*in*/options);
- /**
- *
- */
- void declareParameters();
+ /**
+ *
+ */
+ void declareParameters();
- /**
- *
- */
- void initParameterVars();
+ /**
+ *
+ */
+ void initParameterVars();
};
/************************************************************/
diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe_extcode/src-gen/periodicPublisherCompdef/PeriodicPublisher_main.cpp b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe_extcode/src-gen/periodicPublisherCompdef/PeriodicPublisher_main.cpp
index 7dde710..8dad252 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe_extcode/src-gen/periodicPublisherCompdef/PeriodicPublisher_main.cpp
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe_extcode/src-gen/periodicPublisherCompdef/PeriodicPublisher_main.cpp
@@ -1,4 +1,12 @@
// --------------------------------------------------------
+// Copyright (c) 2020
+//
+// contributions by author
+// author@somewhere.net
+// maintained by CEA LIST
+// info-list@cea.fr
+
+// --------------------------------------------------------
// Code generated by Papyrus C++
// --------------------------------------------------------
@@ -9,48 +17,48 @@
rclcpp::NodeOptions periodicpublisher_options;
int main(int argc, char **argv) {
- rclcpp::init(argc, argv);
+ rclcpp::init(argc, argv);
- auto periodicpublisher = std::make_shared<
- periodicPublisherCompdef::PeriodicPublisher_impl>(
- periodicpublisher_options);
+ auto periodicpublisher = std::make_shared
+ < periodicPublisherCompdef::PeriodicPublisher_impl
+ > (periodicpublisher_options);
- RCLCPP_INFO(periodicpublisher->get_logger(),
- "PeriodicPublisher has been initialized");
+ RCLCPP_INFO(periodicpublisher->get_logger(),
+ "PeriodicPublisher has been initialized");
- periodicpublisher->register_on_activate(
- [periodicpublisher](const rclcpp_lifecycle::State&) {
- // periodic execution (250ms) using a wall timer
- periodicpublisher->timer_Activity1_ =
- periodicpublisher->create_wall_timer(250ms,
- std::bind(
- &periodicPublisherCompdef::PeriodicPublisher_impl::fPublishing,
- periodicpublisher));
- return rclcpp_lifecycle::node_interfaces::LifecycleNodeInterface::CallbackReturn::SUCCESS;
- }
- );
- periodicpublisher->register_on_deactivate(
- [periodicpublisher](const rclcpp_lifecycle::State&) {
- // stop timer
- periodicpublisher->timer_Activity1_->cancel();
- return rclcpp_lifecycle::node_interfaces::LifecycleNodeInterface::CallbackReturn::SUCCESS;
- }
- );
- periodicpublisher->register_on_shutdown(
- [periodicpublisher](const rclcpp_lifecycle::State&) {
- // stop timer
- periodicpublisher->timer_Activity1_->cancel();
- return rclcpp_lifecycle::node_interfaces::LifecycleNodeInterface::CallbackReturn::SUCCESS;
- }
- );
- periodicpublisher->declareParameters();
- periodicpublisher->initParameterVars();
+ periodicpublisher->register_on_activate(
+ [periodicpublisher](const rclcpp_lifecycle::State&) {
+ // periodic execution (250ms) using a wall timer
+ periodicpublisher->timer_Activity1_ =
+ periodicpublisher->create_wall_timer(250ms,
+ std::bind(
+ &periodicPublisherCompdef::PeriodicPublisher_impl::fPublishing,
+ periodicpublisher));
+ return rclcpp_lifecycle::node_interfaces::LifecycleNodeInterface::CallbackReturn::SUCCESS;
+ }
+ );
+ periodicpublisher->register_on_deactivate(
+ [periodicpublisher](const rclcpp_lifecycle::State&) {
+ // stop timer
+ periodicpublisher->timer_Activity1_->cancel();
+ return rclcpp_lifecycle::node_interfaces::LifecycleNodeInterface::CallbackReturn::SUCCESS;
+ }
+ );
+ periodicpublisher->register_on_shutdown(
+ [periodicpublisher](const rclcpp_lifecycle::State&) {
+ // stop timer
+ periodicpublisher->timer_Activity1_->cancel();
+ return rclcpp_lifecycle::node_interfaces::LifecycleNodeInterface::CallbackReturn::SUCCESS;
+ }
+ );
+ periodicpublisher->declareParameters();
+ periodicpublisher->initParameterVars();
- rclcpp::executors::MultiThreadedExecutor executor;
+ rclcpp::executors::MultiThreadedExecutor executor;
- executor.add_node(periodicpublisher->get_node_base_interface());
+ executor.add_node(periodicpublisher->get_node_base_interface());
- executor.spin();
- rclcpp::shutdown();
+ executor.spin();
+ rclcpp::shutdown();
}
diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe_extcode/src-gen/periodicPublisherCompdef/PeriodicPublisher_main.h b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe_extcode/src-gen/periodicPublisherCompdef/PeriodicPublisher_main.h
index 923c5d1..95467e3 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe_extcode/src-gen/periodicPublisherCompdef/PeriodicPublisher_main.h
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe_extcode/src-gen/periodicPublisherCompdef/PeriodicPublisher_main.h
@@ -1,4 +1,12 @@
// --------------------------------------------------------
+// Copyright (c) 2020
+//
+// contributions by author
+// author@somewhere.net
+// maintained by CEA LIST
+// info-list@cea.fr
+
+// --------------------------------------------------------
// Code generated by Papyrus C++
// --------------------------------------------------------
diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe_extcode/src-gen/periodicPublisherCompdef/Pkg_periodicPublisherCompdef.h b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe_extcode/src-gen/periodicPublisherCompdef/Pkg_periodicPublisherCompdef.h
index cf6cb13..697edf7 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe_extcode/src-gen/periodicPublisherCompdef/Pkg_periodicPublisherCompdef.h
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe_extcode/src-gen/periodicPublisherCompdef/Pkg_periodicPublisherCompdef.h
@@ -1,3 +1,11 @@
+// --------------------------------------------------------
+// Copyright (c) 2020
+//
+// contributions by author
+// author@somewhere.net
+// maintained by CEA LIST
+// info-list@cea.fr
+
#ifndef PKG_PERIODICPUBLISHERCOMPDEF
#define PKG_PERIODICPUBLISHERCOMPDEF
diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe_extcode/src-gen/subscriberCompdef/Pkg_subscriberCompdef.h b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe_extcode/src-gen/subscriberCompdef/Pkg_subscriberCompdef.h
index 8bd5482..d26b488 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe_extcode/src-gen/subscriberCompdef/Pkg_subscriberCompdef.h
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe_extcode/src-gen/subscriberCompdef/Pkg_subscriberCompdef.h
@@ -1,3 +1,11 @@
+// --------------------------------------------------------
+// Copyright (c) 2020
+//
+// contributions by author
+// author@somewhere.net
+// maintained by maintainer
+// maintainer@somewhere.net
+
#ifndef PKG_SUBSCRIBERCOMPDEF
#define PKG_SUBSCRIBERCOMPDEF
diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe_extcode/src-gen/subscriberCompdef/Subscriber.cpp b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe_extcode/src-gen/subscriberCompdef/Subscriber.cpp
index 1f0e5b0..fc046b5 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe_extcode/src-gen/subscriberCompdef/Subscriber.cpp
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe_extcode/src-gen/subscriberCompdef/Subscriber.cpp
@@ -1,4 +1,12 @@
// --------------------------------------------------------
+// Copyright (c) 2020
+//
+// contributions by author
+// author@somewhere.net
+// maintained by maintainer
+// maintainer@somewhere.net
+
+// --------------------------------------------------------
// Code generated by Papyrus C++
// --------------------------------------------------------
@@ -30,11 +38,11 @@
* @param options
*/
Subscriber::Subscriber(rclcpp::NodeOptions /*in*/options) :
- rclcpp_lifecycle::LifecycleNode("Subscriber", options) {
- rMap_sub_ = create_subscription<simple::msg::Map>("rMap",
- rclcpp::QoS(rclcpp::KeepLast(100)).best_effort(),
- std::bind(&subscriberCompdef::Subscriber_impl::fListening,
- (Subscriber_impl*) this, std::placeholders::_1));
+ rclcpp_lifecycle::LifecycleNode("Subscriber", options) {
+ rMap_sub_ = create_subscription < simple_msgs::msg::Map
+ > ("rMap", rclcpp::QoS(rclcpp::KeepLast(100)).best_effort(), std::bind(
+ &subscriberCompdef::Subscriber_impl::fListening,
+ (Subscriber_impl*) this, std::placeholders::_1));
}
diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe_extcode/src-gen/subscriberCompdef/Subscriber.h b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe_extcode/src-gen/subscriberCompdef/Subscriber.h
index c25240c..7306ce4 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe_extcode/src-gen/subscriberCompdef/Subscriber.h
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe_extcode/src-gen/subscriberCompdef/Subscriber.h
@@ -1,4 +1,12 @@
// --------------------------------------------------------
+// Copyright (c) 2020
+//
+// contributions by author
+// author@somewhere.net
+// maintained by maintainer
+// maintainer@somewhere.net
+
+// --------------------------------------------------------
// Code generated by Papyrus C++
// --------------------------------------------------------
@@ -12,7 +20,7 @@
#include "subscriberCompdef/Pkg_subscriberCompdef.h"
#include "rclcpp_lifecycle/lifecycle_node.hpp"
-#include "simple/msg/map.hpp"
+#include "simple_msgs/msg/map.hpp"
// Include from Include stereotype (header)
#include <rclcpp/rclcpp.hpp>
@@ -39,16 +47,16 @@
class Subscriber: public rclcpp_lifecycle::LifecycleNode {
public:
- /**
- *
- */
- rclcpp::Subscription<simple::msg::Map>::SharedPtr rMap_sub_;
+ /**
+ *
+ */
+ rclcpp::Subscription<simple_msgs::msg::Map>::SharedPtr rMap_sub_;
- /**
- *
- * @param options
- */
- Subscriber(rclcpp::NodeOptions /*in*/options);
+ /**
+ *
+ * @param options
+ */
+ Subscriber(rclcpp::NodeOptions /*in*/options);
};
/************************************************************/
diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe_extcode/src-gen/subscriberCompdef/Subscriber_main.cpp b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe_extcode/src-gen/subscriberCompdef/Subscriber_main.cpp
index 415e54a..fc90a5c 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe_extcode/src-gen/subscriberCompdef/Subscriber_main.cpp
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe_extcode/src-gen/subscriberCompdef/Subscriber_main.cpp
@@ -1,4 +1,12 @@
// --------------------------------------------------------
+// Copyright (c) 2020
+//
+// contributions by author
+// author@somewhere.net
+// maintained by maintainer
+// maintainer@somewhere.net
+
+// --------------------------------------------------------
// Code generated by Papyrus C++
// --------------------------------------------------------
@@ -8,18 +16,18 @@
rclcpp::NodeOptions subscriber_options;
int main(int argc, char **argv) {
- rclcpp::init(argc, argv);
+ rclcpp::init(argc, argv);
- auto subscriber = std::make_shared<subscriberCompdef::Subscriber_impl>(
- subscriber_options);
+ auto subscriber = std::make_shared < subscriberCompdef::Subscriber_impl
+ > (subscriber_options);
- RCLCPP_INFO(subscriber->get_logger(), "Subscriber has been initialized");
+ RCLCPP_INFO(subscriber->get_logger(), "Subscriber has been initialized");
- rclcpp::executors::MultiThreadedExecutor executor;
+ rclcpp::executors::MultiThreadedExecutor executor;
- executor.add_node(subscriber->get_node_base_interface());
+ executor.add_node(subscriber->get_node_base_interface());
- executor.spin();
- rclcpp::shutdown();
+ executor.spin();
+ rclcpp::shutdown();
}
diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe_extcode/src-gen/subscriberCompdef/Subscriber_main.h b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe_extcode/src-gen/subscriberCompdef/Subscriber_main.h
index 923c5d1..90c8916 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe_extcode/src-gen/subscriberCompdef/Subscriber_main.h
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe_extcode/src-gen/subscriberCompdef/Subscriber_main.h
@@ -1,4 +1,12 @@
// --------------------------------------------------------
+// Copyright (c) 2020
+//
+// contributions by author
+// author@somewhere.net
+// maintained by maintainer
+// maintainer@somewhere.net
+
+// --------------------------------------------------------
// Code generated by Papyrus C++
// --------------------------------------------------------
diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe_extcode/src-skel/periodicPublisherCompdef/PeriodicPublisher_impl.cpp b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe_extcode/src-skel/periodicPublisherCompdef/PeriodicPublisher_impl.cpp
index 7b32bc2..c66b043 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe_extcode/src-skel/periodicPublisherCompdef/PeriodicPublisher_impl.cpp
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe_extcode/src-skel/periodicPublisherCompdef/PeriodicPublisher_impl.cpp
@@ -1,4 +1,12 @@
// --------------------------------------------------------
+// Copyright (c) 2020
+//
+// contributions by author
+// author@somewhere.net
+// maintained by CEA LIST
+// info-list@cea.fr
+
+// --------------------------------------------------------
// Code generated by Papyrus C++
// --------------------------------------------------------
@@ -23,8 +31,8 @@
* @param options
*/
PeriodicPublisher_impl::PeriodicPublisher_impl(
- rclcpp::NodeOptions /*in*/options) :
- PeriodicPublisher(options) {
+ rclcpp::NodeOptions /*in*/options) :
+ PeriodicPublisher(options) {
}
/**
diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe_extcode/src-skel/periodicPublisherCompdef/PeriodicPublisher_impl.h b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe_extcode/src-skel/periodicPublisherCompdef/PeriodicPublisher_impl.h
index 200c4a5..2ba378e 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe_extcode/src-skel/periodicPublisherCompdef/PeriodicPublisher_impl.h
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe_extcode/src-skel/periodicPublisherCompdef/PeriodicPublisher_impl.h
@@ -1,4 +1,12 @@
// --------------------------------------------------------
+// Copyright (c) 2020
+//
+// contributions by author
+// author@somewhere.net
+// maintained by CEA LIST
+// info-list@cea.fr
+
+// --------------------------------------------------------
// Code generated by Papyrus C++
// --------------------------------------------------------
@@ -31,16 +39,16 @@
class PeriodicPublisher_impl: public PeriodicPublisher {
public:
- /**
- *
- * @param options
- */
- PeriodicPublisher_impl(rclcpp::NodeOptions /*in*/options);
+ /**
+ *
+ * @param options
+ */
+ PeriodicPublisher_impl(rclcpp::NodeOptions /*in*/options);
- /**
- *
- */
- void fPublishing();
+ /**
+ *
+ */
+ void fPublishing();
};
/************************************************************/
diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe_extcode/src-skel/subscriberCompdef/Subscriber_impl.cpp b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe_extcode/src-skel/subscriberCompdef/Subscriber_impl.cpp
index 2c29ecb..afbf329 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe_extcode/src-skel/subscriberCompdef/Subscriber_impl.cpp
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe_extcode/src-skel/subscriberCompdef/Subscriber_impl.cpp
@@ -1,4 +1,12 @@
// --------------------------------------------------------
+// Copyright (c) 2020
+//
+// contributions by author
+// author@somewhere.net
+// maintained by maintainer
+// maintainer@somewhere.net
+
+// --------------------------------------------------------
// Code generated by Papyrus C++
// --------------------------------------------------------
@@ -23,14 +31,15 @@
* @param options
*/
Subscriber_impl::Subscriber_impl(rclcpp::NodeOptions /*in*/options) :
- Subscriber(options) {
+ Subscriber(options) {
}
/**
*
* @param map
*/
-void Subscriber_impl::fListening(const simple::msg::Map::SharedPtr /*in*/map) {
+void Subscriber_impl::fListening(
+ const simple_msgs::msg::Map::SharedPtr /*in*/map) {
}
} // of namespace subscriberCompdef
diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe_extcode/src-skel/subscriberCompdef/Subscriber_impl.h b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe_extcode/src-skel/subscriberCompdef/Subscriber_impl.h
index 49f00e5..874e909 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe_extcode/src-skel/subscriberCompdef/Subscriber_impl.h
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/publishSubscribe_extcode/src-skel/subscriberCompdef/Subscriber_impl.h
@@ -1,4 +1,12 @@
// --------------------------------------------------------
+// Copyright (c) 2020
+//
+// contributions by author
+// author@somewhere.net
+// maintained by maintainer
+// maintainer@somewhere.net
+
+// --------------------------------------------------------
// Code generated by Papyrus C++
// --------------------------------------------------------
@@ -11,7 +19,7 @@
#include "subscriberCompdef/Pkg_subscriberCompdef.h"
-#include "simple/msg/map.hpp"
+#include "simple_msgs/msg/map.hpp"
#include "subscriberCompdef/Subscriber.h"
namespace ros2Library {
@@ -32,17 +40,17 @@
class Subscriber_impl: public Subscriber {
public:
- /**
- *
- * @param options
- */
- Subscriber_impl(rclcpp::NodeOptions /*in*/options);
+ /**
+ *
+ * @param options
+ */
+ Subscriber_impl(rclcpp::NodeOptions /*in*/options);
- /**
- *
- * @param map
- */
- void fListening(const simple::msg::Map::SharedPtr /*in*/map);
+ /**
+ *
+ * @param map
+ */
+ void fListening(const simple_msgs::msg::Map::SharedPtr /*in*/map);
};
/************************************************************/
diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/sendReceive/CMakeLists.txt b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/sendReceive/CMakeLists.txt
index 0c4b24d..2756c64 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/sendReceive/CMakeLists.txt
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/sendReceive/CMakeLists.txt
@@ -14,7 +14,7 @@
find_package(rclcpp REQUIRED)
find_package(rclcpp_components REQUIRED)
find_package(rclcpp_lifecycle REQUIRED)
-find_package(simple REQUIRED)
+find_package(simple_msgs REQUIRED)
include_directories(
# assure that generated .h files are found
@@ -30,7 +30,7 @@
rclcpp
rclcpp_components
rclcpp_lifecycle
- simple
+ simple_msgs
)
rclcpp_components_register_nodes(SendClient_comp "sendreceive::SendClient")
@@ -46,7 +46,7 @@
rclcpp
rclcpp_components
rclcpp_lifecycle
- simple
+ simple_msgs
)
rclcpp_components_register_nodes(SendServer_comp "sendreceive::SendServer")
diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/sendReceive/package.xml b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/sendReceive/package.xml
index bba9594..29c2475 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/sendReceive/package.xml
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/sendReceive/package.xml
@@ -6,19 +6,19 @@
<maintainer email="info-list@cea.fr">CEA LIST</maintainer>
<license>Apache2.0</license>
<url type="website">https://eclipse.org/papyrus</url>
- <author email="ansgar.radermacher@cea.fr">author@somewhere.net</author>
+ <author email="ansgar.radermacher@cea.fr">author</author>
<buildtool_depend>ament_cmake</buildtool_depend>
<build_depend>rclcpp</build_depend>
<build_depend>rclcpp_components</build_depend>
<build_depend>rclcpp_lifecycle</build_depend>
- <build_depend>simple</build_depend>
+ <build_depend>simple_msgs</build_depend>
<exec_depend>rclcpp</exec_depend>
<exec_depend>rclcpp_components</exec_depend>
<exec_depend>rclcpp_lifecycle</exec_depend>
- <exec_depend>simple</exec_depend>
+ <exec_depend>simple_msgs</exec_depend>
<export>
<build_type>ament_cmake</build_type>
diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/sendReceive/src-gen/sendReceive/Pkg_sendReceive.h b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/sendReceive/src-gen/sendReceive/Pkg_sendReceive.h
index 04e2f26..7255f84 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/sendReceive/src-gen/sendReceive/Pkg_sendReceive.h
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/sendReceive/src-gen/sendReceive/Pkg_sendReceive.h
@@ -1,3 +1,11 @@
+// --------------------------------------------------------
+// Copyright (c) 2020
+//
+// contributions by Ansgar
+// ansgar.radermacher@cea.fr
+// maintained by CEA LIST
+// info-list@cea.fr
+
#ifndef PKG_SENDRECEIVE
#define PKG_SENDRECEIVE
diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/sendReceive/src-gen/sendReceive/SendClient.cpp b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/sendReceive/src-gen/sendReceive/SendClient.cpp
index 5e967b6..f15c3d7 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/sendReceive/src-gen/sendReceive/SendClient.cpp
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/sendReceive/src-gen/sendReceive/SendClient.cpp
@@ -1,4 +1,12 @@
// --------------------------------------------------------
+// Copyright (c) 2020
+//
+// contributions by Ansgar
+// ansgar.radermacher@cea.fr
+// maintained by CEA LIST
+// info-list@cea.fr
+
+// --------------------------------------------------------
// Code generated by Papyrus C++
// --------------------------------------------------------
@@ -26,7 +34,7 @@
// Register the component with class_loader.
// This acts as a sort of entry point, allowing the component to be discoverable when its library
// is being loaded into a running process.
-RCLCPP_COMPONENTS_REGISTER_NODE(sendReceive::SendClient)
+RCLCPP_COMPONENTS_REGISTER_NODE (sendReceive::SendClient)
// End of Include declaration (body)
@@ -38,14 +46,14 @@
*
*/
void SendClient::fSendMap() {
- simple::msg::Map map;
- map.ogm.width = 16;
- map.ogm.height = 16;
- map.ogm.resolution = 0.1;
+ simple_msgs::msg::Map map;
+ map.ogm.width = 16;
+ map.ogm.height = 16;
+ map.ogm.resolution = 0.1;
- RCLCPP_INFO(get_logger(), "now sending");
+ RCLCPP_INFO(get_logger(), "now sending");
- map_send_->publish(map);
+ map_send_->publish(map);
}
/**
@@ -53,10 +61,10 @@
* @param options
*/
SendClient::SendClient(rclcpp::NodeOptions /*in*/options) :
- rclcpp_lifecycle::LifecycleNode("SendClient", options) {
- map_send_ = create_publisher<simple::msg::Map>("map", 1);
- // directly activate a publisher
- map_send_->on_activate();
+ rclcpp_lifecycle::LifecycleNode("SendClient", options) {
+ map_send_ = create_publisher < simple_msgs::msg::Map > ("map", 1);
+ // directly activate a publisher
+ map_send_->on_activate();
}
diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/sendReceive/src-gen/sendReceive/SendClient.h b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/sendReceive/src-gen/sendReceive/SendClient.h
index e852bd3..cee7678 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/sendReceive/src-gen/sendReceive/SendClient.h
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/sendReceive/src-gen/sendReceive/SendClient.h
@@ -1,4 +1,12 @@
// --------------------------------------------------------
+// Copyright (c) 2020
+//
+// contributions by Ansgar
+// ansgar.radermacher@cea.fr
+// maintained by CEA LIST
+// info-list@cea.fr
+
+// --------------------------------------------------------
// Code generated by Papyrus C++
// --------------------------------------------------------
@@ -12,7 +20,7 @@
#include "sendReceive/Pkg_sendReceive.h"
#include "rclcpp_lifecycle/lifecycle_node.hpp"
-#include "simple/msg/map.hpp"
+#include "simple_msgs/msg/map.hpp"
// Include from Include stereotype (header)
#include <rclcpp/rclcpp.hpp>
@@ -41,26 +49,26 @@
class SendClient: public rclcpp_lifecycle::LifecycleNode {
public:
- /**
- *
- */
- rclcpp::TimerBase::SharedPtr timer_Request_;
+ /**
+ *
+ */
+ rclcpp::TimerBase::SharedPtr timer_Request_;
- /**
- *
- */
- rclcpp_lifecycle::LifecyclePublisher<simple::msg::Map>::SharedPtr map_send_;
+ /**
+ *
+ */
+ rclcpp_lifecycle::LifecyclePublisher<simple_msgs::msg::Map>::SharedPtr map_send_;
- /**
- *
- */
- void fSendMap();
+ /**
+ *
+ */
+ void fSendMap();
- /**
- *
- * @param options
- */
- SendClient(rclcpp::NodeOptions /*in*/options);
+ /**
+ *
+ * @param options
+ */
+ SendClient(rclcpp::NodeOptions /*in*/options);
};
/************************************************************/
diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/sendReceive/src-gen/sendReceive/SendClient_main.cpp b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/sendReceive/src-gen/sendReceive/SendClient_main.cpp
index 83b01e1..e480166 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/sendReceive/src-gen/sendReceive/SendClient_main.cpp
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/sendReceive/src-gen/sendReceive/SendClient_main.cpp
@@ -1,4 +1,12 @@
// --------------------------------------------------------
+// Copyright (c) 2020
+//
+// contributions by Ansgar
+// ansgar.radermacher@cea.fr
+// maintained by CEA LIST
+// info-list@cea.fr
+
+// --------------------------------------------------------
// Code generated by Papyrus C++
// --------------------------------------------------------
@@ -9,42 +17,41 @@
rclcpp::NodeOptions sendclient_options;
int main(int argc, char **argv) {
- rclcpp::init(argc, argv);
+ rclcpp::init(argc, argv);
- auto sendclient = std::make_shared < sendReceive::SendClient
- > (sendclient_options);
+ auto sendclient = std::make_shared < sendReceive::SendClient
+ > (sendclient_options);
- RCLCPP_INFO(sendclient->get_logger(), "SendClient has been initialized");
+ RCLCPP_INFO(sendclient->get_logger(), "SendClient has been initialized");
- sendclient->register_on_activate(
- [sendclient](const rclcpp_lifecycle::State&) {
- // periodic execution (1s) using a wall timer
- sendclient->timer_Request_ = sendclient->create_wall_timer(1s,
- std::bind(&sendReceive::SendClient::fSendMap,
- sendclient));
- return rclcpp_lifecycle::node_interfaces::LifecycleNodeInterface::CallbackReturn::SUCCESS;
- }
- );
- sendclient->register_on_deactivate(
- [sendclient](const rclcpp_lifecycle::State&) {
- // stop timer
- sendclient->timer_Request_->cancel();
- return rclcpp_lifecycle::node_interfaces::LifecycleNodeInterface::CallbackReturn::SUCCESS;
- }
- );
- sendclient->register_on_shutdown(
- [sendclient](const rclcpp_lifecycle::State&) {
- // stop timer
- sendclient->timer_Request_->cancel();
- return rclcpp_lifecycle::node_interfaces::LifecycleNodeInterface::CallbackReturn::SUCCESS;
- }
- );
+ sendclient->register_on_activate(
+ [sendclient](const rclcpp_lifecycle::State&) {
+ // periodic execution (1s) using a wall timer
+ sendclient->timer_Request_ = sendclient->create_wall_timer(1s,
+ std::bind(&sendReceive::SendClient::fSendMap, sendclient));
+ return rclcpp_lifecycle::node_interfaces::LifecycleNodeInterface::CallbackReturn::SUCCESS;
+ }
+ );
+ sendclient->register_on_deactivate(
+ [sendclient](const rclcpp_lifecycle::State&) {
+ // stop timer
+ sendclient->timer_Request_->cancel();
+ return rclcpp_lifecycle::node_interfaces::LifecycleNodeInterface::CallbackReturn::SUCCESS;
+ }
+ );
+ sendclient->register_on_shutdown(
+ [sendclient](const rclcpp_lifecycle::State&) {
+ // stop timer
+ sendclient->timer_Request_->cancel();
+ return rclcpp_lifecycle::node_interfaces::LifecycleNodeInterface::CallbackReturn::SUCCESS;
+ }
+ );
- rclcpp::executors::MultiThreadedExecutor executor;
+ rclcpp::executors::MultiThreadedExecutor executor;
- executor.add_node(sendclient->get_node_base_interface());
+ executor.add_node(sendclient->get_node_base_interface());
- executor.spin();
- rclcpp::shutdown();
+ executor.spin();
+ rclcpp::shutdown();
}
diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/sendReceive/src-gen/sendReceive/SendClient_main.h b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/sendReceive/src-gen/sendReceive/SendClient_main.h
index 923c5d1..bce7bf4 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/sendReceive/src-gen/sendReceive/SendClient_main.h
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/sendReceive/src-gen/sendReceive/SendClient_main.h
@@ -1,4 +1,12 @@
// --------------------------------------------------------
+// Copyright (c) 2020
+//
+// contributions by Ansgar
+// ansgar.radermacher@cea.fr
+// maintained by CEA LIST
+// info-list@cea.fr
+
+// --------------------------------------------------------
// Code generated by Papyrus C++
// --------------------------------------------------------
diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/sendReceive/src-gen/sendReceive/SendServer.cpp b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/sendReceive/src-gen/sendReceive/SendServer.cpp
index 3e51a78..f79f874 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/sendReceive/src-gen/sendReceive/SendServer.cpp
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/sendReceive/src-gen/sendReceive/SendServer.cpp
@@ -1,4 +1,12 @@
// --------------------------------------------------------
+// Copyright (c) 2020
+//
+// contributions by Ansgar
+// ansgar.radermacher@cea.fr
+// maintained by CEA LIST
+// info-list@cea.fr
+
+// --------------------------------------------------------
// Code generated by Papyrus C++
// --------------------------------------------------------
@@ -21,7 +29,7 @@
// Register the component with class_loader.
// This acts as a sort of entry point, allowing the component to be discoverable when its library
// is being loaded into a running process.
-RCLCPP_COMPONENTS_REGISTER_NODE(sendReceive::SendServer)
+RCLCPP_COMPONENTS_REGISTER_NODE (sendReceive::SendServer)
// End of Include declaration (body)
@@ -33,11 +41,11 @@
*
* @param map
*/
-void SendServer::fReceive(const simple::msg::Map::SharedPtr /*in*/map) {
- // the parameter is called as the communication object - "map"
- RCLCPP_INFO(get_logger(), "got map data");
- RCLCPP_INFO(get_logger(), "width: %d, height: %d', resolution: %0.2f",
- map->ogm.width, map->ogm.height, map->ogm.resolution);
+void SendServer::fReceive(const simple_msgs::msg::Map::SharedPtr /*in*/map) {
+ // the parameter is called as the communication object - "map"
+ RCLCPP_INFO(get_logger(), "got map data");
+ RCLCPP_INFO(get_logger(), "width: %d, height: %d', resolution: %0.2f",
+ map->ogm.width, map->ogm.height, map->ogm.resolution);
}
/**
@@ -45,11 +53,11 @@
* @param options
*/
SendServer::SendServer(rclcpp::NodeOptions /*in*/options) :
- rclcpp_lifecycle::LifecycleNode("SendServer", options) {
- map_recv_ = create_subscription<simple::msg::Map>("map",
- rclcpp::QoS(rclcpp::KeepLast(100)).best_effort(),
- std::bind(&sendReceive::SendServer::fReceive, (SendServer*) this,
- std::placeholders::_1));
+ rclcpp_lifecycle::LifecycleNode("SendServer", options) {
+ map_recv_ = create_subscription < simple_msgs::msg::Map
+ > ("map", rclcpp::QoS(rclcpp::KeepLast(100)).best_effort(), std::bind(
+ &sendReceive::SendServer::fReceive, (SendServer*) this,
+ std::placeholders::_1));
}
diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/sendReceive/src-gen/sendReceive/SendServer.h b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/sendReceive/src-gen/sendReceive/SendServer.h
index e4e700f..907599a 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/sendReceive/src-gen/sendReceive/SendServer.h
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/sendReceive/src-gen/sendReceive/SendServer.h
@@ -1,4 +1,12 @@
// --------------------------------------------------------
+// Copyright (c) 2020
+//
+// contributions by Ansgar
+// ansgar.radermacher@cea.fr
+// maintained by CEA LIST
+// info-list@cea.fr
+
+// --------------------------------------------------------
// Code generated by Papyrus C++
// --------------------------------------------------------
@@ -12,7 +20,7 @@
#include "sendReceive/Pkg_sendReceive.h"
#include "rclcpp_lifecycle/lifecycle_node.hpp"
-#include "simple/msg/map.hpp"
+#include "simple_msgs/msg/map.hpp"
// Include from Include stereotype (header)
#include <rclcpp/rclcpp.hpp>
@@ -39,22 +47,22 @@
class SendServer: public rclcpp_lifecycle::LifecycleNode {
public:
- /**
- *
- */
- rclcpp::Subscription<simple::msg::Map>::SharedPtr map_recv_;
+ /**
+ *
+ */
+ rclcpp::Subscription<simple_msgs::msg::Map>::SharedPtr map_recv_;
- /**
- *
- * @param map
- */
- void fReceive(const simple::msg::Map::SharedPtr /*in*/map);
+ /**
+ *
+ * @param map
+ */
+ void fReceive(const simple_msgs::msg::Map::SharedPtr /*in*/map);
- /**
- *
- * @param options
- */
- SendServer(rclcpp::NodeOptions /*in*/options);
+ /**
+ *
+ * @param options
+ */
+ SendServer(rclcpp::NodeOptions /*in*/options);
};
/************************************************************/
diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/sendReceive/src-gen/sendReceive/SendServer_main.cpp b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/sendReceive/src-gen/sendReceive/SendServer_main.cpp
index 5bb604a..b85850d 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/sendReceive/src-gen/sendReceive/SendServer_main.cpp
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/sendReceive/src-gen/sendReceive/SendServer_main.cpp
@@ -1,4 +1,12 @@
// --------------------------------------------------------
+// Copyright (c) 2020
+//
+// contributions by Ansgar
+// ansgar.radermacher@cea.fr
+// maintained by CEA LIST
+// info-list@cea.fr
+
+// --------------------------------------------------------
// Code generated by Papyrus C++
// --------------------------------------------------------
@@ -8,18 +16,18 @@
rclcpp::NodeOptions sendserver_options;
int main(int argc, char **argv) {
- rclcpp::init(argc, argv);
+ rclcpp::init(argc, argv);
- auto sendserver = std::make_shared < sendReceive::SendServer
- > (sendserver_options);
+ auto sendserver = std::make_shared < sendReceive::SendServer
+ > (sendserver_options);
- RCLCPP_INFO(sendserver->get_logger(), "SendServer has been initialized");
+ RCLCPP_INFO(sendserver->get_logger(), "SendServer has been initialized");
- rclcpp::executors::MultiThreadedExecutor executor;
+ rclcpp::executors::MultiThreadedExecutor executor;
- executor.add_node(sendserver->get_node_base_interface());
+ executor.add_node(sendserver->get_node_base_interface());
- executor.spin();
- rclcpp::shutdown();
+ executor.spin();
+ rclcpp::shutdown();
}
diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/sendReceive/src-gen/sendReceive/SendServer_main.h b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/sendReceive/src-gen/sendReceive/SendServer_main.h
index 923c5d1..bce7bf4 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/sendReceive/src-gen/sendReceive/SendServer_main.h
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/sendReceive/src-gen/sendReceive/SendServer_main.h
@@ -1,4 +1,12 @@
// --------------------------------------------------------
+// Copyright (c) 2020
+//
+// contributions by Ansgar
+// ansgar.radermacher@cea.fr
+// maintained by CEA LIST
+// info-list@cea.fr
+
+// --------------------------------------------------------
// Code generated by Papyrus C++
// --------------------------------------------------------
diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/simple/msg/Map.msg b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/simple/msg/Map.msg
deleted file mode 100644
index 59c0a72..0000000
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/simple/msg/Map.msg
+++ /dev/null
@@ -1,3 +0,0 @@
-# Push or Send
-# attributes of datatype simple::msg::Map
-simple/OccupancyGridMap ogm
diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/simple/msg/OccupancyGridMap.msg b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/simple/msg/OccupancyGridMap.msg
deleted file mode 100644
index f7084b5..0000000
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/simple/msg/OccupancyGridMap.msg
+++ /dev/null
@@ -1,5 +0,0 @@
-# Push or Send
-# attributes of datatype simple::msg::OccupancyGridMap
-int32 width
-int32 height
-float64 resolution
diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/simple/srv/AddServiceDef.srv b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/simple/srv/AddServiceDef.srv
deleted file mode 100644
index 56e1a89..0000000
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/simple/srv/AddServiceDef.srv
+++ /dev/null
@@ -1,7 +0,0 @@
-# query pattern - request
-# attributes of request simple::srv::AddRequest
-int16 x
-int16 y
----
-# attributes of response simple::srv::SumReply
-int16 sum
diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/simple/CMakeLists.txt b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/simple_msgs/CMakeLists.txt
similarity index 93%
rename from plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/simple/CMakeLists.txt
rename to plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/simple_msgs/CMakeLists.txt
index f84e609..85ce4ae 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/simple/CMakeLists.txt
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/simple_msgs/CMakeLists.txt
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.5.0)
-project(simple)
+project(simple_msgs)
# Default to C++14
if(NOT CMAKE_CXX_STANDARD)
@@ -16,7 +16,7 @@
# Generate messages, services or actions
rosidl_generate_interfaces(
- simple
+ simple_msgs
"msg/OccupancyGridMap.msg"
"msg/Map.msg"
"srv/AddServiceDef.srv"
diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/simple_msgs/msg/Map.msg b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/simple_msgs/msg/Map.msg
new file mode 100644
index 0000000..f89e75a
--- /dev/null
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/simple_msgs/msg/Map.msg
@@ -0,0 +1,3 @@
+# Push or Send
+# attributes of datatype simple_msgs::msg::Map
+simple_msgs/OccupancyGridMap ogm
diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/simple_msgs/msg/OccupancyGridMap.msg b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/simple_msgs/msg/OccupancyGridMap.msg
new file mode 100644
index 0000000..6539edb
--- /dev/null
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/simple_msgs/msg/OccupancyGridMap.msg
@@ -0,0 +1,5 @@
+# Push or Send
+# attributes of datatype simple_msgs::msg::OccupancyGridMap
+int32 width
+int32 height
+float64 resolution
diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/simple/package.xml b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/simple_msgs/package.xml
similarity index 76%
rename from plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/simple/package.xml
rename to plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/simple_msgs/package.xml
index 8c90d73..a911476 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/simple/package.xml
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/simple_msgs/package.xml
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<package format="3">
- <name>simple</name>
+ <name>simple_msgs</name>
<version>0.0.0</version>
- <description>simple package</description>
+ <description>simple_msgs package</description>
<maintainer email="maintainer@somewhere.net">maintainer</maintainer>
<license>Apache2.0</license>
<url type="website">https://eclipse.org/papyrus</url>
- <author email="author@somewhere.net">author@somewhere.net</author>
+ <author email="author@somewhere.net">author</author>
<buildtool_depend>rosidl_default_generators</buildtool_depend>
diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/simple_msgs/srv/AddServiceDef.srv b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/simple_msgs/srv/AddServiceDef.srv
new file mode 100644
index 0000000..0a46ffd
--- /dev/null
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/expectedResult/simple_msgs/srv/AddServiceDef.srv
@@ -0,0 +1,7 @@
+# query pattern - request
+# attributes of request simple_msgs::srv::AddRequest
+int16 x
+int16 y
+---
+# attributes of response simple_msgs::srv::SumReply
+int16 sum
diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/src/org/eclipse/papyrus/robotics/ros2/codegen/tests/AbstractRosTest.java b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/src/org/eclipse/papyrus/robotics/ros2/codegen/tests/AbstractRosTest.java
new file mode 100644
index 0000000..3e0ed7e
--- /dev/null
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/src/org/eclipse/papyrus/robotics/ros2/codegen/tests/AbstractRosTest.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2020 CEA LIST
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * Ansgar Radermacher (CEA LIST) - initial API and implementation
+ *
+ *******************************************************************************/
+
+package org.eclipse.papyrus.robotics.ros2.codegen.tests;
+
+import org.eclipse.core.resources.IProject;
+
+public class AbstractRosTest {
+ public static final String SIMPLE_MSGS = "simple_msgs"; //$NON-NLS-1$
+
+ protected IProject simpleProject;
+
+ protected LwTransformationTestSupport tts;
+}
diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/src/org/eclipse/papyrus/robotics/ros2/codegen/tests/TestClientServerExample.java b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/src/org/eclipse/papyrus/robotics/ros2/codegen/tests/TestClientServerExample.java
index 2ed8af1..167334c 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/src/org/eclipse/papyrus/robotics/ros2/codegen/tests/TestClientServerExample.java
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/src/org/eclipse/papyrus/robotics/ros2/codegen/tests/TestClientServerExample.java
@@ -29,12 +29,10 @@
// @PluginResource("org.eclipse.papyrus.robotics.ros2.examples:/testmodels/clientServer/models/system/clientserver.system.di")
@SuppressWarnings("nls")
-public class TestClientServerExample {
+public class TestClientServerExample extends AbstractRosTest {
public static final String CLIENT_SERVER = "clientServer";
- public static final String SIMPLE = "simple";
-
protected IProject clientServerProject;
protected LwTransformationTestSupport tts;
@@ -47,7 +45,7 @@
// create generated projects. For generation purposes, it is not important that these are not CDT projects
clientServerProject = houseKeeper.createProject(CLIENT_SERVER);
CDTUtil.addCppNature(clientServerProject);
- IProject simpleProject = houseKeeper.createProject(SIMPLE);
+ IProject simpleProject = houseKeeper.createProject(SIMPLE_MSGS);
CDTUtil.addCppNature(simpleProject);
// the set fixture does not contain the models with the right paths.
diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/src/org/eclipse/papyrus/robotics/ros2/codegen/tests/TestPublishSubscribe.java b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/src/org/eclipse/papyrus/robotics/ros2/codegen/tests/TestPublishSubscribe.java
index dfd8362..c1a20da 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/src/org/eclipse/papyrus/robotics/ros2/codegen/tests/TestPublishSubscribe.java
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/src/org/eclipse/papyrus/robotics/ros2/codegen/tests/TestPublishSubscribe.java
@@ -28,18 +28,12 @@
import org.osgi.framework.FrameworkUtil;
@SuppressWarnings("nls")
-public class TestPublishSubscribe {
+public class TestPublishSubscribe extends AbstractRosTest {
public static final String PUBLISH_SUBSCRIBE = "publishSubscribe";
- public static final String SIMPLE = "simple";
-
protected IProject publishSubscribeProject;
- protected IProject simpleProject;
-
- protected LwTransformationTestSupport tts;
-
@ClassRule
public static HouseKeeper.Static houseKeeper = new HouseKeeper.Static();
@@ -48,7 +42,7 @@
// create generated projects. For generation purposes, it is not important that these are not CDT projects
publishSubscribeProject = houseKeeper.createProject(PUBLISH_SUBSCRIBE);
CDTUtil.addCppNature(publishSubscribeProject);
- simpleProject = houseKeeper.createProject(SIMPLE);
+ simpleProject = houseKeeper.createProject(SIMPLE_MSGS);
CDTUtil.addCppNature(simpleProject);
RecursiveCopy copier = new RecursiveCopy(org.eclipse.papyrus.robotics.ros2.examples.Activator.class);
@@ -81,6 +75,6 @@
@Test
public void testServiceDef() throws InterruptedException {
tts.validateResults(simpleProject, TestConstants.EXPECTED_RESULT + TestConstants.FILE_SEP +
- SIMPLE, ".");
+ SIMPLE_MSGS, ".");
}
}
diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/src/org/eclipse/papyrus/robotics/ros2/codegen/tests/TestPublishSubscribeExtcode.java b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/src/org/eclipse/papyrus/robotics/ros2/codegen/tests/TestPublishSubscribeExtcode.java
index 1bdb8a7..b6d7ae3 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/src/org/eclipse/papyrus/robotics/ros2/codegen/tests/TestPublishSubscribeExtcode.java
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/src/org/eclipse/papyrus/robotics/ros2/codegen/tests/TestPublishSubscribeExtcode.java
@@ -28,18 +28,12 @@
import org.osgi.framework.FrameworkUtil;
@SuppressWarnings("nls")
-public class TestPublishSubscribeExtcode {
+public class TestPublishSubscribeExtcode extends AbstractRosTest {
public static final String PUBLISH_SUBSCRIBE_EXTCODE = "publishSubscribe_extcode";
- public static final String SIMPLE = "simple";
-
protected IProject publishSubscribeProject;
- protected IProject simpleProject;
-
- protected LwTransformationTestSupport tts;
-
@ClassRule
public static HouseKeeper.Static houseKeeper = new HouseKeeper.Static();
@@ -48,7 +42,7 @@
// create generated projects. For generation purposes, it is not important that these are not CDT projects
publishSubscribeProject = houseKeeper.createProject(PUBLISH_SUBSCRIBE_EXTCODE);
CDTUtil.addCppNature(publishSubscribeProject);
- simpleProject = houseKeeper.createProject(SIMPLE);
+ simpleProject = houseKeeper.createProject(SIMPLE_MSGS);
CDTUtil.addCppNature(simpleProject);
RecursiveCopy copier = new RecursiveCopy(org.eclipse.papyrus.robotics.ros2.examples.Activator.class);
diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/src/org/eclipse/papyrus/robotics/ros2/codegen/tests/TestSendReceive.java b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/src/org/eclipse/papyrus/robotics/ros2/codegen/tests/TestSendReceive.java
index 2600471..762593d 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/src/org/eclipse/papyrus/robotics/ros2/codegen/tests/TestSendReceive.java
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/src/org/eclipse/papyrus/robotics/ros2/codegen/tests/TestSendReceive.java
@@ -28,18 +28,12 @@
import org.osgi.framework.FrameworkUtil;
@SuppressWarnings("nls")
-public class TestSendReceive {
+public class TestSendReceive extends AbstractRosTest {
public static final String SEND_RECEIVE = "sendReceive";
- public static final String SIMPLE = "simple";
-
protected IProject sendReceiveProject;
- protected IProject simpleProject;
-
- protected LwTransformationTestSupport tts;
-
@ClassRule
public static HouseKeeper.Static houseKeeper = new HouseKeeper.Static();
@@ -48,7 +42,7 @@
// create generated projects. For generation purposes, it is not important that these are not CDT projects
sendReceiveProject = houseKeeper.createProject(SEND_RECEIVE);
CDTUtil.addCppNature(sendReceiveProject);
- simpleProject = houseKeeper.createProject(SIMPLE);
+ simpleProject = houseKeeper.createProject(SIMPLE_MSGS);
CDTUtil.addCppNature(simpleProject);
RecursiveCopy copier = new RecursiveCopy(org.eclipse.papyrus.robotics.ros2.examples.Activator.class);
@@ -81,6 +75,6 @@
@Test
public void testServiceDef() throws InterruptedException {
tts.validateResults(simpleProject, TestConstants.EXPECTED_RESULT + TestConstants.FILE_SEP +
- SIMPLE, ".");
+ SIMPLE_MSGS, ".");
}
}
diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen/src/org/eclipse/papyrus/robotics/ros2/codegen/component/ComponentHeader.xtend b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen/src/org/eclipse/papyrus/robotics/ros2/codegen/component/ComponentHeader.xtend
new file mode 100644
index 0000000..2f176c7
--- /dev/null
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen/src/org/eclipse/papyrus/robotics/ros2/codegen/component/ComponentHeader.xtend
@@ -0,0 +1,39 @@
+/*****************************************************************************
+ * Copyright (c) 2020 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * Contributors:
+ * Ansgar Radermacher ansgar.radermacher@cea.fr
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.robotics.ros2.codegen.component
+
+import java.time.Year
+import org.eclipse.uml2.uml.Package
+
+import static extension org.eclipse.papyrus.robotics.ros2.codegen.utils.PackageXMLUtils.getAuthorMail
+import static extension org.eclipse.papyrus.robotics.ros2.codegen.utils.PackageXMLUtils.getAuthorName
+import static extension org.eclipse.papyrus.robotics.ros2.codegen.utils.PackageXMLUtils.getMaintainerMail
+import static extension org.eclipse.papyrus.robotics.ros2.codegen.utils.PackageXMLUtils.getMaintainerName
+
+/**
+ * Provide a simple header for components in order to comply with ROS2 conventions
+ */
+class ComponentHeader {
+ static def getHeader(Package model) '''
+ // --------------------------------------------------------
+ // Copyright (c) «Year.now().getValue()»
+ //
+ // contributions by «model.authorName»
+ // «model.authorMail»
+ // maintained by «model.maintainerName»
+ // «model.maintainerMail»
+
+ '''
+}
\ No newline at end of file
diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen/src/org/eclipse/papyrus/robotics/ros2/codegen/component/ComponentTransformations.xtend b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen/src/org/eclipse/papyrus/robotics/ros2/codegen/component/ComponentTransformations.xtend
index 10651f1..badbc0b 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen/src/org/eclipse/papyrus/robotics/ros2/codegen/component/ComponentTransformations.xtend
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen/src/org/eclipse/papyrus/robotics/ros2/codegen/component/ComponentTransformations.xtend
@@ -267,7 +267,7 @@
}
def componentCodegen(Class component, CreateMsgPackage msgPkgCreator) {
- val codeGen = new RoboticsCppCreator(fileAccess, "src-skel/", "src/");
+ val codeGen = new RoboticsCppCreator(genProject, fileAccess, "src-skel/", "src/");
component.removeTemplateSig
component.removePorts
diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen/src/org/eclipse/papyrus/robotics/ros2/codegen/component/RoboticsCppCreator.java b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen/src/org/eclipse/papyrus/robotics/ros2/codegen/component/RoboticsCppCreator.java
index ac6a9ff..94cce75 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen/src/org/eclipse/papyrus/robotics/ros2/codegen/component/RoboticsCppCreator.java
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen/src/org/eclipse/papyrus/robotics/ros2/codegen/component/RoboticsCppCreator.java
@@ -14,6 +14,8 @@
package org.eclipse.papyrus.robotics.ros2.codegen.component;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.papyrus.designer.languages.common.base.file.IFileExists;
import org.eclipse.papyrus.designer.languages.cpp.codegen.transformation.CppModelElementsCreator;
import org.eclipse.papyrus.designer.transformation.base.utils.TransformationException;
@@ -22,7 +24,10 @@
import org.eclipse.papyrus.infra.tools.file.IPFileSystemAccess;
import org.eclipse.papyrus.robotics.codegen.common.component.CodeSkeleton;
import org.eclipse.papyrus.robotics.ros2.codegen.utils.ProjectTools;
+import org.eclipse.papyrus.uml.tools.utils.PackageUtil;
import org.eclipse.uml2.uml.NamedElement;
+import org.eclipse.uml2.uml.Package;
+import org.eclipse.uml2.uml.PackageableElement;
import org.eclipse.xtext.xbase.lib.Exceptions;
/**
@@ -39,6 +44,8 @@
*/
String userSrcFolder;
+ Package currentModel;
+
/**
* Constructor.
*
@@ -47,12 +54,18 @@
* @param skeletonFolder
* the folder, into which skeletons should be placed (with a trailing "/")
*/
- public RoboticsCppCreator(IPFileSystemAccess fileAccess, String skeletonFolder, String userSrcFolder) {
- super(fileAccess, null);
+ public RoboticsCppCreator(IProject project, IPFileSystemAccess fileAccess, String skeletonFolder, String userSrcFolder) {
+ super(project, fileAccess, null);
this.skeletonFolder = skeletonFolder;
this.userSrcFolder = userSrcFolder;
}
+ @Override
+ public void createPackageableElement(PackageableElement element, IProgressMonitor monitor) {
+ currentModel = PackageUtil.getRootPackage(element);
+ super.createPackageableElement(element, monitor);
+ }
+
/**
* If the file is a skeleton file and the user source code file (in src) does not exist yet, generate this
* file as well.
@@ -74,6 +87,9 @@
TransformationContext.monitor.subTask("generate file " + fileName); //$NON-NLS-1$
TransformationContext.monitor.worked(1);
+ if (currentModel != null) {
+ content = ComponentHeader.getHeader(currentModel) + content;
+ }
if (fileName.startsWith(skeletonFolder)) {
String srcFileName = fileName.replaceFirst(skeletonFolder, userSrcFolder);
if (fileSystemAccess instanceof IFileExists) {
diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen/src/org/eclipse/papyrus/robotics/ros2/codegen/utils/PackageXMLUtils.xtend b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen/src/org/eclipse/papyrus/robotics/ros2/codegen/utils/PackageXMLUtils.xtend
index 560c1bd..a0914c6 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen/src/org/eclipse/papyrus/robotics/ros2/codegen/utils/PackageXMLUtils.xtend
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen/src/org/eclipse/papyrus/robotics/ros2/codegen/utils/PackageXMLUtils.xtend
@@ -61,7 +61,7 @@
}
def static getAuthorName(Package model) {
- return getAuthorMail(Collections.singletonList(model))
+ return getAuthorName(Collections.singletonList(model))
}
/**
diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen/src/org/eclipse/papyrus/robotics/ros2/codegen/utils/ProjectTools.xtend b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen/src/org/eclipse/papyrus/robotics/ros2/codegen/utils/ProjectTools.xtend
index caec4fd..e7b9c3f 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen/src/org/eclipse/papyrus/robotics/ros2/codegen/utils/ProjectTools.xtend
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen/src/org/eclipse/papyrus/robotics/ros2/codegen/utils/ProjectTools.xtend
@@ -47,6 +47,8 @@
import org.eclipse.papyrus.uml.tools.utils.StereotypeUtil
import org.eclipse.uml2.uml.Class
import org.eclipse.uml2.uml.Package
+import org.eclipse.core.resources.ProjectScope
+import org.eclipse.cdt.core.formatter.DefaultCodeFormatterConstants
/**
* get or create a CDT project with a given name
@@ -95,6 +97,13 @@
val mngr = CoreModel.getDefault().getProjectDescriptionManager()
var cdesc = mngr.getProjectDescription(project, true)
+
+ // configure formatter
+ // TODO: current code just sets two parameters instead of importing a format profile
+ val scope = new ProjectScope(project);
+ val ref = scope.getNode(CCorePlugin.PLUGIN_ID);
+ ref.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, "space")
+ ref.put(DefaultCodeFormatterConstants.FORMATTER_TAB_SIZE, "2")
try {
val amentPrefix = EnvironmentUtils.get(Ros2Constants.AMENT_PREFIX_PATH)
