Modifying profile to add stereotype "onVariable" for uml parameters,

adding a properties view

50 files changed, 929 insertions, 2021 deletions

diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp1_datatypes/CarLikeCommand.java b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp1_datatypes/CarLikeCommand.java
index 7620fe0777f..1af27eaf1c3 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp1_datatypes/CarLikeCommand.java
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp1_datatypes/CarLikeCommand.java
@@ -12,8 +12,8 @@ import org.eclipse.emf.ecore.EObject;
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.CarLikeCommand#getVelocity <em>Velocity</em>}</li>
- * <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.CarLikeCommand#getSteeringAngle <em>Steering Angle</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.CarLikeCommand#getVelocity <em>Velocity</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.CarLikeCommand#getSteeringAngle <em>Steering Angle</em>}</li>
  * </ul>
  * </p>
  *
@@ -30,7 +30,6 @@ public interface CarLikeCommand extends EObject {
 	 * If the meaning of the '<em>Velocity</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the value of the '<em>Velocity</em>' attribute.
 	 * @see #setVelocity(double)
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.Oarp1_datatypesPackage#getCarLikeCommand_Velocity()
@@ -43,9 +42,7 @@ public interface CarLikeCommand extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.CarLikeCommand#getVelocity <em>Velocity</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
-	 * @param value
-	 *            the new value of the '<em>Velocity</em>' attribute.
+	 * @param value the new value of the '<em>Velocity</em>' attribute.
 	 * @see #getVelocity()
 	 * @generated
 	 */
@@ -59,7 +56,6 @@ public interface CarLikeCommand extends EObject {
 	 * If the meaning of the '<em>Steering Angle</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the value of the '<em>Steering Angle</em>' attribute.
 	 * @see #setSteeringAngle(double)
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.Oarp1_datatypesPackage#getCarLikeCommand_SteeringAngle()
@@ -72,9 +68,7 @@ public interface CarLikeCommand extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.CarLikeCommand#getSteeringAngle <em>Steering Angle</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
-	 * @param value
-	 *            the new value of the '<em>Steering Angle</em>' attribute.
+	 * @param value the new value of the '<em>Steering Angle</em>' attribute.
 	 * @see #getSteeringAngle()
 	 * @generated
 	 */
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp1_datatypes/ExtentedLidarScan.java b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp1_datatypes/ExtentedLidarScan.java
index 38ead8460e7..e8081d75b02 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp1_datatypes/ExtentedLidarScan.java
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp1_datatypes/ExtentedLidarScan.java
@@ -13,9 +13,9 @@ import org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTyp
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.ExtentedLidarScan#getScan <em>Scan</em>}</li>
- * <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.ExtentedLidarScan#getLayerId <em>Layer Id</em>}</li>
- * <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.ExtentedLidarScan#getLayerAngle <em>Layer Angle</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.ExtentedLidarScan#getScan <em>Scan</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.ExtentedLidarScan#getLayerId <em>Layer Id</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.ExtentedLidarScan#getLayerAngle <em>Layer Angle</em>}</li>
  * </ul>
  * </p>
  *
@@ -31,7 +31,6 @@ public interface ExtentedLidarScan extends EObject {
 	 * If the meaning of the '<em>Scan</em>' containment reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the value of the '<em>Scan</em>' containment reference.
 	 * @see #setScan(LaserScan)
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.Oarp1_datatypesPackage#getExtentedLidarScan_Scan()
@@ -44,9 +43,7 @@ public interface ExtentedLidarScan extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.ExtentedLidarScan#getScan <em>Scan</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
-	 * @param value
-	 *            the new value of the '<em>Scan</em>' containment reference.
+	 * @param value the new value of the '<em>Scan</em>' containment reference.
 	 * @see #getScan()
 	 * @generated
 	 */
@@ -59,7 +56,6 @@ public interface ExtentedLidarScan extends EObject {
 	 * If the meaning of the '<em>Layer Id</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the value of the '<em>Layer Id</em>' attribute.
 	 * @see #setLayerId(char)
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.Oarp1_datatypesPackage#getExtentedLidarScan_LayerId()
@@ -72,9 +68,7 @@ public interface ExtentedLidarScan extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.ExtentedLidarScan#getLayerId <em>Layer Id</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
-	 * @param value
-	 *            the new value of the '<em>Layer Id</em>' attribute.
+	 * @param value the new value of the '<em>Layer Id</em>' attribute.
 	 * @see #getLayerId()
 	 * @generated
 	 */
@@ -87,7 +81,6 @@ public interface ExtentedLidarScan extends EObject {
 	 * If the meaning of the '<em>Layer Angle</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the value of the '<em>Layer Angle</em>' attribute.
 	 * @see #setLayerAngle(float)
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.Oarp1_datatypesPackage#getExtentedLidarScan_LayerAngle()
@@ -100,9 +93,7 @@ public interface ExtentedLidarScan extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.ExtentedLidarScan#getLayerAngle <em>Layer Angle</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
-	 * @param value
-	 *            the new value of the '<em>Layer Angle</em>' attribute.
+	 * @param value the new value of the '<em>Layer Angle</em>' attribute.
 	 * @see #getLayerAngle()
 	 * @generated
 	 */
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp1_datatypes/MultiLayerLidarScan.java b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp1_datatypes/MultiLayerLidarScan.java
index fc4b40b632d..9f1572a0350 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp1_datatypes/MultiLayerLidarScan.java
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp1_datatypes/MultiLayerLidarScan.java
@@ -12,8 +12,8 @@ import org.eclipse.emf.ecore.EObject;
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.MultiLayerLidarScan#getLayers <em>Layers</em>}</li>
- * <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.MultiLayerLidarScan#getNbLayer <em>Nb Layer</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.MultiLayerLidarScan#getLayers <em>Layers</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.MultiLayerLidarScan#getNbLayer <em>Nb Layer</em>}</li>
  * </ul>
  * </p>
  *
@@ -29,7 +29,6 @@ public interface MultiLayerLidarScan extends EObject {
 	 * If the meaning of the '<em>Layers</em>' containment reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the value of the '<em>Layers</em>' containment reference.
 	 * @see #setLayers(ExtentedLidarScan)
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.Oarp1_datatypesPackage#getMultiLayerLidarScan_Layers()
@@ -42,9 +41,7 @@ public interface MultiLayerLidarScan extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.MultiLayerLidarScan#getLayers <em>Layers</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
-	 * @param value
-	 *            the new value of the '<em>Layers</em>' containment reference.
+	 * @param value the new value of the '<em>Layers</em>' containment reference.
 	 * @see #getLayers()
 	 * @generated
 	 */
@@ -57,7 +54,6 @@ public interface MultiLayerLidarScan extends EObject {
 	 * If the meaning of the '<em>Nb Layer</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the value of the '<em>Nb Layer</em>' attribute.
 	 * @see #setNbLayer(char)
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.Oarp1_datatypesPackage#getMultiLayerLidarScan_NbLayer()
@@ -70,9 +66,7 @@ public interface MultiLayerLidarScan extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.MultiLayerLidarScan#getNbLayer <em>Nb Layer</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
-	 * @param value
-	 *            the new value of the '<em>Nb Layer</em>' attribute.
+	 * @param value the new value of the '<em>Nb Layer</em>' attribute.
 	 * @see #getNbLayer()
 	 * @generated
 	 */
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp1_datatypes/Oarp1_datatypesFactory.java b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp1_datatypes/Oarp1_datatypesFactory.java
index 8d495baa4da..f78302ce146 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp1_datatypes/Oarp1_datatypesFactory.java
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp1_datatypes/Oarp1_datatypesFactory.java
@@ -9,7 +9,6 @@ import org.eclipse.emf.ecore.EFactory;
  * The <b>Factory</b> for the model.
  * It provides a create method for each non-abstract class of the model.
  * <!-- end-user-doc -->
- *
  * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.Oarp1_datatypesPackage
  * @generated
  */
@@ -18,7 +17,6 @@ public interface Oarp1_datatypesFactory extends EFactory {
 	 * The singleton instance of the factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	Oarp1_datatypesFactory eINSTANCE = org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.impl.Oarp1_datatypesFactoryImpl.init();
@@ -27,7 +25,6 @@ public interface Oarp1_datatypesFactory extends EFactory {
 	 * Returns a new object of class '<em>Car Like Command</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return a new object of class '<em>Car Like Command</em>'.
 	 * @generated
 	 */
@@ -37,7 +34,6 @@ public interface Oarp1_datatypesFactory extends EFactory {
 	 * Returns a new object of class '<em>Multi Layer Lidar Scan</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return a new object of class '<em>Multi Layer Lidar Scan</em>'.
 	 * @generated
 	 */
@@ -47,7 +43,6 @@ public interface Oarp1_datatypesFactory extends EFactory {
 	 * Returns a new object of class '<em>Extented Lidar Scan</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return a new object of class '<em>Extented Lidar Scan</em>'.
 	 * @generated
 	 */
@@ -57,7 +52,6 @@ public interface Oarp1_datatypesFactory extends EFactory {
 	 * Returns the package supported by this factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the package supported by this factory.
 	 * @generated
 	 */
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp1_datatypes/Oarp1_datatypesPackage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp1_datatypes/Oarp1_datatypesPackage.java
index 5ed1ef1d499..0158a1e3560 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp1_datatypes/Oarp1_datatypesPackage.java
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp1_datatypes/Oarp1_datatypesPackage.java
@@ -19,7 +19,6 @@ import org.eclipse.emf.ecore.EReference;
  * <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
- *
  * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.Oarp1_datatypesFactory
  * @model kind="package"
  * @generated
@@ -29,7 +28,6 @@ public interface Oarp1_datatypesPackage extends EPackage {
 	 * The package name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	String eNAME = "oarp1_datatypes";
@@ -38,7 +36,6 @@ public interface Oarp1_datatypesPackage extends EPackage {
 	 * The package namespace URI.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	String eNS_URI = "http:///RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp1_datatypes.ecore";
@@ -47,7 +44,6 @@ public interface Oarp1_datatypesPackage extends EPackage {
 	 * The package namespace name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	String eNS_PREFIX = "RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes";
@@ -56,7 +52,6 @@ public interface Oarp1_datatypesPackage extends EPackage {
 	 * The singleton instance of the package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	Oarp1_datatypesPackage eINSTANCE = org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.impl.Oarp1_datatypesPackageImpl.init();
@@ -65,7 +60,6 @@ public interface Oarp1_datatypesPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.impl.CarLikeCommandImpl <em>Car Like Command</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.impl.CarLikeCommandImpl
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.impl.Oarp1_datatypesPackageImpl#getCarLikeCommand()
 	 * @generated
@@ -76,7 +70,6 @@ public interface Oarp1_datatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Velocity</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -86,7 +79,6 @@ public interface Oarp1_datatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Steering Angle</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -96,7 +88,6 @@ public interface Oarp1_datatypesPackage extends EPackage {
 	 * The number of structural features of the '<em>Car Like Command</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -106,7 +97,6 @@ public interface Oarp1_datatypesPackage extends EPackage {
 	 * The number of operations of the '<em>Car Like Command</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -116,7 +106,6 @@ public interface Oarp1_datatypesPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.impl.MultiLayerLidarScanImpl <em>Multi Layer Lidar Scan</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.impl.MultiLayerLidarScanImpl
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.impl.Oarp1_datatypesPackageImpl#getMultiLayerLidarScan()
 	 * @generated
@@ -127,7 +116,6 @@ public interface Oarp1_datatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Layers</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -137,7 +125,6 @@ public interface Oarp1_datatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Nb Layer</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -147,7 +134,6 @@ public interface Oarp1_datatypesPackage extends EPackage {
 	 * The number of structural features of the '<em>Multi Layer Lidar Scan</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -157,7 +143,6 @@ public interface Oarp1_datatypesPackage extends EPackage {
 	 * The number of operations of the '<em>Multi Layer Lidar Scan</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -167,7 +152,6 @@ public interface Oarp1_datatypesPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.impl.ExtentedLidarScanImpl <em>Extented Lidar Scan</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.impl.ExtentedLidarScanImpl
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.impl.Oarp1_datatypesPackageImpl#getExtentedLidarScan()
 	 * @generated
@@ -178,7 +162,6 @@ public interface Oarp1_datatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Scan</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -188,7 +171,6 @@ public interface Oarp1_datatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Layer Id</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -198,7 +180,6 @@ public interface Oarp1_datatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Layer Angle</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -208,7 +189,6 @@ public interface Oarp1_datatypesPackage extends EPackage {
 	 * The number of structural features of the '<em>Extented Lidar Scan</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -218,7 +198,6 @@ public interface Oarp1_datatypesPackage extends EPackage {
 	 * The number of operations of the '<em>Extented Lidar Scan</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -229,7 +208,6 @@ public interface Oarp1_datatypesPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.CarLikeCommand <em>Car Like Command</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the meta object for class '<em>Car Like Command</em>'.
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.CarLikeCommand
 	 * @generated
@@ -240,7 +218,6 @@ public interface Oarp1_datatypesPackage extends EPackage {
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.CarLikeCommand#getVelocity <em>Velocity</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the meta object for the attribute '<em>Velocity</em>'.
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.CarLikeCommand#getVelocity()
 	 * @see #getCarLikeCommand()
@@ -252,7 +229,6 @@ public interface Oarp1_datatypesPackage extends EPackage {
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.CarLikeCommand#getSteeringAngle <em>Steering Angle</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the meta object for the attribute '<em>Steering Angle</em>'.
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.CarLikeCommand#getSteeringAngle()
 	 * @see #getCarLikeCommand()
@@ -264,7 +240,6 @@ public interface Oarp1_datatypesPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.MultiLayerLidarScan <em>Multi Layer Lidar Scan</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the meta object for class '<em>Multi Layer Lidar Scan</em>'.
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.MultiLayerLidarScan
 	 * @generated
@@ -275,7 +250,6 @@ public interface Oarp1_datatypesPackage extends EPackage {
 	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.MultiLayerLidarScan#getLayers <em>Layers</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the meta object for the containment reference '<em>Layers</em>'.
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.MultiLayerLidarScan#getLayers()
 	 * @see #getMultiLayerLidarScan()
@@ -287,7 +261,6 @@ public interface Oarp1_datatypesPackage extends EPackage {
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.MultiLayerLidarScan#getNbLayer <em>Nb Layer</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the meta object for the attribute '<em>Nb Layer</em>'.
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.MultiLayerLidarScan#getNbLayer()
 	 * @see #getMultiLayerLidarScan()
@@ -299,7 +272,6 @@ public interface Oarp1_datatypesPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.ExtentedLidarScan <em>Extented Lidar Scan</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the meta object for class '<em>Extented Lidar Scan</em>'.
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.ExtentedLidarScan
 	 * @generated
@@ -310,7 +282,6 @@ public interface Oarp1_datatypesPackage extends EPackage {
 	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.ExtentedLidarScan#getScan <em>Scan</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the meta object for the containment reference '<em>Scan</em>'.
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.ExtentedLidarScan#getScan()
 	 * @see #getExtentedLidarScan()
@@ -322,7 +293,6 @@ public interface Oarp1_datatypesPackage extends EPackage {
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.ExtentedLidarScan#getLayerId <em>Layer Id</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the meta object for the attribute '<em>Layer Id</em>'.
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.ExtentedLidarScan#getLayerId()
 	 * @see #getExtentedLidarScan()
@@ -334,7 +304,6 @@ public interface Oarp1_datatypesPackage extends EPackage {
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.ExtentedLidarScan#getLayerAngle <em>Layer Angle</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the meta object for the attribute '<em>Layer Angle</em>'.
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.ExtentedLidarScan#getLayerAngle()
 	 * @see #getExtentedLidarScan()
@@ -346,7 +315,6 @@ public interface Oarp1_datatypesPackage extends EPackage {
 	 * Returns the factory that creates the instances of the model.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the factory that creates the instances of the model.
 	 * @generated
 	 */
@@ -363,7 +331,6 @@ public interface Oarp1_datatypesPackage extends EPackage {
 	 * <li>and each data type</li>
 	 * </ul>
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	interface Literals {
@@ -371,7 +338,6 @@ public interface Oarp1_datatypesPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.impl.CarLikeCommandImpl <em>Car Like Command</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
 		 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.impl.CarLikeCommandImpl
 		 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.impl.Oarp1_datatypesPackageImpl#getCarLikeCommand()
 		 * @generated
@@ -382,7 +348,6 @@ public interface Oarp1_datatypesPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Velocity</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
 		 * @generated
 		 */
 		EAttribute CAR_LIKE_COMMAND__VELOCITY = eINSTANCE.getCarLikeCommand_Velocity();
@@ -391,7 +356,6 @@ public interface Oarp1_datatypesPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Steering Angle</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
 		 * @generated
 		 */
 		EAttribute CAR_LIKE_COMMAND__STEERING_ANGLE = eINSTANCE.getCarLikeCommand_SteeringAngle();
@@ -400,7 +364,6 @@ public interface Oarp1_datatypesPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.impl.MultiLayerLidarScanImpl <em>Multi Layer Lidar Scan</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
 		 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.impl.MultiLayerLidarScanImpl
 		 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.impl.Oarp1_datatypesPackageImpl#getMultiLayerLidarScan()
 		 * @generated
@@ -411,7 +374,6 @@ public interface Oarp1_datatypesPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Layers</b></em>' containment reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
 		 * @generated
 		 */
 		EReference MULTI_LAYER_LIDAR_SCAN__LAYERS = eINSTANCE.getMultiLayerLidarScan_Layers();
@@ -420,7 +382,6 @@ public interface Oarp1_datatypesPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Nb Layer</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
 		 * @generated
 		 */
 		EAttribute MULTI_LAYER_LIDAR_SCAN__NB_LAYER = eINSTANCE.getMultiLayerLidarScan_NbLayer();
@@ -429,7 +390,6 @@ public interface Oarp1_datatypesPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.impl.ExtentedLidarScanImpl <em>Extented Lidar Scan</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
 		 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.impl.ExtentedLidarScanImpl
 		 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.impl.Oarp1_datatypesPackageImpl#getExtentedLidarScan()
 		 * @generated
@@ -440,7 +400,6 @@ public interface Oarp1_datatypesPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Scan</b></em>' containment reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
 		 * @generated
 		 */
 		EReference EXTENTED_LIDAR_SCAN__SCAN = eINSTANCE.getExtentedLidarScan_Scan();
@@ -449,7 +408,6 @@ public interface Oarp1_datatypesPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Layer Id</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
 		 * @generated
 		 */
 		EAttribute EXTENTED_LIDAR_SCAN__LAYER_ID = eINSTANCE.getExtentedLidarScan_LayerId();
@@ -458,7 +416,6 @@ public interface Oarp1_datatypesPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Layer Angle</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
 		 * @generated
 		 */
 		EAttribute EXTENTED_LIDAR_SCAN__LAYER_ANGLE = eINSTANCE.getExtentedLidarScan_LayerAngle();
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp1_datatypes/impl/CarLikeCommandImpl.java b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp1_datatypes/impl/CarLikeCommandImpl.java
index a8c5b7a9eeb..5e25f9a616d 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp1_datatypes/impl/CarLikeCommandImpl.java
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp1_datatypes/impl/CarLikeCommandImpl.java
@@ -16,8 +16,8 @@ import org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTyp
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.impl.CarLikeCommandImpl#getVelocity <em>Velocity</em>}</li>
- * <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.impl.CarLikeCommandImpl#getSteeringAngle <em>Steering Angle</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.impl.CarLikeCommandImpl#getVelocity <em>Velocity</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.impl.CarLikeCommandImpl#getSteeringAngle <em>Steering Angle</em>}</li>
  * </ul>
  * </p>
  *
@@ -28,7 +28,6 @@ public class CarLikeCommandImpl extends MinimalEObjectImpl.Container implements
 	 * The default value of the '{@link #getVelocity() <em>Velocity</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @see #getVelocity()
 	 * @generated
 	 * @ordered
@@ -39,7 +38,6 @@ public class CarLikeCommandImpl extends MinimalEObjectImpl.Container implements
 	 * The cached value of the '{@link #getVelocity() <em>Velocity</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @see #getVelocity()
 	 * @generated
 	 * @ordered
@@ -50,7 +48,6 @@ public class CarLikeCommandImpl extends MinimalEObjectImpl.Container implements
 	 * The default value of the '{@link #getSteeringAngle() <em>Steering Angle</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @see #getSteeringAngle()
 	 * @generated
 	 * @ordered
@@ -61,7 +58,6 @@ public class CarLikeCommandImpl extends MinimalEObjectImpl.Container implements
 	 * The cached value of the '{@link #getSteeringAngle() <em>Steering Angle</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @see #getSteeringAngle()
 	 * @generated
 	 * @ordered
@@ -71,7 +67,6 @@ public class CarLikeCommandImpl extends MinimalEObjectImpl.Container implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	protected CarLikeCommandImpl() {
@@ -81,7 +76,6 @@ public class CarLikeCommandImpl extends MinimalEObjectImpl.Container implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
@@ -92,7 +86,6 @@ public class CarLikeCommandImpl extends MinimalEObjectImpl.Container implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public double getVelocity() {
@@ -102,21 +95,18 @@ public class CarLikeCommandImpl extends MinimalEObjectImpl.Container implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public void setVelocity(double newVelocity) {
 		double oldVelocity = velocity;
 		velocity = newVelocity;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, Oarp1_datatypesPackage.CAR_LIKE_COMMAND__VELOCITY, oldVelocity, velocity));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public double getSteeringAngle() {
@@ -126,30 +116,27 @@ public class CarLikeCommandImpl extends MinimalEObjectImpl.Container implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public void setSteeringAngle(double newSteeringAngle) {
 		double oldSteeringAngle = steeringAngle;
 		steeringAngle = newSteeringAngle;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, Oarp1_datatypesPackage.CAR_LIKE_COMMAND__STEERING_ANGLE, oldSteeringAngle, steeringAngle));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case Oarp1_datatypesPackage.CAR_LIKE_COMMAND__VELOCITY:
-			return getVelocity();
-		case Oarp1_datatypesPackage.CAR_LIKE_COMMAND__STEERING_ANGLE:
-			return getSteeringAngle();
+			case Oarp1_datatypesPackage.CAR_LIKE_COMMAND__VELOCITY:
+				return getVelocity();
+			case Oarp1_datatypesPackage.CAR_LIKE_COMMAND__STEERING_ANGLE:
+				return getSteeringAngle();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -157,18 +144,17 @@ public class CarLikeCommandImpl extends MinimalEObjectImpl.Container implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case Oarp1_datatypesPackage.CAR_LIKE_COMMAND__VELOCITY:
-			setVelocity((Double) newValue);
-			return;
-		case Oarp1_datatypesPackage.CAR_LIKE_COMMAND__STEERING_ANGLE:
-			setSteeringAngle((Double) newValue);
-			return;
+			case Oarp1_datatypesPackage.CAR_LIKE_COMMAND__VELOCITY:
+				setVelocity((Double)newValue);
+				return;
+			case Oarp1_datatypesPackage.CAR_LIKE_COMMAND__STEERING_ANGLE:
+				setSteeringAngle((Double)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -176,18 +162,17 @@ public class CarLikeCommandImpl extends MinimalEObjectImpl.Container implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case Oarp1_datatypesPackage.CAR_LIKE_COMMAND__VELOCITY:
-			setVelocity(VELOCITY_EDEFAULT);
-			return;
-		case Oarp1_datatypesPackage.CAR_LIKE_COMMAND__STEERING_ANGLE:
-			setSteeringAngle(STEERING_ANGLE_EDEFAULT);
-			return;
+			case Oarp1_datatypesPackage.CAR_LIKE_COMMAND__VELOCITY:
+				setVelocity(VELOCITY_EDEFAULT);
+				return;
+			case Oarp1_datatypesPackage.CAR_LIKE_COMMAND__STEERING_ANGLE:
+				setSteeringAngle(STEERING_ANGLE_EDEFAULT);
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -195,16 +180,15 @@ public class CarLikeCommandImpl extends MinimalEObjectImpl.Container implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case Oarp1_datatypesPackage.CAR_LIKE_COMMAND__VELOCITY:
-			return velocity != VELOCITY_EDEFAULT;
-		case Oarp1_datatypesPackage.CAR_LIKE_COMMAND__STEERING_ANGLE:
-			return steeringAngle != STEERING_ANGLE_EDEFAULT;
+			case Oarp1_datatypesPackage.CAR_LIKE_COMMAND__VELOCITY:
+				return velocity != VELOCITY_EDEFAULT;
+			case Oarp1_datatypesPackage.CAR_LIKE_COMMAND__STEERING_ANGLE:
+				return steeringAngle != STEERING_ANGLE_EDEFAULT;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -212,14 +196,11 @@ public class CarLikeCommandImpl extends MinimalEObjectImpl.Container implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) {
-			return super.toString();
-		}
+		if (eIsProxy()) return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (velocity: ");
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp1_datatypes/impl/ExtentedLidarScanImpl.java b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp1_datatypes/impl/ExtentedLidarScanImpl.java
index 412a37f0186..b03b74e2606 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp1_datatypes/impl/ExtentedLidarScanImpl.java
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp1_datatypes/impl/ExtentedLidarScanImpl.java
@@ -19,9 +19,9 @@ import org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTyp
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.impl.ExtentedLidarScanImpl#getScan <em>Scan</em>}</li>
- * <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.impl.ExtentedLidarScanImpl#getLayerId <em>Layer Id</em>}</li>
- * <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.impl.ExtentedLidarScanImpl#getLayerAngle <em>Layer Angle</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.impl.ExtentedLidarScanImpl#getScan <em>Scan</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.impl.ExtentedLidarScanImpl#getLayerId <em>Layer Id</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.impl.ExtentedLidarScanImpl#getLayerAngle <em>Layer Angle</em>}</li>
  * </ul>
  * </p>
  *
@@ -32,7 +32,6 @@ public class ExtentedLidarScanImpl extends MinimalEObjectImpl.Container implemen
 	 * The cached value of the '{@link #getScan() <em>Scan</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @see #getScan()
 	 * @generated
 	 * @ordered
@@ -43,7 +42,6 @@ public class ExtentedLidarScanImpl extends MinimalEObjectImpl.Container implemen
 	 * The default value of the '{@link #getLayerId() <em>Layer Id</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @see #getLayerId()
 	 * @generated
 	 * @ordered
@@ -54,7 +52,6 @@ public class ExtentedLidarScanImpl extends MinimalEObjectImpl.Container implemen
 	 * The cached value of the '{@link #getLayerId() <em>Layer Id</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @see #getLayerId()
 	 * @generated
 	 * @ordered
@@ -65,7 +62,6 @@ public class ExtentedLidarScanImpl extends MinimalEObjectImpl.Container implemen
 	 * The default value of the '{@link #getLayerAngle() <em>Layer Angle</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @see #getLayerAngle()
 	 * @generated
 	 * @ordered
@@ -76,7 +72,6 @@ public class ExtentedLidarScanImpl extends MinimalEObjectImpl.Container implemen
 	 * The cached value of the '{@link #getLayerAngle() <em>Layer Angle</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @see #getLayerAngle()
 	 * @generated
 	 * @ordered
@@ -86,7 +81,6 @@ public class ExtentedLidarScanImpl extends MinimalEObjectImpl.Container implemen
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	protected ExtentedLidarScanImpl() {
@@ -96,7 +90,6 @@ public class ExtentedLidarScanImpl extends MinimalEObjectImpl.Container implemen
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
@@ -107,7 +100,6 @@ public class ExtentedLidarScanImpl extends MinimalEObjectImpl.Container implemen
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public LaserScan getScan() {
@@ -117,7 +109,6 @@ public class ExtentedLidarScanImpl extends MinimalEObjectImpl.Container implemen
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public NotificationChain basicSetScan(LaserScan newScan, NotificationChain msgs) {
@@ -125,11 +116,7 @@ public class ExtentedLidarScanImpl extends MinimalEObjectImpl.Container implemen
 		scan = newScan;
 		if (eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Oarp1_datatypesPackage.EXTENTED_LIDAR_SCAN__SCAN, oldScan, newScan);
-			if (msgs == null) {
-				msgs = notification;
-			} else {
-				msgs.add(notification);
-			}
+			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
 		return msgs;
 	}
@@ -137,32 +124,25 @@ public class ExtentedLidarScanImpl extends MinimalEObjectImpl.Container implemen
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public void setScan(LaserScan newScan) {
 		if (newScan != scan) {
 			NotificationChain msgs = null;
-			if (scan != null) {
-				msgs = ((InternalEObject) scan).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - Oarp1_datatypesPackage.EXTENTED_LIDAR_SCAN__SCAN, null, msgs);
-			}
-			if (newScan != null) {
-				msgs = ((InternalEObject) newScan).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - Oarp1_datatypesPackage.EXTENTED_LIDAR_SCAN__SCAN, null, msgs);
-			}
+			if (scan != null)
+				msgs = ((InternalEObject)scan).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - Oarp1_datatypesPackage.EXTENTED_LIDAR_SCAN__SCAN, null, msgs);
+			if (newScan != null)
+				msgs = ((InternalEObject)newScan).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - Oarp1_datatypesPackage.EXTENTED_LIDAR_SCAN__SCAN, null, msgs);
 			msgs = basicSetScan(newScan, msgs);
-			if (msgs != null) {
-				msgs.dispatch();
-			}
+			if (msgs != null) msgs.dispatch();
 		}
-		else if (eNotificationRequired()) {
+		else if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, Oarp1_datatypesPackage.EXTENTED_LIDAR_SCAN__SCAN, newScan, newScan));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public char getLayerId() {
@@ -172,21 +152,18 @@ public class ExtentedLidarScanImpl extends MinimalEObjectImpl.Container implemen
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public void setLayerId(char newLayerId) {
 		char oldLayerId = layerId;
 		layerId = newLayerId;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, Oarp1_datatypesPackage.EXTENTED_LIDAR_SCAN__LAYER_ID, oldLayerId, layerId));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public float getLayerAngle() {
@@ -196,28 +173,25 @@ public class ExtentedLidarScanImpl extends MinimalEObjectImpl.Container implemen
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public void setLayerAngle(float newLayerAngle) {
 		float oldLayerAngle = layerAngle;
 		layerAngle = newLayerAngle;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, Oarp1_datatypesPackage.EXTENTED_LIDAR_SCAN__LAYER_ANGLE, oldLayerAngle, layerAngle));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-		case Oarp1_datatypesPackage.EXTENTED_LIDAR_SCAN__SCAN:
-			return basicSetScan(null, msgs);
+			case Oarp1_datatypesPackage.EXTENTED_LIDAR_SCAN__SCAN:
+				return basicSetScan(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -225,18 +199,17 @@ public class ExtentedLidarScanImpl extends MinimalEObjectImpl.Container implemen
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case Oarp1_datatypesPackage.EXTENTED_LIDAR_SCAN__SCAN:
-			return getScan();
-		case Oarp1_datatypesPackage.EXTENTED_LIDAR_SCAN__LAYER_ID:
-			return getLayerId();
-		case Oarp1_datatypesPackage.EXTENTED_LIDAR_SCAN__LAYER_ANGLE:
-			return getLayerAngle();
+			case Oarp1_datatypesPackage.EXTENTED_LIDAR_SCAN__SCAN:
+				return getScan();
+			case Oarp1_datatypesPackage.EXTENTED_LIDAR_SCAN__LAYER_ID:
+				return getLayerId();
+			case Oarp1_datatypesPackage.EXTENTED_LIDAR_SCAN__LAYER_ANGLE:
+				return getLayerAngle();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -244,21 +217,20 @@ public class ExtentedLidarScanImpl extends MinimalEObjectImpl.Container implemen
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case Oarp1_datatypesPackage.EXTENTED_LIDAR_SCAN__SCAN:
-			setScan((LaserScan) newValue);
-			return;
-		case Oarp1_datatypesPackage.EXTENTED_LIDAR_SCAN__LAYER_ID:
-			setLayerId((Character) newValue);
-			return;
-		case Oarp1_datatypesPackage.EXTENTED_LIDAR_SCAN__LAYER_ANGLE:
-			setLayerAngle((Float) newValue);
-			return;
+			case Oarp1_datatypesPackage.EXTENTED_LIDAR_SCAN__SCAN:
+				setScan((LaserScan)newValue);
+				return;
+			case Oarp1_datatypesPackage.EXTENTED_LIDAR_SCAN__LAYER_ID:
+				setLayerId((Character)newValue);
+				return;
+			case Oarp1_datatypesPackage.EXTENTED_LIDAR_SCAN__LAYER_ANGLE:
+				setLayerAngle((Float)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -266,21 +238,20 @@ public class ExtentedLidarScanImpl extends MinimalEObjectImpl.Container implemen
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case Oarp1_datatypesPackage.EXTENTED_LIDAR_SCAN__SCAN:
-			setScan((LaserScan) null);
-			return;
-		case Oarp1_datatypesPackage.EXTENTED_LIDAR_SCAN__LAYER_ID:
-			setLayerId(LAYER_ID_EDEFAULT);
-			return;
-		case Oarp1_datatypesPackage.EXTENTED_LIDAR_SCAN__LAYER_ANGLE:
-			setLayerAngle(LAYER_ANGLE_EDEFAULT);
-			return;
+			case Oarp1_datatypesPackage.EXTENTED_LIDAR_SCAN__SCAN:
+				setScan((LaserScan)null);
+				return;
+			case Oarp1_datatypesPackage.EXTENTED_LIDAR_SCAN__LAYER_ID:
+				setLayerId(LAYER_ID_EDEFAULT);
+				return;
+			case Oarp1_datatypesPackage.EXTENTED_LIDAR_SCAN__LAYER_ANGLE:
+				setLayerAngle(LAYER_ANGLE_EDEFAULT);
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -288,18 +259,17 @@ public class ExtentedLidarScanImpl extends MinimalEObjectImpl.Container implemen
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case Oarp1_datatypesPackage.EXTENTED_LIDAR_SCAN__SCAN:
-			return scan != null;
-		case Oarp1_datatypesPackage.EXTENTED_LIDAR_SCAN__LAYER_ID:
-			return layerId != LAYER_ID_EDEFAULT;
-		case Oarp1_datatypesPackage.EXTENTED_LIDAR_SCAN__LAYER_ANGLE:
-			return layerAngle != LAYER_ANGLE_EDEFAULT;
+			case Oarp1_datatypesPackage.EXTENTED_LIDAR_SCAN__SCAN:
+				return scan != null;
+			case Oarp1_datatypesPackage.EXTENTED_LIDAR_SCAN__LAYER_ID:
+				return layerId != LAYER_ID_EDEFAULT;
+			case Oarp1_datatypesPackage.EXTENTED_LIDAR_SCAN__LAYER_ANGLE:
+				return layerAngle != LAYER_ANGLE_EDEFAULT;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -307,14 +277,11 @@ public class ExtentedLidarScanImpl extends MinimalEObjectImpl.Container implemen
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) {
-			return super.toString();
-		}
+		if (eIsProxy()) return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (layerId: ");
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp1_datatypes/impl/MultiLayerLidarScanImpl.java b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp1_datatypes/impl/MultiLayerLidarScanImpl.java
index 58249fea33c..0f648d4832e 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp1_datatypes/impl/MultiLayerLidarScanImpl.java
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp1_datatypes/impl/MultiLayerLidarScanImpl.java
@@ -19,8 +19,8 @@ import org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTyp
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.impl.MultiLayerLidarScanImpl#getLayers <em>Layers</em>}</li>
- * <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.impl.MultiLayerLidarScanImpl#getNbLayer <em>Nb Layer</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.impl.MultiLayerLidarScanImpl#getLayers <em>Layers</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.impl.MultiLayerLidarScanImpl#getNbLayer <em>Nb Layer</em>}</li>
  * </ul>
  * </p>
  *
@@ -31,7 +31,6 @@ public class MultiLayerLidarScanImpl extends MinimalEObjectImpl.Container implem
 	 * The cached value of the '{@link #getLayers() <em>Layers</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @see #getLayers()
 	 * @generated
 	 * @ordered
@@ -42,7 +41,6 @@ public class MultiLayerLidarScanImpl extends MinimalEObjectImpl.Container implem
 	 * The default value of the '{@link #getNbLayer() <em>Nb Layer</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @see #getNbLayer()
 	 * @generated
 	 * @ordered
@@ -53,7 +51,6 @@ public class MultiLayerLidarScanImpl extends MinimalEObjectImpl.Container implem
 	 * The cached value of the '{@link #getNbLayer() <em>Nb Layer</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @see #getNbLayer()
 	 * @generated
 	 * @ordered
@@ -63,7 +60,6 @@ public class MultiLayerLidarScanImpl extends MinimalEObjectImpl.Container implem
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	protected MultiLayerLidarScanImpl() {
@@ -73,7 +69,6 @@ public class MultiLayerLidarScanImpl extends MinimalEObjectImpl.Container implem
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
@@ -84,7 +79,6 @@ public class MultiLayerLidarScanImpl extends MinimalEObjectImpl.Container implem
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public ExtentedLidarScan getLayers() {
@@ -94,7 +88,6 @@ public class MultiLayerLidarScanImpl extends MinimalEObjectImpl.Container implem
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public NotificationChain basicSetLayers(ExtentedLidarScan newLayers, NotificationChain msgs) {
@@ -102,11 +95,7 @@ public class MultiLayerLidarScanImpl extends MinimalEObjectImpl.Container implem
 		layers = newLayers;
 		if (eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Oarp1_datatypesPackage.MULTI_LAYER_LIDAR_SCAN__LAYERS, oldLayers, newLayers);
-			if (msgs == null) {
-				msgs = notification;
-			} else {
-				msgs.add(notification);
-			}
+			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
 		return msgs;
 	}
@@ -114,32 +103,25 @@ public class MultiLayerLidarScanImpl extends MinimalEObjectImpl.Container implem
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public void setLayers(ExtentedLidarScan newLayers) {
 		if (newLayers != layers) {
 			NotificationChain msgs = null;
-			if (layers != null) {
-				msgs = ((InternalEObject) layers).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - Oarp1_datatypesPackage.MULTI_LAYER_LIDAR_SCAN__LAYERS, null, msgs);
-			}
-			if (newLayers != null) {
-				msgs = ((InternalEObject) newLayers).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - Oarp1_datatypesPackage.MULTI_LAYER_LIDAR_SCAN__LAYERS, null, msgs);
-			}
+			if (layers != null)
+				msgs = ((InternalEObject)layers).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - Oarp1_datatypesPackage.MULTI_LAYER_LIDAR_SCAN__LAYERS, null, msgs);
+			if (newLayers != null)
+				msgs = ((InternalEObject)newLayers).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - Oarp1_datatypesPackage.MULTI_LAYER_LIDAR_SCAN__LAYERS, null, msgs);
 			msgs = basicSetLayers(newLayers, msgs);
-			if (msgs != null) {
-				msgs.dispatch();
-			}
+			if (msgs != null) msgs.dispatch();
 		}
-		else if (eNotificationRequired()) {
+		else if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, Oarp1_datatypesPackage.MULTI_LAYER_LIDAR_SCAN__LAYERS, newLayers, newLayers));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public char getNbLayer() {
@@ -149,28 +131,25 @@ public class MultiLayerLidarScanImpl extends MinimalEObjectImpl.Container implem
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public void setNbLayer(char newNbLayer) {
 		char oldNbLayer = nbLayer;
 		nbLayer = newNbLayer;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, Oarp1_datatypesPackage.MULTI_LAYER_LIDAR_SCAN__NB_LAYER, oldNbLayer, nbLayer));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-		case Oarp1_datatypesPackage.MULTI_LAYER_LIDAR_SCAN__LAYERS:
-			return basicSetLayers(null, msgs);
+			case Oarp1_datatypesPackage.MULTI_LAYER_LIDAR_SCAN__LAYERS:
+				return basicSetLayers(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -178,16 +157,15 @@ public class MultiLayerLidarScanImpl extends MinimalEObjectImpl.Container implem
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case Oarp1_datatypesPackage.MULTI_LAYER_LIDAR_SCAN__LAYERS:
-			return getLayers();
-		case Oarp1_datatypesPackage.MULTI_LAYER_LIDAR_SCAN__NB_LAYER:
-			return getNbLayer();
+			case Oarp1_datatypesPackage.MULTI_LAYER_LIDAR_SCAN__LAYERS:
+				return getLayers();
+			case Oarp1_datatypesPackage.MULTI_LAYER_LIDAR_SCAN__NB_LAYER:
+				return getNbLayer();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -195,18 +173,17 @@ public class MultiLayerLidarScanImpl extends MinimalEObjectImpl.Container implem
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case Oarp1_datatypesPackage.MULTI_LAYER_LIDAR_SCAN__LAYERS:
-			setLayers((ExtentedLidarScan) newValue);
-			return;
-		case Oarp1_datatypesPackage.MULTI_LAYER_LIDAR_SCAN__NB_LAYER:
-			setNbLayer((Character) newValue);
-			return;
+			case Oarp1_datatypesPackage.MULTI_LAYER_LIDAR_SCAN__LAYERS:
+				setLayers((ExtentedLidarScan)newValue);
+				return;
+			case Oarp1_datatypesPackage.MULTI_LAYER_LIDAR_SCAN__NB_LAYER:
+				setNbLayer((Character)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -214,18 +191,17 @@ public class MultiLayerLidarScanImpl extends MinimalEObjectImpl.Container implem
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case Oarp1_datatypesPackage.MULTI_LAYER_LIDAR_SCAN__LAYERS:
-			setLayers((ExtentedLidarScan) null);
-			return;
-		case Oarp1_datatypesPackage.MULTI_LAYER_LIDAR_SCAN__NB_LAYER:
-			setNbLayer(NB_LAYER_EDEFAULT);
-			return;
+			case Oarp1_datatypesPackage.MULTI_LAYER_LIDAR_SCAN__LAYERS:
+				setLayers((ExtentedLidarScan)null);
+				return;
+			case Oarp1_datatypesPackage.MULTI_LAYER_LIDAR_SCAN__NB_LAYER:
+				setNbLayer(NB_LAYER_EDEFAULT);
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -233,16 +209,15 @@ public class MultiLayerLidarScanImpl extends MinimalEObjectImpl.Container implem
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case Oarp1_datatypesPackage.MULTI_LAYER_LIDAR_SCAN__LAYERS:
-			return layers != null;
-		case Oarp1_datatypesPackage.MULTI_LAYER_LIDAR_SCAN__NB_LAYER:
-			return nbLayer != NB_LAYER_EDEFAULT;
+			case Oarp1_datatypesPackage.MULTI_LAYER_LIDAR_SCAN__LAYERS:
+				return layers != null;
+			case Oarp1_datatypesPackage.MULTI_LAYER_LIDAR_SCAN__NB_LAYER:
+				return nbLayer != NB_LAYER_EDEFAULT;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -250,14 +225,11 @@ public class MultiLayerLidarScanImpl extends MinimalEObjectImpl.Container implem
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) {
-			return super.toString();
-		}
+		if (eIsProxy()) return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (nbLayer: ");
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp1_datatypes/impl/Oarp1_datatypesFactoryImpl.java b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp1_datatypes/impl/Oarp1_datatypesFactoryImpl.java
index dcac3b02657..0a5f2287720 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp1_datatypes/impl/Oarp1_datatypesFactoryImpl.java
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp1_datatypes/impl/Oarp1_datatypesFactoryImpl.java
@@ -17,7 +17,6 @@ import org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTyp
  * <!-- begin-user-doc -->
  * An implementation of the model <b>Factory</b>.
  * <!-- end-user-doc -->
- *
  * @generated
  */
 public class Oarp1_datatypesFactoryImpl extends EFactoryImpl implements Oarp1_datatypesFactory {
@@ -25,16 +24,16 @@ public class Oarp1_datatypesFactoryImpl extends EFactoryImpl implements Oarp1_da
 	 * Creates the default factory implementation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public static Oarp1_datatypesFactory init() {
 		try {
-			Oarp1_datatypesFactory theOarp1_datatypesFactory = (Oarp1_datatypesFactory) EPackage.Registry.INSTANCE.getEFactory(Oarp1_datatypesPackage.eNS_URI);
+			Oarp1_datatypesFactory theOarp1_datatypesFactory = (Oarp1_datatypesFactory)EPackage.Registry.INSTANCE.getEFactory(Oarp1_datatypesPackage.eNS_URI);
 			if (theOarp1_datatypesFactory != null) {
 				return theOarp1_datatypesFactory;
 			}
-		} catch (Exception exception) {
+		}
+		catch (Exception exception) {
 			EcorePlugin.INSTANCE.log(exception);
 		}
 		return new Oarp1_datatypesFactoryImpl();
@@ -44,7 +43,6 @@ public class Oarp1_datatypesFactoryImpl extends EFactoryImpl implements Oarp1_da
 	 * Creates an instance of the factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public Oarp1_datatypesFactoryImpl() {
@@ -54,27 +52,22 @@ public class Oarp1_datatypesFactoryImpl extends EFactoryImpl implements Oarp1_da
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public EObject create(EClass eClass) {
 		switch (eClass.getClassifierID()) {
-		case Oarp1_datatypesPackage.CAR_LIKE_COMMAND:
-			return createCarLikeCommand();
-		case Oarp1_datatypesPackage.MULTI_LAYER_LIDAR_SCAN:
-			return createMultiLayerLidarScan();
-		case Oarp1_datatypesPackage.EXTENTED_LIDAR_SCAN:
-			return createExtentedLidarScan();
-		default:
-			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+			case Oarp1_datatypesPackage.CAR_LIKE_COMMAND: return createCarLikeCommand();
+			case Oarp1_datatypesPackage.MULTI_LAYER_LIDAR_SCAN: return createMultiLayerLidarScan();
+			case Oarp1_datatypesPackage.EXTENTED_LIDAR_SCAN: return createExtentedLidarScan();
+			default:
+				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
 		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public CarLikeCommand createCarLikeCommand() {
@@ -85,7 +78,6 @@ public class Oarp1_datatypesFactoryImpl extends EFactoryImpl implements Oarp1_da
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public MultiLayerLidarScan createMultiLayerLidarScan() {
@@ -96,7 +88,6 @@ public class Oarp1_datatypesFactoryImpl extends EFactoryImpl implements Oarp1_da
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public ExtentedLidarScan createExtentedLidarScan() {
@@ -107,17 +98,15 @@ public class Oarp1_datatypesFactoryImpl extends EFactoryImpl implements Oarp1_da
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public Oarp1_datatypesPackage getOarp1_datatypesPackage() {
-		return (Oarp1_datatypesPackage) getEPackage();
+		return (Oarp1_datatypesPackage)getEPackage();
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @deprecated
 	 * @generated
 	 */
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp1_datatypes/impl/Oarp1_datatypesPackageImpl.java b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp1_datatypes/impl/Oarp1_datatypesPackageImpl.java
index d0c56c6c67b..dbd5d60369c 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp1_datatypes/impl/Oarp1_datatypesPackageImpl.java
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp1_datatypes/impl/Oarp1_datatypesPackageImpl.java
@@ -34,14 +34,12 @@ import org.eclipse.uml2.uml.UMLPackage;
  * <!-- begin-user-doc -->
  * An implementation of the model <b>Package</b>.
  * <!-- end-user-doc -->
- *
  * @generated
  */
 public class Oarp1_datatypesPackageImpl extends EPackageImpl implements Oarp1_datatypesPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	private EClass carLikeCommandEClass = null;
@@ -49,7 +47,6 @@ public class Oarp1_datatypesPackageImpl extends EPackageImpl implements Oarp1_da
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	private EClass multiLayerLidarScanEClass = null;
@@ -57,17 +54,19 @@ public class Oarp1_datatypesPackageImpl extends EPackageImpl implements Oarp1_da
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	private EClass extentedLidarScanEClass = null;
 
 	/**
-	 * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+	 * Creates an instance of the model <b>Package</b>, registered with
+	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
 	 * package URI value.
-	 * <p>
-	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * <p>Note: the correct way to create the package is via the static
+	 * factory method {@link #init init()}, which also performs
+	 * initialization of the package, or returns the registered package,
+	 * if one already exists.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see org.eclipse.emf.ecore.EPackage.Registry
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.Oarp1_datatypesPackage#eNS_URI
 	 * @see #init()
@@ -80,7 +79,6 @@ public class Oarp1_datatypesPackageImpl extends EPackageImpl implements Oarp1_da
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	private static boolean isInited = false;
@@ -98,12 +96,10 @@ public class Oarp1_datatypesPackageImpl extends EPackageImpl implements Oarp1_da
 	 * @generated
 	 */
 	public static Oarp1_datatypesPackage init() {
-		if (isInited) {
-			return (Oarp1_datatypesPackage) EPackage.Registry.INSTANCE.getEPackage(Oarp1_datatypesPackage.eNS_URI);
-		}
+		if (isInited) return (Oarp1_datatypesPackage)EPackage.Registry.INSTANCE.getEPackage(Oarp1_datatypesPackage.eNS_URI);
 
 		// Obtain or create and register package
-		Oarp1_datatypesPackageImpl theOarp1_datatypesPackage = (Oarp1_datatypesPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Oarp1_datatypesPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new Oarp1_datatypesPackageImpl());
+		Oarp1_datatypesPackageImpl theOarp1_datatypesPackage = (Oarp1_datatypesPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Oarp1_datatypesPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new Oarp1_datatypesPackageImpl());
 
 		isInited = true;
 
@@ -111,21 +107,14 @@ public class Oarp1_datatypesPackageImpl extends EPackageImpl implements Oarp1_da
 		UMLPackage.eINSTANCE.eClass();
 
 		// Obtain or create and register interdependencies
-		RobotMLPackageImpl theRobotMLPackage = (RobotMLPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(RobotMLPackage.eNS_URI) instanceof RobotMLPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(RobotMLPackage.eNS_URI) : RobotMLPackage.eINSTANCE);
-		Diagnostic_datatypesPackageImpl theDiagnostic_datatypesPackage = (Diagnostic_datatypesPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(Diagnostic_datatypesPackage.eNS_URI) instanceof Diagnostic_datatypesPackageImpl ? EPackage.Registry.INSTANCE
-				.getEPackage(Diagnostic_datatypesPackage.eNS_URI) : Diagnostic_datatypesPackage.eINSTANCE);
-		Geometry_datatypesPackageImpl theGeometry_datatypesPackage = (Geometry_datatypesPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(Geometry_datatypesPackage.eNS_URI) instanceof Geometry_datatypesPackageImpl ? EPackage.Registry.INSTANCE
-				.getEPackage(Geometry_datatypesPackage.eNS_URI) : Geometry_datatypesPackage.eINSTANCE);
-		Nav_datatypesPackageImpl theNav_datatypesPackage = (Nav_datatypesPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(Nav_datatypesPackage.eNS_URI) instanceof Nav_datatypesPackageImpl ? EPackage.Registry.INSTANCE
-				.getEPackage(Nav_datatypesPackage.eNS_URI) : Nav_datatypesPackage.eINSTANCE);
-		Sensor_datatypesPackageImpl theSensor_datatypesPackage = (Sensor_datatypesPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(Sensor_datatypesPackage.eNS_URI) instanceof Sensor_datatypesPackageImpl ? EPackage.Registry.INSTANCE
-				.getEPackage(Sensor_datatypesPackage.eNS_URI) : Sensor_datatypesPackage.eINSTANCE);
-		Actionlib_datatypesPackageImpl theActionlib_datatypesPackage = (Actionlib_datatypesPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(Actionlib_datatypesPackage.eNS_URI) instanceof Actionlib_datatypesPackageImpl ? EPackage.Registry.INSTANCE
-				.getEPackage(Actionlib_datatypesPackage.eNS_URI) : Actionlib_datatypesPackage.eINSTANCE);
-		Oarp4_datatypesPackageImpl theOarp4_datatypesPackage = (Oarp4_datatypesPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(Oarp4_datatypesPackage.eNS_URI) instanceof Oarp4_datatypesPackageImpl ? EPackage.Registry.INSTANCE
-				.getEPackage(Oarp4_datatypesPackage.eNS_URI) : Oarp4_datatypesPackage.eINSTANCE);
-		Std_datatypesPackageImpl theStd_datatypesPackage = (Std_datatypesPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(Std_datatypesPackage.eNS_URI) instanceof Std_datatypesPackageImpl ? EPackage.Registry.INSTANCE
-				.getEPackage(Std_datatypesPackage.eNS_URI) : Std_datatypesPackage.eINSTANCE);
+		RobotMLPackageImpl theRobotMLPackage = (RobotMLPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(RobotMLPackage.eNS_URI) instanceof RobotMLPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(RobotMLPackage.eNS_URI) : RobotMLPackage.eINSTANCE);
+		Diagnostic_datatypesPackageImpl theDiagnostic_datatypesPackage = (Diagnostic_datatypesPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(Diagnostic_datatypesPackage.eNS_URI) instanceof Diagnostic_datatypesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(Diagnostic_datatypesPackage.eNS_URI) : Diagnostic_datatypesPackage.eINSTANCE);
+		Geometry_datatypesPackageImpl theGeometry_datatypesPackage = (Geometry_datatypesPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(Geometry_datatypesPackage.eNS_URI) instanceof Geometry_datatypesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(Geometry_datatypesPackage.eNS_URI) : Geometry_datatypesPackage.eINSTANCE);
+		Nav_datatypesPackageImpl theNav_datatypesPackage = (Nav_datatypesPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(Nav_datatypesPackage.eNS_URI) instanceof Nav_datatypesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(Nav_datatypesPackage.eNS_URI) : Nav_datatypesPackage.eINSTANCE);
+		Sensor_datatypesPackageImpl theSensor_datatypesPackage = (Sensor_datatypesPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(Sensor_datatypesPackage.eNS_URI) instanceof Sensor_datatypesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(Sensor_datatypesPackage.eNS_URI) : Sensor_datatypesPackage.eINSTANCE);
+		Actionlib_datatypesPackageImpl theActionlib_datatypesPackage = (Actionlib_datatypesPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(Actionlib_datatypesPackage.eNS_URI) instanceof Actionlib_datatypesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(Actionlib_datatypesPackage.eNS_URI) : Actionlib_datatypesPackage.eINSTANCE);
+		Oarp4_datatypesPackageImpl theOarp4_datatypesPackage = (Oarp4_datatypesPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(Oarp4_datatypesPackage.eNS_URI) instanceof Oarp4_datatypesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(Oarp4_datatypesPackage.eNS_URI) : Oarp4_datatypesPackage.eINSTANCE);
+		Std_datatypesPackageImpl theStd_datatypesPackage = (Std_datatypesPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(Std_datatypesPackage.eNS_URI) instanceof Std_datatypesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(Std_datatypesPackage.eNS_URI) : Std_datatypesPackage.eINSTANCE);
 
 		// Create package meta-data objects
 		theOarp1_datatypesPackage.createPackageContents();
@@ -152,7 +141,7 @@ public class Oarp1_datatypesPackageImpl extends EPackageImpl implements Oarp1_da
 		// Mark meta-data to indicate it can't be changed
 		theOarp1_datatypesPackage.freeze();
 
-
+  
 		// Update the registry and return the package
 		EPackage.Registry.INSTANCE.put(Oarp1_datatypesPackage.eNS_URI, theOarp1_datatypesPackage);
 		return theOarp1_datatypesPackage;
@@ -161,7 +150,6 @@ public class Oarp1_datatypesPackageImpl extends EPackageImpl implements Oarp1_da
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public EClass getCarLikeCommand() {
@@ -171,27 +159,24 @@ public class Oarp1_datatypesPackageImpl extends EPackageImpl implements Oarp1_da
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public EAttribute getCarLikeCommand_Velocity() {
-		return (EAttribute) carLikeCommandEClass.getEStructuralFeatures().get(0);
+		return (EAttribute)carLikeCommandEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public EAttribute getCarLikeCommand_SteeringAngle() {
-		return (EAttribute) carLikeCommandEClass.getEStructuralFeatures().get(1);
+		return (EAttribute)carLikeCommandEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public EClass getMultiLayerLidarScan() {
@@ -201,27 +186,24 @@ public class Oarp1_datatypesPackageImpl extends EPackageImpl implements Oarp1_da
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public EReference getMultiLayerLidarScan_Layers() {
-		return (EReference) multiLayerLidarScanEClass.getEStructuralFeatures().get(0);
+		return (EReference)multiLayerLidarScanEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public EAttribute getMultiLayerLidarScan_NbLayer() {
-		return (EAttribute) multiLayerLidarScanEClass.getEStructuralFeatures().get(1);
+		return (EAttribute)multiLayerLidarScanEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public EClass getExtentedLidarScan() {
@@ -231,63 +213,55 @@ public class Oarp1_datatypesPackageImpl extends EPackageImpl implements Oarp1_da
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public EReference getExtentedLidarScan_Scan() {
-		return (EReference) extentedLidarScanEClass.getEStructuralFeatures().get(0);
+		return (EReference)extentedLidarScanEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public EAttribute getExtentedLidarScan_LayerId() {
-		return (EAttribute) extentedLidarScanEClass.getEStructuralFeatures().get(1);
+		return (EAttribute)extentedLidarScanEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public EAttribute getExtentedLidarScan_LayerAngle() {
-		return (EAttribute) extentedLidarScanEClass.getEStructuralFeatures().get(2);
+		return (EAttribute)extentedLidarScanEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public Oarp1_datatypesFactory getOarp1_datatypesFactory() {
-		return (Oarp1_datatypesFactory) getEFactoryInstance();
+		return (Oarp1_datatypesFactory)getEFactoryInstance();
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	private boolean isCreated = false;
 
 	/**
-	 * Creates the meta-model objects for the package. This method is
+	 * Creates the meta-model objects for the package.  This method is
 	 * guarded to have no affect on any invocation but its first.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public void createPackageContents() {
-		if (isCreated) {
-			return;
-		}
+		if (isCreated) return;
 		isCreated = true;
 
 		// Create classes and their features
@@ -308,23 +282,19 @@ public class Oarp1_datatypesPackageImpl extends EPackageImpl implements Oarp1_da
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	private boolean isInitialized = false;
 
 	/**
-	 * Complete the initialization of the package and its meta-model. This
+	 * Complete the initialization of the package and its meta-model.  This
 	 * method is guarded to have no affect on any invocation but its first.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public void initializePackageContents() {
-		if (isInitialized) {
-			return;
-		}
+		if (isInitialized) return;
 		isInitialized = true;
 
 		// Initialize package
@@ -333,8 +303,8 @@ public class Oarp1_datatypesPackageImpl extends EPackageImpl implements Oarp1_da
 		setNsURI(eNS_URI);
 
 		// Obtain other dependent packages
-		Std_datatypesPackage theStd_datatypesPackage = (Std_datatypesPackage) EPackage.Registry.INSTANCE.getEPackage(Std_datatypesPackage.eNS_URI);
-		Sensor_datatypesPackage theSensor_datatypesPackage = (Sensor_datatypesPackage) EPackage.Registry.INSTANCE.getEPackage(Sensor_datatypesPackage.eNS_URI);
+		Std_datatypesPackage theStd_datatypesPackage = (Std_datatypesPackage)EPackage.Registry.INSTANCE.getEPackage(Std_datatypesPackage.eNS_URI);
+		Sensor_datatypesPackage theSensor_datatypesPackage = (Sensor_datatypesPackage)EPackage.Registry.INSTANCE.getEPackage(Sensor_datatypesPackage.eNS_URI);
 
 		// Create type parameters
 
@@ -348,13 +318,11 @@ public class Oarp1_datatypesPackageImpl extends EPackageImpl implements Oarp1_da
 		initEAttribute(getCarLikeCommand_SteeringAngle(), theStd_datatypesPackage.getFloat64(), "steeringAngle", "0", 1, 1, CarLikeCommand.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 
 		initEClass(multiLayerLidarScanEClass, MultiLayerLidarScan.class, "MultiLayerLidarScan", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getMultiLayerLidarScan_Layers(), this.getExtentedLidarScan(), null, "layers", null, 1, 1, MultiLayerLidarScan.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-				!IS_ORDERED);
+		initEReference(getMultiLayerLidarScan_Layers(), this.getExtentedLidarScan(), null, "layers", null, 1, 1, MultiLayerLidarScan.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEAttribute(getMultiLayerLidarScan_NbLayer(), theStd_datatypesPackage.getUInt8(), "nbLayer", null, 1, 1, MultiLayerLidarScan.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 
 		initEClass(extentedLidarScanEClass, ExtentedLidarScan.class, "ExtentedLidarScan", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getExtentedLidarScan_Scan(), theSensor_datatypesPackage.getLaserScan(), null, "scan", null, 1, 1, ExtentedLidarScan.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-				!IS_DERIVED, !IS_ORDERED);
+		initEReference(getExtentedLidarScan_Scan(), theSensor_datatypesPackage.getLaserScan(), null, "scan", null, 1, 1, ExtentedLidarScan.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEAttribute(getExtentedLidarScan_LayerId(), theStd_datatypesPackage.getUInt8(), "layerId", null, 1, 1, ExtentedLidarScan.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEAttribute(getExtentedLidarScan_LayerAngle(), theStd_datatypesPackage.getFloat32(), "layerAngle", null, 1, 1, ExtentedLidarScan.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp1_datatypes/util/Oarp1_datatypesAdapterFactory.java b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp1_datatypes/util/Oarp1_datatypesAdapterFactory.java
index eb12e207b69..03c8783f784 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp1_datatypes/util/Oarp1_datatypesAdapterFactory.java
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp1_datatypes/util/Oarp1_datatypesAdapterFactory.java
@@ -16,7 +16,6 @@ import org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTyp
  * The <b>Adapter Factory</b> for the model.
  * It provides an adapter <code>createXXX</code> method for each class of the model.
  * <!-- end-user-doc -->
- *
  * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.Oarp1_datatypesPackage
  * @generated
  */
@@ -25,7 +24,6 @@ public class Oarp1_datatypesAdapterFactory extends AdapterFactoryImpl {
 	 * The cached model package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	protected static Oarp1_datatypesPackage modelPackage;
@@ -34,7 +32,6 @@ public class Oarp1_datatypesAdapterFactory extends AdapterFactoryImpl {
 	 * Creates an instance of the adapter factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public Oarp1_datatypesAdapterFactory() {
@@ -48,7 +45,6 @@ public class Oarp1_datatypesAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc -->
 	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
 	 * <!-- end-user-doc -->
-	 *
 	 * @return whether this factory is applicable for the type of the object.
 	 * @generated
 	 */
@@ -58,7 +54,7 @@ public class Oarp1_datatypesAdapterFactory extends AdapterFactoryImpl {
 			return true;
 		}
 		if (object instanceof EObject) {
-			return ((EObject) object).eClass().getEPackage() == modelPackage;
+			return ((EObject)object).eClass().getEPackage() == modelPackage;
 		}
 		return false;
 	}
@@ -67,45 +63,39 @@ public class Oarp1_datatypesAdapterFactory extends AdapterFactoryImpl {
 	 * The switch that delegates to the <code>createXXX</code> methods.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	protected Oarp1_datatypesSwitch<Adapter> modelSwitch =
 			new Oarp1_datatypesSwitch<Adapter>() {
-				@Override
-				public Adapter caseCarLikeCommand(CarLikeCommand object) {
-					return createCarLikeCommandAdapter();
-				}
-
-				@Override
-				public Adapter caseMultiLayerLidarScan(MultiLayerLidarScan object) {
-					return createMultiLayerLidarScanAdapter();
-				}
-
-				@Override
-				public Adapter caseExtentedLidarScan(ExtentedLidarScan object) {
-					return createExtentedLidarScanAdapter();
-				}
-
-				@Override
-				public Adapter defaultCase(EObject object) {
-					return createEObjectAdapter();
-				}
-			};
+			@Override
+			public Adapter caseCarLikeCommand(CarLikeCommand object) {
+				return createCarLikeCommandAdapter();
+			}
+			@Override
+			public Adapter caseMultiLayerLidarScan(MultiLayerLidarScan object) {
+				return createMultiLayerLidarScanAdapter();
+			}
+			@Override
+			public Adapter caseExtentedLidarScan(ExtentedLidarScan object) {
+				return createExtentedLidarScanAdapter();
+			}
+			@Override
+			public Adapter defaultCase(EObject object) {
+				return createEObjectAdapter();
+			}
+		};
 
 	/**
 	 * Creates an adapter for the <code>target</code>.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
-	 * @param target
-	 *            the object to adapt.
+	 * @param target the object to adapt.
 	 * @return the adapter for the <code>target</code>.
 	 * @generated
 	 */
 	@Override
 	public Adapter createAdapter(Notifier target) {
-		return modelSwitch.doSwitch((EObject) target);
+		return modelSwitch.doSwitch((EObject)target);
 	}
 
 
@@ -115,7 +105,6 @@ public class Oarp1_datatypesAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.CarLikeCommand
 	 * @generated
@@ -130,7 +119,6 @@ public class Oarp1_datatypesAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.MultiLayerLidarScan
 	 * @generated
@@ -145,7 +133,6 @@ public class Oarp1_datatypesAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.ExtentedLidarScan
 	 * @generated
@@ -159,7 +146,6 @@ public class Oarp1_datatypesAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null.
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the new adapter.
 	 * @generated
 	 */
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp1_datatypes/util/Oarp1_datatypesSwitch.java b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp1_datatypes/util/Oarp1_datatypesSwitch.java
index 0632f679c46..7a3ac7dc2ee 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp1_datatypes/util/Oarp1_datatypesSwitch.java
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp1_datatypes/util/Oarp1_datatypesSwitch.java
@@ -19,7 +19,6 @@ import org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTyp
  * until a non-null result is returned,
  * which is the result of the switch.
  * <!-- end-user-doc -->
- *
  * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp1_datatypes.Oarp1_datatypesPackage
  * @generated
  */
@@ -28,7 +27,6 @@ public class Oarp1_datatypesSwitch<T> extends Switch<T> {
 	 * The cached model package
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	protected static Oarp1_datatypesPackage modelPackage;
@@ -37,7 +35,6 @@ public class Oarp1_datatypesSwitch<T> extends Switch<T> {
 	 * Creates an instance of the switch.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public Oarp1_datatypesSwitch() {
@@ -50,7 +47,6 @@ public class Oarp1_datatypesSwitch<T> extends Switch<T> {
 	 * Checks whether this is a switch for the given package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @parameter ePackage the package in question.
 	 * @return whether this is a switch for the given package.
 	 * @generated
@@ -64,39 +60,31 @@ public class Oarp1_datatypesSwitch<T> extends Switch<T> {
 	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the first non-null result returned by a <code>caseXXX</code> call.
 	 * @generated
 	 */
 	@Override
 	protected T doSwitch(int classifierID, EObject theEObject) {
 		switch (classifierID) {
-		case Oarp1_datatypesPackage.CAR_LIKE_COMMAND: {
-			CarLikeCommand carLikeCommand = (CarLikeCommand) theEObject;
-			T result = caseCarLikeCommand(carLikeCommand);
-			if (result == null) {
-				result = defaultCase(theEObject);
+			case Oarp1_datatypesPackage.CAR_LIKE_COMMAND: {
+				CarLikeCommand carLikeCommand = (CarLikeCommand)theEObject;
+				T result = caseCarLikeCommand(carLikeCommand);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
 			}
-			return result;
-		}
-		case Oarp1_datatypesPackage.MULTI_LAYER_LIDAR_SCAN: {
-			MultiLayerLidarScan multiLayerLidarScan = (MultiLayerLidarScan) theEObject;
-			T result = caseMultiLayerLidarScan(multiLayerLidarScan);
-			if (result == null) {
-				result = defaultCase(theEObject);
+			case Oarp1_datatypesPackage.MULTI_LAYER_LIDAR_SCAN: {
+				MultiLayerLidarScan multiLayerLidarScan = (MultiLayerLidarScan)theEObject;
+				T result = caseMultiLayerLidarScan(multiLayerLidarScan);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
 			}
-			return result;
-		}
-		case Oarp1_datatypesPackage.EXTENTED_LIDAR_SCAN: {
-			ExtentedLidarScan extentedLidarScan = (ExtentedLidarScan) theEObject;
-			T result = caseExtentedLidarScan(extentedLidarScan);
-			if (result == null) {
-				result = defaultCase(theEObject);
+			case Oarp1_datatypesPackage.EXTENTED_LIDAR_SCAN: {
+				ExtentedLidarScan extentedLidarScan = (ExtentedLidarScan)theEObject;
+				T result = caseExtentedLidarScan(extentedLidarScan);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
 			}
-			return result;
-		}
-		default:
-			return defaultCase(theEObject);
+			default: return defaultCase(theEObject);
 		}
 	}
 
@@ -106,9 +94,7 @@ public class Oarp1_datatypesSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 *
-	 * @param object
-	 *            the target of the switch.
+	 * @param object the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Car Like Command</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -123,9 +109,7 @@ public class Oarp1_datatypesSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 *
-	 * @param object
-	 *            the target of the switch.
+	 * @param object the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Multi Layer Lidar Scan</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -140,9 +124,7 @@ public class Oarp1_datatypesSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 *
-	 * @param object
-	 *            the target of the switch.
+	 * @param object the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Extented Lidar Scan</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -157,9 +139,7 @@ public class Oarp1_datatypesSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch, but this is the last case anyway.
 	 * <!-- end-user-doc -->
-	 *
-	 * @param object
-	 *            the target of the switch.
+	 * @param object the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
 	 * @generated
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/Angular.java b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/Angular.java
index dc45e42dcb8..7c6a41fe97c 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/Angular.java
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/Angular.java
@@ -12,7 +12,7 @@ import org.eclipse.emf.ecore.EObject;
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Angular#getValue <em>Value</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Angular#getValue <em>Value</em>}</li>
  * </ul>
  * </p>
  *
@@ -28,7 +28,6 @@ public interface Angular extends EObject {
 	 * If the meaning of the '<em>Value</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the value of the '<em>Value</em>' attribute.
 	 * @see #setValue(long)
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Oarp4_datatypesPackage#getAngular_Value()
@@ -41,9 +40,7 @@ public interface Angular extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Angular#getValue <em>Value</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
-	 * @param value
-	 *            the new value of the '<em>Value</em>' attribute.
+	 * @param value the new value of the '<em>Value</em>' attribute.
 	 * @see #getValue()
 	 * @generated
 	 */
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/Art_Set_Point.java b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/Art_Set_Point.java
index bdb0a554af4..8214d41e451 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/Art_Set_Point.java
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/Art_Set_Point.java
@@ -12,8 +12,8 @@ import org.eclipse.emf.ecore.EObject;
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Art_Set_Point#getOmega_left <em>Omega left</em>}</li>
- * <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Art_Set_Point#getOmega_right <em>Omega right</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Art_Set_Point#getOmega_left <em>Omega left</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Art_Set_Point#getOmega_right <em>Omega right</em>}</li>
  * </ul>
  * </p>
  *
@@ -29,7 +29,6 @@ public interface Art_Set_Point extends EObject {
 	 * If the meaning of the '<em>Omega left</em>' containment reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the value of the '<em>Omega left</em>' containment reference.
 	 * @see #setOmega_left(Velocity_Angular)
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Oarp4_datatypesPackage#getArt_Set_Point_Omega_left()
@@ -42,9 +41,7 @@ public interface Art_Set_Point extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Art_Set_Point#getOmega_left <em>Omega left</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
-	 * @param value
-	 *            the new value of the '<em>Omega left</em>' containment reference.
+	 * @param value the new value of the '<em>Omega left</em>' containment reference.
 	 * @see #getOmega_left()
 	 * @generated
 	 */
@@ -57,7 +54,6 @@ public interface Art_Set_Point extends EObject {
 	 * If the meaning of the '<em>Omega right</em>' containment reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the value of the '<em>Omega right</em>' containment reference.
 	 * @see #setOmega_right(Velocity_Angular)
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Oarp4_datatypesPackage#getArt_Set_Point_Omega_right()
@@ -70,9 +66,7 @@ public interface Art_Set_Point extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Art_Set_Point#getOmega_right <em>Omega right</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
-	 * @param value
-	 *            the new value of the '<em>Omega right</em>' containment reference.
+	 * @param value the new value of the '<em>Omega right</em>' containment reference.
 	 * @see #getOmega_right()
 	 * @generated
 	 */
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/Distance.java b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/Distance.java
index cd34bfee52a..4843eb9a410 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/Distance.java
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/Distance.java
@@ -12,7 +12,7 @@ import org.eclipse.emf.ecore.EObject;
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Distance#getValue <em>Value</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Distance#getValue <em>Value</em>}</li>
  * </ul>
  * </p>
  *
@@ -28,7 +28,6 @@ public interface Distance extends EObject {
 	 * If the meaning of the '<em>Value</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the value of the '<em>Value</em>' attribute.
 	 * @see #setValue(long)
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Oarp4_datatypesPackage#getDistance_Value()
@@ -41,9 +40,7 @@ public interface Distance extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Distance#getValue <em>Value</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
-	 * @param value
-	 *            the new value of the '<em>Value</em>' attribute.
+	 * @param value the new value of the '<em>Value</em>' attribute.
 	 * @see #getValue()
 	 * @generated
 	 */
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/Metric.java b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/Metric.java
index d8045245c17..72285a0b120 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/Metric.java
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/Metric.java
@@ -12,7 +12,7 @@ import org.eclipse.emf.ecore.EObject;
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Metric#getValue <em>Value</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Metric#getValue <em>Value</em>}</li>
  * </ul>
  * </p>
  *
@@ -28,7 +28,6 @@ public interface Metric extends EObject {
 	 * If the meaning of the '<em>Value</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the value of the '<em>Value</em>' attribute.
 	 * @see #setValue(double)
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Oarp4_datatypesPackage#getMetric_Value()
@@ -41,9 +40,7 @@ public interface Metric extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Metric#getValue <em>Value</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
-	 * @param value
-	 *            the new value of the '<em>Value</em>' attribute.
+	 * @param value the new value of the '<em>Value</em>' attribute.
 	 * @see #getValue()
 	 * @generated
 	 */
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/Milli_Amp.java b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/Milli_Amp.java
index 0647652a5e7..82624688200 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/Milli_Amp.java
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/Milli_Amp.java
@@ -12,7 +12,7 @@ import org.eclipse.emf.ecore.EObject;
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Milli_Amp#getValue <em>Value</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Milli_Amp#getValue <em>Value</em>}</li>
  * </ul>
  * </p>
  *
@@ -28,7 +28,6 @@ public interface Milli_Amp extends EObject {
 	 * If the meaning of the '<em>Value</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the value of the '<em>Value</em>' attribute.
 	 * @see #setValue(long)
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Oarp4_datatypesPackage#getMilli_Amp_Value()
@@ -41,9 +40,7 @@ public interface Milli_Amp extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Milli_Amp#getValue <em>Value</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
-	 * @param value
-	 *            the new value of the '<em>Value</em>' attribute.
+	 * @param value the new value of the '<em>Value</em>' attribute.
 	 * @see #getValue()
 	 * @generated
 	 */
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/Oarp4_datatypesFactory.java b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/Oarp4_datatypesFactory.java
index f805e7cb165..6d2f9c66b61 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/Oarp4_datatypesFactory.java
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/Oarp4_datatypesFactory.java
@@ -9,7 +9,6 @@ import org.eclipse.emf.ecore.EFactory;
  * The <b>Factory</b> for the model.
  * It provides a create method for each non-abstract class of the model.
  * <!-- end-user-doc -->
- *
  * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Oarp4_datatypesPackage
  * @generated
  */
@@ -18,7 +17,6 @@ public interface Oarp4_datatypesFactory extends EFactory {
 	 * The singleton instance of the factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	Oarp4_datatypesFactory eINSTANCE = org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Oarp4_datatypesFactoryImpl.init();
@@ -27,7 +25,6 @@ public interface Oarp4_datatypesFactory extends EFactory {
 	 * Returns a new object of class '<em>Velocity Linear</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return a new object of class '<em>Velocity Linear</em>'.
 	 * @generated
 	 */
@@ -37,7 +34,6 @@ public interface Oarp4_datatypesFactory extends EFactory {
 	 * Returns a new object of class '<em>Art Set Point</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return a new object of class '<em>Art Set Point</em>'.
 	 * @generated
 	 */
@@ -47,7 +43,6 @@ public interface Oarp4_datatypesFactory extends EFactory {
 	 * Returns a new object of class '<em>Velocity Angular</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return a new object of class '<em>Velocity Angular</em>'.
 	 * @generated
 	 */
@@ -57,7 +52,6 @@ public interface Oarp4_datatypesFactory extends EFactory {
 	 * Returns a new object of class '<em>Distance</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return a new object of class '<em>Distance</em>'.
 	 * @generated
 	 */
@@ -67,7 +61,6 @@ public interface Oarp4_datatypesFactory extends EFactory {
 	 * Returns a new object of class '<em>Metric</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return a new object of class '<em>Metric</em>'.
 	 * @generated
 	 */
@@ -77,7 +70,6 @@ public interface Oarp4_datatypesFactory extends EFactory {
 	 * Returns a new object of class '<em>Angular</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return a new object of class '<em>Angular</em>'.
 	 * @generated
 	 */
@@ -87,7 +79,6 @@ public interface Oarp4_datatypesFactory extends EFactory {
 	 * Returns a new object of class '<em>Op Set Point</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return a new object of class '<em>Op Set Point</em>'.
 	 * @generated
 	 */
@@ -97,7 +88,6 @@ public interface Oarp4_datatypesFactory extends EFactory {
 	 * Returns a new object of class '<em>Speed Tics Left Right</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return a new object of class '<em>Speed Tics Left Right</em>'.
 	 * @generated
 	 */
@@ -107,7 +97,6 @@ public interface Oarp4_datatypesFactory extends EFactory {
 	 * Returns a new object of class '<em>Speed Tics</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return a new object of class '<em>Speed Tics</em>'.
 	 * @generated
 	 */
@@ -117,7 +106,6 @@ public interface Oarp4_datatypesFactory extends EFactory {
 	 * Returns a new object of class '<em>Odometer Tics</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return a new object of class '<em>Odometer Tics</em>'.
 	 * @generated
 	 */
@@ -127,7 +115,6 @@ public interface Oarp4_datatypesFactory extends EFactory {
 	 * Returns a new object of class '<em>Odometer Tics Left Right</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return a new object of class '<em>Odometer Tics Left Right</em>'.
 	 * @generated
 	 */
@@ -137,7 +124,6 @@ public interface Oarp4_datatypesFactory extends EFactory {
 	 * Returns a new object of class '<em>Proxi Left Right</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return a new object of class '<em>Proxi Left Right</em>'.
 	 * @generated
 	 */
@@ -147,7 +133,6 @@ public interface Oarp4_datatypesFactory extends EFactory {
 	 * Returns a new object of class '<em>Milli Amp</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return a new object of class '<em>Milli Amp</em>'.
 	 * @generated
 	 */
@@ -157,7 +142,6 @@ public interface Oarp4_datatypesFactory extends EFactory {
 	 * Returns a new object of class '<em>Odometer Linear Left Right</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return a new object of class '<em>Odometer Linear Left Right</em>'.
 	 * @generated
 	 */
@@ -167,7 +151,6 @@ public interface Oarp4_datatypesFactory extends EFactory {
 	 * Returns a new object of class '<em>Velocity Angular Left Right</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return a new object of class '<em>Velocity Angular Left Right</em>'.
 	 * @generated
 	 */
@@ -177,7 +160,6 @@ public interface Oarp4_datatypesFactory extends EFactory {
 	 * Returns a new object of class '<em>Velocity</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return a new object of class '<em>Velocity</em>'.
 	 * @generated
 	 */
@@ -187,7 +169,6 @@ public interface Oarp4_datatypesFactory extends EFactory {
 	 * Returns the package supported by this factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the package supported by this factory.
 	 * @generated
 	 */
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/Oarp4_datatypesPackage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/Oarp4_datatypesPackage.java
index 94d2d6ddba8..7dffda6844d 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/Oarp4_datatypesPackage.java
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/Oarp4_datatypesPackage.java
@@ -19,7 +19,6 @@ import org.eclipse.emf.ecore.EReference;
  * <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
- *
  * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Oarp4_datatypesFactory
  * @model kind="package"
  * @generated
@@ -29,7 +28,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * The package name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	String eNAME = "oarp4_datatypes";
@@ -38,7 +36,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * The package namespace URI.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	String eNS_URI = "http:///RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes.ecore";
@@ -47,7 +44,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * The package namespace name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	String eNS_PREFIX = "RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes";
@@ -56,7 +52,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * The singleton instance of the package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	Oarp4_datatypesPackage eINSTANCE = org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Oarp4_datatypesPackageImpl.init();
@@ -65,7 +60,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Velocity_LinearImpl <em>Velocity Linear</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Velocity_LinearImpl
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Oarp4_datatypesPackageImpl#getVelocity_Linear()
 	 * @generated
@@ -76,7 +70,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Value</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -86,7 +79,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * The number of structural features of the '<em>Velocity Linear</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -96,7 +88,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * The number of operations of the '<em>Velocity Linear</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -106,7 +97,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Art_Set_PointImpl <em>Art Set Point</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Art_Set_PointImpl
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Oarp4_datatypesPackageImpl#getArt_Set_Point()
 	 * @generated
@@ -117,7 +107,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Omega left</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -127,7 +116,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Omega right</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -137,7 +125,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * The number of structural features of the '<em>Art Set Point</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -147,7 +134,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * The number of operations of the '<em>Art Set Point</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -157,7 +143,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Velocity_AngularImpl <em>Velocity Angular</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Velocity_AngularImpl
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Oarp4_datatypesPackageImpl#getVelocity_Angular()
 	 * @generated
@@ -168,7 +153,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Value</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -178,7 +162,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * The number of structural features of the '<em>Velocity Angular</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -188,7 +171,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * The number of operations of the '<em>Velocity Angular</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -198,7 +180,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.DistanceImpl <em>Distance</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.DistanceImpl
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Oarp4_datatypesPackageImpl#getDistance()
 	 * @generated
@@ -209,7 +190,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Value</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -219,7 +199,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * The number of structural features of the '<em>Distance</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -229,7 +208,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * The number of operations of the '<em>Distance</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -239,7 +217,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.MetricImpl <em>Metric</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.MetricImpl
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Oarp4_datatypesPackageImpl#getMetric()
 	 * @generated
@@ -250,7 +227,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Value</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -260,7 +236,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * The number of structural features of the '<em>Metric</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -270,7 +245,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * The number of operations of the '<em>Metric</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -280,7 +254,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.AngularImpl <em>Angular</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.AngularImpl
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Oarp4_datatypesPackageImpl#getAngular()
 	 * @generated
@@ -291,7 +264,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Value</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -301,7 +273,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * The number of structural features of the '<em>Angular</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -311,7 +282,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * The number of operations of the '<em>Angular</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -321,7 +291,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Op_Set_PointImpl <em>Op Set Point</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Op_Set_PointImpl
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Oarp4_datatypesPackageImpl#getOp_Set_Point()
 	 * @generated
@@ -332,7 +301,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Velocity</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -342,7 +310,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Orientation</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -352,7 +319,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * The number of structural features of the '<em>Op Set Point</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -362,7 +328,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * The number of operations of the '<em>Op Set Point</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -372,7 +337,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Speed_Tics_Left_RightImpl <em>Speed Tics Left Right</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Speed_Tics_Left_RightImpl
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Oarp4_datatypesPackageImpl#getSpeed_Tics_Left_Right()
 	 * @generated
@@ -383,7 +347,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Speed tics left</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -393,7 +356,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Speed tics right</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -403,7 +365,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * The number of structural features of the '<em>Speed Tics Left Right</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -413,7 +374,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * The number of operations of the '<em>Speed Tics Left Right</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -423,7 +383,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Speed_TicsImpl <em>Speed Tics</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Speed_TicsImpl
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Oarp4_datatypesPackageImpl#getSpeed_Tics()
 	 * @generated
@@ -434,7 +393,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Value</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -444,7 +402,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * The number of structural features of the '<em>Speed Tics</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -454,7 +411,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * The number of operations of the '<em>Speed Tics</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -464,7 +420,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Odometer_TicsImpl <em>Odometer Tics</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Odometer_TicsImpl
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Oarp4_datatypesPackageImpl#getOdometer_Tics()
 	 * @generated
@@ -475,7 +430,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Value</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -485,7 +439,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * The number of structural features of the '<em>Odometer Tics</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -495,7 +448,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * The number of operations of the '<em>Odometer Tics</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -505,7 +457,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Odometer_Tics_Left_RightImpl <em>Odometer Tics Left Right</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Odometer_Tics_Left_RightImpl
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Oarp4_datatypesPackageImpl#getOdometer_Tics_Left_Right()
 	 * @generated
@@ -516,7 +467,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Odometer tics left</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -526,7 +476,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Odometer tics right</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -536,7 +485,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * The number of structural features of the '<em>Odometer Tics Left Right</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -546,7 +494,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * The number of operations of the '<em>Odometer Tics Left Right</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -556,7 +503,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Proxi_Left_RightImpl <em>Proxi Left Right</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Proxi_Left_RightImpl
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Oarp4_datatypesPackageImpl#getProxi_Left_Right()
 	 * @generated
@@ -567,7 +513,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Proxi left</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -577,7 +522,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Proxi right</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -587,7 +531,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * The number of structural features of the '<em>Proxi Left Right</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -597,7 +540,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * The number of operations of the '<em>Proxi Left Right</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -607,7 +549,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Milli_AmpImpl <em>Milli Amp</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Milli_AmpImpl
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Oarp4_datatypesPackageImpl#getMilli_Amp()
 	 * @generated
@@ -618,7 +559,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Value</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -628,7 +568,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * The number of structural features of the '<em>Milli Amp</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -638,7 +577,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * The number of operations of the '<em>Milli Amp</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -648,7 +586,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Odometer_Linear_Left_RightImpl <em>Odometer Linear Left Right</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Odometer_Linear_Left_RightImpl
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Oarp4_datatypesPackageImpl#getOdometer_Linear_Left_Right()
 	 * @generated
@@ -659,7 +596,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Odometer linear left</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -669,7 +605,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Odometer linear right</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -679,7 +614,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * The number of structural features of the '<em>Odometer Linear Left Right</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -689,7 +623,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * The number of operations of the '<em>Odometer Linear Left Right</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -699,7 +632,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Velocity_Angular_Left_RightImpl <em>Velocity Angular Left Right</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Velocity_Angular_Left_RightImpl
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Oarp4_datatypesPackageImpl#getVelocity_Angular_Left_Right()
 	 * @generated
@@ -710,7 +642,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Velocity angular left</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -720,7 +651,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Velocity angular right</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -730,7 +660,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * The number of structural features of the '<em>Velocity Angular Left Right</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -740,7 +669,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * The number of operations of the '<em>Velocity Angular Left Right</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -750,7 +678,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.VelocityImpl <em>Velocity</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.VelocityImpl
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Oarp4_datatypesPackageImpl#getVelocity()
 	 * @generated
@@ -761,7 +688,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Velocity linear</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -771,7 +697,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Velocity angular</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -781,7 +706,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * The number of structural features of the '<em>Velocity</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -791,7 +715,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * The number of operations of the '<em>Velocity</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -802,7 +725,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Velocity_Linear <em>Velocity Linear</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the meta object for class '<em>Velocity Linear</em>'.
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Velocity_Linear
 	 * @generated
@@ -813,7 +735,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Velocity_Linear#getValue <em>Value</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the meta object for the attribute '<em>Value</em>'.
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Velocity_Linear#getValue()
 	 * @see #getVelocity_Linear()
@@ -825,7 +746,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Art_Set_Point <em>Art Set Point</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the meta object for class '<em>Art Set Point</em>'.
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Art_Set_Point
 	 * @generated
@@ -836,7 +756,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Art_Set_Point#getOmega_left <em>Omega left</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the meta object for the containment reference '<em>Omega left</em>'.
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Art_Set_Point#getOmega_left()
 	 * @see #getArt_Set_Point()
@@ -848,7 +767,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Art_Set_Point#getOmega_right <em>Omega right</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the meta object for the containment reference '<em>Omega right</em>'.
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Art_Set_Point#getOmega_right()
 	 * @see #getArt_Set_Point()
@@ -860,7 +778,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Velocity_Angular <em>Velocity Angular</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the meta object for class '<em>Velocity Angular</em>'.
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Velocity_Angular
 	 * @generated
@@ -871,7 +788,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Velocity_Angular#getValue <em>Value</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the meta object for the attribute '<em>Value</em>'.
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Velocity_Angular#getValue()
 	 * @see #getVelocity_Angular()
@@ -883,7 +799,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Distance <em>Distance</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the meta object for class '<em>Distance</em>'.
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Distance
 	 * @generated
@@ -894,7 +809,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Distance#getValue <em>Value</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the meta object for the attribute '<em>Value</em>'.
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Distance#getValue()
 	 * @see #getDistance()
@@ -906,7 +820,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Metric <em>Metric</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the meta object for class '<em>Metric</em>'.
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Metric
 	 * @generated
@@ -917,7 +830,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Metric#getValue <em>Value</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the meta object for the attribute '<em>Value</em>'.
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Metric#getValue()
 	 * @see #getMetric()
@@ -929,7 +841,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Angular <em>Angular</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the meta object for class '<em>Angular</em>'.
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Angular
 	 * @generated
@@ -940,7 +851,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Angular#getValue <em>Value</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the meta object for the attribute '<em>Value</em>'.
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Angular#getValue()
 	 * @see #getAngular()
@@ -952,7 +862,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Op_Set_Point <em>Op Set Point</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the meta object for class '<em>Op Set Point</em>'.
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Op_Set_Point
 	 * @generated
@@ -963,7 +872,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Op_Set_Point#getVelocity <em>Velocity</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the meta object for the containment reference '<em>Velocity</em>'.
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Op_Set_Point#getVelocity()
 	 * @see #getOp_Set_Point()
@@ -975,7 +883,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Op_Set_Point#getOrientation <em>Orientation</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the meta object for the containment reference '<em>Orientation</em>'.
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Op_Set_Point#getOrientation()
 	 * @see #getOp_Set_Point()
@@ -987,7 +894,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Speed_Tics_Left_Right <em>Speed Tics Left Right</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the meta object for class '<em>Speed Tics Left Right</em>'.
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Speed_Tics_Left_Right
 	 * @generated
@@ -998,7 +904,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Speed_Tics_Left_Right#getSpeed_tics_left <em>Speed tics left</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the meta object for the containment reference '<em>Speed tics left</em>'.
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Speed_Tics_Left_Right#getSpeed_tics_left()
 	 * @see #getSpeed_Tics_Left_Right()
@@ -1010,7 +915,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Speed_Tics_Left_Right#getSpeed_tics_right <em>Speed tics right</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the meta object for the containment reference '<em>Speed tics right</em>'.
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Speed_Tics_Left_Right#getSpeed_tics_right()
 	 * @see #getSpeed_Tics_Left_Right()
@@ -1022,7 +926,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Speed_Tics <em>Speed Tics</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the meta object for class '<em>Speed Tics</em>'.
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Speed_Tics
 	 * @generated
@@ -1033,7 +936,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Speed_Tics#getValue <em>Value</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the meta object for the attribute '<em>Value</em>'.
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Speed_Tics#getValue()
 	 * @see #getSpeed_Tics()
@@ -1045,7 +947,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Odometer_Tics <em>Odometer Tics</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the meta object for class '<em>Odometer Tics</em>'.
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Odometer_Tics
 	 * @generated
@@ -1056,7 +957,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Odometer_Tics#getValue <em>Value</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the meta object for the attribute '<em>Value</em>'.
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Odometer_Tics#getValue()
 	 * @see #getOdometer_Tics()
@@ -1068,7 +968,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Odometer_Tics_Left_Right <em>Odometer Tics Left Right</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the meta object for class '<em>Odometer Tics Left Right</em>'.
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Odometer_Tics_Left_Right
 	 * @generated
@@ -1079,7 +978,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Odometer_Tics_Left_Right#getOdometer_tics_left <em>Odometer tics left</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the meta object for the containment reference '<em>Odometer tics left</em>'.
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Odometer_Tics_Left_Right#getOdometer_tics_left()
 	 * @see #getOdometer_Tics_Left_Right()
@@ -1091,7 +989,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Odometer_Tics_Left_Right#getOdometer_tics_right <em>Odometer tics right</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the meta object for the containment reference '<em>Odometer tics right</em>'.
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Odometer_Tics_Left_Right#getOdometer_tics_right()
 	 * @see #getOdometer_Tics_Left_Right()
@@ -1103,7 +1000,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Proxi_Left_Right <em>Proxi Left Right</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the meta object for class '<em>Proxi Left Right</em>'.
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Proxi_Left_Right
 	 * @generated
@@ -1114,7 +1010,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Proxi_Left_Right#getProxi_left <em>Proxi left</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the meta object for the containment reference '<em>Proxi left</em>'.
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Proxi_Left_Right#getProxi_left()
 	 * @see #getProxi_Left_Right()
@@ -1126,7 +1021,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Proxi_Left_Right#getProxi_right <em>Proxi right</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the meta object for the containment reference '<em>Proxi right</em>'.
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Proxi_Left_Right#getProxi_right()
 	 * @see #getProxi_Left_Right()
@@ -1138,7 +1032,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Milli_Amp <em>Milli Amp</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the meta object for class '<em>Milli Amp</em>'.
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Milli_Amp
 	 * @generated
@@ -1149,7 +1042,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Milli_Amp#getValue <em>Value</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the meta object for the attribute '<em>Value</em>'.
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Milli_Amp#getValue()
 	 * @see #getMilli_Amp()
@@ -1161,7 +1053,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Odometer_Linear_Left_Right <em>Odometer Linear Left Right</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the meta object for class '<em>Odometer Linear Left Right</em>'.
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Odometer_Linear_Left_Right
 	 * @generated
@@ -1172,7 +1063,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Odometer_Linear_Left_Right#getOdometer_linear_left <em>Odometer linear left</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the meta object for the containment reference '<em>Odometer linear left</em>'.
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Odometer_Linear_Left_Right#getOdometer_linear_left()
 	 * @see #getOdometer_Linear_Left_Right()
@@ -1181,11 +1071,9 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	EReference getOdometer_Linear_Left_Right_Odometer_linear_left();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Odometer_Linear_Left_Right#getOdometer_linear_right <em>Odometer linear right</em>}
-	 * '.
+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Odometer_Linear_Left_Right#getOdometer_linear_right <em>Odometer linear right</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the meta object for the containment reference '<em>Odometer linear right</em>'.
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Odometer_Linear_Left_Right#getOdometer_linear_right()
 	 * @see #getOdometer_Linear_Left_Right()
@@ -1197,7 +1085,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Velocity_Angular_Left_Right <em>Velocity Angular Left Right</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the meta object for class '<em>Velocity Angular Left Right</em>'.
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Velocity_Angular_Left_Right
 	 * @generated
@@ -1205,11 +1092,9 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	EClass getVelocity_Angular_Left_Right();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Velocity_Angular_Left_Right#getVelocity_angular_left
-	 * <em>Velocity angular left</em>}'.
+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Velocity_Angular_Left_Right#getVelocity_angular_left <em>Velocity angular left</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the meta object for the containment reference '<em>Velocity angular left</em>'.
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Velocity_Angular_Left_Right#getVelocity_angular_left()
 	 * @see #getVelocity_Angular_Left_Right()
@@ -1218,11 +1103,9 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	EReference getVelocity_Angular_Left_Right_Velocity_angular_left();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Velocity_Angular_Left_Right#getVelocity_angular_right
-	 * <em>Velocity angular right</em>}'.
+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Velocity_Angular_Left_Right#getVelocity_angular_right <em>Velocity angular right</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the meta object for the containment reference '<em>Velocity angular right</em>'.
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Velocity_Angular_Left_Right#getVelocity_angular_right()
 	 * @see #getVelocity_Angular_Left_Right()
@@ -1234,7 +1117,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Velocity <em>Velocity</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the meta object for class '<em>Velocity</em>'.
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Velocity
 	 * @generated
@@ -1245,7 +1127,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Velocity#getVelocity_linear <em>Velocity linear</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the meta object for the containment reference '<em>Velocity linear</em>'.
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Velocity#getVelocity_linear()
 	 * @see #getVelocity()
@@ -1257,7 +1138,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Velocity#getVelocity_angular <em>Velocity angular</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the meta object for the containment reference '<em>Velocity angular</em>'.
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Velocity#getVelocity_angular()
 	 * @see #getVelocity()
@@ -1269,7 +1149,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * Returns the factory that creates the instances of the model.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the factory that creates the instances of the model.
 	 * @generated
 	 */
@@ -1286,7 +1165,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 	 * <li>and each data type</li>
 	 * </ul>
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	interface Literals {
@@ -1294,7 +1172,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Velocity_LinearImpl <em>Velocity Linear</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
 		 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Velocity_LinearImpl
 		 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Oarp4_datatypesPackageImpl#getVelocity_Linear()
 		 * @generated
@@ -1305,7 +1182,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
 		 * @generated
 		 */
 		EAttribute VELOCITY_LINEAR__VALUE = eINSTANCE.getVelocity_Linear_Value();
@@ -1314,7 +1190,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Art_Set_PointImpl <em>Art Set Point</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
 		 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Art_Set_PointImpl
 		 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Oarp4_datatypesPackageImpl#getArt_Set_Point()
 		 * @generated
@@ -1325,7 +1200,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Omega left</b></em>' containment reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
 		 * @generated
 		 */
 		EReference ART_SET_POINT__OMEGA_LEFT = eINSTANCE.getArt_Set_Point_Omega_left();
@@ -1334,7 +1208,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Omega right</b></em>' containment reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
 		 * @generated
 		 */
 		EReference ART_SET_POINT__OMEGA_RIGHT = eINSTANCE.getArt_Set_Point_Omega_right();
@@ -1343,7 +1216,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Velocity_AngularImpl <em>Velocity Angular</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
 		 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Velocity_AngularImpl
 		 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Oarp4_datatypesPackageImpl#getVelocity_Angular()
 		 * @generated
@@ -1354,7 +1226,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
 		 * @generated
 		 */
 		EAttribute VELOCITY_ANGULAR__VALUE = eINSTANCE.getVelocity_Angular_Value();
@@ -1363,7 +1234,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.DistanceImpl <em>Distance</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
 		 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.DistanceImpl
 		 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Oarp4_datatypesPackageImpl#getDistance()
 		 * @generated
@@ -1374,7 +1244,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
 		 * @generated
 		 */
 		EAttribute DISTANCE__VALUE = eINSTANCE.getDistance_Value();
@@ -1383,7 +1252,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.MetricImpl <em>Metric</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
 		 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.MetricImpl
 		 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Oarp4_datatypesPackageImpl#getMetric()
 		 * @generated
@@ -1394,7 +1262,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
 		 * @generated
 		 */
 		EAttribute METRIC__VALUE = eINSTANCE.getMetric_Value();
@@ -1403,7 +1270,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.AngularImpl <em>Angular</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
 		 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.AngularImpl
 		 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Oarp4_datatypesPackageImpl#getAngular()
 		 * @generated
@@ -1414,7 +1280,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
 		 * @generated
 		 */
 		EAttribute ANGULAR__VALUE = eINSTANCE.getAngular_Value();
@@ -1423,7 +1288,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Op_Set_PointImpl <em>Op Set Point</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
 		 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Op_Set_PointImpl
 		 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Oarp4_datatypesPackageImpl#getOp_Set_Point()
 		 * @generated
@@ -1434,7 +1298,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Velocity</b></em>' containment reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
 		 * @generated
 		 */
 		EReference OP_SET_POINT__VELOCITY = eINSTANCE.getOp_Set_Point_Velocity();
@@ -1443,7 +1306,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Orientation</b></em>' containment reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
 		 * @generated
 		 */
 		EReference OP_SET_POINT__ORIENTATION = eINSTANCE.getOp_Set_Point_Orientation();
@@ -1452,7 +1314,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Speed_Tics_Left_RightImpl <em>Speed Tics Left Right</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
 		 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Speed_Tics_Left_RightImpl
 		 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Oarp4_datatypesPackageImpl#getSpeed_Tics_Left_Right()
 		 * @generated
@@ -1463,7 +1324,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Speed tics left</b></em>' containment reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
 		 * @generated
 		 */
 		EReference SPEED_TICS_LEFT_RIGHT__SPEED_TICS_LEFT = eINSTANCE.getSpeed_Tics_Left_Right_Speed_tics_left();
@@ -1472,7 +1332,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Speed tics right</b></em>' containment reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
 		 * @generated
 		 */
 		EReference SPEED_TICS_LEFT_RIGHT__SPEED_TICS_RIGHT = eINSTANCE.getSpeed_Tics_Left_Right_Speed_tics_right();
@@ -1481,7 +1340,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Speed_TicsImpl <em>Speed Tics</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
 		 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Speed_TicsImpl
 		 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Oarp4_datatypesPackageImpl#getSpeed_Tics()
 		 * @generated
@@ -1492,7 +1350,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
 		 * @generated
 		 */
 		EAttribute SPEED_TICS__VALUE = eINSTANCE.getSpeed_Tics_Value();
@@ -1501,7 +1358,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Odometer_TicsImpl <em>Odometer Tics</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
 		 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Odometer_TicsImpl
 		 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Oarp4_datatypesPackageImpl#getOdometer_Tics()
 		 * @generated
@@ -1512,7 +1368,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
 		 * @generated
 		 */
 		EAttribute ODOMETER_TICS__VALUE = eINSTANCE.getOdometer_Tics_Value();
@@ -1521,7 +1376,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Odometer_Tics_Left_RightImpl <em>Odometer Tics Left Right</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
 		 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Odometer_Tics_Left_RightImpl
 		 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Oarp4_datatypesPackageImpl#getOdometer_Tics_Left_Right()
 		 * @generated
@@ -1532,7 +1386,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Odometer tics left</b></em>' containment reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
 		 * @generated
 		 */
 		EReference ODOMETER_TICS_LEFT_RIGHT__ODOMETER_TICS_LEFT = eINSTANCE.getOdometer_Tics_Left_Right_Odometer_tics_left();
@@ -1541,7 +1394,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Odometer tics right</b></em>' containment reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
 		 * @generated
 		 */
 		EReference ODOMETER_TICS_LEFT_RIGHT__ODOMETER_TICS_RIGHT = eINSTANCE.getOdometer_Tics_Left_Right_Odometer_tics_right();
@@ -1550,7 +1402,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Proxi_Left_RightImpl <em>Proxi Left Right</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
 		 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Proxi_Left_RightImpl
 		 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Oarp4_datatypesPackageImpl#getProxi_Left_Right()
 		 * @generated
@@ -1561,7 +1412,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Proxi left</b></em>' containment reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
 		 * @generated
 		 */
 		EReference PROXI_LEFT_RIGHT__PROXI_LEFT = eINSTANCE.getProxi_Left_Right_Proxi_left();
@@ -1570,7 +1420,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Proxi right</b></em>' containment reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
 		 * @generated
 		 */
 		EReference PROXI_LEFT_RIGHT__PROXI_RIGHT = eINSTANCE.getProxi_Left_Right_Proxi_right();
@@ -1579,7 +1428,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Milli_AmpImpl <em>Milli Amp</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
 		 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Milli_AmpImpl
 		 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Oarp4_datatypesPackageImpl#getMilli_Amp()
 		 * @generated
@@ -1590,7 +1438,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
 		 * @generated
 		 */
 		EAttribute MILLI_AMP__VALUE = eINSTANCE.getMilli_Amp_Value();
@@ -1599,7 +1446,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Odometer_Linear_Left_RightImpl <em>Odometer Linear Left Right</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
 		 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Odometer_Linear_Left_RightImpl
 		 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Oarp4_datatypesPackageImpl#getOdometer_Linear_Left_Right()
 		 * @generated
@@ -1610,7 +1456,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Odometer linear left</b></em>' containment reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
 		 * @generated
 		 */
 		EReference ODOMETER_LINEAR_LEFT_RIGHT__ODOMETER_LINEAR_LEFT = eINSTANCE.getOdometer_Linear_Left_Right_Odometer_linear_left();
@@ -1619,7 +1464,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Odometer linear right</b></em>' containment reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
 		 * @generated
 		 */
 		EReference ODOMETER_LINEAR_LEFT_RIGHT__ODOMETER_LINEAR_RIGHT = eINSTANCE.getOdometer_Linear_Left_Right_Odometer_linear_right();
@@ -1628,7 +1472,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Velocity_Angular_Left_RightImpl <em>Velocity Angular Left Right</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
 		 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Velocity_Angular_Left_RightImpl
 		 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Oarp4_datatypesPackageImpl#getVelocity_Angular_Left_Right()
 		 * @generated
@@ -1639,7 +1482,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Velocity angular left</b></em>' containment reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
 		 * @generated
 		 */
 		EReference VELOCITY_ANGULAR_LEFT_RIGHT__VELOCITY_ANGULAR_LEFT = eINSTANCE.getVelocity_Angular_Left_Right_Velocity_angular_left();
@@ -1648,7 +1490,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Velocity angular right</b></em>' containment reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
 		 * @generated
 		 */
 		EReference VELOCITY_ANGULAR_LEFT_RIGHT__VELOCITY_ANGULAR_RIGHT = eINSTANCE.getVelocity_Angular_Left_Right_Velocity_angular_right();
@@ -1657,7 +1498,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.VelocityImpl <em>Velocity</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
 		 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.VelocityImpl
 		 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Oarp4_datatypesPackageImpl#getVelocity()
 		 * @generated
@@ -1668,7 +1508,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Velocity linear</b></em>' containment reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
 		 * @generated
 		 */
 		EReference VELOCITY__VELOCITY_LINEAR = eINSTANCE.getVelocity_Velocity_linear();
@@ -1677,7 +1516,6 @@ public interface Oarp4_datatypesPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Velocity angular</b></em>' containment reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
 		 * @generated
 		 */
 		EReference VELOCITY__VELOCITY_ANGULAR = eINSTANCE.getVelocity_Velocity_angular();
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/Odometer_Linear_Left_Right.java b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/Odometer_Linear_Left_Right.java
index 283f6f15742..41abfe3ff70 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/Odometer_Linear_Left_Right.java
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/Odometer_Linear_Left_Right.java
@@ -12,8 +12,8 @@ import org.eclipse.emf.ecore.EObject;
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Odometer_Linear_Left_Right#getOdometer_linear_left <em>Odometer linear left</em>}</li>
- * <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Odometer_Linear_Left_Right#getOdometer_linear_right <em>Odometer linear right</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Odometer_Linear_Left_Right#getOdometer_linear_left <em>Odometer linear left</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Odometer_Linear_Left_Right#getOdometer_linear_right <em>Odometer linear right</em>}</li>
  * </ul>
  * </p>
  *
@@ -29,7 +29,6 @@ public interface Odometer_Linear_Left_Right extends EObject {
 	 * If the meaning of the '<em>Odometer linear left</em>' containment reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the value of the '<em>Odometer linear left</em>' containment reference.
 	 * @see #setOdometer_linear_left(Metric)
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Oarp4_datatypesPackage#getOdometer_Linear_Left_Right_Odometer_linear_left()
@@ -42,9 +41,7 @@ public interface Odometer_Linear_Left_Right extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Odometer_Linear_Left_Right#getOdometer_linear_left <em>Odometer linear left</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
-	 * @param value
-	 *            the new value of the '<em>Odometer linear left</em>' containment reference.
+	 * @param value the new value of the '<em>Odometer linear left</em>' containment reference.
 	 * @see #getOdometer_linear_left()
 	 * @generated
 	 */
@@ -57,7 +54,6 @@ public interface Odometer_Linear_Left_Right extends EObject {
 	 * If the meaning of the '<em>Odometer linear right</em>' containment reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the value of the '<em>Odometer linear right</em>' containment reference.
 	 * @see #setOdometer_linear_right(Metric)
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Oarp4_datatypesPackage#getOdometer_Linear_Left_Right_Odometer_linear_right()
@@ -70,9 +66,7 @@ public interface Odometer_Linear_Left_Right extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Odometer_Linear_Left_Right#getOdometer_linear_right <em>Odometer linear right</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
-	 * @param value
-	 *            the new value of the '<em>Odometer linear right</em>' containment reference.
+	 * @param value the new value of the '<em>Odometer linear right</em>' containment reference.
 	 * @see #getOdometer_linear_right()
 	 * @generated
 	 */
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/Odometer_Tics.java b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/Odometer_Tics.java
index e753da8a7b3..584ccaa3006 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/Odometer_Tics.java
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/Odometer_Tics.java
@@ -12,7 +12,7 @@ import org.eclipse.emf.ecore.EObject;
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Odometer_Tics#getValue <em>Value</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Odometer_Tics#getValue <em>Value</em>}</li>
  * </ul>
  * </p>
  *
@@ -28,7 +28,6 @@ public interface Odometer_Tics extends EObject {
 	 * If the meaning of the '<em>Value</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the value of the '<em>Value</em>' attribute.
 	 * @see #setValue(int)
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Oarp4_datatypesPackage#getOdometer_Tics_Value()
@@ -41,9 +40,7 @@ public interface Odometer_Tics extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Odometer_Tics#getValue <em>Value</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
-	 * @param value
-	 *            the new value of the '<em>Value</em>' attribute.
+	 * @param value the new value of the '<em>Value</em>' attribute.
 	 * @see #getValue()
 	 * @generated
 	 */
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/Odometer_Tics_Left_Right.java b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/Odometer_Tics_Left_Right.java
index 14dcac19413..d5ce8e59d11 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/Odometer_Tics_Left_Right.java
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/Odometer_Tics_Left_Right.java
@@ -12,8 +12,8 @@ import org.eclipse.emf.ecore.EObject;
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Odometer_Tics_Left_Right#getOdometer_tics_left <em>Odometer tics left</em>}</li>
- * <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Odometer_Tics_Left_Right#getOdometer_tics_right <em>Odometer tics right</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Odometer_Tics_Left_Right#getOdometer_tics_left <em>Odometer tics left</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Odometer_Tics_Left_Right#getOdometer_tics_right <em>Odometer tics right</em>}</li>
  * </ul>
  * </p>
  *
@@ -29,7 +29,6 @@ public interface Odometer_Tics_Left_Right extends EObject {
 	 * If the meaning of the '<em>Odometer tics left</em>' containment reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the value of the '<em>Odometer tics left</em>' containment reference.
 	 * @see #setOdometer_tics_left(Odometer_Tics)
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Oarp4_datatypesPackage#getOdometer_Tics_Left_Right_Odometer_tics_left()
@@ -42,9 +41,7 @@ public interface Odometer_Tics_Left_Right extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Odometer_Tics_Left_Right#getOdometer_tics_left <em>Odometer tics left</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
-	 * @param value
-	 *            the new value of the '<em>Odometer tics left</em>' containment reference.
+	 * @param value the new value of the '<em>Odometer tics left</em>' containment reference.
 	 * @see #getOdometer_tics_left()
 	 * @generated
 	 */
@@ -57,7 +54,6 @@ public interface Odometer_Tics_Left_Right extends EObject {
 	 * If the meaning of the '<em>Odometer tics right</em>' containment reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the value of the '<em>Odometer tics right</em>' containment reference.
 	 * @see #setOdometer_tics_right(Odometer_Tics)
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Oarp4_datatypesPackage#getOdometer_Tics_Left_Right_Odometer_tics_right()
@@ -70,9 +66,7 @@ public interface Odometer_Tics_Left_Right extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Odometer_Tics_Left_Right#getOdometer_tics_right <em>Odometer tics right</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
-	 * @param value
-	 *            the new value of the '<em>Odometer tics right</em>' containment reference.
+	 * @param value the new value of the '<em>Odometer tics right</em>' containment reference.
 	 * @see #getOdometer_tics_right()
 	 * @generated
 	 */
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/Op_Set_Point.java b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/Op_Set_Point.java
index f46e34b5fb1..6e191e3eaba 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/Op_Set_Point.java
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/Op_Set_Point.java
@@ -12,8 +12,8 @@ import org.eclipse.emf.ecore.EObject;
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Op_Set_Point#getVelocity <em>Velocity</em>}</li>
- * <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Op_Set_Point#getOrientation <em>Orientation</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Op_Set_Point#getVelocity <em>Velocity</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Op_Set_Point#getOrientation <em>Orientation</em>}</li>
  * </ul>
  * </p>
  *
@@ -29,7 +29,6 @@ public interface Op_Set_Point extends EObject {
 	 * If the meaning of the '<em>Velocity</em>' containment reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the value of the '<em>Velocity</em>' containment reference.
 	 * @see #setVelocity(Velocity_Linear)
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Oarp4_datatypesPackage#getOp_Set_Point_Velocity()
@@ -42,9 +41,7 @@ public interface Op_Set_Point extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Op_Set_Point#getVelocity <em>Velocity</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
-	 * @param value
-	 *            the new value of the '<em>Velocity</em>' containment reference.
+	 * @param value the new value of the '<em>Velocity</em>' containment reference.
 	 * @see #getVelocity()
 	 * @generated
 	 */
@@ -57,7 +54,6 @@ public interface Op_Set_Point extends EObject {
 	 * If the meaning of the '<em>Orientation</em>' containment reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the value of the '<em>Orientation</em>' containment reference.
 	 * @see #setOrientation(Angular)
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Oarp4_datatypesPackage#getOp_Set_Point_Orientation()
@@ -70,9 +66,7 @@ public interface Op_Set_Point extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Op_Set_Point#getOrientation <em>Orientation</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
-	 * @param value
-	 *            the new value of the '<em>Orientation</em>' containment reference.
+	 * @param value the new value of the '<em>Orientation</em>' containment reference.
 	 * @see #getOrientation()
 	 * @generated
 	 */
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/Proxi_Left_Right.java b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/Proxi_Left_Right.java
index 302d0d440ae..7176510c8be 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/Proxi_Left_Right.java
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/Proxi_Left_Right.java
@@ -12,8 +12,8 @@ import org.eclipse.emf.ecore.EObject;
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Proxi_Left_Right#getProxi_left <em>Proxi left</em>}</li>
- * <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Proxi_Left_Right#getProxi_right <em>Proxi right</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Proxi_Left_Right#getProxi_left <em>Proxi left</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Proxi_Left_Right#getProxi_right <em>Proxi right</em>}</li>
  * </ul>
  * </p>
  *
@@ -29,7 +29,6 @@ public interface Proxi_Left_Right extends EObject {
 	 * If the meaning of the '<em>Proxi left</em>' containment reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the value of the '<em>Proxi left</em>' containment reference.
 	 * @see #setProxi_left(Distance)
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Oarp4_datatypesPackage#getProxi_Left_Right_Proxi_left()
@@ -42,9 +41,7 @@ public interface Proxi_Left_Right extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Proxi_Left_Right#getProxi_left <em>Proxi left</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
-	 * @param value
-	 *            the new value of the '<em>Proxi left</em>' containment reference.
+	 * @param value the new value of the '<em>Proxi left</em>' containment reference.
 	 * @see #getProxi_left()
 	 * @generated
 	 */
@@ -57,7 +54,6 @@ public interface Proxi_Left_Right extends EObject {
 	 * If the meaning of the '<em>Proxi right</em>' containment reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the value of the '<em>Proxi right</em>' containment reference.
 	 * @see #setProxi_right(Distance)
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Oarp4_datatypesPackage#getProxi_Left_Right_Proxi_right()
@@ -70,9 +66,7 @@ public interface Proxi_Left_Right extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Proxi_Left_Right#getProxi_right <em>Proxi right</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
-	 * @param value
-	 *            the new value of the '<em>Proxi right</em>' containment reference.
+	 * @param value the new value of the '<em>Proxi right</em>' containment reference.
 	 * @see #getProxi_right()
 	 * @generated
 	 */
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/Speed_Tics.java b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/Speed_Tics.java
index 67b87f313fb..aacb20c5b70 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/Speed_Tics.java
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/Speed_Tics.java
@@ -12,7 +12,7 @@ import org.eclipse.emf.ecore.EObject;
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Speed_Tics#getValue <em>Value</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Speed_Tics#getValue <em>Value</em>}</li>
  * </ul>
  * </p>
  *
@@ -28,7 +28,6 @@ public interface Speed_Tics extends EObject {
 	 * If the meaning of the '<em>Value</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the value of the '<em>Value</em>' attribute.
 	 * @see #setValue(int)
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Oarp4_datatypesPackage#getSpeed_Tics_Value()
@@ -41,9 +40,7 @@ public interface Speed_Tics extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Speed_Tics#getValue <em>Value</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
-	 * @param value
-	 *            the new value of the '<em>Value</em>' attribute.
+	 * @param value the new value of the '<em>Value</em>' attribute.
 	 * @see #getValue()
 	 * @generated
 	 */
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/Speed_Tics_Left_Right.java b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/Speed_Tics_Left_Right.java
index f66f2909569..9445d4b4db4 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/Speed_Tics_Left_Right.java
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/Speed_Tics_Left_Right.java
@@ -12,8 +12,8 @@ import org.eclipse.emf.ecore.EObject;
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Speed_Tics_Left_Right#getSpeed_tics_left <em>Speed tics left</em>}</li>
- * <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Speed_Tics_Left_Right#getSpeed_tics_right <em>Speed tics right</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Speed_Tics_Left_Right#getSpeed_tics_left <em>Speed tics left</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Speed_Tics_Left_Right#getSpeed_tics_right <em>Speed tics right</em>}</li>
  * </ul>
  * </p>
  *
@@ -29,7 +29,6 @@ public interface Speed_Tics_Left_Right extends EObject {
 	 * If the meaning of the '<em>Speed tics left</em>' containment reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the value of the '<em>Speed tics left</em>' containment reference.
 	 * @see #setSpeed_tics_left(Speed_Tics)
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Oarp4_datatypesPackage#getSpeed_Tics_Left_Right_Speed_tics_left()
@@ -42,9 +41,7 @@ public interface Speed_Tics_Left_Right extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Speed_Tics_Left_Right#getSpeed_tics_left <em>Speed tics left</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
-	 * @param value
-	 *            the new value of the '<em>Speed tics left</em>' containment reference.
+	 * @param value the new value of the '<em>Speed tics left</em>' containment reference.
 	 * @see #getSpeed_tics_left()
 	 * @generated
 	 */
@@ -57,7 +54,6 @@ public interface Speed_Tics_Left_Right extends EObject {
 	 * If the meaning of the '<em>Speed tics right</em>' containment reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the value of the '<em>Speed tics right</em>' containment reference.
 	 * @see #setSpeed_tics_right(Speed_Tics)
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Oarp4_datatypesPackage#getSpeed_Tics_Left_Right_Speed_tics_right()
@@ -70,9 +66,7 @@ public interface Speed_Tics_Left_Right extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Speed_Tics_Left_Right#getSpeed_tics_right <em>Speed tics right</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
-	 * @param value
-	 *            the new value of the '<em>Speed tics right</em>' containment reference.
+	 * @param value the new value of the '<em>Speed tics right</em>' containment reference.
 	 * @see #getSpeed_tics_right()
 	 * @generated
 	 */
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/Velocity.java b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/Velocity.java
index 6f18602d08e..15998b1e610 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/Velocity.java
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/Velocity.java
@@ -12,8 +12,8 @@ import org.eclipse.emf.ecore.EObject;
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Velocity#getVelocity_linear <em>Velocity linear</em>}</li>
- * <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Velocity#getVelocity_angular <em>Velocity angular</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Velocity#getVelocity_linear <em>Velocity linear</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Velocity#getVelocity_angular <em>Velocity angular</em>}</li>
  * </ul>
  * </p>
  *
@@ -29,7 +29,6 @@ public interface Velocity extends EObject {
 	 * If the meaning of the '<em>Velocity linear</em>' containment reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the value of the '<em>Velocity linear</em>' containment reference.
 	 * @see #setVelocity_linear(Velocity_Linear)
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Oarp4_datatypesPackage#getVelocity_Velocity_linear()
@@ -42,9 +41,7 @@ public interface Velocity extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Velocity#getVelocity_linear <em>Velocity linear</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
-	 * @param value
-	 *            the new value of the '<em>Velocity linear</em>' containment reference.
+	 * @param value the new value of the '<em>Velocity linear</em>' containment reference.
 	 * @see #getVelocity_linear()
 	 * @generated
 	 */
@@ -57,7 +54,6 @@ public interface Velocity extends EObject {
 	 * If the meaning of the '<em>Velocity angular</em>' containment reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the value of the '<em>Velocity angular</em>' containment reference.
 	 * @see #setVelocity_angular(Velocity_Angular)
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Oarp4_datatypesPackage#getVelocity_Velocity_angular()
@@ -70,9 +66,7 @@ public interface Velocity extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Velocity#getVelocity_angular <em>Velocity angular</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
-	 * @param value
-	 *            the new value of the '<em>Velocity angular</em>' containment reference.
+	 * @param value the new value of the '<em>Velocity angular</em>' containment reference.
 	 * @see #getVelocity_angular()
 	 * @generated
 	 */
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/Velocity_Angular.java b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/Velocity_Angular.java
index 9200cc36a0f..e48f9f307d3 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/Velocity_Angular.java
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/Velocity_Angular.java
@@ -12,7 +12,7 @@ import org.eclipse.emf.ecore.EObject;
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Velocity_Angular#getValue <em>Value</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Velocity_Angular#getValue <em>Value</em>}</li>
  * </ul>
  * </p>
  *
@@ -28,7 +28,6 @@ public interface Velocity_Angular extends EObject {
 	 * If the meaning of the '<em>Value</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the value of the '<em>Value</em>' attribute.
 	 * @see #setValue(double)
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Oarp4_datatypesPackage#getVelocity_Angular_Value()
@@ -41,9 +40,7 @@ public interface Velocity_Angular extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Velocity_Angular#getValue <em>Value</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
-	 * @param value
-	 *            the new value of the '<em>Value</em>' attribute.
+	 * @param value the new value of the '<em>Value</em>' attribute.
 	 * @see #getValue()
 	 * @generated
 	 */
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/Velocity_Angular_Left_Right.java b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/Velocity_Angular_Left_Right.java
index 5a6555cda0f..b0c2fd432a4 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/Velocity_Angular_Left_Right.java
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/Velocity_Angular_Left_Right.java
@@ -12,8 +12,8 @@ import org.eclipse.emf.ecore.EObject;
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Velocity_Angular_Left_Right#getVelocity_angular_left <em>Velocity angular left</em>}</li>
- * <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Velocity_Angular_Left_Right#getVelocity_angular_right <em>Velocity angular right</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Velocity_Angular_Left_Right#getVelocity_angular_left <em>Velocity angular left</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Velocity_Angular_Left_Right#getVelocity_angular_right <em>Velocity angular right</em>}</li>
  * </ul>
  * </p>
  *
@@ -29,7 +29,6 @@ public interface Velocity_Angular_Left_Right extends EObject {
 	 * If the meaning of the '<em>Velocity angular left</em>' containment reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the value of the '<em>Velocity angular left</em>' containment reference.
 	 * @see #setVelocity_angular_left(Velocity_Angular)
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Oarp4_datatypesPackage#getVelocity_Angular_Left_Right_Velocity_angular_left()
@@ -42,9 +41,7 @@ public interface Velocity_Angular_Left_Right extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Velocity_Angular_Left_Right#getVelocity_angular_left <em>Velocity angular left</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
-	 * @param value
-	 *            the new value of the '<em>Velocity angular left</em>' containment reference.
+	 * @param value the new value of the '<em>Velocity angular left</em>' containment reference.
 	 * @see #getVelocity_angular_left()
 	 * @generated
 	 */
@@ -57,7 +54,6 @@ public interface Velocity_Angular_Left_Right extends EObject {
 	 * If the meaning of the '<em>Velocity angular right</em>' containment reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the value of the '<em>Velocity angular right</em>' containment reference.
 	 * @see #setVelocity_angular_right(Velocity_Angular)
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Oarp4_datatypesPackage#getVelocity_Angular_Left_Right_Velocity_angular_right()
@@ -70,9 +66,7 @@ public interface Velocity_Angular_Left_Right extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Velocity_Angular_Left_Right#getVelocity_angular_right <em>Velocity angular right</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
-	 * @param value
-	 *            the new value of the '<em>Velocity angular right</em>' containment reference.
+	 * @param value the new value of the '<em>Velocity angular right</em>' containment reference.
 	 * @see #getVelocity_angular_right()
 	 * @generated
 	 */
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/Velocity_Linear.java b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/Velocity_Linear.java
index 990c5fce94e..8eafa90c79a 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/Velocity_Linear.java
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/Velocity_Linear.java
@@ -12,7 +12,7 @@ import org.eclipse.emf.ecore.EObject;
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Velocity_Linear#getValue <em>Value</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Velocity_Linear#getValue <em>Value</em>}</li>
  * </ul>
  * </p>
  *
@@ -28,7 +28,6 @@ public interface Velocity_Linear extends EObject {
 	 * If the meaning of the '<em>Value</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the value of the '<em>Value</em>' attribute.
 	 * @see #setValue(int)
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Oarp4_datatypesPackage#getVelocity_Linear_Value()
@@ -41,9 +40,7 @@ public interface Velocity_Linear extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Velocity_Linear#getValue <em>Value</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
-	 * @param value
-	 *            the new value of the '<em>Value</em>' attribute.
+	 * @param value the new value of the '<em>Value</em>' attribute.
 	 * @see #getValue()
 	 * @generated
 	 */
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/impl/AngularImpl.java b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/impl/AngularImpl.java
index 70daddf0971..cf7dfbf9236 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/impl/AngularImpl.java
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/impl/AngularImpl.java
@@ -16,7 +16,7 @@ import org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTyp
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.AngularImpl#getValue <em>Value</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.AngularImpl#getValue <em>Value</em>}</li>
  * </ul>
  * </p>
  *
@@ -27,7 +27,6 @@ public class AngularImpl extends MinimalEObjectImpl.Container implements Angular
 	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @see #getValue()
 	 * @generated
 	 * @ordered
@@ -38,7 +37,6 @@ public class AngularImpl extends MinimalEObjectImpl.Container implements Angular
 	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @see #getValue()
 	 * @generated
 	 * @ordered
@@ -48,7 +46,6 @@ public class AngularImpl extends MinimalEObjectImpl.Container implements Angular
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	protected AngularImpl() {
@@ -58,7 +55,6 @@ public class AngularImpl extends MinimalEObjectImpl.Container implements Angular
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
@@ -69,7 +65,6 @@ public class AngularImpl extends MinimalEObjectImpl.Container implements Angular
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public long getValue() {
@@ -79,28 +74,25 @@ public class AngularImpl extends MinimalEObjectImpl.Container implements Angular
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public void setValue(long newValue) {
 		long oldValue = value;
 		value = newValue;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, Oarp4_datatypesPackage.ANGULAR__VALUE, oldValue, value));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case Oarp4_datatypesPackage.ANGULAR__VALUE:
-			return getValue();
+			case Oarp4_datatypesPackage.ANGULAR__VALUE:
+				return getValue();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -108,15 +100,14 @@ public class AngularImpl extends MinimalEObjectImpl.Container implements Angular
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case Oarp4_datatypesPackage.ANGULAR__VALUE:
-			setValue((Long) newValue);
-			return;
+			case Oarp4_datatypesPackage.ANGULAR__VALUE:
+				setValue((Long)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -124,15 +115,14 @@ public class AngularImpl extends MinimalEObjectImpl.Container implements Angular
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case Oarp4_datatypesPackage.ANGULAR__VALUE:
-			setValue(VALUE_EDEFAULT);
-			return;
+			case Oarp4_datatypesPackage.ANGULAR__VALUE:
+				setValue(VALUE_EDEFAULT);
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -140,14 +130,13 @@ public class AngularImpl extends MinimalEObjectImpl.Container implements Angular
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case Oarp4_datatypesPackage.ANGULAR__VALUE:
-			return value != VALUE_EDEFAULT;
+			case Oarp4_datatypesPackage.ANGULAR__VALUE:
+				return value != VALUE_EDEFAULT;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -155,14 +144,11 @@ public class AngularImpl extends MinimalEObjectImpl.Container implements Angular
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) {
-			return super.toString();
-		}
+		if (eIsProxy()) return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (value: ");
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/impl/Art_Set_PointImpl.java b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/impl/Art_Set_PointImpl.java
index ef1c3176e73..8c094cbe48e 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/impl/Art_Set_PointImpl.java
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/impl/Art_Set_PointImpl.java
@@ -19,8 +19,8 @@ import org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTyp
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Art_Set_PointImpl#getOmega_left <em>Omega left</em>}</li>
- * <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Art_Set_PointImpl#getOmega_right <em>Omega right</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Art_Set_PointImpl#getOmega_left <em>Omega left</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Art_Set_PointImpl#getOmega_right <em>Omega right</em>}</li>
  * </ul>
  * </p>
  *
@@ -31,7 +31,6 @@ public class Art_Set_PointImpl extends MinimalEObjectImpl.Container implements A
 	 * The cached value of the '{@link #getOmega_left() <em>Omega left</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @see #getOmega_left()
 	 * @generated
 	 * @ordered
@@ -42,7 +41,6 @@ public class Art_Set_PointImpl extends MinimalEObjectImpl.Container implements A
 	 * The cached value of the '{@link #getOmega_right() <em>Omega right</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @see #getOmega_right()
 	 * @generated
 	 * @ordered
@@ -52,7 +50,6 @@ public class Art_Set_PointImpl extends MinimalEObjectImpl.Container implements A
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	protected Art_Set_PointImpl() {
@@ -62,7 +59,6 @@ public class Art_Set_PointImpl extends MinimalEObjectImpl.Container implements A
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
@@ -73,7 +69,6 @@ public class Art_Set_PointImpl extends MinimalEObjectImpl.Container implements A
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public Velocity_Angular getOmega_left() {
@@ -83,7 +78,6 @@ public class Art_Set_PointImpl extends MinimalEObjectImpl.Container implements A
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public NotificationChain basicSetOmega_left(Velocity_Angular newOmega_left, NotificationChain msgs) {
@@ -91,11 +85,7 @@ public class Art_Set_PointImpl extends MinimalEObjectImpl.Container implements A
 		omega_left = newOmega_left;
 		if (eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Oarp4_datatypesPackage.ART_SET_POINT__OMEGA_LEFT, oldOmega_left, newOmega_left);
-			if (msgs == null) {
-				msgs = notification;
-			} else {
-				msgs.add(notification);
-			}
+			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
 		return msgs;
 	}
@@ -103,32 +93,25 @@ public class Art_Set_PointImpl extends MinimalEObjectImpl.Container implements A
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public void setOmega_left(Velocity_Angular newOmega_left) {
 		if (newOmega_left != omega_left) {
 			NotificationChain msgs = null;
-			if (omega_left != null) {
-				msgs = ((InternalEObject) omega_left).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - Oarp4_datatypesPackage.ART_SET_POINT__OMEGA_LEFT, null, msgs);
-			}
-			if (newOmega_left != null) {
-				msgs = ((InternalEObject) newOmega_left).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - Oarp4_datatypesPackage.ART_SET_POINT__OMEGA_LEFT, null, msgs);
-			}
+			if (omega_left != null)
+				msgs = ((InternalEObject)omega_left).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - Oarp4_datatypesPackage.ART_SET_POINT__OMEGA_LEFT, null, msgs);
+			if (newOmega_left != null)
+				msgs = ((InternalEObject)newOmega_left).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - Oarp4_datatypesPackage.ART_SET_POINT__OMEGA_LEFT, null, msgs);
 			msgs = basicSetOmega_left(newOmega_left, msgs);
-			if (msgs != null) {
-				msgs.dispatch();
-			}
+			if (msgs != null) msgs.dispatch();
 		}
-		else if (eNotificationRequired()) {
+		else if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, Oarp4_datatypesPackage.ART_SET_POINT__OMEGA_LEFT, newOmega_left, newOmega_left));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public Velocity_Angular getOmega_right() {
@@ -138,7 +121,6 @@ public class Art_Set_PointImpl extends MinimalEObjectImpl.Container implements A
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public NotificationChain basicSetOmega_right(Velocity_Angular newOmega_right, NotificationChain msgs) {
@@ -146,11 +128,7 @@ public class Art_Set_PointImpl extends MinimalEObjectImpl.Container implements A
 		omega_right = newOmega_right;
 		if (eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Oarp4_datatypesPackage.ART_SET_POINT__OMEGA_RIGHT, oldOmega_right, newOmega_right);
-			if (msgs == null) {
-				msgs = notification;
-			} else {
-				msgs.add(notification);
-			}
+			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
 		return msgs;
 	}
@@ -158,41 +136,34 @@ public class Art_Set_PointImpl extends MinimalEObjectImpl.Container implements A
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public void setOmega_right(Velocity_Angular newOmega_right) {
 		if (newOmega_right != omega_right) {
 			NotificationChain msgs = null;
-			if (omega_right != null) {
-				msgs = ((InternalEObject) omega_right).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - Oarp4_datatypesPackage.ART_SET_POINT__OMEGA_RIGHT, null, msgs);
-			}
-			if (newOmega_right != null) {
-				msgs = ((InternalEObject) newOmega_right).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - Oarp4_datatypesPackage.ART_SET_POINT__OMEGA_RIGHT, null, msgs);
-			}
+			if (omega_right != null)
+				msgs = ((InternalEObject)omega_right).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - Oarp4_datatypesPackage.ART_SET_POINT__OMEGA_RIGHT, null, msgs);
+			if (newOmega_right != null)
+				msgs = ((InternalEObject)newOmega_right).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - Oarp4_datatypesPackage.ART_SET_POINT__OMEGA_RIGHT, null, msgs);
 			msgs = basicSetOmega_right(newOmega_right, msgs);
-			if (msgs != null) {
-				msgs.dispatch();
-			}
+			if (msgs != null) msgs.dispatch();
 		}
-		else if (eNotificationRequired()) {
+		else if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, Oarp4_datatypesPackage.ART_SET_POINT__OMEGA_RIGHT, newOmega_right, newOmega_right));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-		case Oarp4_datatypesPackage.ART_SET_POINT__OMEGA_LEFT:
-			return basicSetOmega_left(null, msgs);
-		case Oarp4_datatypesPackage.ART_SET_POINT__OMEGA_RIGHT:
-			return basicSetOmega_right(null, msgs);
+			case Oarp4_datatypesPackage.ART_SET_POINT__OMEGA_LEFT:
+				return basicSetOmega_left(null, msgs);
+			case Oarp4_datatypesPackage.ART_SET_POINT__OMEGA_RIGHT:
+				return basicSetOmega_right(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -200,16 +171,15 @@ public class Art_Set_PointImpl extends MinimalEObjectImpl.Container implements A
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case Oarp4_datatypesPackage.ART_SET_POINT__OMEGA_LEFT:
-			return getOmega_left();
-		case Oarp4_datatypesPackage.ART_SET_POINT__OMEGA_RIGHT:
-			return getOmega_right();
+			case Oarp4_datatypesPackage.ART_SET_POINT__OMEGA_LEFT:
+				return getOmega_left();
+			case Oarp4_datatypesPackage.ART_SET_POINT__OMEGA_RIGHT:
+				return getOmega_right();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -217,18 +187,17 @@ public class Art_Set_PointImpl extends MinimalEObjectImpl.Container implements A
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case Oarp4_datatypesPackage.ART_SET_POINT__OMEGA_LEFT:
-			setOmega_left((Velocity_Angular) newValue);
-			return;
-		case Oarp4_datatypesPackage.ART_SET_POINT__OMEGA_RIGHT:
-			setOmega_right((Velocity_Angular) newValue);
-			return;
+			case Oarp4_datatypesPackage.ART_SET_POINT__OMEGA_LEFT:
+				setOmega_left((Velocity_Angular)newValue);
+				return;
+			case Oarp4_datatypesPackage.ART_SET_POINT__OMEGA_RIGHT:
+				setOmega_right((Velocity_Angular)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -236,18 +205,17 @@ public class Art_Set_PointImpl extends MinimalEObjectImpl.Container implements A
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case Oarp4_datatypesPackage.ART_SET_POINT__OMEGA_LEFT:
-			setOmega_left((Velocity_Angular) null);
-			return;
-		case Oarp4_datatypesPackage.ART_SET_POINT__OMEGA_RIGHT:
-			setOmega_right((Velocity_Angular) null);
-			return;
+			case Oarp4_datatypesPackage.ART_SET_POINT__OMEGA_LEFT:
+				setOmega_left((Velocity_Angular)null);
+				return;
+			case Oarp4_datatypesPackage.ART_SET_POINT__OMEGA_RIGHT:
+				setOmega_right((Velocity_Angular)null);
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -255,16 +223,15 @@ public class Art_Set_PointImpl extends MinimalEObjectImpl.Container implements A
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case Oarp4_datatypesPackage.ART_SET_POINT__OMEGA_LEFT:
-			return omega_left != null;
-		case Oarp4_datatypesPackage.ART_SET_POINT__OMEGA_RIGHT:
-			return omega_right != null;
+			case Oarp4_datatypesPackage.ART_SET_POINT__OMEGA_LEFT:
+				return omega_left != null;
+			case Oarp4_datatypesPackage.ART_SET_POINT__OMEGA_RIGHT:
+				return omega_right != null;
 		}
 		return super.eIsSet(featureID);
 	}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/impl/DistanceImpl.java b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/impl/DistanceImpl.java
index 0a2e1233d05..254ba2e1ff2 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/impl/DistanceImpl.java
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/impl/DistanceImpl.java
@@ -16,7 +16,7 @@ import org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTyp
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.DistanceImpl#getValue <em>Value</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.DistanceImpl#getValue <em>Value</em>}</li>
  * </ul>
  * </p>
  *
@@ -27,7 +27,6 @@ public class DistanceImpl extends MinimalEObjectImpl.Container implements Distan
 	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @see #getValue()
 	 * @generated
 	 * @ordered
@@ -38,7 +37,6 @@ public class DistanceImpl extends MinimalEObjectImpl.Container implements Distan
 	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @see #getValue()
 	 * @generated
 	 * @ordered
@@ -48,7 +46,6 @@ public class DistanceImpl extends MinimalEObjectImpl.Container implements Distan
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	protected DistanceImpl() {
@@ -58,7 +55,6 @@ public class DistanceImpl extends MinimalEObjectImpl.Container implements Distan
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
@@ -69,7 +65,6 @@ public class DistanceImpl extends MinimalEObjectImpl.Container implements Distan
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public long getValue() {
@@ -79,28 +74,25 @@ public class DistanceImpl extends MinimalEObjectImpl.Container implements Distan
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public void setValue(long newValue) {
 		long oldValue = value;
 		value = newValue;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, Oarp4_datatypesPackage.DISTANCE__VALUE, oldValue, value));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case Oarp4_datatypesPackage.DISTANCE__VALUE:
-			return getValue();
+			case Oarp4_datatypesPackage.DISTANCE__VALUE:
+				return getValue();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -108,15 +100,14 @@ public class DistanceImpl extends MinimalEObjectImpl.Container implements Distan
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case Oarp4_datatypesPackage.DISTANCE__VALUE:
-			setValue((Long) newValue);
-			return;
+			case Oarp4_datatypesPackage.DISTANCE__VALUE:
+				setValue((Long)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -124,15 +115,14 @@ public class DistanceImpl extends MinimalEObjectImpl.Container implements Distan
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case Oarp4_datatypesPackage.DISTANCE__VALUE:
-			setValue(VALUE_EDEFAULT);
-			return;
+			case Oarp4_datatypesPackage.DISTANCE__VALUE:
+				setValue(VALUE_EDEFAULT);
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -140,14 +130,13 @@ public class DistanceImpl extends MinimalEObjectImpl.Container implements Distan
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case Oarp4_datatypesPackage.DISTANCE__VALUE:
-			return value != VALUE_EDEFAULT;
+			case Oarp4_datatypesPackage.DISTANCE__VALUE:
+				return value != VALUE_EDEFAULT;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -155,14 +144,11 @@ public class DistanceImpl extends MinimalEObjectImpl.Container implements Distan
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) {
-			return super.toString();
-		}
+		if (eIsProxy()) return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (value: ");
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/impl/MetricImpl.java b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/impl/MetricImpl.java
index db4edb41932..6e8e4fa6e1f 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/impl/MetricImpl.java
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/impl/MetricImpl.java
@@ -16,7 +16,7 @@ import org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTyp
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.MetricImpl#getValue <em>Value</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.MetricImpl#getValue <em>Value</em>}</li>
  * </ul>
  * </p>
  *
@@ -27,7 +27,6 @@ public class MetricImpl extends MinimalEObjectImpl.Container implements Metric {
 	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @see #getValue()
 	 * @generated
 	 * @ordered
@@ -38,7 +37,6 @@ public class MetricImpl extends MinimalEObjectImpl.Container implements Metric {
 	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @see #getValue()
 	 * @generated
 	 * @ordered
@@ -48,7 +46,6 @@ public class MetricImpl extends MinimalEObjectImpl.Container implements Metric {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	protected MetricImpl() {
@@ -58,7 +55,6 @@ public class MetricImpl extends MinimalEObjectImpl.Container implements Metric {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
@@ -69,7 +65,6 @@ public class MetricImpl extends MinimalEObjectImpl.Container implements Metric {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public double getValue() {
@@ -79,28 +74,25 @@ public class MetricImpl extends MinimalEObjectImpl.Container implements Metric {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public void setValue(double newValue) {
 		double oldValue = value;
 		value = newValue;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, Oarp4_datatypesPackage.METRIC__VALUE, oldValue, value));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case Oarp4_datatypesPackage.METRIC__VALUE:
-			return getValue();
+			case Oarp4_datatypesPackage.METRIC__VALUE:
+				return getValue();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -108,15 +100,14 @@ public class MetricImpl extends MinimalEObjectImpl.Container implements Metric {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case Oarp4_datatypesPackage.METRIC__VALUE:
-			setValue((Double) newValue);
-			return;
+			case Oarp4_datatypesPackage.METRIC__VALUE:
+				setValue((Double)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -124,15 +115,14 @@ public class MetricImpl extends MinimalEObjectImpl.Container implements Metric {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case Oarp4_datatypesPackage.METRIC__VALUE:
-			setValue(VALUE_EDEFAULT);
-			return;
+			case Oarp4_datatypesPackage.METRIC__VALUE:
+				setValue(VALUE_EDEFAULT);
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -140,14 +130,13 @@ public class MetricImpl extends MinimalEObjectImpl.Container implements Metric {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case Oarp4_datatypesPackage.METRIC__VALUE:
-			return value != VALUE_EDEFAULT;
+			case Oarp4_datatypesPackage.METRIC__VALUE:
+				return value != VALUE_EDEFAULT;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -155,14 +144,11 @@ public class MetricImpl extends MinimalEObjectImpl.Container implements Metric {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) {
-			return super.toString();
-		}
+		if (eIsProxy()) return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (value: ");
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/impl/Milli_AmpImpl.java b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/impl/Milli_AmpImpl.java
index 61b8d5e95ef..452bb12b883 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/impl/Milli_AmpImpl.java
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/impl/Milli_AmpImpl.java
@@ -16,7 +16,7 @@ import org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTyp
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Milli_AmpImpl#getValue <em>Value</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Milli_AmpImpl#getValue <em>Value</em>}</li>
  * </ul>
  * </p>
  *
@@ -27,7 +27,6 @@ public class Milli_AmpImpl extends MinimalEObjectImpl.Container implements Milli
 	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @see #getValue()
 	 * @generated
 	 * @ordered
@@ -38,7 +37,6 @@ public class Milli_AmpImpl extends MinimalEObjectImpl.Container implements Milli
 	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @see #getValue()
 	 * @generated
 	 * @ordered
@@ -48,7 +46,6 @@ public class Milli_AmpImpl extends MinimalEObjectImpl.Container implements Milli
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	protected Milli_AmpImpl() {
@@ -58,7 +55,6 @@ public class Milli_AmpImpl extends MinimalEObjectImpl.Container implements Milli
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
@@ -69,7 +65,6 @@ public class Milli_AmpImpl extends MinimalEObjectImpl.Container implements Milli
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public long getValue() {
@@ -79,28 +74,25 @@ public class Milli_AmpImpl extends MinimalEObjectImpl.Container implements Milli
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public void setValue(long newValue) {
 		long oldValue = value;
 		value = newValue;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, Oarp4_datatypesPackage.MILLI_AMP__VALUE, oldValue, value));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case Oarp4_datatypesPackage.MILLI_AMP__VALUE:
-			return getValue();
+			case Oarp4_datatypesPackage.MILLI_AMP__VALUE:
+				return getValue();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -108,15 +100,14 @@ public class Milli_AmpImpl extends MinimalEObjectImpl.Container implements Milli
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case Oarp4_datatypesPackage.MILLI_AMP__VALUE:
-			setValue((Long) newValue);
-			return;
+			case Oarp4_datatypesPackage.MILLI_AMP__VALUE:
+				setValue((Long)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -124,15 +115,14 @@ public class Milli_AmpImpl extends MinimalEObjectImpl.Container implements Milli
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case Oarp4_datatypesPackage.MILLI_AMP__VALUE:
-			setValue(VALUE_EDEFAULT);
-			return;
+			case Oarp4_datatypesPackage.MILLI_AMP__VALUE:
+				setValue(VALUE_EDEFAULT);
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -140,14 +130,13 @@ public class Milli_AmpImpl extends MinimalEObjectImpl.Container implements Milli
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case Oarp4_datatypesPackage.MILLI_AMP__VALUE:
-			return value != VALUE_EDEFAULT;
+			case Oarp4_datatypesPackage.MILLI_AMP__VALUE:
+				return value != VALUE_EDEFAULT;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -155,14 +144,11 @@ public class Milli_AmpImpl extends MinimalEObjectImpl.Container implements Milli
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) {
-			return super.toString();
-		}
+		if (eIsProxy()) return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (value: ");
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/impl/Oarp4_datatypesFactoryImpl.java b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/impl/Oarp4_datatypesFactoryImpl.java
index cc1f8fcce56..05068108c3a 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/impl/Oarp4_datatypesFactoryImpl.java
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/impl/Oarp4_datatypesFactoryImpl.java
@@ -30,7 +30,6 @@ import org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTyp
  * <!-- begin-user-doc -->
  * An implementation of the model <b>Factory</b>.
  * <!-- end-user-doc -->
- *
  * @generated
  */
 public class Oarp4_datatypesFactoryImpl extends EFactoryImpl implements Oarp4_datatypesFactory {
@@ -38,16 +37,16 @@ public class Oarp4_datatypesFactoryImpl extends EFactoryImpl implements Oarp4_da
 	 * Creates the default factory implementation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public static Oarp4_datatypesFactory init() {
 		try {
-			Oarp4_datatypesFactory theOarp4_datatypesFactory = (Oarp4_datatypesFactory) EPackage.Registry.INSTANCE.getEFactory(Oarp4_datatypesPackage.eNS_URI);
+			Oarp4_datatypesFactory theOarp4_datatypesFactory = (Oarp4_datatypesFactory)EPackage.Registry.INSTANCE.getEFactory(Oarp4_datatypesPackage.eNS_URI);
 			if (theOarp4_datatypesFactory != null) {
 				return theOarp4_datatypesFactory;
 			}
-		} catch (Exception exception) {
+		}
+		catch (Exception exception) {
 			EcorePlugin.INSTANCE.log(exception);
 		}
 		return new Oarp4_datatypesFactoryImpl();
@@ -57,7 +56,6 @@ public class Oarp4_datatypesFactoryImpl extends EFactoryImpl implements Oarp4_da
 	 * Creates an instance of the factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public Oarp4_datatypesFactoryImpl() {
@@ -67,53 +65,35 @@ public class Oarp4_datatypesFactoryImpl extends EFactoryImpl implements Oarp4_da
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public EObject create(EClass eClass) {
 		switch (eClass.getClassifierID()) {
-		case Oarp4_datatypesPackage.VELOCITY_LINEAR:
-			return createVelocity_Linear();
-		case Oarp4_datatypesPackage.ART_SET_POINT:
-			return createArt_Set_Point();
-		case Oarp4_datatypesPackage.VELOCITY_ANGULAR:
-			return createVelocity_Angular();
-		case Oarp4_datatypesPackage.DISTANCE:
-			return createDistance();
-		case Oarp4_datatypesPackage.METRIC:
-			return createMetric();
-		case Oarp4_datatypesPackage.ANGULAR:
-			return createAngular();
-		case Oarp4_datatypesPackage.OP_SET_POINT:
-			return createOp_Set_Point();
-		case Oarp4_datatypesPackage.SPEED_TICS_LEFT_RIGHT:
-			return createSpeed_Tics_Left_Right();
-		case Oarp4_datatypesPackage.SPEED_TICS:
-			return createSpeed_Tics();
-		case Oarp4_datatypesPackage.ODOMETER_TICS:
-			return createOdometer_Tics();
-		case Oarp4_datatypesPackage.ODOMETER_TICS_LEFT_RIGHT:
-			return createOdometer_Tics_Left_Right();
-		case Oarp4_datatypesPackage.PROXI_LEFT_RIGHT:
-			return createProxi_Left_Right();
-		case Oarp4_datatypesPackage.MILLI_AMP:
-			return createMilli_Amp();
-		case Oarp4_datatypesPackage.ODOMETER_LINEAR_LEFT_RIGHT:
-			return createOdometer_Linear_Left_Right();
-		case Oarp4_datatypesPackage.VELOCITY_ANGULAR_LEFT_RIGHT:
-			return createVelocity_Angular_Left_Right();
-		case Oarp4_datatypesPackage.VELOCITY:
-			return createVelocity();
-		default:
-			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+			case Oarp4_datatypesPackage.VELOCITY_LINEAR: return createVelocity_Linear();
+			case Oarp4_datatypesPackage.ART_SET_POINT: return createArt_Set_Point();
+			case Oarp4_datatypesPackage.VELOCITY_ANGULAR: return createVelocity_Angular();
+			case Oarp4_datatypesPackage.DISTANCE: return createDistance();
+			case Oarp4_datatypesPackage.METRIC: return createMetric();
+			case Oarp4_datatypesPackage.ANGULAR: return createAngular();
+			case Oarp4_datatypesPackage.OP_SET_POINT: return createOp_Set_Point();
+			case Oarp4_datatypesPackage.SPEED_TICS_LEFT_RIGHT: return createSpeed_Tics_Left_Right();
+			case Oarp4_datatypesPackage.SPEED_TICS: return createSpeed_Tics();
+			case Oarp4_datatypesPackage.ODOMETER_TICS: return createOdometer_Tics();
+			case Oarp4_datatypesPackage.ODOMETER_TICS_LEFT_RIGHT: return createOdometer_Tics_Left_Right();
+			case Oarp4_datatypesPackage.PROXI_LEFT_RIGHT: return createProxi_Left_Right();
+			case Oarp4_datatypesPackage.MILLI_AMP: return createMilli_Amp();
+			case Oarp4_datatypesPackage.ODOMETER_LINEAR_LEFT_RIGHT: return createOdometer_Linear_Left_Right();
+			case Oarp4_datatypesPackage.VELOCITY_ANGULAR_LEFT_RIGHT: return createVelocity_Angular_Left_Right();
+			case Oarp4_datatypesPackage.VELOCITY: return createVelocity();
+			default:
+				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
 		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public Velocity_Linear createVelocity_Linear() {
@@ -124,7 +104,6 @@ public class Oarp4_datatypesFactoryImpl extends EFactoryImpl implements Oarp4_da
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public Art_Set_Point createArt_Set_Point() {
@@ -135,7 +114,6 @@ public class Oarp4_datatypesFactoryImpl extends EFactoryImpl implements Oarp4_da
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public Velocity_Angular createVelocity_Angular() {
@@ -146,7 +124,6 @@ public class Oarp4_datatypesFactoryImpl extends EFactoryImpl implements Oarp4_da
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public Distance createDistance() {
@@ -157,7 +134,6 @@ public class Oarp4_datatypesFactoryImpl extends EFactoryImpl implements Oarp4_da
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public Metric createMetric() {
@@ -168,7 +144,6 @@ public class Oarp4_datatypesFactoryImpl extends EFactoryImpl implements Oarp4_da
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public Angular createAngular() {
@@ -179,7 +154,6 @@ public class Oarp4_datatypesFactoryImpl extends EFactoryImpl implements Oarp4_da
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public Op_Set_Point createOp_Set_Point() {
@@ -190,7 +164,6 @@ public class Oarp4_datatypesFactoryImpl extends EFactoryImpl implements Oarp4_da
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public Speed_Tics_Left_Right createSpeed_Tics_Left_Right() {
@@ -201,7 +174,6 @@ public class Oarp4_datatypesFactoryImpl extends EFactoryImpl implements Oarp4_da
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public Speed_Tics createSpeed_Tics() {
@@ -212,7 +184,6 @@ public class Oarp4_datatypesFactoryImpl extends EFactoryImpl implements Oarp4_da
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public Odometer_Tics createOdometer_Tics() {
@@ -223,7 +194,6 @@ public class Oarp4_datatypesFactoryImpl extends EFactoryImpl implements Oarp4_da
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public Odometer_Tics_Left_Right createOdometer_Tics_Left_Right() {
@@ -234,7 +204,6 @@ public class Oarp4_datatypesFactoryImpl extends EFactoryImpl implements Oarp4_da
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public Proxi_Left_Right createProxi_Left_Right() {
@@ -245,7 +214,6 @@ public class Oarp4_datatypesFactoryImpl extends EFactoryImpl implements Oarp4_da
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public Milli_Amp createMilli_Amp() {
@@ -256,7 +224,6 @@ public class Oarp4_datatypesFactoryImpl extends EFactoryImpl implements Oarp4_da
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public Odometer_Linear_Left_Right createOdometer_Linear_Left_Right() {
@@ -267,7 +234,6 @@ public class Oarp4_datatypesFactoryImpl extends EFactoryImpl implements Oarp4_da
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public Velocity_Angular_Left_Right createVelocity_Angular_Left_Right() {
@@ -278,7 +244,6 @@ public class Oarp4_datatypesFactoryImpl extends EFactoryImpl implements Oarp4_da
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public Velocity createVelocity() {
@@ -289,17 +254,15 @@ public class Oarp4_datatypesFactoryImpl extends EFactoryImpl implements Oarp4_da
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public Oarp4_datatypesPackage getOarp4_datatypesPackage() {
-		return (Oarp4_datatypesPackage) getEPackage();
+		return (Oarp4_datatypesPackage)getEPackage();
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @deprecated
 	 * @generated
 	 */
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/impl/Oarp4_datatypesPackageImpl.java b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/impl/Oarp4_datatypesPackageImpl.java
index 14791f87ff0..ef67f29bd6b 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/impl/Oarp4_datatypesPackageImpl.java
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/impl/Oarp4_datatypesPackageImpl.java
@@ -47,14 +47,12 @@ import org.eclipse.uml2.uml.UMLPackage;
  * <!-- begin-user-doc -->
  * An implementation of the model <b>Package</b>.
  * <!-- end-user-doc -->
- *
  * @generated
  */
 public class Oarp4_datatypesPackageImpl extends EPackageImpl implements Oarp4_datatypesPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	private EClass velocity_LinearEClass = null;
@@ -62,7 +60,6 @@ public class Oarp4_datatypesPackageImpl extends EPackageImpl implements Oarp4_da
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	private EClass art_Set_PointEClass = null;
@@ -70,7 +67,6 @@ public class Oarp4_datatypesPackageImpl extends EPackageImpl implements Oarp4_da
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	private EClass velocity_AngularEClass = null;
@@ -78,7 +74,6 @@ public class Oarp4_datatypesPackageImpl extends EPackageImpl implements Oarp4_da
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	private EClass distanceEClass = null;
@@ -86,7 +81,6 @@ public class Oarp4_datatypesPackageImpl extends EPackageImpl implements Oarp4_da
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	private EClass metricEClass = null;
@@ -94,7 +88,6 @@ public class Oarp4_datatypesPackageImpl extends EPackageImpl implements Oarp4_da
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	private EClass angularEClass = null;
@@ -102,7 +95,6 @@ public class Oarp4_datatypesPackageImpl extends EPackageImpl implements Oarp4_da
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	private EClass op_Set_PointEClass = null;
@@ -110,7 +102,6 @@ public class Oarp4_datatypesPackageImpl extends EPackageImpl implements Oarp4_da
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	private EClass speed_Tics_Left_RightEClass = null;
@@ -118,7 +109,6 @@ public class Oarp4_datatypesPackageImpl extends EPackageImpl implements Oarp4_da
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	private EClass speed_TicsEClass = null;
@@ -126,7 +116,6 @@ public class Oarp4_datatypesPackageImpl extends EPackageImpl implements Oarp4_da
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	private EClass odometer_TicsEClass = null;
@@ -134,7 +123,6 @@ public class Oarp4_datatypesPackageImpl extends EPackageImpl implements Oarp4_da
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	private EClass odometer_Tics_Left_RightEClass = null;
@@ -142,7 +130,6 @@ public class Oarp4_datatypesPackageImpl extends EPackageImpl implements Oarp4_da
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	private EClass proxi_Left_RightEClass = null;
@@ -150,7 +137,6 @@ public class Oarp4_datatypesPackageImpl extends EPackageImpl implements Oarp4_da
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	private EClass milli_AmpEClass = null;
@@ -158,7 +144,6 @@ public class Oarp4_datatypesPackageImpl extends EPackageImpl implements Oarp4_da
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	private EClass odometer_Linear_Left_RightEClass = null;
@@ -166,7 +151,6 @@ public class Oarp4_datatypesPackageImpl extends EPackageImpl implements Oarp4_da
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	private EClass velocity_Angular_Left_RightEClass = null;
@@ -174,17 +158,19 @@ public class Oarp4_datatypesPackageImpl extends EPackageImpl implements Oarp4_da
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	private EClass velocityEClass = null;
 
 	/**
-	 * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+	 * Creates an instance of the model <b>Package</b>, registered with
+	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
 	 * package URI value.
-	 * <p>
-	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * <p>Note: the correct way to create the package is via the static
+	 * factory method {@link #init init()}, which also performs
+	 * initialization of the package, or returns the registered package,
+	 * if one already exists.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see org.eclipse.emf.ecore.EPackage.Registry
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Oarp4_datatypesPackage#eNS_URI
 	 * @see #init()
@@ -197,7 +183,6 @@ public class Oarp4_datatypesPackageImpl extends EPackageImpl implements Oarp4_da
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	private static boolean isInited = false;
@@ -215,12 +200,10 @@ public class Oarp4_datatypesPackageImpl extends EPackageImpl implements Oarp4_da
 	 * @generated
 	 */
 	public static Oarp4_datatypesPackage init() {
-		if (isInited) {
-			return (Oarp4_datatypesPackage) EPackage.Registry.INSTANCE.getEPackage(Oarp4_datatypesPackage.eNS_URI);
-		}
+		if (isInited) return (Oarp4_datatypesPackage)EPackage.Registry.INSTANCE.getEPackage(Oarp4_datatypesPackage.eNS_URI);
 
 		// Obtain or create and register package
-		Oarp4_datatypesPackageImpl theOarp4_datatypesPackage = (Oarp4_datatypesPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Oarp4_datatypesPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new Oarp4_datatypesPackageImpl());
+		Oarp4_datatypesPackageImpl theOarp4_datatypesPackage = (Oarp4_datatypesPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Oarp4_datatypesPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new Oarp4_datatypesPackageImpl());
 
 		isInited = true;
 
@@ -228,21 +211,14 @@ public class Oarp4_datatypesPackageImpl extends EPackageImpl implements Oarp4_da
 		UMLPackage.eINSTANCE.eClass();
 
 		// Obtain or create and register interdependencies
-		RobotMLPackageImpl theRobotMLPackage = (RobotMLPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(RobotMLPackage.eNS_URI) instanceof RobotMLPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(RobotMLPackage.eNS_URI) : RobotMLPackage.eINSTANCE);
-		Diagnostic_datatypesPackageImpl theDiagnostic_datatypesPackage = (Diagnostic_datatypesPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(Diagnostic_datatypesPackage.eNS_URI) instanceof Diagnostic_datatypesPackageImpl ? EPackage.Registry.INSTANCE
-				.getEPackage(Diagnostic_datatypesPackage.eNS_URI) : Diagnostic_datatypesPackage.eINSTANCE);
-		Geometry_datatypesPackageImpl theGeometry_datatypesPackage = (Geometry_datatypesPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(Geometry_datatypesPackage.eNS_URI) instanceof Geometry_datatypesPackageImpl ? EPackage.Registry.INSTANCE
-				.getEPackage(Geometry_datatypesPackage.eNS_URI) : Geometry_datatypesPackage.eINSTANCE);
-		Nav_datatypesPackageImpl theNav_datatypesPackage = (Nav_datatypesPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(Nav_datatypesPackage.eNS_URI) instanceof Nav_datatypesPackageImpl ? EPackage.Registry.INSTANCE
-				.getEPackage(Nav_datatypesPackage.eNS_URI) : Nav_datatypesPackage.eINSTANCE);
-		Sensor_datatypesPackageImpl theSensor_datatypesPackage = (Sensor_datatypesPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(Sensor_datatypesPackage.eNS_URI) instanceof Sensor_datatypesPackageImpl ? EPackage.Registry.INSTANCE
-				.getEPackage(Sensor_datatypesPackage.eNS_URI) : Sensor_datatypesPackage.eINSTANCE);
-		Actionlib_datatypesPackageImpl theActionlib_datatypesPackage = (Actionlib_datatypesPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(Actionlib_datatypesPackage.eNS_URI) instanceof Actionlib_datatypesPackageImpl ? EPackage.Registry.INSTANCE
-				.getEPackage(Actionlib_datatypesPackage.eNS_URI) : Actionlib_datatypesPackage.eINSTANCE);
-		Oarp1_datatypesPackageImpl theOarp1_datatypesPackage = (Oarp1_datatypesPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(Oarp1_datatypesPackage.eNS_URI) instanceof Oarp1_datatypesPackageImpl ? EPackage.Registry.INSTANCE
-				.getEPackage(Oarp1_datatypesPackage.eNS_URI) : Oarp1_datatypesPackage.eINSTANCE);
-		Std_datatypesPackageImpl theStd_datatypesPackage = (Std_datatypesPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(Std_datatypesPackage.eNS_URI) instanceof Std_datatypesPackageImpl ? EPackage.Registry.INSTANCE
-				.getEPackage(Std_datatypesPackage.eNS_URI) : Std_datatypesPackage.eINSTANCE);
+		RobotMLPackageImpl theRobotMLPackage = (RobotMLPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(RobotMLPackage.eNS_URI) instanceof RobotMLPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(RobotMLPackage.eNS_URI) : RobotMLPackage.eINSTANCE);
+		Diagnostic_datatypesPackageImpl theDiagnostic_datatypesPackage = (Diagnostic_datatypesPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(Diagnostic_datatypesPackage.eNS_URI) instanceof Diagnostic_datatypesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(Diagnostic_datatypesPackage.eNS_URI) : Diagnostic_datatypesPackage.eINSTANCE);
+		Geometry_datatypesPackageImpl theGeometry_datatypesPackage = (Geometry_datatypesPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(Geometry_datatypesPackage.eNS_URI) instanceof Geometry_datatypesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(Geometry_datatypesPackage.eNS_URI) : Geometry_datatypesPackage.eINSTANCE);
+		Nav_datatypesPackageImpl theNav_datatypesPackage = (Nav_datatypesPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(Nav_datatypesPackage.eNS_URI) instanceof Nav_datatypesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(Nav_datatypesPackage.eNS_URI) : Nav_datatypesPackage.eINSTANCE);
+		Sensor_datatypesPackageImpl theSensor_datatypesPackage = (Sensor_datatypesPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(Sensor_datatypesPackage.eNS_URI) instanceof Sensor_datatypesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(Sensor_datatypesPackage.eNS_URI) : Sensor_datatypesPackage.eINSTANCE);
+		Actionlib_datatypesPackageImpl theActionlib_datatypesPackage = (Actionlib_datatypesPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(Actionlib_datatypesPackage.eNS_URI) instanceof Actionlib_datatypesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(Actionlib_datatypesPackage.eNS_URI) : Actionlib_datatypesPackage.eINSTANCE);
+		Oarp1_datatypesPackageImpl theOarp1_datatypesPackage = (Oarp1_datatypesPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(Oarp1_datatypesPackage.eNS_URI) instanceof Oarp1_datatypesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(Oarp1_datatypesPackage.eNS_URI) : Oarp1_datatypesPackage.eINSTANCE);
+		Std_datatypesPackageImpl theStd_datatypesPackage = (Std_datatypesPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(Std_datatypesPackage.eNS_URI) instanceof Std_datatypesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(Std_datatypesPackage.eNS_URI) : Std_datatypesPackage.eINSTANCE);
 
 		// Create package meta-data objects
 		theOarp4_datatypesPackage.createPackageContents();
@@ -269,7 +245,7 @@ public class Oarp4_datatypesPackageImpl extends EPackageImpl implements Oarp4_da
 		// Mark meta-data to indicate it can't be changed
 		theOarp4_datatypesPackage.freeze();
 
-
+  
 		// Update the registry and return the package
 		EPackage.Registry.INSTANCE.put(Oarp4_datatypesPackage.eNS_URI, theOarp4_datatypesPackage);
 		return theOarp4_datatypesPackage;
@@ -278,7 +254,6 @@ public class Oarp4_datatypesPackageImpl extends EPackageImpl implements Oarp4_da
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public EClass getVelocity_Linear() {
@@ -288,17 +263,15 @@ public class Oarp4_datatypesPackageImpl extends EPackageImpl implements Oarp4_da
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public EAttribute getVelocity_Linear_Value() {
-		return (EAttribute) velocity_LinearEClass.getEStructuralFeatures().get(0);
+		return (EAttribute)velocity_LinearEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public EClass getArt_Set_Point() {
@@ -308,27 +281,24 @@ public class Oarp4_datatypesPackageImpl extends EPackageImpl implements Oarp4_da
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public EReference getArt_Set_Point_Omega_left() {
-		return (EReference) art_Set_PointEClass.getEStructuralFeatures().get(0);
+		return (EReference)art_Set_PointEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public EReference getArt_Set_Point_Omega_right() {
-		return (EReference) art_Set_PointEClass.getEStructuralFeatures().get(1);
+		return (EReference)art_Set_PointEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public EClass getVelocity_Angular() {
@@ -338,17 +308,15 @@ public class Oarp4_datatypesPackageImpl extends EPackageImpl implements Oarp4_da
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public EAttribute getVelocity_Angular_Value() {
-		return (EAttribute) velocity_AngularEClass.getEStructuralFeatures().get(0);
+		return (EAttribute)velocity_AngularEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public EClass getDistance() {
@@ -358,17 +326,15 @@ public class Oarp4_datatypesPackageImpl extends EPackageImpl implements Oarp4_da
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public EAttribute getDistance_Value() {
-		return (EAttribute) distanceEClass.getEStructuralFeatures().get(0);
+		return (EAttribute)distanceEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public EClass getMetric() {
@@ -378,17 +344,15 @@ public class Oarp4_datatypesPackageImpl extends EPackageImpl implements Oarp4_da
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public EAttribute getMetric_Value() {
-		return (EAttribute) metricEClass.getEStructuralFeatures().get(0);
+		return (EAttribute)metricEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public EClass getAngular() {
@@ -398,17 +362,15 @@ public class Oarp4_datatypesPackageImpl extends EPackageImpl implements Oarp4_da
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public EAttribute getAngular_Value() {
-		return (EAttribute) angularEClass.getEStructuralFeatures().get(0);
+		return (EAttribute)angularEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public EClass getOp_Set_Point() {
@@ -418,27 +380,24 @@ public class Oarp4_datatypesPackageImpl extends EPackageImpl implements Oarp4_da
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public EReference getOp_Set_Point_Velocity() {
-		return (EReference) op_Set_PointEClass.getEStructuralFeatures().get(0);
+		return (EReference)op_Set_PointEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public EReference getOp_Set_Point_Orientation() {
-		return (EReference) op_Set_PointEClass.getEStructuralFeatures().get(1);
+		return (EReference)op_Set_PointEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public EClass getSpeed_Tics_Left_Right() {
@@ -448,27 +407,24 @@ public class Oarp4_datatypesPackageImpl extends EPackageImpl implements Oarp4_da
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public EReference getSpeed_Tics_Left_Right_Speed_tics_left() {
-		return (EReference) speed_Tics_Left_RightEClass.getEStructuralFeatures().get(0);
+		return (EReference)speed_Tics_Left_RightEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public EReference getSpeed_Tics_Left_Right_Speed_tics_right() {
-		return (EReference) speed_Tics_Left_RightEClass.getEStructuralFeatures().get(1);
+		return (EReference)speed_Tics_Left_RightEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public EClass getSpeed_Tics() {
@@ -478,17 +434,15 @@ public class Oarp4_datatypesPackageImpl extends EPackageImpl implements Oarp4_da
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public EAttribute getSpeed_Tics_Value() {
-		return (EAttribute) speed_TicsEClass.getEStructuralFeatures().get(0);
+		return (EAttribute)speed_TicsEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public EClass getOdometer_Tics() {
@@ -498,17 +452,15 @@ public class Oarp4_datatypesPackageImpl extends EPackageImpl implements Oarp4_da
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public EAttribute getOdometer_Tics_Value() {
-		return (EAttribute) odometer_TicsEClass.getEStructuralFeatures().get(0);
+		return (EAttribute)odometer_TicsEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public EClass getOdometer_Tics_Left_Right() {
@@ -518,27 +470,24 @@ public class Oarp4_datatypesPackageImpl extends EPackageImpl implements Oarp4_da
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public EReference getOdometer_Tics_Left_Right_Odometer_tics_left() {
-		return (EReference) odometer_Tics_Left_RightEClass.getEStructuralFeatures().get(0);
+		return (EReference)odometer_Tics_Left_RightEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public EReference getOdometer_Tics_Left_Right_Odometer_tics_right() {
-		return (EReference) odometer_Tics_Left_RightEClass.getEStructuralFeatures().get(1);
+		return (EReference)odometer_Tics_Left_RightEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public EClass getProxi_Left_Right() {
@@ -548,27 +497,24 @@ public class Oarp4_datatypesPackageImpl extends EPackageImpl implements Oarp4_da
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public EReference getProxi_Left_Right_Proxi_left() {
-		return (EReference) proxi_Left_RightEClass.getEStructuralFeatures().get(0);
+		return (EReference)proxi_Left_RightEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public EReference getProxi_Left_Right_Proxi_right() {
-		return (EReference) proxi_Left_RightEClass.getEStructuralFeatures().get(1);
+		return (EReference)proxi_Left_RightEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public EClass getMilli_Amp() {
@@ -578,17 +524,15 @@ public class Oarp4_datatypesPackageImpl extends EPackageImpl implements Oarp4_da
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public EAttribute getMilli_Amp_Value() {
-		return (EAttribute) milli_AmpEClass.getEStructuralFeatures().get(0);
+		return (EAttribute)milli_AmpEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public EClass getOdometer_Linear_Left_Right() {
@@ -598,27 +542,24 @@ public class Oarp4_datatypesPackageImpl extends EPackageImpl implements Oarp4_da
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public EReference getOdometer_Linear_Left_Right_Odometer_linear_left() {
-		return (EReference) odometer_Linear_Left_RightEClass.getEStructuralFeatures().get(0);
+		return (EReference)odometer_Linear_Left_RightEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public EReference getOdometer_Linear_Left_Right_Odometer_linear_right() {
-		return (EReference) odometer_Linear_Left_RightEClass.getEStructuralFeatures().get(1);
+		return (EReference)odometer_Linear_Left_RightEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public EClass getVelocity_Angular_Left_Right() {
@@ -628,27 +569,24 @@ public class Oarp4_datatypesPackageImpl extends EPackageImpl implements Oarp4_da
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public EReference getVelocity_Angular_Left_Right_Velocity_angular_left() {
-		return (EReference) velocity_Angular_Left_RightEClass.getEStructuralFeatures().get(0);
+		return (EReference)velocity_Angular_Left_RightEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public EReference getVelocity_Angular_Left_Right_Velocity_angular_right() {
-		return (EReference) velocity_Angular_Left_RightEClass.getEStructuralFeatures().get(1);
+		return (EReference)velocity_Angular_Left_RightEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public EClass getVelocity() {
@@ -658,53 +596,46 @@ public class Oarp4_datatypesPackageImpl extends EPackageImpl implements Oarp4_da
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public EReference getVelocity_Velocity_linear() {
-		return (EReference) velocityEClass.getEStructuralFeatures().get(0);
+		return (EReference)velocityEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public EReference getVelocity_Velocity_angular() {
-		return (EReference) velocityEClass.getEStructuralFeatures().get(1);
+		return (EReference)velocityEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public Oarp4_datatypesFactory getOarp4_datatypesFactory() {
-		return (Oarp4_datatypesFactory) getEFactoryInstance();
+		return (Oarp4_datatypesFactory)getEFactoryInstance();
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	private boolean isCreated = false;
 
 	/**
-	 * Creates the meta-model objects for the package. This method is
+	 * Creates the meta-model objects for the package.  This method is
 	 * guarded to have no affect on any invocation but its first.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public void createPackageContents() {
-		if (isCreated) {
-			return;
-		}
+		if (isCreated) return;
 		isCreated = true;
 
 		// Create classes and their features
@@ -768,23 +699,19 @@ public class Oarp4_datatypesPackageImpl extends EPackageImpl implements Oarp4_da
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	private boolean isInitialized = false;
 
 	/**
-	 * Complete the initialization of the package and its meta-model. This
+	 * Complete the initialization of the package and its meta-model.  This
 	 * method is guarded to have no affect on any invocation but its first.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public void initializePackageContents() {
-		if (isInitialized) {
-			return;
-		}
+		if (isInitialized) return;
 		isInitialized = true;
 
 		// Initialize package
@@ -793,7 +720,7 @@ public class Oarp4_datatypesPackageImpl extends EPackageImpl implements Oarp4_da
 		setNsURI(eNS_URI);
 
 		// Obtain other dependent packages
-		Std_datatypesPackage theStd_datatypesPackage = (Std_datatypesPackage) EPackage.Registry.INSTANCE.getEPackage(Std_datatypesPackage.eNS_URI);
+		Std_datatypesPackage theStd_datatypesPackage = (Std_datatypesPackage)EPackage.Registry.INSTANCE.getEPackage(Std_datatypesPackage.eNS_URI);
 
 		// Create type parameters
 
@@ -806,10 +733,8 @@ public class Oarp4_datatypesPackageImpl extends EPackageImpl implements Oarp4_da
 		initEAttribute(getVelocity_Linear_Value(), theStd_datatypesPackage.getInt32(), "value", null, 1, 1, Velocity_Linear.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 
 		initEClass(art_Set_PointEClass, Art_Set_Point.class, "Art_Set_Point", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getArt_Set_Point_Omega_left(), this.getVelocity_Angular(), null, "omega_left", null, 1, 1, Art_Set_Point.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED,
-				!IS_ORDERED);
-		initEReference(getArt_Set_Point_Omega_right(), this.getVelocity_Angular(), null, "omega_right", null, 1, 1, Art_Set_Point.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-				!IS_ORDERED);
+		initEReference(getArt_Set_Point_Omega_left(), this.getVelocity_Angular(), null, "omega_left", null, 1, 1, Art_Set_Point.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getArt_Set_Point_Omega_right(), this.getVelocity_Angular(), null, "omega_right", null, 1, 1, Art_Set_Point.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 
 		initEClass(velocity_AngularEClass, Velocity_Angular.class, "Velocity_Angular", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getVelocity_Angular_Value(), theStd_datatypesPackage.getFloat64(), "value", null, 1, 1, Velocity_Angular.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
@@ -828,10 +753,8 @@ public class Oarp4_datatypesPackageImpl extends EPackageImpl implements Oarp4_da
 		initEReference(getOp_Set_Point_Orientation(), this.getAngular(), null, "orientation", null, 1, 1, Op_Set_Point.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 
 		initEClass(speed_Tics_Left_RightEClass, Speed_Tics_Left_Right.class, "Speed_Tics_Left_Right", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getSpeed_Tics_Left_Right_Speed_tics_left(), this.getSpeed_Tics(), null, "speed_tics_left", null, 1, 1, Speed_Tics_Left_Right.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-				!IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getSpeed_Tics_Left_Right_Speed_tics_right(), this.getSpeed_Tics(), null, "speed_tics_right", null, 1, 1, Speed_Tics_Left_Right.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-				!IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getSpeed_Tics_Left_Right_Speed_tics_left(), this.getSpeed_Tics(), null, "speed_tics_left", null, 1, 1, Speed_Tics_Left_Right.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getSpeed_Tics_Left_Right_Speed_tics_right(), this.getSpeed_Tics(), null, "speed_tics_right", null, 1, 1, Speed_Tics_Left_Right.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 
 		initEClass(speed_TicsEClass, Speed_Tics.class, "Speed_Tics", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getSpeed_Tics_Value(), theStd_datatypesPackage.getInt32(), "value", null, 1, 1, Speed_Tics.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
@@ -840,37 +763,27 @@ public class Oarp4_datatypesPackageImpl extends EPackageImpl implements Oarp4_da
 		initEAttribute(getOdometer_Tics_Value(), theStd_datatypesPackage.getInt32(), "value", null, 1, 1, Odometer_Tics.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 
 		initEClass(odometer_Tics_Left_RightEClass, Odometer_Tics_Left_Right.class, "Odometer_Tics_Left_Right", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getOdometer_Tics_Left_Right_Odometer_tics_left(), this.getOdometer_Tics(), null, "odometer_tics_left", null, 1, 1, Odometer_Tics_Left_Right.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-				!IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getOdometer_Tics_Left_Right_Odometer_tics_right(), this.getOdometer_Tics(), null, "odometer_tics_right", null, 1, 1, Odometer_Tics_Left_Right.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-				!IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getOdometer_Tics_Left_Right_Odometer_tics_left(), this.getOdometer_Tics(), null, "odometer_tics_left", null, 1, 1, Odometer_Tics_Left_Right.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getOdometer_Tics_Left_Right_Odometer_tics_right(), this.getOdometer_Tics(), null, "odometer_tics_right", null, 1, 1, Odometer_Tics_Left_Right.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 
 		initEClass(proxi_Left_RightEClass, Proxi_Left_Right.class, "Proxi_Left_Right", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getProxi_Left_Right_Proxi_left(), this.getDistance(), null, "proxi_left", null, 1, 1, Proxi_Left_Right.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED,
-				!IS_ORDERED);
-		initEReference(getProxi_Left_Right_Proxi_right(), this.getDistance(), null, "proxi_right", null, 1, 1, Proxi_Left_Right.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED,
-				!IS_ORDERED);
+		initEReference(getProxi_Left_Right_Proxi_left(), this.getDistance(), null, "proxi_left", null, 1, 1, Proxi_Left_Right.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getProxi_Left_Right_Proxi_right(), this.getDistance(), null, "proxi_right", null, 1, 1, Proxi_Left_Right.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 
 		initEClass(milli_AmpEClass, Milli_Amp.class, "Milli_Amp", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getMilli_Amp_Value(), theStd_datatypesPackage.getUInt32(), "value", null, 1, 1, Milli_Amp.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 
 		initEClass(odometer_Linear_Left_RightEClass, Odometer_Linear_Left_Right.class, "Odometer_Linear_Left_Right", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getOdometer_Linear_Left_Right_Odometer_linear_left(), this.getMetric(), null, "odometer_linear_left", null, 1, 1, Odometer_Linear_Left_Right.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-				!IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getOdometer_Linear_Left_Right_Odometer_linear_right(), this.getMetric(), null, "odometer_linear_right", null, 1, 1, Odometer_Linear_Left_Right.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-				!IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getOdometer_Linear_Left_Right_Odometer_linear_left(), this.getMetric(), null, "odometer_linear_left", null, 1, 1, Odometer_Linear_Left_Right.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getOdometer_Linear_Left_Right_Odometer_linear_right(), this.getMetric(), null, "odometer_linear_right", null, 1, 1, Odometer_Linear_Left_Right.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 
 		initEClass(velocity_Angular_Left_RightEClass, Velocity_Angular_Left_Right.class, "Velocity_Angular_Left_Right", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getVelocity_Angular_Left_Right_Velocity_angular_left(), this.getVelocity_Angular(), null, "velocity_angular_left", null, 1, 1, Velocity_Angular_Left_Right.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
-				!IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getVelocity_Angular_Left_Right_Velocity_angular_right(), this.getVelocity_Angular(), null, "velocity_angular_right", null, 1, 1, Velocity_Angular_Left_Right.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
-				!IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getVelocity_Angular_Left_Right_Velocity_angular_left(), this.getVelocity_Angular(), null, "velocity_angular_left", null, 1, 1, Velocity_Angular_Left_Right.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getVelocity_Angular_Left_Right_Velocity_angular_right(), this.getVelocity_Angular(), null, "velocity_angular_right", null, 1, 1, Velocity_Angular_Left_Right.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 
 		initEClass(velocityEClass, Velocity.class, "Velocity", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getVelocity_Velocity_linear(), this.getVelocity_Linear(), null, "velocity_linear", null, 1, 1, Velocity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED,
-				!IS_ORDERED);
-		initEReference(getVelocity_Velocity_angular(), this.getVelocity_Angular(), null, "velocity_angular", null, 1, 1, Velocity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED,
-				!IS_ORDERED);
+		initEReference(getVelocity_Velocity_linear(), this.getVelocity_Linear(), null, "velocity_linear", null, 1, 1, Velocity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getVelocity_Velocity_angular(), this.getVelocity_Angular(), null, "velocity_angular", null, 1, 1, Velocity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 
 		// Create resource
 		createResource(eNS_URI);
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/impl/Odometer_Linear_Left_RightImpl.java b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/impl/Odometer_Linear_Left_RightImpl.java
index d24511ec92f..0e67fcce568 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/impl/Odometer_Linear_Left_RightImpl.java
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/impl/Odometer_Linear_Left_RightImpl.java
@@ -19,8 +19,8 @@ import org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTyp
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Odometer_Linear_Left_RightImpl#getOdometer_linear_left <em>Odometer linear left</em>}</li>
- * <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Odometer_Linear_Left_RightImpl#getOdometer_linear_right <em>Odometer linear right</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Odometer_Linear_Left_RightImpl#getOdometer_linear_left <em>Odometer linear left</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Odometer_Linear_Left_RightImpl#getOdometer_linear_right <em>Odometer linear right</em>}</li>
  * </ul>
  * </p>
  *
@@ -31,7 +31,6 @@ public class Odometer_Linear_Left_RightImpl extends MinimalEObjectImpl.Container
 	 * The cached value of the '{@link #getOdometer_linear_left() <em>Odometer linear left</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @see #getOdometer_linear_left()
 	 * @generated
 	 * @ordered
@@ -42,7 +41,6 @@ public class Odometer_Linear_Left_RightImpl extends MinimalEObjectImpl.Container
 	 * The cached value of the '{@link #getOdometer_linear_right() <em>Odometer linear right</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @see #getOdometer_linear_right()
 	 * @generated
 	 * @ordered
@@ -52,7 +50,6 @@ public class Odometer_Linear_Left_RightImpl extends MinimalEObjectImpl.Container
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	protected Odometer_Linear_Left_RightImpl() {
@@ -62,7 +59,6 @@ public class Odometer_Linear_Left_RightImpl extends MinimalEObjectImpl.Container
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
@@ -73,7 +69,6 @@ public class Odometer_Linear_Left_RightImpl extends MinimalEObjectImpl.Container
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public Metric getOdometer_linear_left() {
@@ -83,7 +78,6 @@ public class Odometer_Linear_Left_RightImpl extends MinimalEObjectImpl.Container
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public NotificationChain basicSetOdometer_linear_left(Metric newOdometer_linear_left, NotificationChain msgs) {
@@ -91,11 +85,7 @@ public class Odometer_Linear_Left_RightImpl extends MinimalEObjectImpl.Container
 		odometer_linear_left = newOdometer_linear_left;
 		if (eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Oarp4_datatypesPackage.ODOMETER_LINEAR_LEFT_RIGHT__ODOMETER_LINEAR_LEFT, oldOdometer_linear_left, newOdometer_linear_left);
-			if (msgs == null) {
-				msgs = notification;
-			} else {
-				msgs.add(notification);
-			}
+			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
 		return msgs;
 	}
@@ -103,32 +93,25 @@ public class Odometer_Linear_Left_RightImpl extends MinimalEObjectImpl.Container
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public void setOdometer_linear_left(Metric newOdometer_linear_left) {
 		if (newOdometer_linear_left != odometer_linear_left) {
 			NotificationChain msgs = null;
-			if (odometer_linear_left != null) {
-				msgs = ((InternalEObject) odometer_linear_left).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - Oarp4_datatypesPackage.ODOMETER_LINEAR_LEFT_RIGHT__ODOMETER_LINEAR_LEFT, null, msgs);
-			}
-			if (newOdometer_linear_left != null) {
-				msgs = ((InternalEObject) newOdometer_linear_left).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - Oarp4_datatypesPackage.ODOMETER_LINEAR_LEFT_RIGHT__ODOMETER_LINEAR_LEFT, null, msgs);
-			}
+			if (odometer_linear_left != null)
+				msgs = ((InternalEObject)odometer_linear_left).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - Oarp4_datatypesPackage.ODOMETER_LINEAR_LEFT_RIGHT__ODOMETER_LINEAR_LEFT, null, msgs);
+			if (newOdometer_linear_left != null)
+				msgs = ((InternalEObject)newOdometer_linear_left).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - Oarp4_datatypesPackage.ODOMETER_LINEAR_LEFT_RIGHT__ODOMETER_LINEAR_LEFT, null, msgs);
 			msgs = basicSetOdometer_linear_left(newOdometer_linear_left, msgs);
-			if (msgs != null) {
-				msgs.dispatch();
-			}
+			if (msgs != null) msgs.dispatch();
 		}
-		else if (eNotificationRequired()) {
+		else if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, Oarp4_datatypesPackage.ODOMETER_LINEAR_LEFT_RIGHT__ODOMETER_LINEAR_LEFT, newOdometer_linear_left, newOdometer_linear_left));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public Metric getOdometer_linear_right() {
@@ -138,7 +121,6 @@ public class Odometer_Linear_Left_RightImpl extends MinimalEObjectImpl.Container
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public NotificationChain basicSetOdometer_linear_right(Metric newOdometer_linear_right, NotificationChain msgs) {
@@ -146,11 +128,7 @@ public class Odometer_Linear_Left_RightImpl extends MinimalEObjectImpl.Container
 		odometer_linear_right = newOdometer_linear_right;
 		if (eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Oarp4_datatypesPackage.ODOMETER_LINEAR_LEFT_RIGHT__ODOMETER_LINEAR_RIGHT, oldOdometer_linear_right, newOdometer_linear_right);
-			if (msgs == null) {
-				msgs = notification;
-			} else {
-				msgs.add(notification);
-			}
+			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
 		return msgs;
 	}
@@ -158,41 +136,34 @@ public class Odometer_Linear_Left_RightImpl extends MinimalEObjectImpl.Container
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public void setOdometer_linear_right(Metric newOdometer_linear_right) {
 		if (newOdometer_linear_right != odometer_linear_right) {
 			NotificationChain msgs = null;
-			if (odometer_linear_right != null) {
-				msgs = ((InternalEObject) odometer_linear_right).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - Oarp4_datatypesPackage.ODOMETER_LINEAR_LEFT_RIGHT__ODOMETER_LINEAR_RIGHT, null, msgs);
-			}
-			if (newOdometer_linear_right != null) {
-				msgs = ((InternalEObject) newOdometer_linear_right).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - Oarp4_datatypesPackage.ODOMETER_LINEAR_LEFT_RIGHT__ODOMETER_LINEAR_RIGHT, null, msgs);
-			}
+			if (odometer_linear_right != null)
+				msgs = ((InternalEObject)odometer_linear_right).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - Oarp4_datatypesPackage.ODOMETER_LINEAR_LEFT_RIGHT__ODOMETER_LINEAR_RIGHT, null, msgs);
+			if (newOdometer_linear_right != null)
+				msgs = ((InternalEObject)newOdometer_linear_right).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - Oarp4_datatypesPackage.ODOMETER_LINEAR_LEFT_RIGHT__ODOMETER_LINEAR_RIGHT, null, msgs);
 			msgs = basicSetOdometer_linear_right(newOdometer_linear_right, msgs);
-			if (msgs != null) {
-				msgs.dispatch();
-			}
+			if (msgs != null) msgs.dispatch();
 		}
-		else if (eNotificationRequired()) {
+		else if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, Oarp4_datatypesPackage.ODOMETER_LINEAR_LEFT_RIGHT__ODOMETER_LINEAR_RIGHT, newOdometer_linear_right, newOdometer_linear_right));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-		case Oarp4_datatypesPackage.ODOMETER_LINEAR_LEFT_RIGHT__ODOMETER_LINEAR_LEFT:
-			return basicSetOdometer_linear_left(null, msgs);
-		case Oarp4_datatypesPackage.ODOMETER_LINEAR_LEFT_RIGHT__ODOMETER_LINEAR_RIGHT:
-			return basicSetOdometer_linear_right(null, msgs);
+			case Oarp4_datatypesPackage.ODOMETER_LINEAR_LEFT_RIGHT__ODOMETER_LINEAR_LEFT:
+				return basicSetOdometer_linear_left(null, msgs);
+			case Oarp4_datatypesPackage.ODOMETER_LINEAR_LEFT_RIGHT__ODOMETER_LINEAR_RIGHT:
+				return basicSetOdometer_linear_right(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -200,16 +171,15 @@ public class Odometer_Linear_Left_RightImpl extends MinimalEObjectImpl.Container
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case Oarp4_datatypesPackage.ODOMETER_LINEAR_LEFT_RIGHT__ODOMETER_LINEAR_LEFT:
-			return getOdometer_linear_left();
-		case Oarp4_datatypesPackage.ODOMETER_LINEAR_LEFT_RIGHT__ODOMETER_LINEAR_RIGHT:
-			return getOdometer_linear_right();
+			case Oarp4_datatypesPackage.ODOMETER_LINEAR_LEFT_RIGHT__ODOMETER_LINEAR_LEFT:
+				return getOdometer_linear_left();
+			case Oarp4_datatypesPackage.ODOMETER_LINEAR_LEFT_RIGHT__ODOMETER_LINEAR_RIGHT:
+				return getOdometer_linear_right();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -217,18 +187,17 @@ public class Odometer_Linear_Left_RightImpl extends MinimalEObjectImpl.Container
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case Oarp4_datatypesPackage.ODOMETER_LINEAR_LEFT_RIGHT__ODOMETER_LINEAR_LEFT:
-			setOdometer_linear_left((Metric) newValue);
-			return;
-		case Oarp4_datatypesPackage.ODOMETER_LINEAR_LEFT_RIGHT__ODOMETER_LINEAR_RIGHT:
-			setOdometer_linear_right((Metric) newValue);
-			return;
+			case Oarp4_datatypesPackage.ODOMETER_LINEAR_LEFT_RIGHT__ODOMETER_LINEAR_LEFT:
+				setOdometer_linear_left((Metric)newValue);
+				return;
+			case Oarp4_datatypesPackage.ODOMETER_LINEAR_LEFT_RIGHT__ODOMETER_LINEAR_RIGHT:
+				setOdometer_linear_right((Metric)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -236,18 +205,17 @@ public class Odometer_Linear_Left_RightImpl extends MinimalEObjectImpl.Container
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case Oarp4_datatypesPackage.ODOMETER_LINEAR_LEFT_RIGHT__ODOMETER_LINEAR_LEFT:
-			setOdometer_linear_left((Metric) null);
-			return;
-		case Oarp4_datatypesPackage.ODOMETER_LINEAR_LEFT_RIGHT__ODOMETER_LINEAR_RIGHT:
-			setOdometer_linear_right((Metric) null);
-			return;
+			case Oarp4_datatypesPackage.ODOMETER_LINEAR_LEFT_RIGHT__ODOMETER_LINEAR_LEFT:
+				setOdometer_linear_left((Metric)null);
+				return;
+			case Oarp4_datatypesPackage.ODOMETER_LINEAR_LEFT_RIGHT__ODOMETER_LINEAR_RIGHT:
+				setOdometer_linear_right((Metric)null);
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -255,16 +223,15 @@ public class Odometer_Linear_Left_RightImpl extends MinimalEObjectImpl.Container
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case Oarp4_datatypesPackage.ODOMETER_LINEAR_LEFT_RIGHT__ODOMETER_LINEAR_LEFT:
-			return odometer_linear_left != null;
-		case Oarp4_datatypesPackage.ODOMETER_LINEAR_LEFT_RIGHT__ODOMETER_LINEAR_RIGHT:
-			return odometer_linear_right != null;
+			case Oarp4_datatypesPackage.ODOMETER_LINEAR_LEFT_RIGHT__ODOMETER_LINEAR_LEFT:
+				return odometer_linear_left != null;
+			case Oarp4_datatypesPackage.ODOMETER_LINEAR_LEFT_RIGHT__ODOMETER_LINEAR_RIGHT:
+				return odometer_linear_right != null;
 		}
 		return super.eIsSet(featureID);
 	}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/impl/Odometer_TicsImpl.java b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/impl/Odometer_TicsImpl.java
index 8e39778280b..012eb7aed45 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/impl/Odometer_TicsImpl.java
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/impl/Odometer_TicsImpl.java
@@ -16,7 +16,7 @@ import org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTyp
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Odometer_TicsImpl#getValue <em>Value</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Odometer_TicsImpl#getValue <em>Value</em>}</li>
  * </ul>
  * </p>
  *
@@ -27,7 +27,6 @@ public class Odometer_TicsImpl extends MinimalEObjectImpl.Container implements O
 	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @see #getValue()
 	 * @generated
 	 * @ordered
@@ -38,7 +37,6 @@ public class Odometer_TicsImpl extends MinimalEObjectImpl.Container implements O
 	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @see #getValue()
 	 * @generated
 	 * @ordered
@@ -48,7 +46,6 @@ public class Odometer_TicsImpl extends MinimalEObjectImpl.Container implements O
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	protected Odometer_TicsImpl() {
@@ -58,7 +55,6 @@ public class Odometer_TicsImpl extends MinimalEObjectImpl.Container implements O
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
@@ -69,7 +65,6 @@ public class Odometer_TicsImpl extends MinimalEObjectImpl.Container implements O
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public int getValue() {
@@ -79,28 +74,25 @@ public class Odometer_TicsImpl extends MinimalEObjectImpl.Container implements O
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public void setValue(int newValue) {
 		int oldValue = value;
 		value = newValue;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, Oarp4_datatypesPackage.ODOMETER_TICS__VALUE, oldValue, value));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case Oarp4_datatypesPackage.ODOMETER_TICS__VALUE:
-			return getValue();
+			case Oarp4_datatypesPackage.ODOMETER_TICS__VALUE:
+				return getValue();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -108,15 +100,14 @@ public class Odometer_TicsImpl extends MinimalEObjectImpl.Container implements O
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case Oarp4_datatypesPackage.ODOMETER_TICS__VALUE:
-			setValue((Integer) newValue);
-			return;
+			case Oarp4_datatypesPackage.ODOMETER_TICS__VALUE:
+				setValue((Integer)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -124,15 +115,14 @@ public class Odometer_TicsImpl extends MinimalEObjectImpl.Container implements O
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case Oarp4_datatypesPackage.ODOMETER_TICS__VALUE:
-			setValue(VALUE_EDEFAULT);
-			return;
+			case Oarp4_datatypesPackage.ODOMETER_TICS__VALUE:
+				setValue(VALUE_EDEFAULT);
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -140,14 +130,13 @@ public class Odometer_TicsImpl extends MinimalEObjectImpl.Container implements O
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case Oarp4_datatypesPackage.ODOMETER_TICS__VALUE:
-			return value != VALUE_EDEFAULT;
+			case Oarp4_datatypesPackage.ODOMETER_TICS__VALUE:
+				return value != VALUE_EDEFAULT;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -155,14 +144,11 @@ public class Odometer_TicsImpl extends MinimalEObjectImpl.Container implements O
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) {
-			return super.toString();
-		}
+		if (eIsProxy()) return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (value: ");
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/impl/Odometer_Tics_Left_RightImpl.java b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/impl/Odometer_Tics_Left_RightImpl.java
index ad485a9e02c..f820c713722 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/impl/Odometer_Tics_Left_RightImpl.java
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/impl/Odometer_Tics_Left_RightImpl.java
@@ -19,8 +19,8 @@ import org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTyp
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Odometer_Tics_Left_RightImpl#getOdometer_tics_left <em>Odometer tics left</em>}</li>
- * <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Odometer_Tics_Left_RightImpl#getOdometer_tics_right <em>Odometer tics right</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Odometer_Tics_Left_RightImpl#getOdometer_tics_left <em>Odometer tics left</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Odometer_Tics_Left_RightImpl#getOdometer_tics_right <em>Odometer tics right</em>}</li>
  * </ul>
  * </p>
  *
@@ -31,7 +31,6 @@ public class Odometer_Tics_Left_RightImpl extends MinimalEObjectImpl.Container i
 	 * The cached value of the '{@link #getOdometer_tics_left() <em>Odometer tics left</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @see #getOdometer_tics_left()
 	 * @generated
 	 * @ordered
@@ -42,7 +41,6 @@ public class Odometer_Tics_Left_RightImpl extends MinimalEObjectImpl.Container i
 	 * The cached value of the '{@link #getOdometer_tics_right() <em>Odometer tics right</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @see #getOdometer_tics_right()
 	 * @generated
 	 * @ordered
@@ -52,7 +50,6 @@ public class Odometer_Tics_Left_RightImpl extends MinimalEObjectImpl.Container i
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	protected Odometer_Tics_Left_RightImpl() {
@@ -62,7 +59,6 @@ public class Odometer_Tics_Left_RightImpl extends MinimalEObjectImpl.Container i
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
@@ -73,7 +69,6 @@ public class Odometer_Tics_Left_RightImpl extends MinimalEObjectImpl.Container i
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public Odometer_Tics getOdometer_tics_left() {
@@ -83,7 +78,6 @@ public class Odometer_Tics_Left_RightImpl extends MinimalEObjectImpl.Container i
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public NotificationChain basicSetOdometer_tics_left(Odometer_Tics newOdometer_tics_left, NotificationChain msgs) {
@@ -91,11 +85,7 @@ public class Odometer_Tics_Left_RightImpl extends MinimalEObjectImpl.Container i
 		odometer_tics_left = newOdometer_tics_left;
 		if (eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Oarp4_datatypesPackage.ODOMETER_TICS_LEFT_RIGHT__ODOMETER_TICS_LEFT, oldOdometer_tics_left, newOdometer_tics_left);
-			if (msgs == null) {
-				msgs = notification;
-			} else {
-				msgs.add(notification);
-			}
+			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
 		return msgs;
 	}
@@ -103,32 +93,25 @@ public class Odometer_Tics_Left_RightImpl extends MinimalEObjectImpl.Container i
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public void setOdometer_tics_left(Odometer_Tics newOdometer_tics_left) {
 		if (newOdometer_tics_left != odometer_tics_left) {
 			NotificationChain msgs = null;
-			if (odometer_tics_left != null) {
-				msgs = ((InternalEObject) odometer_tics_left).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - Oarp4_datatypesPackage.ODOMETER_TICS_LEFT_RIGHT__ODOMETER_TICS_LEFT, null, msgs);
-			}
-			if (newOdometer_tics_left != null) {
-				msgs = ((InternalEObject) newOdometer_tics_left).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - Oarp4_datatypesPackage.ODOMETER_TICS_LEFT_RIGHT__ODOMETER_TICS_LEFT, null, msgs);
-			}
+			if (odometer_tics_left != null)
+				msgs = ((InternalEObject)odometer_tics_left).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - Oarp4_datatypesPackage.ODOMETER_TICS_LEFT_RIGHT__ODOMETER_TICS_LEFT, null, msgs);
+			if (newOdometer_tics_left != null)
+				msgs = ((InternalEObject)newOdometer_tics_left).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - Oarp4_datatypesPackage.ODOMETER_TICS_LEFT_RIGHT__ODOMETER_TICS_LEFT, null, msgs);
 			msgs = basicSetOdometer_tics_left(newOdometer_tics_left, msgs);
-			if (msgs != null) {
-				msgs.dispatch();
-			}
+			if (msgs != null) msgs.dispatch();
 		}
-		else if (eNotificationRequired()) {
+		else if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, Oarp4_datatypesPackage.ODOMETER_TICS_LEFT_RIGHT__ODOMETER_TICS_LEFT, newOdometer_tics_left, newOdometer_tics_left));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public Odometer_Tics getOdometer_tics_right() {
@@ -138,7 +121,6 @@ public class Odometer_Tics_Left_RightImpl extends MinimalEObjectImpl.Container i
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public NotificationChain basicSetOdometer_tics_right(Odometer_Tics newOdometer_tics_right, NotificationChain msgs) {
@@ -146,11 +128,7 @@ public class Odometer_Tics_Left_RightImpl extends MinimalEObjectImpl.Container i
 		odometer_tics_right = newOdometer_tics_right;
 		if (eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Oarp4_datatypesPackage.ODOMETER_TICS_LEFT_RIGHT__ODOMETER_TICS_RIGHT, oldOdometer_tics_right, newOdometer_tics_right);
-			if (msgs == null) {
-				msgs = notification;
-			} else {
-				msgs.add(notification);
-			}
+			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
 		return msgs;
 	}
@@ -158,41 +136,34 @@ public class Odometer_Tics_Left_RightImpl extends MinimalEObjectImpl.Container i
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public void setOdometer_tics_right(Odometer_Tics newOdometer_tics_right) {
 		if (newOdometer_tics_right != odometer_tics_right) {
 			NotificationChain msgs = null;
-			if (odometer_tics_right != null) {
-				msgs = ((InternalEObject) odometer_tics_right).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - Oarp4_datatypesPackage.ODOMETER_TICS_LEFT_RIGHT__ODOMETER_TICS_RIGHT, null, msgs);
-			}
-			if (newOdometer_tics_right != null) {
-				msgs = ((InternalEObject) newOdometer_tics_right).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - Oarp4_datatypesPackage.ODOMETER_TICS_LEFT_RIGHT__ODOMETER_TICS_RIGHT, null, msgs);
-			}
+			if (odometer_tics_right != null)
+				msgs = ((InternalEObject)odometer_tics_right).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - Oarp4_datatypesPackage.ODOMETER_TICS_LEFT_RIGHT__ODOMETER_TICS_RIGHT, null, msgs);
+			if (newOdometer_tics_right != null)
+				msgs = ((InternalEObject)newOdometer_tics_right).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - Oarp4_datatypesPackage.ODOMETER_TICS_LEFT_RIGHT__ODOMETER_TICS_RIGHT, null, msgs);
 			msgs = basicSetOdometer_tics_right(newOdometer_tics_right, msgs);
-			if (msgs != null) {
-				msgs.dispatch();
-			}
+			if (msgs != null) msgs.dispatch();
 		}
-		else if (eNotificationRequired()) {
+		else if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, Oarp4_datatypesPackage.ODOMETER_TICS_LEFT_RIGHT__ODOMETER_TICS_RIGHT, newOdometer_tics_right, newOdometer_tics_right));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-		case Oarp4_datatypesPackage.ODOMETER_TICS_LEFT_RIGHT__ODOMETER_TICS_LEFT:
-			return basicSetOdometer_tics_left(null, msgs);
-		case Oarp4_datatypesPackage.ODOMETER_TICS_LEFT_RIGHT__ODOMETER_TICS_RIGHT:
-			return basicSetOdometer_tics_right(null, msgs);
+			case Oarp4_datatypesPackage.ODOMETER_TICS_LEFT_RIGHT__ODOMETER_TICS_LEFT:
+				return basicSetOdometer_tics_left(null, msgs);
+			case Oarp4_datatypesPackage.ODOMETER_TICS_LEFT_RIGHT__ODOMETER_TICS_RIGHT:
+				return basicSetOdometer_tics_right(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -200,16 +171,15 @@ public class Odometer_Tics_Left_RightImpl extends MinimalEObjectImpl.Container i
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case Oarp4_datatypesPackage.ODOMETER_TICS_LEFT_RIGHT__ODOMETER_TICS_LEFT:
-			return getOdometer_tics_left();
-		case Oarp4_datatypesPackage.ODOMETER_TICS_LEFT_RIGHT__ODOMETER_TICS_RIGHT:
-			return getOdometer_tics_right();
+			case Oarp4_datatypesPackage.ODOMETER_TICS_LEFT_RIGHT__ODOMETER_TICS_LEFT:
+				return getOdometer_tics_left();
+			case Oarp4_datatypesPackage.ODOMETER_TICS_LEFT_RIGHT__ODOMETER_TICS_RIGHT:
+				return getOdometer_tics_right();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -217,18 +187,17 @@ public class Odometer_Tics_Left_RightImpl extends MinimalEObjectImpl.Container i
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case Oarp4_datatypesPackage.ODOMETER_TICS_LEFT_RIGHT__ODOMETER_TICS_LEFT:
-			setOdometer_tics_left((Odometer_Tics) newValue);
-			return;
-		case Oarp4_datatypesPackage.ODOMETER_TICS_LEFT_RIGHT__ODOMETER_TICS_RIGHT:
-			setOdometer_tics_right((Odometer_Tics) newValue);
-			return;
+			case Oarp4_datatypesPackage.ODOMETER_TICS_LEFT_RIGHT__ODOMETER_TICS_LEFT:
+				setOdometer_tics_left((Odometer_Tics)newValue);
+				return;
+			case Oarp4_datatypesPackage.ODOMETER_TICS_LEFT_RIGHT__ODOMETER_TICS_RIGHT:
+				setOdometer_tics_right((Odometer_Tics)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -236,18 +205,17 @@ public class Odometer_Tics_Left_RightImpl extends MinimalEObjectImpl.Container i
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case Oarp4_datatypesPackage.ODOMETER_TICS_LEFT_RIGHT__ODOMETER_TICS_LEFT:
-			setOdometer_tics_left((Odometer_Tics) null);
-			return;
-		case Oarp4_datatypesPackage.ODOMETER_TICS_LEFT_RIGHT__ODOMETER_TICS_RIGHT:
-			setOdometer_tics_right((Odometer_Tics) null);
-			return;
+			case Oarp4_datatypesPackage.ODOMETER_TICS_LEFT_RIGHT__ODOMETER_TICS_LEFT:
+				setOdometer_tics_left((Odometer_Tics)null);
+				return;
+			case Oarp4_datatypesPackage.ODOMETER_TICS_LEFT_RIGHT__ODOMETER_TICS_RIGHT:
+				setOdometer_tics_right((Odometer_Tics)null);
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -255,16 +223,15 @@ public class Odometer_Tics_Left_RightImpl extends MinimalEObjectImpl.Container i
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case Oarp4_datatypesPackage.ODOMETER_TICS_LEFT_RIGHT__ODOMETER_TICS_LEFT:
-			return odometer_tics_left != null;
-		case Oarp4_datatypesPackage.ODOMETER_TICS_LEFT_RIGHT__ODOMETER_TICS_RIGHT:
-			return odometer_tics_right != null;
+			case Oarp4_datatypesPackage.ODOMETER_TICS_LEFT_RIGHT__ODOMETER_TICS_LEFT:
+				return odometer_tics_left != null;
+			case Oarp4_datatypesPackage.ODOMETER_TICS_LEFT_RIGHT__ODOMETER_TICS_RIGHT:
+				return odometer_tics_right != null;
 		}
 		return super.eIsSet(featureID);
 	}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/impl/Op_Set_PointImpl.java b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/impl/Op_Set_PointImpl.java
index 9c24eed35ab..78f521197f0 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/impl/Op_Set_PointImpl.java
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/impl/Op_Set_PointImpl.java
@@ -20,8 +20,8 @@ import org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTyp
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Op_Set_PointImpl#getVelocity <em>Velocity</em>}</li>
- * <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Op_Set_PointImpl#getOrientation <em>Orientation</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Op_Set_PointImpl#getVelocity <em>Velocity</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Op_Set_PointImpl#getOrientation <em>Orientation</em>}</li>
  * </ul>
  * </p>
  *
@@ -32,7 +32,6 @@ public class Op_Set_PointImpl extends MinimalEObjectImpl.Container implements Op
 	 * The cached value of the '{@link #getVelocity() <em>Velocity</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @see #getVelocity()
 	 * @generated
 	 * @ordered
@@ -43,7 +42,6 @@ public class Op_Set_PointImpl extends MinimalEObjectImpl.Container implements Op
 	 * The cached value of the '{@link #getOrientation() <em>Orientation</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @see #getOrientation()
 	 * @generated
 	 * @ordered
@@ -53,7 +51,6 @@ public class Op_Set_PointImpl extends MinimalEObjectImpl.Container implements Op
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	protected Op_Set_PointImpl() {
@@ -63,7 +60,6 @@ public class Op_Set_PointImpl extends MinimalEObjectImpl.Container implements Op
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
@@ -74,7 +70,6 @@ public class Op_Set_PointImpl extends MinimalEObjectImpl.Container implements Op
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public Velocity_Linear getVelocity() {
@@ -84,7 +79,6 @@ public class Op_Set_PointImpl extends MinimalEObjectImpl.Container implements Op
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public NotificationChain basicSetVelocity(Velocity_Linear newVelocity, NotificationChain msgs) {
@@ -92,11 +86,7 @@ public class Op_Set_PointImpl extends MinimalEObjectImpl.Container implements Op
 		velocity = newVelocity;
 		if (eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Oarp4_datatypesPackage.OP_SET_POINT__VELOCITY, oldVelocity, newVelocity);
-			if (msgs == null) {
-				msgs = notification;
-			} else {
-				msgs.add(notification);
-			}
+			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
 		return msgs;
 	}
@@ -104,32 +94,25 @@ public class Op_Set_PointImpl extends MinimalEObjectImpl.Container implements Op
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public void setVelocity(Velocity_Linear newVelocity) {
 		if (newVelocity != velocity) {
 			NotificationChain msgs = null;
-			if (velocity != null) {
-				msgs = ((InternalEObject) velocity).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - Oarp4_datatypesPackage.OP_SET_POINT__VELOCITY, null, msgs);
-			}
-			if (newVelocity != null) {
-				msgs = ((InternalEObject) newVelocity).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - Oarp4_datatypesPackage.OP_SET_POINT__VELOCITY, null, msgs);
-			}
+			if (velocity != null)
+				msgs = ((InternalEObject)velocity).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - Oarp4_datatypesPackage.OP_SET_POINT__VELOCITY, null, msgs);
+			if (newVelocity != null)
+				msgs = ((InternalEObject)newVelocity).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - Oarp4_datatypesPackage.OP_SET_POINT__VELOCITY, null, msgs);
 			msgs = basicSetVelocity(newVelocity, msgs);
-			if (msgs != null) {
-				msgs.dispatch();
-			}
+			if (msgs != null) msgs.dispatch();
 		}
-		else if (eNotificationRequired()) {
+		else if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, Oarp4_datatypesPackage.OP_SET_POINT__VELOCITY, newVelocity, newVelocity));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public Angular getOrientation() {
@@ -139,7 +122,6 @@ public class Op_Set_PointImpl extends MinimalEObjectImpl.Container implements Op
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public NotificationChain basicSetOrientation(Angular newOrientation, NotificationChain msgs) {
@@ -147,11 +129,7 @@ public class Op_Set_PointImpl extends MinimalEObjectImpl.Container implements Op
 		orientation = newOrientation;
 		if (eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Oarp4_datatypesPackage.OP_SET_POINT__ORIENTATION, oldOrientation, newOrientation);
-			if (msgs == null) {
-				msgs = notification;
-			} else {
-				msgs.add(notification);
-			}
+			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
 		return msgs;
 	}
@@ -159,41 +137,34 @@ public class Op_Set_PointImpl extends MinimalEObjectImpl.Container implements Op
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public void setOrientation(Angular newOrientation) {
 		if (newOrientation != orientation) {
 			NotificationChain msgs = null;
-			if (orientation != null) {
-				msgs = ((InternalEObject) orientation).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - Oarp4_datatypesPackage.OP_SET_POINT__ORIENTATION, null, msgs);
-			}
-			if (newOrientation != null) {
-				msgs = ((InternalEObject) newOrientation).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - Oarp4_datatypesPackage.OP_SET_POINT__ORIENTATION, null, msgs);
-			}
+			if (orientation != null)
+				msgs = ((InternalEObject)orientation).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - Oarp4_datatypesPackage.OP_SET_POINT__ORIENTATION, null, msgs);
+			if (newOrientation != null)
+				msgs = ((InternalEObject)newOrientation).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - Oarp4_datatypesPackage.OP_SET_POINT__ORIENTATION, null, msgs);
 			msgs = basicSetOrientation(newOrientation, msgs);
-			if (msgs != null) {
-				msgs.dispatch();
-			}
+			if (msgs != null) msgs.dispatch();
 		}
-		else if (eNotificationRequired()) {
+		else if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, Oarp4_datatypesPackage.OP_SET_POINT__ORIENTATION, newOrientation, newOrientation));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-		case Oarp4_datatypesPackage.OP_SET_POINT__VELOCITY:
-			return basicSetVelocity(null, msgs);
-		case Oarp4_datatypesPackage.OP_SET_POINT__ORIENTATION:
-			return basicSetOrientation(null, msgs);
+			case Oarp4_datatypesPackage.OP_SET_POINT__VELOCITY:
+				return basicSetVelocity(null, msgs);
+			case Oarp4_datatypesPackage.OP_SET_POINT__ORIENTATION:
+				return basicSetOrientation(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -201,16 +172,15 @@ public class Op_Set_PointImpl extends MinimalEObjectImpl.Container implements Op
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case Oarp4_datatypesPackage.OP_SET_POINT__VELOCITY:
-			return getVelocity();
-		case Oarp4_datatypesPackage.OP_SET_POINT__ORIENTATION:
-			return getOrientation();
+			case Oarp4_datatypesPackage.OP_SET_POINT__VELOCITY:
+				return getVelocity();
+			case Oarp4_datatypesPackage.OP_SET_POINT__ORIENTATION:
+				return getOrientation();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -218,18 +188,17 @@ public class Op_Set_PointImpl extends MinimalEObjectImpl.Container implements Op
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case Oarp4_datatypesPackage.OP_SET_POINT__VELOCITY:
-			setVelocity((Velocity_Linear) newValue);
-			return;
-		case Oarp4_datatypesPackage.OP_SET_POINT__ORIENTATION:
-			setOrientation((Angular) newValue);
-			return;
+			case Oarp4_datatypesPackage.OP_SET_POINT__VELOCITY:
+				setVelocity((Velocity_Linear)newValue);
+				return;
+			case Oarp4_datatypesPackage.OP_SET_POINT__ORIENTATION:
+				setOrientation((Angular)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -237,18 +206,17 @@ public class Op_Set_PointImpl extends MinimalEObjectImpl.Container implements Op
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case Oarp4_datatypesPackage.OP_SET_POINT__VELOCITY:
-			setVelocity((Velocity_Linear) null);
-			return;
-		case Oarp4_datatypesPackage.OP_SET_POINT__ORIENTATION:
-			setOrientation((Angular) null);
-			return;
+			case Oarp4_datatypesPackage.OP_SET_POINT__VELOCITY:
+				setVelocity((Velocity_Linear)null);
+				return;
+			case Oarp4_datatypesPackage.OP_SET_POINT__ORIENTATION:
+				setOrientation((Angular)null);
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -256,16 +224,15 @@ public class Op_Set_PointImpl extends MinimalEObjectImpl.Container implements Op
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case Oarp4_datatypesPackage.OP_SET_POINT__VELOCITY:
-			return velocity != null;
-		case Oarp4_datatypesPackage.OP_SET_POINT__ORIENTATION:
-			return orientation != null;
+			case Oarp4_datatypesPackage.OP_SET_POINT__VELOCITY:
+				return velocity != null;
+			case Oarp4_datatypesPackage.OP_SET_POINT__ORIENTATION:
+				return orientation != null;
 		}
 		return super.eIsSet(featureID);
 	}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/impl/Proxi_Left_RightImpl.java b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/impl/Proxi_Left_RightImpl.java
index aef44f9272b..0b05e2896dc 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/impl/Proxi_Left_RightImpl.java
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/impl/Proxi_Left_RightImpl.java
@@ -19,8 +19,8 @@ import org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTyp
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Proxi_Left_RightImpl#getProxi_left <em>Proxi left</em>}</li>
- * <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Proxi_Left_RightImpl#getProxi_right <em>Proxi right</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Proxi_Left_RightImpl#getProxi_left <em>Proxi left</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Proxi_Left_RightImpl#getProxi_right <em>Proxi right</em>}</li>
  * </ul>
  * </p>
  *
@@ -31,7 +31,6 @@ public class Proxi_Left_RightImpl extends MinimalEObjectImpl.Container implement
 	 * The cached value of the '{@link #getProxi_left() <em>Proxi left</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @see #getProxi_left()
 	 * @generated
 	 * @ordered
@@ -42,7 +41,6 @@ public class Proxi_Left_RightImpl extends MinimalEObjectImpl.Container implement
 	 * The cached value of the '{@link #getProxi_right() <em>Proxi right</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @see #getProxi_right()
 	 * @generated
 	 * @ordered
@@ -52,7 +50,6 @@ public class Proxi_Left_RightImpl extends MinimalEObjectImpl.Container implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	protected Proxi_Left_RightImpl() {
@@ -62,7 +59,6 @@ public class Proxi_Left_RightImpl extends MinimalEObjectImpl.Container implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
@@ -73,7 +69,6 @@ public class Proxi_Left_RightImpl extends MinimalEObjectImpl.Container implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public Distance getProxi_left() {
@@ -83,7 +78,6 @@ public class Proxi_Left_RightImpl extends MinimalEObjectImpl.Container implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public NotificationChain basicSetProxi_left(Distance newProxi_left, NotificationChain msgs) {
@@ -91,11 +85,7 @@ public class Proxi_Left_RightImpl extends MinimalEObjectImpl.Container implement
 		proxi_left = newProxi_left;
 		if (eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Oarp4_datatypesPackage.PROXI_LEFT_RIGHT__PROXI_LEFT, oldProxi_left, newProxi_left);
-			if (msgs == null) {
-				msgs = notification;
-			} else {
-				msgs.add(notification);
-			}
+			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
 		return msgs;
 	}
@@ -103,32 +93,25 @@ public class Proxi_Left_RightImpl extends MinimalEObjectImpl.Container implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public void setProxi_left(Distance newProxi_left) {
 		if (newProxi_left != proxi_left) {
 			NotificationChain msgs = null;
-			if (proxi_left != null) {
-				msgs = ((InternalEObject) proxi_left).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - Oarp4_datatypesPackage.PROXI_LEFT_RIGHT__PROXI_LEFT, null, msgs);
-			}
-			if (newProxi_left != null) {
-				msgs = ((InternalEObject) newProxi_left).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - Oarp4_datatypesPackage.PROXI_LEFT_RIGHT__PROXI_LEFT, null, msgs);
-			}
+			if (proxi_left != null)
+				msgs = ((InternalEObject)proxi_left).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - Oarp4_datatypesPackage.PROXI_LEFT_RIGHT__PROXI_LEFT, null, msgs);
+			if (newProxi_left != null)
+				msgs = ((InternalEObject)newProxi_left).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - Oarp4_datatypesPackage.PROXI_LEFT_RIGHT__PROXI_LEFT, null, msgs);
 			msgs = basicSetProxi_left(newProxi_left, msgs);
-			if (msgs != null) {
-				msgs.dispatch();
-			}
+			if (msgs != null) msgs.dispatch();
 		}
-		else if (eNotificationRequired()) {
+		else if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, Oarp4_datatypesPackage.PROXI_LEFT_RIGHT__PROXI_LEFT, newProxi_left, newProxi_left));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public Distance getProxi_right() {
@@ -138,7 +121,6 @@ public class Proxi_Left_RightImpl extends MinimalEObjectImpl.Container implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public NotificationChain basicSetProxi_right(Distance newProxi_right, NotificationChain msgs) {
@@ -146,11 +128,7 @@ public class Proxi_Left_RightImpl extends MinimalEObjectImpl.Container implement
 		proxi_right = newProxi_right;
 		if (eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Oarp4_datatypesPackage.PROXI_LEFT_RIGHT__PROXI_RIGHT, oldProxi_right, newProxi_right);
-			if (msgs == null) {
-				msgs = notification;
-			} else {
-				msgs.add(notification);
-			}
+			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
 		return msgs;
 	}
@@ -158,41 +136,34 @@ public class Proxi_Left_RightImpl extends MinimalEObjectImpl.Container implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public void setProxi_right(Distance newProxi_right) {
 		if (newProxi_right != proxi_right) {
 			NotificationChain msgs = null;
-			if (proxi_right != null) {
-				msgs = ((InternalEObject) proxi_right).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - Oarp4_datatypesPackage.PROXI_LEFT_RIGHT__PROXI_RIGHT, null, msgs);
-			}
-			if (newProxi_right != null) {
-				msgs = ((InternalEObject) newProxi_right).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - Oarp4_datatypesPackage.PROXI_LEFT_RIGHT__PROXI_RIGHT, null, msgs);
-			}
+			if (proxi_right != null)
+				msgs = ((InternalEObject)proxi_right).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - Oarp4_datatypesPackage.PROXI_LEFT_RIGHT__PROXI_RIGHT, null, msgs);
+			if (newProxi_right != null)
+				msgs = ((InternalEObject)newProxi_right).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - Oarp4_datatypesPackage.PROXI_LEFT_RIGHT__PROXI_RIGHT, null, msgs);
 			msgs = basicSetProxi_right(newProxi_right, msgs);
-			if (msgs != null) {
-				msgs.dispatch();
-			}
+			if (msgs != null) msgs.dispatch();
 		}
-		else if (eNotificationRequired()) {
+		else if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, Oarp4_datatypesPackage.PROXI_LEFT_RIGHT__PROXI_RIGHT, newProxi_right, newProxi_right));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-		case Oarp4_datatypesPackage.PROXI_LEFT_RIGHT__PROXI_LEFT:
-			return basicSetProxi_left(null, msgs);
-		case Oarp4_datatypesPackage.PROXI_LEFT_RIGHT__PROXI_RIGHT:
-			return basicSetProxi_right(null, msgs);
+			case Oarp4_datatypesPackage.PROXI_LEFT_RIGHT__PROXI_LEFT:
+				return basicSetProxi_left(null, msgs);
+			case Oarp4_datatypesPackage.PROXI_LEFT_RIGHT__PROXI_RIGHT:
+				return basicSetProxi_right(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -200,16 +171,15 @@ public class Proxi_Left_RightImpl extends MinimalEObjectImpl.Container implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case Oarp4_datatypesPackage.PROXI_LEFT_RIGHT__PROXI_LEFT:
-			return getProxi_left();
-		case Oarp4_datatypesPackage.PROXI_LEFT_RIGHT__PROXI_RIGHT:
-			return getProxi_right();
+			case Oarp4_datatypesPackage.PROXI_LEFT_RIGHT__PROXI_LEFT:
+				return getProxi_left();
+			case Oarp4_datatypesPackage.PROXI_LEFT_RIGHT__PROXI_RIGHT:
+				return getProxi_right();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -217,18 +187,17 @@ public class Proxi_Left_RightImpl extends MinimalEObjectImpl.Container implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case Oarp4_datatypesPackage.PROXI_LEFT_RIGHT__PROXI_LEFT:
-			setProxi_left((Distance) newValue);
-			return;
-		case Oarp4_datatypesPackage.PROXI_LEFT_RIGHT__PROXI_RIGHT:
-			setProxi_right((Distance) newValue);
-			return;
+			case Oarp4_datatypesPackage.PROXI_LEFT_RIGHT__PROXI_LEFT:
+				setProxi_left((Distance)newValue);
+				return;
+			case Oarp4_datatypesPackage.PROXI_LEFT_RIGHT__PROXI_RIGHT:
+				setProxi_right((Distance)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -236,18 +205,17 @@ public class Proxi_Left_RightImpl extends MinimalEObjectImpl.Container implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case Oarp4_datatypesPackage.PROXI_LEFT_RIGHT__PROXI_LEFT:
-			setProxi_left((Distance) null);
-			return;
-		case Oarp4_datatypesPackage.PROXI_LEFT_RIGHT__PROXI_RIGHT:
-			setProxi_right((Distance) null);
-			return;
+			case Oarp4_datatypesPackage.PROXI_LEFT_RIGHT__PROXI_LEFT:
+				setProxi_left((Distance)null);
+				return;
+			case Oarp4_datatypesPackage.PROXI_LEFT_RIGHT__PROXI_RIGHT:
+				setProxi_right((Distance)null);
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -255,16 +223,15 @@ public class Proxi_Left_RightImpl extends MinimalEObjectImpl.Container implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case Oarp4_datatypesPackage.PROXI_LEFT_RIGHT__PROXI_LEFT:
-			return proxi_left != null;
-		case Oarp4_datatypesPackage.PROXI_LEFT_RIGHT__PROXI_RIGHT:
-			return proxi_right != null;
+			case Oarp4_datatypesPackage.PROXI_LEFT_RIGHT__PROXI_LEFT:
+				return proxi_left != null;
+			case Oarp4_datatypesPackage.PROXI_LEFT_RIGHT__PROXI_RIGHT:
+				return proxi_right != null;
 		}
 		return super.eIsSet(featureID);
 	}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/impl/Speed_TicsImpl.java b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/impl/Speed_TicsImpl.java
index 86483074099..1614122e31f 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/impl/Speed_TicsImpl.java
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/impl/Speed_TicsImpl.java
@@ -16,7 +16,7 @@ import org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTyp
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Speed_TicsImpl#getValue <em>Value</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Speed_TicsImpl#getValue <em>Value</em>}</li>
  * </ul>
  * </p>
  *
@@ -27,7 +27,6 @@ public class Speed_TicsImpl extends MinimalEObjectImpl.Container implements Spee
 	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @see #getValue()
 	 * @generated
 	 * @ordered
@@ -38,7 +37,6 @@ public class Speed_TicsImpl extends MinimalEObjectImpl.Container implements Spee
 	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @see #getValue()
 	 * @generated
 	 * @ordered
@@ -48,7 +46,6 @@ public class Speed_TicsImpl extends MinimalEObjectImpl.Container implements Spee
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	protected Speed_TicsImpl() {
@@ -58,7 +55,6 @@ public class Speed_TicsImpl extends MinimalEObjectImpl.Container implements Spee
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
@@ -69,7 +65,6 @@ public class Speed_TicsImpl extends MinimalEObjectImpl.Container implements Spee
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public int getValue() {
@@ -79,28 +74,25 @@ public class Speed_TicsImpl extends MinimalEObjectImpl.Container implements Spee
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public void setValue(int newValue) {
 		int oldValue = value;
 		value = newValue;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, Oarp4_datatypesPackage.SPEED_TICS__VALUE, oldValue, value));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case Oarp4_datatypesPackage.SPEED_TICS__VALUE:
-			return getValue();
+			case Oarp4_datatypesPackage.SPEED_TICS__VALUE:
+				return getValue();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -108,15 +100,14 @@ public class Speed_TicsImpl extends MinimalEObjectImpl.Container implements Spee
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case Oarp4_datatypesPackage.SPEED_TICS__VALUE:
-			setValue((Integer) newValue);
-			return;
+			case Oarp4_datatypesPackage.SPEED_TICS__VALUE:
+				setValue((Integer)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -124,15 +115,14 @@ public class Speed_TicsImpl extends MinimalEObjectImpl.Container implements Spee
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case Oarp4_datatypesPackage.SPEED_TICS__VALUE:
-			setValue(VALUE_EDEFAULT);
-			return;
+			case Oarp4_datatypesPackage.SPEED_TICS__VALUE:
+				setValue(VALUE_EDEFAULT);
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -140,14 +130,13 @@ public class Speed_TicsImpl extends MinimalEObjectImpl.Container implements Spee
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case Oarp4_datatypesPackage.SPEED_TICS__VALUE:
-			return value != VALUE_EDEFAULT;
+			case Oarp4_datatypesPackage.SPEED_TICS__VALUE:
+				return value != VALUE_EDEFAULT;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -155,14 +144,11 @@ public class Speed_TicsImpl extends MinimalEObjectImpl.Container implements Spee
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) {
-			return super.toString();
-		}
+		if (eIsProxy()) return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (value: ");
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/impl/Speed_Tics_Left_RightImpl.java b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/impl/Speed_Tics_Left_RightImpl.java
index 07b39aac77f..9c05e534244 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/impl/Speed_Tics_Left_RightImpl.java
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/impl/Speed_Tics_Left_RightImpl.java
@@ -19,8 +19,8 @@ import org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTyp
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Speed_Tics_Left_RightImpl#getSpeed_tics_left <em>Speed tics left</em>}</li>
- * <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Speed_Tics_Left_RightImpl#getSpeed_tics_right <em>Speed tics right</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Speed_Tics_Left_RightImpl#getSpeed_tics_left <em>Speed tics left</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Speed_Tics_Left_RightImpl#getSpeed_tics_right <em>Speed tics right</em>}</li>
  * </ul>
  * </p>
  *
@@ -31,7 +31,6 @@ public class Speed_Tics_Left_RightImpl extends MinimalEObjectImpl.Container impl
 	 * The cached value of the '{@link #getSpeed_tics_left() <em>Speed tics left</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @see #getSpeed_tics_left()
 	 * @generated
 	 * @ordered
@@ -42,7 +41,6 @@ public class Speed_Tics_Left_RightImpl extends MinimalEObjectImpl.Container impl
 	 * The cached value of the '{@link #getSpeed_tics_right() <em>Speed tics right</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @see #getSpeed_tics_right()
 	 * @generated
 	 * @ordered
@@ -52,7 +50,6 @@ public class Speed_Tics_Left_RightImpl extends MinimalEObjectImpl.Container impl
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	protected Speed_Tics_Left_RightImpl() {
@@ -62,7 +59,6 @@ public class Speed_Tics_Left_RightImpl extends MinimalEObjectImpl.Container impl
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
@@ -73,7 +69,6 @@ public class Speed_Tics_Left_RightImpl extends MinimalEObjectImpl.Container impl
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public Speed_Tics getSpeed_tics_left() {
@@ -83,7 +78,6 @@ public class Speed_Tics_Left_RightImpl extends MinimalEObjectImpl.Container impl
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public NotificationChain basicSetSpeed_tics_left(Speed_Tics newSpeed_tics_left, NotificationChain msgs) {
@@ -91,11 +85,7 @@ public class Speed_Tics_Left_RightImpl extends MinimalEObjectImpl.Container impl
 		speed_tics_left = newSpeed_tics_left;
 		if (eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Oarp4_datatypesPackage.SPEED_TICS_LEFT_RIGHT__SPEED_TICS_LEFT, oldSpeed_tics_left, newSpeed_tics_left);
-			if (msgs == null) {
-				msgs = notification;
-			} else {
-				msgs.add(notification);
-			}
+			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
 		return msgs;
 	}
@@ -103,32 +93,25 @@ public class Speed_Tics_Left_RightImpl extends MinimalEObjectImpl.Container impl
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public void setSpeed_tics_left(Speed_Tics newSpeed_tics_left) {
 		if (newSpeed_tics_left != speed_tics_left) {
 			NotificationChain msgs = null;
-			if (speed_tics_left != null) {
-				msgs = ((InternalEObject) speed_tics_left).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - Oarp4_datatypesPackage.SPEED_TICS_LEFT_RIGHT__SPEED_TICS_LEFT, null, msgs);
-			}
-			if (newSpeed_tics_left != null) {
-				msgs = ((InternalEObject) newSpeed_tics_left).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - Oarp4_datatypesPackage.SPEED_TICS_LEFT_RIGHT__SPEED_TICS_LEFT, null, msgs);
-			}
+			if (speed_tics_left != null)
+				msgs = ((InternalEObject)speed_tics_left).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - Oarp4_datatypesPackage.SPEED_TICS_LEFT_RIGHT__SPEED_TICS_LEFT, null, msgs);
+			if (newSpeed_tics_left != null)
+				msgs = ((InternalEObject)newSpeed_tics_left).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - Oarp4_datatypesPackage.SPEED_TICS_LEFT_RIGHT__SPEED_TICS_LEFT, null, msgs);
 			msgs = basicSetSpeed_tics_left(newSpeed_tics_left, msgs);
-			if (msgs != null) {
-				msgs.dispatch();
-			}
+			if (msgs != null) msgs.dispatch();
 		}
-		else if (eNotificationRequired()) {
+		else if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, Oarp4_datatypesPackage.SPEED_TICS_LEFT_RIGHT__SPEED_TICS_LEFT, newSpeed_tics_left, newSpeed_tics_left));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public Speed_Tics getSpeed_tics_right() {
@@ -138,7 +121,6 @@ public class Speed_Tics_Left_RightImpl extends MinimalEObjectImpl.Container impl
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public NotificationChain basicSetSpeed_tics_right(Speed_Tics newSpeed_tics_right, NotificationChain msgs) {
@@ -146,11 +128,7 @@ public class Speed_Tics_Left_RightImpl extends MinimalEObjectImpl.Container impl
 		speed_tics_right = newSpeed_tics_right;
 		if (eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Oarp4_datatypesPackage.SPEED_TICS_LEFT_RIGHT__SPEED_TICS_RIGHT, oldSpeed_tics_right, newSpeed_tics_right);
-			if (msgs == null) {
-				msgs = notification;
-			} else {
-				msgs.add(notification);
-			}
+			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
 		return msgs;
 	}
@@ -158,41 +136,34 @@ public class Speed_Tics_Left_RightImpl extends MinimalEObjectImpl.Container impl
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public void setSpeed_tics_right(Speed_Tics newSpeed_tics_right) {
 		if (newSpeed_tics_right != speed_tics_right) {
 			NotificationChain msgs = null;
-			if (speed_tics_right != null) {
-				msgs = ((InternalEObject) speed_tics_right).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - Oarp4_datatypesPackage.SPEED_TICS_LEFT_RIGHT__SPEED_TICS_RIGHT, null, msgs);
-			}
-			if (newSpeed_tics_right != null) {
-				msgs = ((InternalEObject) newSpeed_tics_right).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - Oarp4_datatypesPackage.SPEED_TICS_LEFT_RIGHT__SPEED_TICS_RIGHT, null, msgs);
-			}
+			if (speed_tics_right != null)
+				msgs = ((InternalEObject)speed_tics_right).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - Oarp4_datatypesPackage.SPEED_TICS_LEFT_RIGHT__SPEED_TICS_RIGHT, null, msgs);
+			if (newSpeed_tics_right != null)
+				msgs = ((InternalEObject)newSpeed_tics_right).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - Oarp4_datatypesPackage.SPEED_TICS_LEFT_RIGHT__SPEED_TICS_RIGHT, null, msgs);
 			msgs = basicSetSpeed_tics_right(newSpeed_tics_right, msgs);
-			if (msgs != null) {
-				msgs.dispatch();
-			}
+			if (msgs != null) msgs.dispatch();
 		}
-		else if (eNotificationRequired()) {
+		else if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, Oarp4_datatypesPackage.SPEED_TICS_LEFT_RIGHT__SPEED_TICS_RIGHT, newSpeed_tics_right, newSpeed_tics_right));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-		case Oarp4_datatypesPackage.SPEED_TICS_LEFT_RIGHT__SPEED_TICS_LEFT:
-			return basicSetSpeed_tics_left(null, msgs);
-		case Oarp4_datatypesPackage.SPEED_TICS_LEFT_RIGHT__SPEED_TICS_RIGHT:
-			return basicSetSpeed_tics_right(null, msgs);
+			case Oarp4_datatypesPackage.SPEED_TICS_LEFT_RIGHT__SPEED_TICS_LEFT:
+				return basicSetSpeed_tics_left(null, msgs);
+			case Oarp4_datatypesPackage.SPEED_TICS_LEFT_RIGHT__SPEED_TICS_RIGHT:
+				return basicSetSpeed_tics_right(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -200,16 +171,15 @@ public class Speed_Tics_Left_RightImpl extends MinimalEObjectImpl.Container impl
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case Oarp4_datatypesPackage.SPEED_TICS_LEFT_RIGHT__SPEED_TICS_LEFT:
-			return getSpeed_tics_left();
-		case Oarp4_datatypesPackage.SPEED_TICS_LEFT_RIGHT__SPEED_TICS_RIGHT:
-			return getSpeed_tics_right();
+			case Oarp4_datatypesPackage.SPEED_TICS_LEFT_RIGHT__SPEED_TICS_LEFT:
+				return getSpeed_tics_left();
+			case Oarp4_datatypesPackage.SPEED_TICS_LEFT_RIGHT__SPEED_TICS_RIGHT:
+				return getSpeed_tics_right();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -217,18 +187,17 @@ public class Speed_Tics_Left_RightImpl extends MinimalEObjectImpl.Container impl
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case Oarp4_datatypesPackage.SPEED_TICS_LEFT_RIGHT__SPEED_TICS_LEFT:
-			setSpeed_tics_left((Speed_Tics) newValue);
-			return;
-		case Oarp4_datatypesPackage.SPEED_TICS_LEFT_RIGHT__SPEED_TICS_RIGHT:
-			setSpeed_tics_right((Speed_Tics) newValue);
-			return;
+			case Oarp4_datatypesPackage.SPEED_TICS_LEFT_RIGHT__SPEED_TICS_LEFT:
+				setSpeed_tics_left((Speed_Tics)newValue);
+				return;
+			case Oarp4_datatypesPackage.SPEED_TICS_LEFT_RIGHT__SPEED_TICS_RIGHT:
+				setSpeed_tics_right((Speed_Tics)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -236,18 +205,17 @@ public class Speed_Tics_Left_RightImpl extends MinimalEObjectImpl.Container impl
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case Oarp4_datatypesPackage.SPEED_TICS_LEFT_RIGHT__SPEED_TICS_LEFT:
-			setSpeed_tics_left((Speed_Tics) null);
-			return;
-		case Oarp4_datatypesPackage.SPEED_TICS_LEFT_RIGHT__SPEED_TICS_RIGHT:
-			setSpeed_tics_right((Speed_Tics) null);
-			return;
+			case Oarp4_datatypesPackage.SPEED_TICS_LEFT_RIGHT__SPEED_TICS_LEFT:
+				setSpeed_tics_left((Speed_Tics)null);
+				return;
+			case Oarp4_datatypesPackage.SPEED_TICS_LEFT_RIGHT__SPEED_TICS_RIGHT:
+				setSpeed_tics_right((Speed_Tics)null);
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -255,16 +223,15 @@ public class Speed_Tics_Left_RightImpl extends MinimalEObjectImpl.Container impl
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case Oarp4_datatypesPackage.SPEED_TICS_LEFT_RIGHT__SPEED_TICS_LEFT:
-			return speed_tics_left != null;
-		case Oarp4_datatypesPackage.SPEED_TICS_LEFT_RIGHT__SPEED_TICS_RIGHT:
-			return speed_tics_right != null;
+			case Oarp4_datatypesPackage.SPEED_TICS_LEFT_RIGHT__SPEED_TICS_LEFT:
+				return speed_tics_left != null;
+			case Oarp4_datatypesPackage.SPEED_TICS_LEFT_RIGHT__SPEED_TICS_RIGHT:
+				return speed_tics_right != null;
 		}
 		return super.eIsSet(featureID);
 	}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/impl/VelocityImpl.java b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/impl/VelocityImpl.java
index aa506786284..7e193767ed2 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/impl/VelocityImpl.java
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/impl/VelocityImpl.java
@@ -20,8 +20,8 @@ import org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTyp
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.VelocityImpl#getVelocity_linear <em>Velocity linear</em>}</li>
- * <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.VelocityImpl#getVelocity_angular <em>Velocity angular</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.VelocityImpl#getVelocity_linear <em>Velocity linear</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.VelocityImpl#getVelocity_angular <em>Velocity angular</em>}</li>
  * </ul>
  * </p>
  *
@@ -32,7 +32,6 @@ public class VelocityImpl extends MinimalEObjectImpl.Container implements Veloci
 	 * The cached value of the '{@link #getVelocity_linear() <em>Velocity linear</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @see #getVelocity_linear()
 	 * @generated
 	 * @ordered
@@ -43,7 +42,6 @@ public class VelocityImpl extends MinimalEObjectImpl.Container implements Veloci
 	 * The cached value of the '{@link #getVelocity_angular() <em>Velocity angular</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @see #getVelocity_angular()
 	 * @generated
 	 * @ordered
@@ -53,7 +51,6 @@ public class VelocityImpl extends MinimalEObjectImpl.Container implements Veloci
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	protected VelocityImpl() {
@@ -63,7 +60,6 @@ public class VelocityImpl extends MinimalEObjectImpl.Container implements Veloci
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
@@ -74,7 +70,6 @@ public class VelocityImpl extends MinimalEObjectImpl.Container implements Veloci
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public Velocity_Linear getVelocity_linear() {
@@ -84,7 +79,6 @@ public class VelocityImpl extends MinimalEObjectImpl.Container implements Veloci
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public NotificationChain basicSetVelocity_linear(Velocity_Linear newVelocity_linear, NotificationChain msgs) {
@@ -92,11 +86,7 @@ public class VelocityImpl extends MinimalEObjectImpl.Container implements Veloci
 		velocity_linear = newVelocity_linear;
 		if (eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Oarp4_datatypesPackage.VELOCITY__VELOCITY_LINEAR, oldVelocity_linear, newVelocity_linear);
-			if (msgs == null) {
-				msgs = notification;
-			} else {
-				msgs.add(notification);
-			}
+			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
 		return msgs;
 	}
@@ -104,32 +94,25 @@ public class VelocityImpl extends MinimalEObjectImpl.Container implements Veloci
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public void setVelocity_linear(Velocity_Linear newVelocity_linear) {
 		if (newVelocity_linear != velocity_linear) {
 			NotificationChain msgs = null;
-			if (velocity_linear != null) {
-				msgs = ((InternalEObject) velocity_linear).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - Oarp4_datatypesPackage.VELOCITY__VELOCITY_LINEAR, null, msgs);
-			}
-			if (newVelocity_linear != null) {
-				msgs = ((InternalEObject) newVelocity_linear).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - Oarp4_datatypesPackage.VELOCITY__VELOCITY_LINEAR, null, msgs);
-			}
+			if (velocity_linear != null)
+				msgs = ((InternalEObject)velocity_linear).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - Oarp4_datatypesPackage.VELOCITY__VELOCITY_LINEAR, null, msgs);
+			if (newVelocity_linear != null)
+				msgs = ((InternalEObject)newVelocity_linear).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - Oarp4_datatypesPackage.VELOCITY__VELOCITY_LINEAR, null, msgs);
 			msgs = basicSetVelocity_linear(newVelocity_linear, msgs);
-			if (msgs != null) {
-				msgs.dispatch();
-			}
+			if (msgs != null) msgs.dispatch();
 		}
-		else if (eNotificationRequired()) {
+		else if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, Oarp4_datatypesPackage.VELOCITY__VELOCITY_LINEAR, newVelocity_linear, newVelocity_linear));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public Velocity_Angular getVelocity_angular() {
@@ -139,7 +122,6 @@ public class VelocityImpl extends MinimalEObjectImpl.Container implements Veloci
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public NotificationChain basicSetVelocity_angular(Velocity_Angular newVelocity_angular, NotificationChain msgs) {
@@ -147,11 +129,7 @@ public class VelocityImpl extends MinimalEObjectImpl.Container implements Veloci
 		velocity_angular = newVelocity_angular;
 		if (eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Oarp4_datatypesPackage.VELOCITY__VELOCITY_ANGULAR, oldVelocity_angular, newVelocity_angular);
-			if (msgs == null) {
-				msgs = notification;
-			} else {
-				msgs.add(notification);
-			}
+			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
 		return msgs;
 	}
@@ -159,41 +137,34 @@ public class VelocityImpl extends MinimalEObjectImpl.Container implements Veloci
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public void setVelocity_angular(Velocity_Angular newVelocity_angular) {
 		if (newVelocity_angular != velocity_angular) {
 			NotificationChain msgs = null;
-			if (velocity_angular != null) {
-				msgs = ((InternalEObject) velocity_angular).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - Oarp4_datatypesPackage.VELOCITY__VELOCITY_ANGULAR, null, msgs);
-			}
-			if (newVelocity_angular != null) {
-				msgs = ((InternalEObject) newVelocity_angular).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - Oarp4_datatypesPackage.VELOCITY__VELOCITY_ANGULAR, null, msgs);
-			}
+			if (velocity_angular != null)
+				msgs = ((InternalEObject)velocity_angular).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - Oarp4_datatypesPackage.VELOCITY__VELOCITY_ANGULAR, null, msgs);
+			if (newVelocity_angular != null)
+				msgs = ((InternalEObject)newVelocity_angular).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - Oarp4_datatypesPackage.VELOCITY__VELOCITY_ANGULAR, null, msgs);
 			msgs = basicSetVelocity_angular(newVelocity_angular, msgs);
-			if (msgs != null) {
-				msgs.dispatch();
-			}
+			if (msgs != null) msgs.dispatch();
 		}
-		else if (eNotificationRequired()) {
+		else if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, Oarp4_datatypesPackage.VELOCITY__VELOCITY_ANGULAR, newVelocity_angular, newVelocity_angular));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-		case Oarp4_datatypesPackage.VELOCITY__VELOCITY_LINEAR:
-			return basicSetVelocity_linear(null, msgs);
-		case Oarp4_datatypesPackage.VELOCITY__VELOCITY_ANGULAR:
-			return basicSetVelocity_angular(null, msgs);
+			case Oarp4_datatypesPackage.VELOCITY__VELOCITY_LINEAR:
+				return basicSetVelocity_linear(null, msgs);
+			case Oarp4_datatypesPackage.VELOCITY__VELOCITY_ANGULAR:
+				return basicSetVelocity_angular(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -201,16 +172,15 @@ public class VelocityImpl extends MinimalEObjectImpl.Container implements Veloci
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case Oarp4_datatypesPackage.VELOCITY__VELOCITY_LINEAR:
-			return getVelocity_linear();
-		case Oarp4_datatypesPackage.VELOCITY__VELOCITY_ANGULAR:
-			return getVelocity_angular();
+			case Oarp4_datatypesPackage.VELOCITY__VELOCITY_LINEAR:
+				return getVelocity_linear();
+			case Oarp4_datatypesPackage.VELOCITY__VELOCITY_ANGULAR:
+				return getVelocity_angular();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -218,18 +188,17 @@ public class VelocityImpl extends MinimalEObjectImpl.Container implements Veloci
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case Oarp4_datatypesPackage.VELOCITY__VELOCITY_LINEAR:
-			setVelocity_linear((Velocity_Linear) newValue);
-			return;
-		case Oarp4_datatypesPackage.VELOCITY__VELOCITY_ANGULAR:
-			setVelocity_angular((Velocity_Angular) newValue);
-			return;
+			case Oarp4_datatypesPackage.VELOCITY__VELOCITY_LINEAR:
+				setVelocity_linear((Velocity_Linear)newValue);
+				return;
+			case Oarp4_datatypesPackage.VELOCITY__VELOCITY_ANGULAR:
+				setVelocity_angular((Velocity_Angular)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -237,18 +206,17 @@ public class VelocityImpl extends MinimalEObjectImpl.Container implements Veloci
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case Oarp4_datatypesPackage.VELOCITY__VELOCITY_LINEAR:
-			setVelocity_linear((Velocity_Linear) null);
-			return;
-		case Oarp4_datatypesPackage.VELOCITY__VELOCITY_ANGULAR:
-			setVelocity_angular((Velocity_Angular) null);
-			return;
+			case Oarp4_datatypesPackage.VELOCITY__VELOCITY_LINEAR:
+				setVelocity_linear((Velocity_Linear)null);
+				return;
+			case Oarp4_datatypesPackage.VELOCITY__VELOCITY_ANGULAR:
+				setVelocity_angular((Velocity_Angular)null);
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -256,16 +224,15 @@ public class VelocityImpl extends MinimalEObjectImpl.Container implements Veloci
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case Oarp4_datatypesPackage.VELOCITY__VELOCITY_LINEAR:
-			return velocity_linear != null;
-		case Oarp4_datatypesPackage.VELOCITY__VELOCITY_ANGULAR:
-			return velocity_angular != null;
+			case Oarp4_datatypesPackage.VELOCITY__VELOCITY_LINEAR:
+				return velocity_linear != null;
+			case Oarp4_datatypesPackage.VELOCITY__VELOCITY_ANGULAR:
+				return velocity_angular != null;
 		}
 		return super.eIsSet(featureID);
 	}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/impl/Velocity_AngularImpl.java b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/impl/Velocity_AngularImpl.java
index 3982d51e07e..b307389035c 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/impl/Velocity_AngularImpl.java
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/impl/Velocity_AngularImpl.java
@@ -16,7 +16,7 @@ import org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTyp
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Velocity_AngularImpl#getValue <em>Value</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Velocity_AngularImpl#getValue <em>Value</em>}</li>
  * </ul>
  * </p>
  *
@@ -27,7 +27,6 @@ public class Velocity_AngularImpl extends MinimalEObjectImpl.Container implement
 	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @see #getValue()
 	 * @generated
 	 * @ordered
@@ -38,7 +37,6 @@ public class Velocity_AngularImpl extends MinimalEObjectImpl.Container implement
 	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @see #getValue()
 	 * @generated
 	 * @ordered
@@ -48,7 +46,6 @@ public class Velocity_AngularImpl extends MinimalEObjectImpl.Container implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	protected Velocity_AngularImpl() {
@@ -58,7 +55,6 @@ public class Velocity_AngularImpl extends MinimalEObjectImpl.Container implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
@@ -69,7 +65,6 @@ public class Velocity_AngularImpl extends MinimalEObjectImpl.Container implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public double getValue() {
@@ -79,28 +74,25 @@ public class Velocity_AngularImpl extends MinimalEObjectImpl.Container implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public void setValue(double newValue) {
 		double oldValue = value;
 		value = newValue;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, Oarp4_datatypesPackage.VELOCITY_ANGULAR__VALUE, oldValue, value));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case Oarp4_datatypesPackage.VELOCITY_ANGULAR__VALUE:
-			return getValue();
+			case Oarp4_datatypesPackage.VELOCITY_ANGULAR__VALUE:
+				return getValue();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -108,15 +100,14 @@ public class Velocity_AngularImpl extends MinimalEObjectImpl.Container implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case Oarp4_datatypesPackage.VELOCITY_ANGULAR__VALUE:
-			setValue((Double) newValue);
-			return;
+			case Oarp4_datatypesPackage.VELOCITY_ANGULAR__VALUE:
+				setValue((Double)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -124,15 +115,14 @@ public class Velocity_AngularImpl extends MinimalEObjectImpl.Container implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case Oarp4_datatypesPackage.VELOCITY_ANGULAR__VALUE:
-			setValue(VALUE_EDEFAULT);
-			return;
+			case Oarp4_datatypesPackage.VELOCITY_ANGULAR__VALUE:
+				setValue(VALUE_EDEFAULT);
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -140,14 +130,13 @@ public class Velocity_AngularImpl extends MinimalEObjectImpl.Container implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case Oarp4_datatypesPackage.VELOCITY_ANGULAR__VALUE:
-			return value != VALUE_EDEFAULT;
+			case Oarp4_datatypesPackage.VELOCITY_ANGULAR__VALUE:
+				return value != VALUE_EDEFAULT;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -155,14 +144,11 @@ public class Velocity_AngularImpl extends MinimalEObjectImpl.Container implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) {
-			return super.toString();
-		}
+		if (eIsProxy()) return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (value: ");
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/impl/Velocity_Angular_Left_RightImpl.java b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/impl/Velocity_Angular_Left_RightImpl.java
index 7bffc9a3828..e55b61088cf 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/impl/Velocity_Angular_Left_RightImpl.java
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/impl/Velocity_Angular_Left_RightImpl.java
@@ -19,8 +19,8 @@ import org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTyp
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Velocity_Angular_Left_RightImpl#getVelocity_angular_left <em>Velocity angular left</em>}</li>
- * <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Velocity_Angular_Left_RightImpl#getVelocity_angular_right <em>Velocity angular right</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Velocity_Angular_Left_RightImpl#getVelocity_angular_left <em>Velocity angular left</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Velocity_Angular_Left_RightImpl#getVelocity_angular_right <em>Velocity angular right</em>}</li>
  * </ul>
  * </p>
  *
@@ -31,7 +31,6 @@ public class Velocity_Angular_Left_RightImpl extends MinimalEObjectImpl.Containe
 	 * The cached value of the '{@link #getVelocity_angular_left() <em>Velocity angular left</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @see #getVelocity_angular_left()
 	 * @generated
 	 * @ordered
@@ -42,7 +41,6 @@ public class Velocity_Angular_Left_RightImpl extends MinimalEObjectImpl.Containe
 	 * The cached value of the '{@link #getVelocity_angular_right() <em>Velocity angular right</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @see #getVelocity_angular_right()
 	 * @generated
 	 * @ordered
@@ -52,7 +50,6 @@ public class Velocity_Angular_Left_RightImpl extends MinimalEObjectImpl.Containe
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	protected Velocity_Angular_Left_RightImpl() {
@@ -62,7 +59,6 @@ public class Velocity_Angular_Left_RightImpl extends MinimalEObjectImpl.Containe
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
@@ -73,7 +69,6 @@ public class Velocity_Angular_Left_RightImpl extends MinimalEObjectImpl.Containe
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public Velocity_Angular getVelocity_angular_left() {
@@ -83,7 +78,6 @@ public class Velocity_Angular_Left_RightImpl extends MinimalEObjectImpl.Containe
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public NotificationChain basicSetVelocity_angular_left(Velocity_Angular newVelocity_angular_left, NotificationChain msgs) {
@@ -91,11 +85,7 @@ public class Velocity_Angular_Left_RightImpl extends MinimalEObjectImpl.Containe
 		velocity_angular_left = newVelocity_angular_left;
 		if (eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Oarp4_datatypesPackage.VELOCITY_ANGULAR_LEFT_RIGHT__VELOCITY_ANGULAR_LEFT, oldVelocity_angular_left, newVelocity_angular_left);
-			if (msgs == null) {
-				msgs = notification;
-			} else {
-				msgs.add(notification);
-			}
+			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
 		return msgs;
 	}
@@ -103,32 +93,25 @@ public class Velocity_Angular_Left_RightImpl extends MinimalEObjectImpl.Containe
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public void setVelocity_angular_left(Velocity_Angular newVelocity_angular_left) {
 		if (newVelocity_angular_left != velocity_angular_left) {
 			NotificationChain msgs = null;
-			if (velocity_angular_left != null) {
-				msgs = ((InternalEObject) velocity_angular_left).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - Oarp4_datatypesPackage.VELOCITY_ANGULAR_LEFT_RIGHT__VELOCITY_ANGULAR_LEFT, null, msgs);
-			}
-			if (newVelocity_angular_left != null) {
-				msgs = ((InternalEObject) newVelocity_angular_left).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - Oarp4_datatypesPackage.VELOCITY_ANGULAR_LEFT_RIGHT__VELOCITY_ANGULAR_LEFT, null, msgs);
-			}
+			if (velocity_angular_left != null)
+				msgs = ((InternalEObject)velocity_angular_left).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - Oarp4_datatypesPackage.VELOCITY_ANGULAR_LEFT_RIGHT__VELOCITY_ANGULAR_LEFT, null, msgs);
+			if (newVelocity_angular_left != null)
+				msgs = ((InternalEObject)newVelocity_angular_left).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - Oarp4_datatypesPackage.VELOCITY_ANGULAR_LEFT_RIGHT__VELOCITY_ANGULAR_LEFT, null, msgs);
 			msgs = basicSetVelocity_angular_left(newVelocity_angular_left, msgs);
-			if (msgs != null) {
-				msgs.dispatch();
-			}
+			if (msgs != null) msgs.dispatch();
 		}
-		else if (eNotificationRequired()) {
+		else if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, Oarp4_datatypesPackage.VELOCITY_ANGULAR_LEFT_RIGHT__VELOCITY_ANGULAR_LEFT, newVelocity_angular_left, newVelocity_angular_left));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public Velocity_Angular getVelocity_angular_right() {
@@ -138,7 +121,6 @@ public class Velocity_Angular_Left_RightImpl extends MinimalEObjectImpl.Containe
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public NotificationChain basicSetVelocity_angular_right(Velocity_Angular newVelocity_angular_right, NotificationChain msgs) {
@@ -146,11 +128,7 @@ public class Velocity_Angular_Left_RightImpl extends MinimalEObjectImpl.Containe
 		velocity_angular_right = newVelocity_angular_right;
 		if (eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Oarp4_datatypesPackage.VELOCITY_ANGULAR_LEFT_RIGHT__VELOCITY_ANGULAR_RIGHT, oldVelocity_angular_right, newVelocity_angular_right);
-			if (msgs == null) {
-				msgs = notification;
-			} else {
-				msgs.add(notification);
-			}
+			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
 		return msgs;
 	}
@@ -158,41 +136,34 @@ public class Velocity_Angular_Left_RightImpl extends MinimalEObjectImpl.Containe
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public void setVelocity_angular_right(Velocity_Angular newVelocity_angular_right) {
 		if (newVelocity_angular_right != velocity_angular_right) {
 			NotificationChain msgs = null;
-			if (velocity_angular_right != null) {
-				msgs = ((InternalEObject) velocity_angular_right).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - Oarp4_datatypesPackage.VELOCITY_ANGULAR_LEFT_RIGHT__VELOCITY_ANGULAR_RIGHT, null, msgs);
-			}
-			if (newVelocity_angular_right != null) {
-				msgs = ((InternalEObject) newVelocity_angular_right).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - Oarp4_datatypesPackage.VELOCITY_ANGULAR_LEFT_RIGHT__VELOCITY_ANGULAR_RIGHT, null, msgs);
-			}
+			if (velocity_angular_right != null)
+				msgs = ((InternalEObject)velocity_angular_right).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - Oarp4_datatypesPackage.VELOCITY_ANGULAR_LEFT_RIGHT__VELOCITY_ANGULAR_RIGHT, null, msgs);
+			if (newVelocity_angular_right != null)
+				msgs = ((InternalEObject)newVelocity_angular_right).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - Oarp4_datatypesPackage.VELOCITY_ANGULAR_LEFT_RIGHT__VELOCITY_ANGULAR_RIGHT, null, msgs);
 			msgs = basicSetVelocity_angular_right(newVelocity_angular_right, msgs);
-			if (msgs != null) {
-				msgs.dispatch();
-			}
+			if (msgs != null) msgs.dispatch();
 		}
-		else if (eNotificationRequired()) {
+		else if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, Oarp4_datatypesPackage.VELOCITY_ANGULAR_LEFT_RIGHT__VELOCITY_ANGULAR_RIGHT, newVelocity_angular_right, newVelocity_angular_right));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-		case Oarp4_datatypesPackage.VELOCITY_ANGULAR_LEFT_RIGHT__VELOCITY_ANGULAR_LEFT:
-			return basicSetVelocity_angular_left(null, msgs);
-		case Oarp4_datatypesPackage.VELOCITY_ANGULAR_LEFT_RIGHT__VELOCITY_ANGULAR_RIGHT:
-			return basicSetVelocity_angular_right(null, msgs);
+			case Oarp4_datatypesPackage.VELOCITY_ANGULAR_LEFT_RIGHT__VELOCITY_ANGULAR_LEFT:
+				return basicSetVelocity_angular_left(null, msgs);
+			case Oarp4_datatypesPackage.VELOCITY_ANGULAR_LEFT_RIGHT__VELOCITY_ANGULAR_RIGHT:
+				return basicSetVelocity_angular_right(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -200,16 +171,15 @@ public class Velocity_Angular_Left_RightImpl extends MinimalEObjectImpl.Containe
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case Oarp4_datatypesPackage.VELOCITY_ANGULAR_LEFT_RIGHT__VELOCITY_ANGULAR_LEFT:
-			return getVelocity_angular_left();
-		case Oarp4_datatypesPackage.VELOCITY_ANGULAR_LEFT_RIGHT__VELOCITY_ANGULAR_RIGHT:
-			return getVelocity_angular_right();
+			case Oarp4_datatypesPackage.VELOCITY_ANGULAR_LEFT_RIGHT__VELOCITY_ANGULAR_LEFT:
+				return getVelocity_angular_left();
+			case Oarp4_datatypesPackage.VELOCITY_ANGULAR_LEFT_RIGHT__VELOCITY_ANGULAR_RIGHT:
+				return getVelocity_angular_right();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -217,18 +187,17 @@ public class Velocity_Angular_Left_RightImpl extends MinimalEObjectImpl.Containe
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case Oarp4_datatypesPackage.VELOCITY_ANGULAR_LEFT_RIGHT__VELOCITY_ANGULAR_LEFT:
-			setVelocity_angular_left((Velocity_Angular) newValue);
-			return;
-		case Oarp4_datatypesPackage.VELOCITY_ANGULAR_LEFT_RIGHT__VELOCITY_ANGULAR_RIGHT:
-			setVelocity_angular_right((Velocity_Angular) newValue);
-			return;
+			case Oarp4_datatypesPackage.VELOCITY_ANGULAR_LEFT_RIGHT__VELOCITY_ANGULAR_LEFT:
+				setVelocity_angular_left((Velocity_Angular)newValue);
+				return;
+			case Oarp4_datatypesPackage.VELOCITY_ANGULAR_LEFT_RIGHT__VELOCITY_ANGULAR_RIGHT:
+				setVelocity_angular_right((Velocity_Angular)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -236,18 +205,17 @@ public class Velocity_Angular_Left_RightImpl extends MinimalEObjectImpl.Containe
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case Oarp4_datatypesPackage.VELOCITY_ANGULAR_LEFT_RIGHT__VELOCITY_ANGULAR_LEFT:
-			setVelocity_angular_left((Velocity_Angular) null);
-			return;
-		case Oarp4_datatypesPackage.VELOCITY_ANGULAR_LEFT_RIGHT__VELOCITY_ANGULAR_RIGHT:
-			setVelocity_angular_right((Velocity_Angular) null);
-			return;
+			case Oarp4_datatypesPackage.VELOCITY_ANGULAR_LEFT_RIGHT__VELOCITY_ANGULAR_LEFT:
+				setVelocity_angular_left((Velocity_Angular)null);
+				return;
+			case Oarp4_datatypesPackage.VELOCITY_ANGULAR_LEFT_RIGHT__VELOCITY_ANGULAR_RIGHT:
+				setVelocity_angular_right((Velocity_Angular)null);
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -255,16 +223,15 @@ public class Velocity_Angular_Left_RightImpl extends MinimalEObjectImpl.Containe
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case Oarp4_datatypesPackage.VELOCITY_ANGULAR_LEFT_RIGHT__VELOCITY_ANGULAR_LEFT:
-			return velocity_angular_left != null;
-		case Oarp4_datatypesPackage.VELOCITY_ANGULAR_LEFT_RIGHT__VELOCITY_ANGULAR_RIGHT:
-			return velocity_angular_right != null;
+			case Oarp4_datatypesPackage.VELOCITY_ANGULAR_LEFT_RIGHT__VELOCITY_ANGULAR_LEFT:
+				return velocity_angular_left != null;
+			case Oarp4_datatypesPackage.VELOCITY_ANGULAR_LEFT_RIGHT__VELOCITY_ANGULAR_RIGHT:
+				return velocity_angular_right != null;
 		}
 		return super.eIsSet(featureID);
 	}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/impl/Velocity_LinearImpl.java b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/impl/Velocity_LinearImpl.java
index 77095a237e1..e2bdda253d6 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/impl/Velocity_LinearImpl.java
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/impl/Velocity_LinearImpl.java
@@ -16,7 +16,7 @@ import org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTyp
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Velocity_LinearImpl#getValue <em>Value</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.impl.Velocity_LinearImpl#getValue <em>Value</em>}</li>
  * </ul>
  * </p>
  *
@@ -27,7 +27,6 @@ public class Velocity_LinearImpl extends MinimalEObjectImpl.Container implements
 	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @see #getValue()
 	 * @generated
 	 * @ordered
@@ -38,7 +37,6 @@ public class Velocity_LinearImpl extends MinimalEObjectImpl.Container implements
 	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @see #getValue()
 	 * @generated
 	 * @ordered
@@ -48,7 +46,6 @@ public class Velocity_LinearImpl extends MinimalEObjectImpl.Container implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	protected Velocity_LinearImpl() {
@@ -58,7 +55,6 @@ public class Velocity_LinearImpl extends MinimalEObjectImpl.Container implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
@@ -69,7 +65,6 @@ public class Velocity_LinearImpl extends MinimalEObjectImpl.Container implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public int getValue() {
@@ -79,28 +74,25 @@ public class Velocity_LinearImpl extends MinimalEObjectImpl.Container implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public void setValue(int newValue) {
 		int oldValue = value;
 		value = newValue;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, Oarp4_datatypesPackage.VELOCITY_LINEAR__VALUE, oldValue, value));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case Oarp4_datatypesPackage.VELOCITY_LINEAR__VALUE:
-			return getValue();
+			case Oarp4_datatypesPackage.VELOCITY_LINEAR__VALUE:
+				return getValue();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -108,15 +100,14 @@ public class Velocity_LinearImpl extends MinimalEObjectImpl.Container implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case Oarp4_datatypesPackage.VELOCITY_LINEAR__VALUE:
-			setValue((Integer) newValue);
-			return;
+			case Oarp4_datatypesPackage.VELOCITY_LINEAR__VALUE:
+				setValue((Integer)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -124,15 +115,14 @@ public class Velocity_LinearImpl extends MinimalEObjectImpl.Container implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case Oarp4_datatypesPackage.VELOCITY_LINEAR__VALUE:
-			setValue(VALUE_EDEFAULT);
-			return;
+			case Oarp4_datatypesPackage.VELOCITY_LINEAR__VALUE:
+				setValue(VALUE_EDEFAULT);
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -140,14 +130,13 @@ public class Velocity_LinearImpl extends MinimalEObjectImpl.Container implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case Oarp4_datatypesPackage.VELOCITY_LINEAR__VALUE:
-			return value != VALUE_EDEFAULT;
+			case Oarp4_datatypesPackage.VELOCITY_LINEAR__VALUE:
+				return value != VALUE_EDEFAULT;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -155,14 +144,11 @@ public class Velocity_LinearImpl extends MinimalEObjectImpl.Container implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) {
-			return super.toString();
-		}
+		if (eIsProxy()) return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (value: ");
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/util/Oarp4_datatypesAdapterFactory.java b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/util/Oarp4_datatypesAdapterFactory.java
index b238ec2fd16..4bb2d43e429 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/util/Oarp4_datatypesAdapterFactory.java
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/util/Oarp4_datatypesAdapterFactory.java
@@ -29,7 +29,6 @@ import org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTyp
  * The <b>Adapter Factory</b> for the model.
  * It provides an adapter <code>createXXX</code> method for each class of the model.
  * <!-- end-user-doc -->
- *
  * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Oarp4_datatypesPackage
  * @generated
  */
@@ -38,7 +37,6 @@ public class Oarp4_datatypesAdapterFactory extends AdapterFactoryImpl {
 	 * The cached model package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	protected static Oarp4_datatypesPackage modelPackage;
@@ -47,7 +45,6 @@ public class Oarp4_datatypesAdapterFactory extends AdapterFactoryImpl {
 	 * Creates an instance of the adapter factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public Oarp4_datatypesAdapterFactory() {
@@ -61,7 +58,6 @@ public class Oarp4_datatypesAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc -->
 	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
 	 * <!-- end-user-doc -->
-	 *
 	 * @return whether this factory is applicable for the type of the object.
 	 * @generated
 	 */
@@ -71,7 +67,7 @@ public class Oarp4_datatypesAdapterFactory extends AdapterFactoryImpl {
 			return true;
 		}
 		if (object instanceof EObject) {
-			return ((EObject) object).eClass().getEPackage() == modelPackage;
+			return ((EObject)object).eClass().getEPackage() == modelPackage;
 		}
 		return false;
 	}
@@ -80,110 +76,91 @@ public class Oarp4_datatypesAdapterFactory extends AdapterFactoryImpl {
 	 * The switch that delegates to the <code>createXXX</code> methods.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	protected Oarp4_datatypesSwitch<Adapter> modelSwitch =
 			new Oarp4_datatypesSwitch<Adapter>() {
-				@Override
-				public Adapter caseVelocity_Linear(Velocity_Linear object) {
-					return createVelocity_LinearAdapter();
-				}
-
-				@Override
-				public Adapter caseArt_Set_Point(Art_Set_Point object) {
-					return createArt_Set_PointAdapter();
-				}
-
-				@Override
-				public Adapter caseVelocity_Angular(Velocity_Angular object) {
-					return createVelocity_AngularAdapter();
-				}
-
-				@Override
-				public Adapter caseDistance(Distance object) {
-					return createDistanceAdapter();
-				}
-
-				@Override
-				public Adapter caseMetric(Metric object) {
-					return createMetricAdapter();
-				}
-
-				@Override
-				public Adapter caseAngular(Angular object) {
-					return createAngularAdapter();
-				}
-
-				@Override
-				public Adapter caseOp_Set_Point(Op_Set_Point object) {
-					return createOp_Set_PointAdapter();
-				}
-
-				@Override
-				public Adapter caseSpeed_Tics_Left_Right(Speed_Tics_Left_Right object) {
-					return createSpeed_Tics_Left_RightAdapter();
-				}
-
-				@Override
-				public Adapter caseSpeed_Tics(Speed_Tics object) {
-					return createSpeed_TicsAdapter();
-				}
-
-				@Override
-				public Adapter caseOdometer_Tics(Odometer_Tics object) {
-					return createOdometer_TicsAdapter();
-				}
-
-				@Override
-				public Adapter caseOdometer_Tics_Left_Right(Odometer_Tics_Left_Right object) {
-					return createOdometer_Tics_Left_RightAdapter();
-				}
-
-				@Override
-				public Adapter caseProxi_Left_Right(Proxi_Left_Right object) {
-					return createProxi_Left_RightAdapter();
-				}
-
-				@Override
-				public Adapter caseMilli_Amp(Milli_Amp object) {
-					return createMilli_AmpAdapter();
-				}
-
-				@Override
-				public Adapter caseOdometer_Linear_Left_Right(Odometer_Linear_Left_Right object) {
-					return createOdometer_Linear_Left_RightAdapter();
-				}
-
-				@Override
-				public Adapter caseVelocity_Angular_Left_Right(Velocity_Angular_Left_Right object) {
-					return createVelocity_Angular_Left_RightAdapter();
-				}
-
-				@Override
-				public Adapter caseVelocity(Velocity object) {
-					return createVelocityAdapter();
-				}
-
-				@Override
-				public Adapter defaultCase(EObject object) {
-					return createEObjectAdapter();
-				}
-			};
+			@Override
+			public Adapter caseVelocity_Linear(Velocity_Linear object) {
+				return createVelocity_LinearAdapter();
+			}
+			@Override
+			public Adapter caseArt_Set_Point(Art_Set_Point object) {
+				return createArt_Set_PointAdapter();
+			}
+			@Override
+			public Adapter caseVelocity_Angular(Velocity_Angular object) {
+				return createVelocity_AngularAdapter();
+			}
+			@Override
+			public Adapter caseDistance(Distance object) {
+				return createDistanceAdapter();
+			}
+			@Override
+			public Adapter caseMetric(Metric object) {
+				return createMetricAdapter();
+			}
+			@Override
+			public Adapter caseAngular(Angular object) {
+				return createAngularAdapter();
+			}
+			@Override
+			public Adapter caseOp_Set_Point(Op_Set_Point object) {
+				return createOp_Set_PointAdapter();
+			}
+			@Override
+			public Adapter caseSpeed_Tics_Left_Right(Speed_Tics_Left_Right object) {
+				return createSpeed_Tics_Left_RightAdapter();
+			}
+			@Override
+			public Adapter caseSpeed_Tics(Speed_Tics object) {
+				return createSpeed_TicsAdapter();
+			}
+			@Override
+			public Adapter caseOdometer_Tics(Odometer_Tics object) {
+				return createOdometer_TicsAdapter();
+			}
+			@Override
+			public Adapter caseOdometer_Tics_Left_Right(Odometer_Tics_Left_Right object) {
+				return createOdometer_Tics_Left_RightAdapter();
+			}
+			@Override
+			public Adapter caseProxi_Left_Right(Proxi_Left_Right object) {
+				return createProxi_Left_RightAdapter();
+			}
+			@Override
+			public Adapter caseMilli_Amp(Milli_Amp object) {
+				return createMilli_AmpAdapter();
+			}
+			@Override
+			public Adapter caseOdometer_Linear_Left_Right(Odometer_Linear_Left_Right object) {
+				return createOdometer_Linear_Left_RightAdapter();
+			}
+			@Override
+			public Adapter caseVelocity_Angular_Left_Right(Velocity_Angular_Left_Right object) {
+				return createVelocity_Angular_Left_RightAdapter();
+			}
+			@Override
+			public Adapter caseVelocity(Velocity object) {
+				return createVelocityAdapter();
+			}
+			@Override
+			public Adapter defaultCase(EObject object) {
+				return createEObjectAdapter();
+			}
+		};
 
 	/**
 	 * Creates an adapter for the <code>target</code>.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
-	 * @param target
-	 *            the object to adapt.
+	 * @param target the object to adapt.
 	 * @return the adapter for the <code>target</code>.
 	 * @generated
 	 */
 	@Override
 	public Adapter createAdapter(Notifier target) {
-		return modelSwitch.doSwitch((EObject) target);
+		return modelSwitch.doSwitch((EObject)target);
 	}
 
 
@@ -193,7 +170,6 @@ public class Oarp4_datatypesAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Velocity_Linear
 	 * @generated
@@ -208,7 +184,6 @@ public class Oarp4_datatypesAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Art_Set_Point
 	 * @generated
@@ -223,7 +198,6 @@ public class Oarp4_datatypesAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Velocity_Angular
 	 * @generated
@@ -238,7 +212,6 @@ public class Oarp4_datatypesAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Distance
 	 * @generated
@@ -253,7 +226,6 @@ public class Oarp4_datatypesAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Metric
 	 * @generated
@@ -268,7 +240,6 @@ public class Oarp4_datatypesAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Angular
 	 * @generated
@@ -283,7 +254,6 @@ public class Oarp4_datatypesAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Op_Set_Point
 	 * @generated
@@ -298,7 +268,6 @@ public class Oarp4_datatypesAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Speed_Tics_Left_Right
 	 * @generated
@@ -313,7 +282,6 @@ public class Oarp4_datatypesAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Speed_Tics
 	 * @generated
@@ -328,7 +296,6 @@ public class Oarp4_datatypesAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Odometer_Tics
 	 * @generated
@@ -343,7 +310,6 @@ public class Oarp4_datatypesAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Odometer_Tics_Left_Right
 	 * @generated
@@ -358,7 +324,6 @@ public class Oarp4_datatypesAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Proxi_Left_Right
 	 * @generated
@@ -373,7 +338,6 @@ public class Oarp4_datatypesAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Milli_Amp
 	 * @generated
@@ -388,7 +352,6 @@ public class Oarp4_datatypesAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Odometer_Linear_Left_Right
 	 * @generated
@@ -403,7 +366,6 @@ public class Oarp4_datatypesAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Velocity_Angular_Left_Right
 	 * @generated
@@ -418,7 +380,6 @@ public class Oarp4_datatypesAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Velocity
 	 * @generated
@@ -432,7 +393,6 @@ public class Oarp4_datatypesAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null.
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the new adapter.
 	 * @generated
 	 */
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/util/Oarp4_datatypesSwitch.java b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/util/Oarp4_datatypesSwitch.java
index 63c38b1cf04..8d1f36e999f 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/util/Oarp4_datatypesSwitch.java
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml/src/org/eclipse/papyrus/RobotMLLibraries/RobotML_ModelLibrary/RobotML_DataTypes/oarps_datatypes/oarp4_datatypes/util/Oarp4_datatypesSwitch.java
@@ -32,7 +32,6 @@ import org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTyp
  * until a non-null result is returned,
  * which is the result of the switch.
  * <!-- end-user-doc -->
- *
  * @see org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.oarps_datatypes.oarp4_datatypes.Oarp4_datatypesPackage
  * @generated
  */
@@ -41,7 +40,6 @@ public class Oarp4_datatypesSwitch<T> extends Switch<T> {
 	 * The cached model package
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	protected static Oarp4_datatypesPackage modelPackage;
@@ -50,7 +48,6 @@ public class Oarp4_datatypesSwitch<T> extends Switch<T> {
 	 * Creates an instance of the switch.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public Oarp4_datatypesSwitch() {
@@ -63,7 +60,6 @@ public class Oarp4_datatypesSwitch<T> extends Switch<T> {
 	 * Checks whether this is a switch for the given package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @parameter ePackage the package in question.
 	 * @return whether this is a switch for the given package.
 	 * @generated
@@ -77,143 +73,109 @@ public class Oarp4_datatypesSwitch<T> extends Switch<T> {
 	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the first non-null result returned by a <code>caseXXX</code> call.
 	 * @generated
 	 */
 	@Override
 	protected T doSwitch(int classifierID, EObject theEObject) {
 		switch (classifierID) {
-		case Oarp4_datatypesPackage.VELOCITY_LINEAR: {
-			Velocity_Linear velocity_Linear = (Velocity_Linear) theEObject;
-			T result = caseVelocity_Linear(velocity_Linear);
-			if (result == null) {
-				result = defaultCase(theEObject);
+			case Oarp4_datatypesPackage.VELOCITY_LINEAR: {
+				Velocity_Linear velocity_Linear = (Velocity_Linear)theEObject;
+				T result = caseVelocity_Linear(velocity_Linear);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
 			}
-			return result;
-		}
-		case Oarp4_datatypesPackage.ART_SET_POINT: {
-			Art_Set_Point art_Set_Point = (Art_Set_Point) theEObject;
-			T result = caseArt_Set_Point(art_Set_Point);
-			if (result == null) {
-				result = defaultCase(theEObject);
+			case Oarp4_datatypesPackage.ART_SET_POINT: {
+				Art_Set_Point art_Set_Point = (Art_Set_Point)theEObject;
+				T result = caseArt_Set_Point(art_Set_Point);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
 			}
-			return result;
-		}
-		case Oarp4_datatypesPackage.VELOCITY_ANGULAR: {
-			Velocity_Angular velocity_Angular = (Velocity_Angular) theEObject;
-			T result = caseVelocity_Angular(velocity_Angular);
-			if (result == null) {
-				result = defaultCase(theEObject);
+			case Oarp4_datatypesPackage.VELOCITY_ANGULAR: {
+				Velocity_Angular velocity_Angular = (Velocity_Angular)theEObject;
+				T result = caseVelocity_Angular(velocity_Angular);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
 			}
-			return result;
-		}
-		case Oarp4_datatypesPackage.DISTANCE: {
-			Distance distance = (Distance) theEObject;
-			T result = caseDistance(distance);
-			if (result == null) {
-				result = defaultCase(theEObject);
+			case Oarp4_datatypesPackage.DISTANCE: {
+				Distance distance = (Distance)theEObject;
+				T result = caseDistance(distance);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
 			}
-			return result;
-		}
-		case Oarp4_datatypesPackage.METRIC: {
-			Metric metric = (Metric) theEObject;
-			T result = caseMetric(metric);
-			if (result == null) {
-				result = defaultCase(theEObject);
+			case Oarp4_datatypesPackage.METRIC: {
+				Metric metric = (Metric)theEObject;
+				T result = caseMetric(metric);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
 			}
-			return result;
-		}
-		case Oarp4_datatypesPackage.ANGULAR: {
-			Angular angular = (Angular) theEObject;
-			T result = caseAngular(angular);
-			if (result == null) {
-				result = defaultCase(theEObject);
+			case Oarp4_datatypesPackage.ANGULAR: {
+				Angular angular = (Angular)theEObject;
+				T result = caseAngular(angular);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
 			}
-			return result;
-		}
-		case Oarp4_datatypesPackage.OP_SET_POINT: {
-			Op_Set_Point op_Set_Point = (Op_Set_Point) theEObject;
-			T result = caseOp_Set_Point(op_Set_Point);
-			if (result == null) {
-				result = defaultCase(theEObject);
+			case Oarp4_datatypesPackage.OP_SET_POINT: {
+				Op_Set_Point op_Set_Point = (Op_Set_Point)theEObject;
+				T result = caseOp_Set_Point(op_Set_Point);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
 			}
-			return result;
-		}
-		case Oarp4_datatypesPackage.SPEED_TICS_LEFT_RIGHT: {
-			Speed_Tics_Left_Right speed_Tics_Left_Right = (Speed_Tics_Left_Right) theEObject;
-			T result = caseSpeed_Tics_Left_Right(speed_Tics_Left_Right);
-			if (result == null) {
-				result = defaultCase(theEObject);
+			case Oarp4_datatypesPackage.SPEED_TICS_LEFT_RIGHT: {
+				Speed_Tics_Left_Right speed_Tics_Left_Right = (Speed_Tics_Left_Right)theEObject;
+				T result = caseSpeed_Tics_Left_Right(speed_Tics_Left_Right);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
 			}
-			return result;
-		}
-		case Oarp4_datatypesPackage.SPEED_TICS: {
-			Speed_Tics speed_Tics = (Speed_Tics) theEObject;
-			T result = caseSpeed_Tics(speed_Tics);
-			if (result == null) {
-				result = defaultCase(theEObject);
+			case Oarp4_datatypesPackage.SPEED_TICS: {
+				Speed_Tics speed_Tics = (Speed_Tics)theEObject;
+				T result = caseSpeed_Tics(speed_Tics);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
 			}
-			return result;
-		}
-		case Oarp4_datatypesPackage.ODOMETER_TICS: {
-			Odometer_Tics odometer_Tics = (Odometer_Tics) theEObject;
-			T result = caseOdometer_Tics(odometer_Tics);
-			if (result == null) {
-				result = defaultCase(theEObject);
+			case Oarp4_datatypesPackage.ODOMETER_TICS: {
+				Odometer_Tics odometer_Tics = (Odometer_Tics)theEObject;
+				T result = caseOdometer_Tics(odometer_Tics);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
 			}
-			return result;
-		}
-		case Oarp4_datatypesPackage.ODOMETER_TICS_LEFT_RIGHT: {
-			Odometer_Tics_Left_Right odometer_Tics_Left_Right = (Odometer_Tics_Left_Right) theEObject;
-			T result = caseOdometer_Tics_Left_Right(odometer_Tics_Left_Right);
-			if (result == null) {
-				result = defaultCase(theEObject);
+			case Oarp4_datatypesPackage.ODOMETER_TICS_LEFT_RIGHT: {
+				Odometer_Tics_Left_Right odometer_Tics_Left_Right = (Odometer_Tics_Left_Right)theEObject;
+				T result = caseOdometer_Tics_Left_Right(odometer_Tics_Left_Right);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
 			}
-			return result;
-		}
-		case Oarp4_datatypesPackage.PROXI_LEFT_RIGHT: {
-			Proxi_Left_Right proxi_Left_Right = (Proxi_Left_Right) theEObject;
-			T result = caseProxi_Left_Right(proxi_Left_Right);
-			if (result == null) {
-				result = defaultCase(theEObject);
+			case Oarp4_datatypesPackage.PROXI_LEFT_RIGHT: {
+				Proxi_Left_Right proxi_Left_Right = (Proxi_Left_Right)theEObject;
+				T result = caseProxi_Left_Right(proxi_Left_Right);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
 			}
-			return result;
-		}
-		case Oarp4_datatypesPackage.MILLI_AMP: {
-			Milli_Amp milli_Amp = (Milli_Amp) theEObject;
-			T result = caseMilli_Amp(milli_Amp);
-			if (result == null) {
-				result = defaultCase(theEObject);
+			case Oarp4_datatypesPackage.MILLI_AMP: {
+				Milli_Amp milli_Amp = (Milli_Amp)theEObject;
+				T result = caseMilli_Amp(milli_Amp);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
 			}
-			return result;
-		}
-		case Oarp4_datatypesPackage.ODOMETER_LINEAR_LEFT_RIGHT: {
-			Odometer_Linear_Left_Right odometer_Linear_Left_Right = (Odometer_Linear_Left_Right) theEObject;
-			T result = caseOdometer_Linear_Left_Right(odometer_Linear_Left_Right);
-			if (result == null) {
-				result = defaultCase(theEObject);
+			case Oarp4_datatypesPackage.ODOMETER_LINEAR_LEFT_RIGHT: {
+				Odometer_Linear_Left_Right odometer_Linear_Left_Right = (Odometer_Linear_Left_Right)theEObject;
+				T result = caseOdometer_Linear_Left_Right(odometer_Linear_Left_Right);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
 			}
-			return result;
-		}
-		case Oarp4_datatypesPackage.VELOCITY_ANGULAR_LEFT_RIGHT: {
-			Velocity_Angular_Left_Right velocity_Angular_Left_Right = (Velocity_Angular_Left_Right) theEObject;
-			T result = caseVelocity_Angular_Left_Right(velocity_Angular_Left_Right);
-			if (result == null) {
-				result = defaultCase(theEObject);
+			case Oarp4_datatypesPackage.VELOCITY_ANGULAR_LEFT_RIGHT: {
+				Velocity_Angular_Left_Right velocity_Angular_Left_Right = (Velocity_Angular_Left_Right)theEObject;
+				T result = caseVelocity_Angular_Left_Right(velocity_Angular_Left_Right);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
 			}
-			return result;
-		}
-		case Oarp4_datatypesPackage.VELOCITY: {
-			Velocity velocity = (Velocity) theEObject;
-			T result = caseVelocity(velocity);
-			if (result == null) {
-				result = defaultCase(theEObject);
+			case Oarp4_datatypesPackage.VELOCITY: {
+				Velocity velocity = (Velocity)theEObject;
+				T result = caseVelocity(velocity);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
 			}
-			return result;
-		}
-		default:
-			return defaultCase(theEObject);
+			default: return defaultCase(theEObject);
 		}
 	}
 
@@ -223,9 +185,7 @@ public class Oarp4_datatypesSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 *
-	 * @param object
-	 *            the target of the switch.
+	 * @param object the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Velocity Linear</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -240,9 +200,7 @@ public class Oarp4_datatypesSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 *
-	 * @param object
-	 *            the target of the switch.
+	 * @param object the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Art Set Point</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -257,9 +215,7 @@ public class Oarp4_datatypesSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 *
-	 * @param object
-	 *            the target of the switch.
+	 * @param object the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Velocity Angular</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -274,9 +230,7 @@ public class Oarp4_datatypesSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 *
-	 * @param object
-	 *            the target of the switch.
+	 * @param object the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Distance</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -291,9 +245,7 @@ public class Oarp4_datatypesSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 *
-	 * @param object
-	 *            the target of the switch.
+	 * @param object the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Metric</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -308,9 +260,7 @@ public class Oarp4_datatypesSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 *
-	 * @param object
-	 *            the target of the switch.
+	 * @param object the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Angular</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -325,9 +275,7 @@ public class Oarp4_datatypesSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 *
-	 * @param object
-	 *            the target of the switch.
+	 * @param object the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Op Set Point</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -342,9 +290,7 @@ public class Oarp4_datatypesSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 *
-	 * @param object
-	 *            the target of the switch.
+	 * @param object the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Speed Tics Left Right</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -359,9 +305,7 @@ public class Oarp4_datatypesSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 *
-	 * @param object
-	 *            the target of the switch.
+	 * @param object the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Speed Tics</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -376,9 +320,7 @@ public class Oarp4_datatypesSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 *
-	 * @param object
-	 *            the target of the switch.
+	 * @param object the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Odometer Tics</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -393,9 +335,7 @@ public class Oarp4_datatypesSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 *
-	 * @param object
-	 *            the target of the switch.
+	 * @param object the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Odometer Tics Left Right</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -410,9 +350,7 @@ public class Oarp4_datatypesSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 *
-	 * @param object
-	 *            the target of the switch.
+	 * @param object the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Proxi Left Right</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -427,9 +365,7 @@ public class Oarp4_datatypesSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 *
-	 * @param object
-	 *            the target of the switch.
+	 * @param object the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Milli Amp</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -444,9 +380,7 @@ public class Oarp4_datatypesSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 *
-	 * @param object
-	 *            the target of the switch.
+	 * @param object the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Odometer Linear Left Right</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -461,9 +395,7 @@ public class Oarp4_datatypesSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 *
-	 * @param object
-	 *            the target of the switch.
+	 * @param object the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Velocity Angular Left Right</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -478,9 +410,7 @@ public class Oarp4_datatypesSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 *
-	 * @param object
-	 *            the target of the switch.
+	 * @param object the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Velocity</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -495,9 +425,7 @@ public class Oarp4_datatypesSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch, but this is the last case anyway.
 	 * <!-- end-user-doc -->
-	 *
-	 * @param object
-	 *            the target of the switch.
+	 * @param object the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
 	 * @generated