22 files changed, 158 insertions, 161 deletions
diff --git a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src-gen/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/ConstraintWithVSLlStandaloneSetupGenerated.java b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src-gen/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/ConstraintWithVSLlStandaloneSetupGenerated.java
index 21cdb739d1f..db7445b7c3f 100644
--- a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src-gen/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/ConstraintWithVSLlStandaloneSetupGenerated.java
+++ b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src-gen/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/ConstraintWithVSLlStandaloneSetupGenerated.java
@@ -1,8 +1,8 @@
 package org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext;
 
 import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.xtext.ISetup;
 import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.xtext.ISetup;
 
 import com.google.inject.Guice;
 import com.google.inject.Injector;
diff --git a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src-gen/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/constraintWithVSLl/ConstraintRule.java b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src-gen/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/constraintWithVSLl/ConstraintRule.java
index 5b5e4163c3d..a0f0d018ec0 100644
--- a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src-gen/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/constraintWithVSLl/ConstraintRule.java
+++ b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src-gen/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/constraintWithVSLl/ConstraintRule.java
@@ -7,7 +7,6 @@
 package org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.constraintWithVSLl;
 
 import org.eclipse.emf.ecore.EObject;
-
 import org.eclipse.uml2.uml.Element;
 import org.eclipse.uml2.uml.Type;
 
@@ -35,7 +34,7 @@ public interface ConstraintRule extends EObject {
 	 * If the meaning of the '<em>Specification</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>Specification</em>' containment reference.
 	 * @see #setSpecification(ConstraintSpecification)
 	 * @see org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.constraintWithVSLl.ConstraintWithVSLlPackage#getConstraintRule_Specification()
@@ -48,7 +47,7 @@ public interface ConstraintRule extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.constraintWithVSLl.ConstraintRule#getSpecification <em>Specification</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
+	 *
 	 * @param value
 	 *            the new value of the '<em>Specification</em>' containment reference.
 	 * @see #getSpecification()
@@ -59,7 +58,7 @@ public interface ConstraintRule extends EObject {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
+	 *
 	 * @model kind="operation"
 	 *        annotation="http://www.eclipse.org/emf/2002/GenModel body='return org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.validation.ContextUtil.getExpectedType(this) ;'"
 	 * @generated
@@ -69,7 +68,7 @@ public interface ConstraintRule extends EObject {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
+	 *
 	 * @model kind="operation"
 	 *        annotation="http://www.eclipse.org/emf/2002/GenModel body='return org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.validation.ContextUtil.getContextElement(this) ;'"
 	 * @generated
diff --git a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src-gen/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/constraintWithVSLl/ConstraintSpecification.java b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src-gen/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/constraintWithVSLl/ConstraintSpecification.java
index fbb1a9d63bc..476b5b6e83d 100644
--- a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src-gen/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/constraintWithVSLl/ConstraintSpecification.java
+++ b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src-gen/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/constraintWithVSLl/ConstraintSpecification.java
@@ -7,9 +7,7 @@
 package org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.constraintWithVSLl;
 
 import org.eclipse.emf.ecore.EObject;
-
 import org.eclipse.papyrus.marte.vsl.vSL.Expression;
-
 import org.eclipse.uml2.uml.Element;
 import org.eclipse.uml2.uml.Type;
 
@@ -37,7 +35,7 @@ public interface ConstraintSpecification extends EObject {
 	 * If the meaning of the '<em>Expression</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>Expression</em>' containment reference.
 	 * @see #setExpression(Expression)
 	 * @see org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.constraintWithVSLl.ConstraintWithVSLlPackage#getConstraintSpecification_Expression()
@@ -50,7 +48,7 @@ public interface ConstraintSpecification extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.constraintWithVSLl.ConstraintSpecification#getExpression <em>Expression</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
+	 *
 	 * @param value
 	 *            the new value of the '<em>Expression</em>' containment reference.
 	 * @see #getExpression()
@@ -61,7 +59,7 @@ public interface ConstraintSpecification extends EObject {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
+	 *
 	 * @model kind="operation"
 	 *        annotation="http://www.eclipse.org/emf/2002/GenModel body='return org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.validation.ContextUtil.getExpectedType(this) ;'"
 	 * @generated
@@ -71,7 +69,7 @@ public interface ConstraintSpecification extends EObject {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
+	 *
 	 * @model kind="operation"
 	 *        annotation="http://www.eclipse.org/emf/2002/GenModel body='return org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.validation.ContextUtil.getContextElement(this) ;'"
 	 * @generated
diff --git a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src-gen/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/constraintWithVSLl/ConstraintWithVSLlFactory.java b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src-gen/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/constraintWithVSLl/ConstraintWithVSLlFactory.java
index 90881842623..fdcb804d558 100644
--- a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src-gen/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/constraintWithVSLl/ConstraintWithVSLlFactory.java
+++ b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src-gen/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/constraintWithVSLl/ConstraintWithVSLlFactory.java
@@ -13,7 +13,7 @@ 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.marte.textedit.constraintwithvsl.xtext.constraintWithVSLl.ConstraintWithVSLlPackage
  * @generated
  */
@@ -22,7 +22,7 @@ public interface ConstraintWithVSLlFactory extends EFactory {
 	 * The singleton instance of the factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
+	 *
 	 * @generated
 	 */
 	ConstraintWithVSLlFactory eINSTANCE = org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.constraintWithVSLl.impl.ConstraintWithVSLlFactoryImpl.init();
@@ -31,7 +31,7 @@ public interface ConstraintWithVSLlFactory extends EFactory {
 	 * Returns a new object of class '<em>Constraint Rule</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
+	 *
 	 * @return a new object of class '<em>Constraint Rule</em>'.
 	 * @generated
 	 */
@@ -41,7 +41,7 @@ public interface ConstraintWithVSLlFactory extends EFactory {
 	 * Returns a new object of class '<em>Constraint Specification</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
+	 *
 	 * @return a new object of class '<em>Constraint Specification</em>'.
 	 * @generated
 	 */
@@ -51,7 +51,7 @@ public interface ConstraintWithVSLlFactory 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/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src-gen/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/constraintWithVSLl/ConstraintWithVSLlPackage.java b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src-gen/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/constraintWithVSLl/ConstraintWithVSLlPackage.java
index a69cd599706..80a2ed2f1ba 100644
--- a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src-gen/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/constraintWithVSLl/ConstraintWithVSLlPackage.java
+++ b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src-gen/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/constraintWithVSLl/ConstraintWithVSLlPackage.java
@@ -21,7 +21,7 @@ import org.eclipse.emf.ecore.EReference;
  * <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
- * 
+ *
  * @see org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.constraintWithVSLl.ConstraintWithVSLlFactory
  * @model kind="package"
  * @generated
@@ -31,7 +31,7 @@ public interface ConstraintWithVSLlPackage extends EPackage {
 	 * The package name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
+	 *
 	 * @generated
 	 */
 	String eNAME = "constraintWithVSLl";
@@ -40,7 +40,7 @@ public interface ConstraintWithVSLlPackage extends EPackage {
 	 * The package namespace URI.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
+	 *
 	 * @generated
 	 */
 	String eNS_URI = "http://www.eclipse.org/papyrus/marte/textedit/constraintwithvsl/xtext/ConstraintWithVSLl";
@@ -49,7 +49,7 @@ public interface ConstraintWithVSLlPackage extends EPackage {
 	 * The package namespace name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
+	 *
 	 * @generated
 	 */
 	String eNS_PREFIX = "constraintWithVSLl";
@@ -58,7 +58,7 @@ public interface ConstraintWithVSLlPackage extends EPackage {
 	 * The singleton instance of the package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
+	 *
 	 * @generated
 	 */
 	ConstraintWithVSLlPackage eINSTANCE = org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.constraintWithVSLl.impl.ConstraintWithVSLlPackageImpl.init();
@@ -67,7 +67,7 @@ public interface ConstraintWithVSLlPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.constraintWithVSLl.impl.ConstraintRuleImpl <em>Constraint Rule</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
+	 *
 	 * @see org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.constraintWithVSLl.impl.ConstraintRuleImpl
 	 * @see org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.constraintWithVSLl.impl.ConstraintWithVSLlPackageImpl#getConstraintRule()
 	 * @generated
@@ -78,7 +78,7 @@ public interface ConstraintWithVSLlPackage extends EPackage {
 	 * The feature id for the '<em><b>Specification</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
+	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -88,7 +88,7 @@ public interface ConstraintWithVSLlPackage extends EPackage {
 	 * The number of structural features of the '<em>Constraint Rule</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
+	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -98,7 +98,7 @@ public interface ConstraintWithVSLlPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.constraintWithVSLl.impl.ConstraintSpecificationImpl <em>Constraint Specification</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
+	 *
 	 * @see org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.constraintWithVSLl.impl.ConstraintSpecificationImpl
 	 * @see org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.constraintWithVSLl.impl.ConstraintWithVSLlPackageImpl#getConstraintSpecification()
 	 * @generated
@@ -109,7 +109,7 @@ public interface ConstraintWithVSLlPackage extends EPackage {
 	 * The feature id for the '<em><b>Expression</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
+	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -119,7 +119,7 @@ public interface ConstraintWithVSLlPackage extends EPackage {
 	 * The number of structural features of the '<em>Constraint Specification</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
+	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -130,7 +130,7 @@ public interface ConstraintWithVSLlPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.constraintWithVSLl.ConstraintRule <em>Constraint Rule</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
+	 *
 	 * @return the meta object for class '<em>Constraint Rule</em>'.
 	 * @see org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.constraintWithVSLl.ConstraintRule
 	 * @generated
@@ -141,7 +141,7 @@ public interface ConstraintWithVSLlPackage extends EPackage {
 	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.constraintWithVSLl.ConstraintRule#getSpecification <em>Specification</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
+	 *
 	 * @return the meta object for the containment reference '<em>Specification</em>'.
 	 * @see org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.constraintWithVSLl.ConstraintRule#getSpecification()
 	 * @see #getConstraintRule()
@@ -153,7 +153,7 @@ public interface ConstraintWithVSLlPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.constraintWithVSLl.ConstraintSpecification <em>Constraint Specification</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
+	 *
 	 * @return the meta object for class '<em>Constraint Specification</em>'.
 	 * @see org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.constraintWithVSLl.ConstraintSpecification
 	 * @generated
@@ -164,7 +164,7 @@ public interface ConstraintWithVSLlPackage extends EPackage {
 	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.constraintWithVSLl.ConstraintSpecification#getExpression <em>Expression</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
+	 *
 	 * @return the meta object for the containment reference '<em>Expression</em>'.
 	 * @see org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.constraintWithVSLl.ConstraintSpecification#getExpression()
 	 * @see #getConstraintSpecification()
@@ -176,7 +176,7 @@ public interface ConstraintWithVSLlPackage 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
 	 */
@@ -192,7 +192,7 @@ public interface ConstraintWithVSLlPackage extends EPackage {
 	 * <li>and each data type</li>
 	 * </ul>
 	 * <!-- end-user-doc -->
-	 * 
+	 *
 	 * @generated
 	 */
 	interface Literals {
@@ -200,7 +200,7 @@ public interface ConstraintWithVSLlPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.constraintWithVSLl.impl.ConstraintRuleImpl <em>Constraint Rule</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * 
+		 *
 		 * @see org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.constraintWithVSLl.impl.ConstraintRuleImpl
 		 * @see org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.constraintWithVSLl.impl.ConstraintWithVSLlPackageImpl#getConstraintRule()
 		 * @generated
@@ -211,7 +211,7 @@ public interface ConstraintWithVSLlPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Specification</b></em>' containment reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * 
+		 *
 		 * @generated
 		 */
 		EReference CONSTRAINT_RULE__SPECIFICATION = eINSTANCE.getConstraintRule_Specification();
@@ -220,7 +220,7 @@ public interface ConstraintWithVSLlPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.constraintWithVSLl.impl.ConstraintSpecificationImpl <em>Constraint Specification</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * 
+		 *
 		 * @see org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.constraintWithVSLl.impl.ConstraintSpecificationImpl
 		 * @see org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.constraintWithVSLl.impl.ConstraintWithVSLlPackageImpl#getConstraintSpecification()
 		 * @generated
@@ -231,7 +231,7 @@ public interface ConstraintWithVSLlPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Expression</b></em>' containment reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * 
+		 *
 		 * @generated
 		 */
 		EReference CONSTRAINT_SPECIFICATION__EXPRESSION = eINSTANCE.getConstraintSpecification_Expression();
diff --git a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src-gen/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/constraintWithVSLl/impl/ConstraintRuleImpl.java b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src-gen/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/constraintWithVSLl/impl/ConstraintRuleImpl.java
index ac2207184f7..66824fc53ea 100644
--- a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src-gen/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/constraintWithVSLl/impl/ConstraintRuleImpl.java
+++ b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src-gen/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/constraintWithVSLl/impl/ConstraintRuleImpl.java
@@ -8,17 +8,13 @@ package org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.constraintWit
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-
 import org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.constraintWithVSLl.ConstraintRule;
 import org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.constraintWithVSLl.ConstraintSpecification;
 import org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.constraintWithVSLl.ConstraintWithVSLlPackage;
-
 import org.eclipse.uml2.uml.Element;
 import org.eclipse.uml2.uml.Type;
 
@@ -40,7 +36,7 @@ public class ConstraintRuleImpl extends MinimalEObjectImpl.Container implements
 	 * The cached value of the '{@link #getSpecification() <em>Specification</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
+	 *
 	 * @see #getSpecification()
 	 * @generated
 	 * @ordered
@@ -50,7 +46,7 @@ public class ConstraintRuleImpl extends MinimalEObjectImpl.Container implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
+	 *
 	 * @generated
 	 */
 	protected ConstraintRuleImpl() {
@@ -60,7 +56,7 @@ public class ConstraintRuleImpl extends MinimalEObjectImpl.Container implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
+	 *
 	 * @generated
 	 */
 	@Override
@@ -71,7 +67,7 @@ public class ConstraintRuleImpl extends MinimalEObjectImpl.Container implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
+	 *
 	 * @generated
 	 */
 	@Override
@@ -82,7 +78,7 @@ public class ConstraintRuleImpl extends MinimalEObjectImpl.Container implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
+	 *
 	 * @generated
 	 */
 	public NotificationChain basicSetSpecification(ConstraintSpecification newSpecification, NotificationChain msgs) {
@@ -102,7 +98,7 @@ public class ConstraintRuleImpl extends MinimalEObjectImpl.Container implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
+	 *
 	 * @generated
 	 */
 	@Override
@@ -128,7 +124,7 @@ public class ConstraintRuleImpl extends MinimalEObjectImpl.Container implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
+	 *
 	 * @generated
 	 */
 	@Override
@@ -139,7 +135,7 @@ public class ConstraintRuleImpl extends MinimalEObjectImpl.Container implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
+	 *
 	 * @generated
 	 */
 	@Override
@@ -150,7 +146,7 @@ public class ConstraintRuleImpl extends MinimalEObjectImpl.Container implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
+	 *
 	 * @generated
 	 */
 	@Override
@@ -165,7 +161,7 @@ public class ConstraintRuleImpl extends MinimalEObjectImpl.Container implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
+	 *
 	 * @generated
 	 */
 	@Override
@@ -180,7 +176,7 @@ public class ConstraintRuleImpl extends MinimalEObjectImpl.Container implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
+	 *
 	 * @generated
 	 */
 	@Override
@@ -196,7 +192,7 @@ public class ConstraintRuleImpl extends MinimalEObjectImpl.Container implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
+	 *
 	 * @generated
 	 */
 	@Override
@@ -212,7 +208,7 @@ public class ConstraintRuleImpl extends MinimalEObjectImpl.Container implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
+	 *
 	 * @generated
 	 */
 	@Override
diff --git a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src-gen/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/constraintWithVSLl/impl/ConstraintSpecificationImpl.java b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src-gen/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/constraintWithVSLl/impl/ConstraintSpecificationImpl.java
index 135e3f15b1d..d821fb13501 100644
--- a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src-gen/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/constraintWithVSLl/impl/ConstraintSpecificationImpl.java
+++ b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src-gen/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/constraintWithVSLl/impl/ConstraintSpecificationImpl.java
@@ -8,17 +8,13 @@ package org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.constraintWit
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-
 import org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.constraintWithVSLl.ConstraintSpecification;
 import org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.constraintWithVSLl.ConstraintWithVSLlPackage;
 import org.eclipse.papyrus.marte.vsl.vSL.Expression;
-
 import org.eclipse.uml2.uml.Element;
 import org.eclipse.uml2.uml.Type;
 
@@ -40,7 +36,7 @@ public class ConstraintSpecificationImpl extends MinimalEObjectImpl.Container im
 	 * The cached value of the '{@link #getExpression() <em>Expression</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
+	 *
 	 * @see #getExpression()
 	 * @generated
 	 * @ordered
@@ -50,7 +46,7 @@ public class ConstraintSpecificationImpl extends MinimalEObjectImpl.Container im
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
+	 *
 	 * @generated
 	 */
 	protected ConstraintSpecificationImpl() {
@@ -60,7 +56,7 @@ public class ConstraintSpecificationImpl extends MinimalEObjectImpl.Container im
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
+	 *
 	 * @generated
 	 */
 	@Override
@@ -71,7 +67,7 @@ public class ConstraintSpecificationImpl extends MinimalEObjectImpl.Container im
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
+	 *
 	 * @generated
 	 */
 	@Override
@@ -82,7 +78,7 @@ public class ConstraintSpecificationImpl extends MinimalEObjectImpl.Container im
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
+	 *
 	 * @generated
 	 */
 	public NotificationChain basicSetExpression(Expression newExpression, NotificationChain msgs) {
@@ -102,7 +98,7 @@ public class ConstraintSpecificationImpl extends MinimalEObjectImpl.Container im
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
+	 *
 	 * @generated
 	 */
 	@Override
@@ -128,7 +124,7 @@ public class ConstraintSpecificationImpl extends MinimalEObjectImpl.Container im
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
+	 *
 	 * @generated
 	 */
 	@Override
@@ -139,7 +135,7 @@ public class ConstraintSpecificationImpl extends MinimalEObjectImpl.Container im
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
+	 *
 	 * @generated
 	 */
 	@Override
@@ -150,7 +146,7 @@ public class ConstraintSpecificationImpl extends MinimalEObjectImpl.Container im
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
+	 *
 	 * @generated
 	 */
 	@Override
@@ -165,7 +161,7 @@ public class ConstraintSpecificationImpl extends MinimalEObjectImpl.Container im
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
+	 *
 	 * @generated
 	 */
 	@Override
@@ -180,7 +176,7 @@ public class ConstraintSpecificationImpl extends MinimalEObjectImpl.Container im
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
+	 *
 	 * @generated
 	 */
 	@Override
@@ -196,7 +192,7 @@ public class ConstraintSpecificationImpl extends MinimalEObjectImpl.Container im
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
+	 *
 	 * @generated
 	 */
 	@Override
@@ -212,7 +208,7 @@ public class ConstraintSpecificationImpl extends MinimalEObjectImpl.Container im
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
+	 *
 	 * @generated
 	 */
 	@Override
diff --git a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src-gen/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/constraintWithVSLl/impl/ConstraintWithVSLlFactoryImpl.java b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src-gen/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/constraintWithVSLl/impl/ConstraintWithVSLlFactoryImpl.java
index 53ba4c5ca39..029eead616a 100644
--- a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src-gen/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/constraintWithVSLl/impl/ConstraintWithVSLlFactoryImpl.java
+++ b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src-gen/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/constraintWithVSLl/impl/ConstraintWithVSLlFactoryImpl.java
@@ -9,18 +9,18 @@ package org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.constraintWit
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
-
 import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.constraintWithVSLl.*;
+import org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.constraintWithVSLl.ConstraintRule;
+import org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.constraintWithVSLl.ConstraintSpecification;
+import org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.constraintWithVSLl.ConstraintWithVSLlFactory;
+import org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.constraintWithVSLl.ConstraintWithVSLlPackage;
 
 /**
  * <!-- begin-user-doc -->
  * An implementation of the model <b>Factory</b>.
  * <!-- end-user-doc -->
- * 
+ *
  * @generated
  */
 public class ConstraintWithVSLlFactoryImpl extends EFactoryImpl implements ConstraintWithVSLlFactory {
@@ -28,7 +28,7 @@ public class ConstraintWithVSLlFactoryImpl extends EFactoryImpl implements Const
 	 * Creates the default factory implementation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
+	 *
 	 * @generated
 	 */
 	public static ConstraintWithVSLlFactory init() {
@@ -47,7 +47,7 @@ public class ConstraintWithVSLlFactoryImpl extends EFactoryImpl implements Const
 	 * Creates an instance of the factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
+	 *
 	 * @generated
 	 */
 	public ConstraintWithVSLlFactoryImpl() {
@@ -57,7 +57,7 @@ public class ConstraintWithVSLlFactoryImpl extends EFactoryImpl implements Const
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
+	 *
 	 * @generated
 	 */
 	@Override
@@ -75,7 +75,7 @@ public class ConstraintWithVSLlFactoryImpl extends EFactoryImpl implements Const
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
+	 *
 	 * @generated
 	 */
 	@Override
@@ -87,7 +87,7 @@ public class ConstraintWithVSLlFactoryImpl extends EFactoryImpl implements Const
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
+	 *
 	 * @generated
 	 */
 	@Override
@@ -99,7 +99,7 @@ public class ConstraintWithVSLlFactoryImpl extends EFactoryImpl implements Const
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
+	 *
 	 * @generated
 	 */
 	@Override
@@ -110,7 +110,7 @@ public class ConstraintWithVSLlFactoryImpl extends EFactoryImpl implements Const
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
+	 *
 	 * @deprecated
 	 * @generated
 	 */
diff --git a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src-gen/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/constraintWithVSLl/impl/ConstraintWithVSLlPackageImpl.java b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src-gen/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/constraintWithVSLl/impl/ConstraintWithVSLlPackageImpl.java
index 7f38fe3902d..d0fa16fb9ce 100644
--- a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src-gen/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/constraintWithVSLl/impl/ConstraintWithVSLlPackageImpl.java
+++ b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src-gen/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/constraintWithVSLl/impl/ConstraintWithVSLlPackageImpl.java
@@ -9,29 +9,26 @@ package org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.constraintWit
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
-
 import org.eclipse.emf.ecore.impl.EPackageImpl;
-
 import org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.constraintWithVSLl.ConstraintRule;
 import org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.constraintWithVSLl.ConstraintSpecification;
 import org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.constraintWithVSLl.ConstraintWithVSLlFactory;
 import org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.constraintWithVSLl.ConstraintWithVSLlPackage;
 import org.eclipse.papyrus.marte.vsl.vSL.VSLPackage;
-
 import org.eclipse.uml2.uml.UMLPackage;
 
 /**
  * <!-- begin-user-doc -->
  * An implementation of the model <b>Package</b>.
  * <!-- end-user-doc -->
- * 
+ *
  * @generated
  */
 public class ConstraintWithVSLlPackageImpl extends EPackageImpl implements ConstraintWithVSLlPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
+	 *
 	 * @generated
 	 */
 	private EClass constraintRuleEClass = null;
@@ -39,7 +36,7 @@ public class ConstraintWithVSLlPackageImpl extends EPackageImpl implements Const
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
+	 *
 	 * @generated
 	 */
 	private EClass constraintSpecificationEClass = null;
@@ -49,7 +46,7 @@ public class ConstraintWithVSLlPackageImpl extends EPackageImpl implements Const
 	 * 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 -->
-	 * 
+	 *
 	 * @see org.eclipse.emf.ecore.EPackage.Registry
 	 * @see org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.constraintWithVSLl.ConstraintWithVSLlPackage#eNS_URI
 	 * @see #init()
@@ -62,7 +59,7 @@ public class ConstraintWithVSLlPackageImpl extends EPackageImpl implements Const
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
+	 *
 	 * @generated
 	 */
 	private static boolean isInited = false;
@@ -73,7 +70,7 @@ public class ConstraintWithVSLlPackageImpl extends EPackageImpl implements Const
 	 * <p>
 	 * This method is used to initialize {@link ConstraintWithVSLlPackage#eINSTANCE} when that field is accessed. Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
+	 *
 	 * @see #eNS_URI
 	 * @see #createPackageContents()
 	 * @see #initializePackageContents()
@@ -111,7 +108,7 @@ public class ConstraintWithVSLlPackageImpl extends EPackageImpl implements Const
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
+	 *
 	 * @generated
 	 */
 	@Override
@@ -122,7 +119,7 @@ public class ConstraintWithVSLlPackageImpl extends EPackageImpl implements Const
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
+	 *
 	 * @generated
 	 */
 	@Override
@@ -133,7 +130,7 @@ public class ConstraintWithVSLlPackageImpl extends EPackageImpl implements Const
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
+	 *
 	 * @generated
 	 */
 	@Override
@@ -144,7 +141,7 @@ public class ConstraintWithVSLlPackageImpl extends EPackageImpl implements Const
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
+	 *
 	 * @generated
 	 */
 	@Override
@@ -155,7 +152,7 @@ public class ConstraintWithVSLlPackageImpl extends EPackageImpl implements Const
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
+	 *
 	 * @generated
 	 */
 	@Override
@@ -166,7 +163,7 @@ public class ConstraintWithVSLlPackageImpl extends EPackageImpl implements Const
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
+	 *
 	 * @generated
 	 */
 	private boolean isCreated = false;
@@ -176,7 +173,7 @@ public class ConstraintWithVSLlPackageImpl extends EPackageImpl implements Const
 	 * guarded to have no affect on any invocation but its first.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
+	 *
 	 * @generated
 	 */
 	public void createPackageContents() {
@@ -196,7 +193,7 @@ public class ConstraintWithVSLlPackageImpl extends EPackageImpl implements Const
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
+	 *
 	 * @generated
 	 */
 	private boolean isInitialized = false;
@@ -206,7 +203,7 @@ public class ConstraintWithVSLlPackageImpl extends EPackageImpl implements Const
 	 * method is guarded to have no affect on any invocation but its first.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
+	 *
 	 * @generated
 	 */
 	public void initializePackageContents() {
diff --git a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src-gen/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/constraintWithVSLl/util/ConstraintWithVSLlAdapterFactory.java b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src-gen/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/constraintWithVSLl/util/ConstraintWithVSLlAdapterFactory.java
index ed87975727f..00388cefa51 100644
--- a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src-gen/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/constraintWithVSLl/util/ConstraintWithVSLlAdapterFactory.java
+++ b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src-gen/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/constraintWithVSLl/util/ConstraintWithVSLlAdapterFactory.java
@@ -8,19 +8,18 @@ package org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.constraintWit
 
 import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notifier;
-
 import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
 import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.constraintWithVSLl.*;
+import org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.constraintWithVSLl.ConstraintRule;
+import org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.constraintWithVSLl.ConstraintSpecification;
+import org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.constraintWithVSLl.ConstraintWithVSLlPackage;
 
 /**
  * <!-- begin-user-doc -->
  * 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.marte.textedit.constraintwithvsl.xtext.constraintWithVSLl.ConstraintWithVSLlPackage
  * @generated
  */
@@ -29,7 +28,7 @@ public class ConstraintWithVSLlAdapterFactory extends AdapterFactoryImpl {
 	 * The cached model package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
+	 *
 	 * @generated
 	 */
 	protected static ConstraintWithVSLlPackage modelPackage;
@@ -38,7 +37,7 @@ public class ConstraintWithVSLlAdapterFactory extends AdapterFactoryImpl {
 	 * Creates an instance of the adapter factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
+	 *
 	 * @generated
 	 */
 	public ConstraintWithVSLlAdapterFactory() {
@@ -52,7 +51,7 @@ public class ConstraintWithVSLlAdapterFactory 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 +70,7 @@ public class ConstraintWithVSLlAdapterFactory extends AdapterFactoryImpl {
 	 * The switch that delegates to the <code>createXXX</code> methods.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
+	 *
 	 * @generated
 	 */
 	protected ConstraintWithVSLlSwitch<Adapter> modelSwitch =
@@ -96,7 +95,7 @@ public class ConstraintWithVSLlAdapterFactory extends AdapterFactoryImpl {
 	 * Creates an adapter for the <code>target</code>.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
+	 *
 	 * @param target
 	 *            the object to adapt.
 	 * @return the adapter for the <code>target</code>.
@@ -114,7 +113,7 @@ public class ConstraintWithVSLlAdapterFactory 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.marte.textedit.constraintwithvsl.xtext.constraintWithVSLl.ConstraintRule
 	 * @generated
@@ -129,7 +128,7 @@ public class ConstraintWithVSLlAdapterFactory 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.marte.textedit.constraintwithvsl.xtext.constraintWithVSLl.ConstraintSpecification
 	 * @generated
@@ -143,7 +142,7 @@ public class ConstraintWithVSLlAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null.
 	 * <!-- end-user-doc -->
-	 * 
+	 *
 	 * @return the new adapter.
 	 * @generated
 	 */
diff --git a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src-gen/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/constraintWithVSLl/util/ConstraintWithVSLlResourceFactoryImpl.java b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src-gen/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/constraintWithVSLl/util/ConstraintWithVSLlResourceFactoryImpl.java
index 244751e2250..0e5c7b0b4c7 100644
--- a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src-gen/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/constraintWithVSLl/util/ConstraintWithVSLlResourceFactoryImpl.java
+++ b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src-gen/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/constraintWithVSLl/util/ConstraintWithVSLlResourceFactoryImpl.java
@@ -7,18 +7,15 @@
 package org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.constraintWithVSLl.util;
 
 import org.eclipse.emf.common.util.URI;
-
 import org.eclipse.emf.ecore.resource.Resource;
-
 import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
-
 import org.eclipse.emf.ecore.xmi.XMLResource;
 
 /**
  * <!-- begin-user-doc -->
  * The <b>Resource Factory</b> associated with the package.
  * <!-- end-user-doc -->
- * 
+ *
  * @see org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.constraintWithVSLl.util.ConstraintWithVSLlResourceImpl
  * @generated
  */
@@ -27,7 +24,7 @@ public class ConstraintWithVSLlResourceFactoryImpl extends ResourceFactoryImpl {
 	 * Creates an instance of the resource factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
+	 *
 	 * @generated
 	 */
 	public ConstraintWithVSLlResourceFactoryImpl() {
@@ -38,7 +35,7 @@ public class ConstraintWithVSLlResourceFactoryImpl extends ResourceFactoryImpl {
 	 * Creates an instance of the resource.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
+	 *
 	 * @generated
 	 */
 	@Override
diff --git a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src-gen/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/constraintWithVSLl/util/ConstraintWithVSLlResourceImpl.java b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src-gen/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/constraintWithVSLl/util/ConstraintWithVSLlResourceImpl.java
index 420e1f71cf5..eae6b3c01cd 100644
--- a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src-gen/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/constraintWithVSLl/util/ConstraintWithVSLlResourceImpl.java
+++ b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src-gen/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/constraintWithVSLl/util/ConstraintWithVSLlResourceImpl.java
@@ -7,14 +7,13 @@
 package org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.constraintWithVSLl.util;
 
 import org.eclipse.emf.common.util.URI;
-
 import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
 
 /**
  * <!-- begin-user-doc -->
  * The <b>Resource </b> associated with the package.
  * <!-- end-user-doc -->
- * 
+ *
  * @see org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.constraintWithVSLl.util.ConstraintWithVSLlResourceFactoryImpl
  * @generated
  */
@@ -23,7 +22,7 @@ public class ConstraintWithVSLlResourceImpl extends XMLResourceImpl {
 	 * Creates an instance of the resource.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
+	 *
 	 * @param uri
 	 *            the URI of the new resource.
 	 * @generated
diff --git a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src-gen/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/constraintWithVSLl/util/ConstraintWithVSLlSwitch.java b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src-gen/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/constraintWithVSLl/util/ConstraintWithVSLlSwitch.java
index 6bed5ce3958..a852ddf0d1c 100644
--- a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src-gen/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/constraintWithVSLl/util/ConstraintWithVSLlSwitch.java
+++ b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src-gen/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/constraintWithVSLl/util/ConstraintWithVSLlSwitch.java
@@ -8,10 +8,10 @@ package org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.constraintWit
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
-
 import org.eclipse.emf.ecore.util.Switch;
-
-import org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.constraintWithVSLl.*;
+import org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.constraintWithVSLl.ConstraintRule;
+import org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.constraintWithVSLl.ConstraintSpecification;
+import org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.constraintWithVSLl.ConstraintWithVSLlPackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -22,7 +22,7 @@ import org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.constraintWith
  * until a non-null result is returned,
  * which is the result of the switch.
  * <!-- end-user-doc -->
- * 
+ *
  * @see org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.constraintWithVSLl.ConstraintWithVSLlPackage
  * @generated
  */
@@ -31,7 +31,7 @@ public class ConstraintWithVSLlSwitch<T> extends Switch<T> {
 	 * The cached model package
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
+	 *
 	 * @generated
 	 */
 	protected static ConstraintWithVSLlPackage modelPackage;
@@ -40,7 +40,7 @@ public class ConstraintWithVSLlSwitch<T> extends Switch<T> {
 	 * Creates an instance of the switch.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
+	 *
 	 * @generated
 	 */
 	public ConstraintWithVSLlSwitch() {
@@ -53,7 +53,7 @@ public class ConstraintWithVSLlSwitch<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
@@ -67,7 +67,7 @@ public class ConstraintWithVSLlSwitch<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
 	 */
@@ -101,7 +101,7 @@ public class ConstraintWithVSLlSwitch<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.
 	 * @return the result of interpreting the object as an instance of '<em>Constraint Rule</em>'.
@@ -118,7 +118,7 @@ public class ConstraintWithVSLlSwitch<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.
 	 * @return the result of interpreting the object as an instance of '<em>Constraint Specification</em>'.
@@ -135,7 +135,7 @@ public class ConstraintWithVSLlSwitch<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.
 	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
diff --git a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src-gen/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/constraintWithVSLl/util/ConstraintWithVSLlXMLProcessor.java b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src-gen/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/constraintWithVSLl/util/ConstraintWithVSLlXMLProcessor.java
index 22427b1bb35..2114364f5f6 100644
--- a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src-gen/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/constraintWithVSLl/util/ConstraintWithVSLlXMLProcessor.java
+++ b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src-gen/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/constraintWithVSLl/util/ConstraintWithVSLlXMLProcessor.java
@@ -9,18 +9,15 @@ package org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.constraintWit
 import java.util.Map;
 
 import org.eclipse.emf.ecore.EPackage;
-
 import org.eclipse.emf.ecore.resource.Resource;
-
 import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
-
 import org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.constraintWithVSLl.ConstraintWithVSLlPackage;
 
 /**
  * This class contains helper methods to serialize and deserialize XML documents
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- * 
+ *
  * @generated
  */
 public class ConstraintWithVSLlXMLProcessor extends XMLProcessor {
@@ -29,7 +26,7 @@ public class ConstraintWithVSLlXMLProcessor extends XMLProcessor {
 	 * Public constructor to instantiate the helper.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
+	 *
 	 * @generated
 	 */
 	public ConstraintWithVSLlXMLProcessor() {
@@ -41,7 +38,7 @@ public class ConstraintWithVSLlXMLProcessor extends XMLProcessor {
 	 * Register for "*" and "xml" file extensions the ConstraintWithVSLlResourceFactoryImpl factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
+	 *
 	 * @generated
 	 */
 	@Override
diff --git a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src-gen/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/parseTreeConstruction/ConstraintWithVSLlParsetreeConstructor.java b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src-gen/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/parseTreeConstruction/ConstraintWithVSLlParsetreeConstructor.java
index eb7a9b933b3..1e2eef09f2d 100644
--- a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src-gen/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/parseTreeConstruction/ConstraintWithVSLlParsetreeConstructor.java
+++ b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src-gen/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/parseTreeConstruction/ConstraintWithVSLlParsetreeConstructor.java
@@ -3,13 +3,16 @@
  */
 package org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.parseTreeConstruction;
 
-import org.eclipse.emf.ecore.*;
-import org.eclipse.xtext.*;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.services.ConstraintWithVSLlGrammarAccess;
+import org.eclipse.xtext.Alternatives;
+import org.eclipse.xtext.Assignment;
+import org.eclipse.xtext.Group;
+import org.eclipse.xtext.Keyword;
+import org.eclipse.xtext.RuleCall;
 import org.eclipse.xtext.parsetree.reconstr.IEObjectConsumer;
 import org.eclipse.xtext.parsetree.reconstr.impl.AbstractParseTreeConstructor;
 
-import org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.services.ConstraintWithVSLlGrammarAccess;
-
 import com.google.inject.Inject;
 
 @SuppressWarnings("all")
diff --git a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src-gen/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/parser/antlr/ConstraintWithVSLlAntlrTokenFileProvider.java b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src-gen/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/parser/antlr/ConstraintWithVSLlAntlrTokenFileProvider.java
index 767a4356957..d9f935129be 100644
--- a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src-gen/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/parser/antlr/ConstraintWithVSLlAntlrTokenFileProvider.java
+++ b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src-gen/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/parser/antlr/ConstraintWithVSLlAntlrTokenFileProvider.java
@@ -4,6 +4,7 @@
 package org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.parser.antlr;
 
 import java.io.InputStream;
+
 import org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider;
 
 public class ConstraintWithVSLlAntlrTokenFileProvider implements IAntlrTokenFileProvider {
diff --git a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src-gen/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/parser/antlr/ConstraintWithVSLlParser.java b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src-gen/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/parser/antlr/ConstraintWithVSLlParser.java
index 91d196ab1db..6962481a435 100644
--- a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src-gen/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/parser/antlr/ConstraintWithVSLlParser.java
+++ b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src-gen/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/parser/antlr/ConstraintWithVSLlParser.java
@@ -3,10 +3,10 @@
  */
 package org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.parser.antlr;
 
-import com.google.inject.Inject;
-
-import org.eclipse.xtext.parser.antlr.XtextTokenStream;
 import org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.services.ConstraintWithVSLlGrammarAccess;
+import org.eclipse.xtext.parser.antlr.XtextTokenStream;
+
+import com.google.inject.Inject;
 
 public class ConstraintWithVSLlParser extends org.eclipse.xtext.parser.antlr.AbstractAntlrParser {
 
diff --git a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src-gen/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/parser/antlr/internal/InternalConstraintWithVSLlLexer.java b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src-gen/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/parser/antlr/internal/InternalConstraintWithVSLlLexer.java
index 14093a0be28..50949d0f060 100644
--- a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src-gen/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/parser/antlr/internal/InternalConstraintWithVSLlLexer.java
+++ b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src-gen/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/parser/antlr/internal/InternalConstraintWithVSLlLexer.java
@@ -2,10 +2,17 @@ package org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.parser.antlr.
 
 // Hack: Use our own Lexer superclass by means of import.
 // Currently there is no other way to specify the superclass for the lexer.
+import org.antlr.runtime.BaseRecognizer;
+import org.antlr.runtime.CharStream;
+import org.antlr.runtime.DFA;
+import org.antlr.runtime.EarlyExitException;
+import org.antlr.runtime.IntStream;
+import org.antlr.runtime.MismatchedSetException;
+import org.antlr.runtime.NoViableAltException;
+import org.antlr.runtime.RecognitionException;
+import org.antlr.runtime.RecognizerSharedState;
 import org.eclipse.xtext.parser.antlr.Lexer;
 
-import org.antlr.runtime.*;
-
 @SuppressWarnings("all")
 public class InternalConstraintWithVSLlLexer extends Lexer {
 	public static final int RULE_DATETIMELITERAL = 7;
diff --git a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src-gen/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/parser/antlr/internal/InternalConstraintWithVSLlParser.java b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src-gen/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/parser/antlr/internal/InternalConstraintWithVSLlParser.java
index 85f74f459d6..4985242f168 100644
--- a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src-gen/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/parser/antlr/internal/InternalConstraintWithVSLlParser.java
+++ b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src-gen/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/parser/antlr/internal/InternalConstraintWithVSLlParser.java
@@ -1,11 +1,17 @@
 package org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.parser.antlr.internal;
 
+import org.antlr.runtime.BaseRecognizer;
+import org.antlr.runtime.BitSet;
+import org.antlr.runtime.DFA;
+import org.antlr.runtime.NoViableAltException;
+import org.antlr.runtime.RecognitionException;
+import org.antlr.runtime.RecognizerSharedState;
+import org.antlr.runtime.Token;
+import org.antlr.runtime.TokenStream;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.services.ConstraintWithVSLlGrammarAccess;
 import org.eclipse.xtext.parser.antlr.AbstractInternalAntlrParser;
 import org.eclipse.xtext.parser.antlr.AntlrDatatypeRuleToken;
-import org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.services.ConstraintWithVSLlGrammarAccess;
-
-import org.antlr.runtime.*;
 
 @SuppressWarnings("all")
 public class InternalConstraintWithVSLlParser extends AbstractInternalAntlrParser {
diff --git a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src-gen/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/services/ConstraintWithVSLlGrammarAccess.java b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src-gen/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/services/ConstraintWithVSLlGrammarAccess.java
index d9781218deb..32f6207a1b6 100644
--- a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src-gen/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/services/ConstraintWithVSLlGrammarAccess.java
+++ b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src-gen/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/services/ConstraintWithVSLlGrammarAccess.java
@@ -4,14 +4,18 @@
 
 package org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.services;
 
-import com.google.inject.Singleton;
-import com.google.inject.Inject;
-
-import org.eclipse.xtext.*;
+import org.eclipse.papyrus.marte.vsl.services.VSLGrammarAccess;
+import org.eclipse.xtext.Assignment;
+import org.eclipse.xtext.Grammar;
+import org.eclipse.xtext.GrammarUtil;
+import org.eclipse.xtext.ParserRule;
+import org.eclipse.xtext.RuleCall;
+import org.eclipse.xtext.TerminalRule;
+import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder;
 import org.eclipse.xtext.service.GrammarProvider;
-import org.eclipse.xtext.service.AbstractElementFinder.*;
 
-import org.eclipse.papyrus.marte.vsl.services.VSLGrammarAccess;
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
 
 @Singleton
 public class ConstraintWithVSLlGrammarAccess extends AbstractGrammarElementFinder {
diff --git a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/ConstraintWithVSLlStandaloneSetup.java b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/ConstraintWithVSLlStandaloneSetup.java
index 75b9829f8e3..500f8b91ac7 100644
--- a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/ConstraintWithVSLlStandaloneSetup.java
+++ b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/ConstraintWithVSLlStandaloneSetup.java
@@ -14,7 +14,6 @@
 
 package org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext;
 
-import org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.ConstraintWithVSLlStandaloneSetupGenerated;
 
 /**
  * Initialization support for running Xtext languages
diff --git a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/validation/ConstraintWithVSLlJavaValidator.java b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/validation/ConstraintWithVSLlJavaValidator.java
index 57a1d7fd4ee..94252f14061 100644
--- a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/validation/ConstraintWithVSLlJavaValidator.java
+++ b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/validation/ConstraintWithVSLlJavaValidator.java
@@ -15,7 +15,6 @@ package org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.validation;
 
 import org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.constraintWithVSLl.ConstraintSpecification;
 import org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.constraintWithVSLl.ConstraintWithVSLlPackage;
-import org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.validation.AbstractConstraintWithVSLlJavaValidator;
 import org.eclipse.papyrus.marte.vsl.validation.VSLJavaValidator;
 import org.eclipse.uml2.uml.Element;
 import org.eclipse.uml2.uml.Namespace;