Bug 566309 - [Robotics] Integrate tables for Assertions, Contracts & NFProperties (ITP contribution)
Bug 568448 - [Robotics, ROS2] Respect ROS2 conventions with respect code formatting/author information
- Minor modifications from ITP (OthelloLanguage)
- Remove year from copyright info (build failed, since the expected
code contains (c) 2020, but build is done in 2021)
=> adapt expected code
Change-Id: Ic315f3c0bac311730f8053607a0289af66c50f4c
Signed-off-by: Ansgar Radermacher <ansgar.radermacher@cea.fr>
diff --git a/plugins/assertions/languages/org.eclipse.papyrus.robotics.assertions.languages.othello/src/org/eclipse/papyrus/robotics/assertions/languages/othello/OthelloLanguage.java b/plugins/assertions/languages/org.eclipse.papyrus.robotics.assertions.languages.othello/src/org/eclipse/papyrus/robotics/assertions/languages/othello/OthelloLanguage.java
index 3168f9a..2c0b4ba 100644
--- a/plugins/assertions/languages/org.eclipse.papyrus.robotics.assertions.languages.othello/src/org/eclipse/papyrus/robotics/assertions/languages/othello/OthelloLanguage.java
+++ b/plugins/assertions/languages/org.eclipse.papyrus.robotics.assertions.languages.othello/src/org/eclipse/papyrus/robotics/assertions/languages/othello/OthelloLanguage.java
@@ -56,16 +56,18 @@
@Override
public Object evaluate(EObject context, String expression) {
-
+
if (expression != null) {
expression = updateExpression(context, expression);
}
-
+
String oss = getOSSForEvaluation(context, expression);
String ocra_command = null;
- if (expression != null && (context instanceof org.eclipse.papyrus.robotics.profile.robotics.components.System
+
+ if ((context instanceof org.eclipse.papyrus.robotics.profile.robotics.components.System
|| (context instanceof Element && UMLUtil.getStereotypeApplication((Element) context,
- org.eclipse.papyrus.robotics.profile.robotics.components.System.class) != null))) {
+ org.eclipse.papyrus.robotics.profile.robotics.components.System.class) != null))
+ && oss.contains(" REFINEDBY ")) { //$NON-NLS-1$
ocra_command = OCRAIntegration.COMMAND_CHECK_REFINEMENT;
} else {
ocra_command = OCRAIntegration.COMMAND_CHECK_CONSISTENCY;
@@ -98,14 +100,14 @@
}
ScrollableColorMessageDialog dialog = new ScrollableColorMessageDialog(Display.getCurrent().getActiveShell(),
- "Using OCRA to evaluate " + getName() + " assertions", "OSS file", oss.toString());
+ "Using OCRA to evaluate " + getName() + " assertions", "OSS file. Command: " + ocra_command, oss.toString());
dialog.open();
dialog = new ScrollableColorMessageDialog(Display.getCurrent().getActiveShell(),
- "Using OCRA to evaluate " + getName() + " assertions", "OCRA Console", ocraConsole);
+ "Using OCRA to evaluate " + getName() + " assertions", "OCRA Console. Command: " + ocra_command, ocraConsole);
dialog.open();
- return ocraConsole.contains("Success: all the contracts are consistent");
+ return ocraConsole.contains("Success: all the contracts are consistent") || ocraConsole.contains("Summary: everything is OK.");
}
/**
@@ -241,6 +243,7 @@
/**
* Update expression. To be overriden
+ *
* @param context
* @param expression
* @return updated expression
@@ -367,7 +370,7 @@
// Evaluating a single expression
if (expression != null) {
if (system != null) {
- oss = ossFromSystem(system, false);
+ oss = ossFromSystem(system, true);
// insert a contract at system level
int systemRef = oss.indexOf("REFINEMENT");
String contract = "CONTRACT pass\nassume: true;\nguarantee: " + expression + ";\n";
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 9dcac08..bbe38f8 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,5 +1,5 @@
// --------------------------------------------------------
-// Copyright (c) 2020
+// Copyright (c)
//
// contributions by Ansgar
// ansgar.radermacher@cea.fr
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 a16e225..6548281 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,5 +1,5 @@
// --------------------------------------------------------
-// Copyright (c) 2020
+// Copyright (c)
//
// contributions by Ansgar
// ansgar.radermacher@cea.fr
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 ee2f9d3..ffbc919 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,5 +1,5 @@
// --------------------------------------------------------
-// Copyright (c) 2020
+// Copyright (c)
//
// contributions by Ansgar
// ansgar.radermacher@cea.fr
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 bce7bf4..0062352 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,5 +1,5 @@
// --------------------------------------------------------
-// Copyright (c) 2020
+// Copyright (c)
//
// contributions by Ansgar
// ansgar.radermacher@cea.fr
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 ff287ea..9aa9d0c 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,5 +1,5 @@
// --------------------------------------------------------
-// Copyright (c) 2020
+// Copyright (c)
//
// contributions by Ansgar
// ansgar.radermacher@cea.fr
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 2368b8b..9c2a171 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,5 +1,5 @@
// --------------------------------------------------------
-// Copyright (c) 2020
+// Copyright (c)
//
// contributions by Ansgar
// ansgar.radermacher@cea.fr
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 d8b102b..7c0eb19 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,5 +1,5 @@
// --------------------------------------------------------
-// Copyright (c) 2020
+// Copyright (c)
//
// contributions by Ansgar
// ansgar.radermacher@cea.fr
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 eaf3792..3e3cd6b 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,5 +1,5 @@
// --------------------------------------------------------
-// Copyright (c) 2020
+// Copyright (c)
//
// contributions by Ansgar
// ansgar.radermacher@cea.fr
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 bce7bf4..0062352 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,5 +1,5 @@
// --------------------------------------------------------
-// Copyright (c) 2020
+// Copyright (c)
//
// contributions by Ansgar
// ansgar.radermacher@cea.fr
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 01b3cad..e1fcc7b 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,5 +1,5 @@
// --------------------------------------------------------
-// Copyright (c) 2020
+// Copyright (c)
//
// contributions by Ansgar
// ansgar.radermacher@cea.fr
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 12ce3f9..75dc708 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,5 +1,5 @@
// --------------------------------------------------------
-// Copyright (c) 2020
+// Copyright (c)
//
// contributions by author
// author@somewhere.net
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 eb0c7b5..9f1b864 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,5 +1,5 @@
// --------------------------------------------------------
-// Copyright (c) 2020
+// Copyright (c)
//
// contributions by author
// author@somewhere.net
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 e288e29..94621d3 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,5 +1,5 @@
// --------------------------------------------------------
-// Copyright (c) 2020
+// Copyright (c)
//
// contributions by author
// author@somewhere.net
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 e1c19db..cb2937d 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,5 +1,5 @@
// --------------------------------------------------------
-// Copyright (c) 2020
+// Copyright (c)
//
// contributions by author
// author@somewhere.net
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 95467e3..d43e008 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,5 +1,5 @@
// --------------------------------------------------------
-// Copyright (c) 2020
+// Copyright (c)
//
// contributions by author
// author@somewhere.net
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 697edf7..df1f9a6 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,5 +1,5 @@
// --------------------------------------------------------
-// Copyright (c) 2020
+// Copyright (c)
//
// contributions by author
// author@somewhere.net
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 d26b488..d08ea86 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,5 +1,5 @@
// --------------------------------------------------------
-// Copyright (c) 2020
+// Copyright (c)
//
// contributions by author
// author@somewhere.net
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 a95dfa5..b4a7b9c 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,5 +1,5 @@
// --------------------------------------------------------
-// Copyright (c) 2020
+// Copyright (c)
//
// contributions by author
// author@somewhere.net
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 ba7bab4..be0e0f9 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,5 +1,5 @@
// --------------------------------------------------------
-// Copyright (c) 2020
+// Copyright (c)
//
// contributions by author
// author@somewhere.net
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 1a4ac9a..042039e 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,5 +1,5 @@
// --------------------------------------------------------
-// Copyright (c) 2020
+// Copyright (c)
//
// contributions by author
// author@somewhere.net
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 90c8916..d7c865a 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,5 +1,5 @@
// --------------------------------------------------------
-// Copyright (c) 2020
+// Copyright (c)
//
// contributions by author
// author@somewhere.net
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 12ce3f9..75dc708 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,5 +1,5 @@
// --------------------------------------------------------
-// Copyright (c) 2020
+// Copyright (c)
//
// contributions by author
// author@somewhere.net
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 83f4262..d69d7e2 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,5 +1,5 @@
// --------------------------------------------------------
-// Copyright (c) 2020
+// Copyright (c)
//
// contributions by author
// author@somewhere.net
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 40b4bc8..40b7333 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,5 +1,5 @@
// --------------------------------------------------------
-// Copyright (c) 2020
+// Copyright (c)
//
// contributions by author
// author@somewhere.net
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 8dad252..60a1ffc 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,5 +1,5 @@
// --------------------------------------------------------
-// Copyright (c) 2020
+// Copyright (c)
//
// contributions by author
// author@somewhere.net
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 95467e3..d43e008 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,5 +1,5 @@
// --------------------------------------------------------
-// Copyright (c) 2020
+// Copyright (c)
//
// contributions by author
// author@somewhere.net
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 697edf7..df1f9a6 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,5 +1,5 @@
// --------------------------------------------------------
-// Copyright (c) 2020
+// Copyright (c)
//
// contributions by author
// author@somewhere.net
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 d26b488..d08ea86 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,5 +1,5 @@
// --------------------------------------------------------
-// Copyright (c) 2020
+// Copyright (c)
//
// contributions by author
// author@somewhere.net
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 fc046b5..e4d5329 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,5 +1,5 @@
// --------------------------------------------------------
-// Copyright (c) 2020
+// Copyright (c)
//
// contributions by author
// author@somewhere.net
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 7306ce4..51ee2b7 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,5 +1,5 @@
// --------------------------------------------------------
-// Copyright (c) 2020
+// Copyright (c)
//
// contributions by author
// author@somewhere.net
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 fc90a5c..35b3435 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,5 +1,5 @@
// --------------------------------------------------------
-// Copyright (c) 2020
+// Copyright (c)
//
// contributions by author
// author@somewhere.net
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 90c8916..d7c865a 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,5 +1,5 @@
// --------------------------------------------------------
-// Copyright (c) 2020
+// Copyright (c)
//
// contributions by author
// author@somewhere.net
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 c66b043..76fc3c8 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,5 +1,5 @@
// --------------------------------------------------------
-// Copyright (c) 2020
+// Copyright (c)
//
// contributions by author
// author@somewhere.net
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 2ba378e..52f79dc 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,5 +1,5 @@
// --------------------------------------------------------
-// Copyright (c) 2020
+// Copyright (c)
//
// contributions by author
// author@somewhere.net
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 afbf329..e19070b 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,5 +1,5 @@
// --------------------------------------------------------
-// Copyright (c) 2020
+// Copyright (c)
//
// contributions by author
// author@somewhere.net
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 874e909..970420b 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,5 +1,5 @@
// --------------------------------------------------------
-// Copyright (c) 2020
+// Copyright (c)
//
// contributions by author
// author@somewhere.net
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 7255f84..5183e74 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,5 +1,5 @@
// --------------------------------------------------------
-// Copyright (c) 2020
+// Copyright (c)
//
// contributions by Ansgar
// ansgar.radermacher@cea.fr
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 f15c3d7..5ee7334 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,5 +1,5 @@
// --------------------------------------------------------
-// Copyright (c) 2020
+// Copyright (c)
//
// contributions by Ansgar
// ansgar.radermacher@cea.fr
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 cee7678..2d8e2f3 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,5 +1,5 @@
// --------------------------------------------------------
-// Copyright (c) 2020
+// Copyright (c)
//
// contributions by Ansgar
// ansgar.radermacher@cea.fr
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 e480166..0c30e20 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,5 +1,5 @@
// --------------------------------------------------------
-// Copyright (c) 2020
+// Copyright (c)
//
// contributions by Ansgar
// ansgar.radermacher@cea.fr
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 bce7bf4..0062352 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,5 +1,5 @@
// --------------------------------------------------------
-// Copyright (c) 2020
+// Copyright (c)
//
// contributions by Ansgar
// ansgar.radermacher@cea.fr
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 f79f874..b5e4355 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,5 +1,5 @@
// --------------------------------------------------------
-// Copyright (c) 2020
+// Copyright (c)
//
// contributions by Ansgar
// ansgar.radermacher@cea.fr
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 907599a..b9a16a5 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,5 +1,5 @@
// --------------------------------------------------------
-// Copyright (c) 2020
+// Copyright (c)
//
// contributions by Ansgar
// ansgar.radermacher@cea.fr
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 b85850d..33823b5 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,5 +1,5 @@
// --------------------------------------------------------
-// Copyright (c) 2020
+// Copyright (c)
//
// contributions by Ansgar
// ansgar.radermacher@cea.fr
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 bce7bf4..0062352 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,5 +1,5 @@
// --------------------------------------------------------
-// Copyright (c) 2020
+// Copyright (c)
//
// contributions by Ansgar
// ansgar.radermacher@cea.fr
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
index 2f176c7..2a8e0ad 100644
--- 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
@@ -14,7 +14,6 @@
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
@@ -28,7 +27,7 @@
class ComponentHeader {
static def getHeader(Package model) '''
// --------------------------------------------------------
- // Copyright (c) «Year.now().getValue()»
+ // Copyright (c)
//
// contributions by «model.authorName»
// «model.authorMail»