[470822] Re-generate core metamodels with NON-NLS markers

Bug: 470822
Change-Id: Ie43fc18b01ee5686fb3889932ed7e8d6f569a4e0
Signed-off-by: Pierre-Charles David <pierre-charles.david@obeo.fr>

665 files changed, 10889 insertions, 7603 deletions

diff --git a/plugins/org.eclipse.sirius.diagram.layoutdata/src-gen/org/eclipse/sirius/diagram/layoutdata/AbstractLayoutData.java b/plugins/org.eclipse.sirius.diagram.layoutdata/src-gen/org/eclipse/sirius/diagram/layoutdata/AbstractLayoutData.java
index e08a64466b..f94dbb548f 100644
--- a/plugins/org.eclipse.sirius.diagram.layoutdata/src-gen/org/eclipse/sirius/diagram/layoutdata/AbstractLayoutData.java
+++ b/plugins/org.eclipse.sirius.diagram.layoutdata/src-gen/org/eclipse/sirius/diagram/layoutdata/AbstractLayoutData.java
@@ -15,10 +15,10 @@ import org.eclipse.emf.ecore.EObject;
 /**
  * <!-- begin-user-doc --> A representation of the model object '
  * <em><b>Abstract Layout Data</b></em>'. <!-- end-user-doc -->
- * 
+ *
  * <!-- begin-model-doc --> An astract class for all layout data. <!--
  * end-model-doc -->
- * 
+ *
  * <p>
  * The following features are supported:
  * <ul>
@@ -28,7 +28,7 @@ import org.eclipse.emf.ecore.EObject;
  * <em>Label</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.sirius.diagram.layoutdata.LayoutdataPackage#getAbstractLayoutData()
  * @model abstract="true"
  * @generated
@@ -39,7 +39,7 @@ public interface AbstractLayoutData extends EObject {
      * begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc -->
      * Serialization of the ID of the associated graphical element <!--
      * end-model-doc -->
-     * 
+     *
      * @return the value of the '<em>Id</em>' attribute.
      * @see #setId(String)
      * @see org.eclipse.sirius.diagram.layoutdata.LayoutdataPackage#getAbstractLayoutData_Id()
@@ -65,7 +65,7 @@ public interface AbstractLayoutData extends EObject {
      * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc -->
      * Represents the layout of the label of this edge (only the location is
      * used). <!-- end-model-doc -->
-     * 
+     *
      * @return the value of the '<em>Label</em>' containment reference.
      * @see #setLabel(NodeLayoutData)
      * @see org.eclipse.sirius.diagram.layoutdata.LayoutdataPackage#getAbstractLayoutData_Label()
diff --git a/plugins/org.eclipse.sirius.diagram.layoutdata/src-gen/org/eclipse/sirius/diagram/layoutdata/EdgeLayoutData.java b/plugins/org.eclipse.sirius.diagram.layoutdata/src-gen/org/eclipse/sirius/diagram/layoutdata/EdgeLayoutData.java
index 0ff0b8bce7..40fae20e08 100644
--- a/plugins/org.eclipse.sirius.diagram.layoutdata/src-gen/org/eclipse/sirius/diagram/layoutdata/EdgeLayoutData.java
+++ b/plugins/org.eclipse.sirius.diagram.layoutdata/src-gen/org/eclipse/sirius/diagram/layoutdata/EdgeLayoutData.java
@@ -15,9 +15,9 @@ import org.eclipse.emf.common.util.EList;
 /**
  * <!-- begin-user-doc --> A representation of the model object '
  * <em><b>Edge Layout Data</b></em>'. <!-- end-user-doc -->
- * 
+ *
  * <!-- begin-model-doc --> The layout data for an edge. <!-- end-model-doc -->
- * 
+ *
  * <p>
  * The following features are supported:
  * <ul>
@@ -51,7 +51,7 @@ import org.eclipse.emf.common.util.EList;
  * <em>Smoothness</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.sirius.diagram.layoutdata.LayoutdataPackage#getEdgeLayoutData()
  * @model
  * @generated
@@ -61,7 +61,7 @@ public interface EdgeLayoutData extends AbstractLayoutData {
      * Returns the value of the '<em><b>Source Terminal</b></em>' attribute.
      * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc -->
      * Identifier associated with the source anchor.
-     * 
+     *
      * @see {@link org.eclipse.gmf.runtime.draw2d.ui.figures.IAnchorableFigure}
      * @see {@link org.eclipse.gmf.runtime.draw2d.ui.figures.BaseSlidableAnchor.parseTerminalString}
      *      <!-- end-model-doc -->
@@ -90,7 +90,7 @@ public interface EdgeLayoutData extends AbstractLayoutData {
      * Returns the value of the '<em><b>Target Terminal</b></em>' attribute.
      * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc -->
      * Identifier associated with the target anchor.
-     * 
+     *
      * @see {@link org.eclipse.gmf.runtime.draw2d.ui.figures.IAnchorableFigure}
      * @see {@link org.eclipse.gmf.runtime.draw2d.ui.figures.BaseSlidableAnchor.parseTerminalString}
      *      <!-- end-model-doc -->
@@ -119,7 +119,7 @@ public interface EdgeLayoutData extends AbstractLayoutData {
      * Returns the value of the '<em><b>Routing</b></em>' attribute. <!--
      * begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> The
      * literal value of the routing.
-     * 
+     *
      * @see {@link org.eclipse.gmf.runtime.notation.Routing} <!-- end-model-doc
      *      -->
      * @return the value of the '<em>Routing</em>' attribute.
@@ -135,7 +135,7 @@ public interface EdgeLayoutData extends AbstractLayoutData {
      * {@link org.eclipse.sirius.diagram.layoutdata.EdgeLayoutData#getRouting
      * <em>Routing</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @param value
      *            the new value of the '<em>Routing</em>' attribute.
      * @see #getRouting()
@@ -149,7 +149,7 @@ public interface EdgeLayoutData extends AbstractLayoutData {
      * {@link org.eclipse.sirius.diagram.layoutdata.Point}. <!-- begin-user-doc
      * --> <!-- end-user-doc --> <!-- begin-model-doc --> List of points by
      * which the edge passes. <!-- end-model-doc -->
-     * 
+     *
      * @return the value of the '<em>Point List</em>' containment reference
      *         list.
      * @see org.eclipse.sirius.diagram.layoutdata.LayoutdataPackage#getEdgeLayoutData_PointList()
@@ -226,7 +226,7 @@ public interface EdgeLayoutData extends AbstractLayoutData {
      * Returns the value of the '<em><b>Jump Link Status</b></em>' attribute.
      * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc -->
      * The literal value of the Jump Links Status
-     * 
+     *
      * @see {@link org.eclipse.gmf.runtime.notation.JumpLinkStatus} <!--
      *      end-model-doc -->
      * @return the value of the '<em>Jump Link Status</em>' attribute.
@@ -254,7 +254,7 @@ public interface EdgeLayoutData extends AbstractLayoutData {
      * Returns the value of the '<em><b>Jump Link Type</b></em>' attribute. <!--
      * begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> The
      * literal value of the Jump Links Type.
-     * 
+     *
      * @see {@link org.eclipse.gmf.runtime.notation.JumpLinkType} <!--
      *      end-model-doc -->
      * @return the value of the '<em>Jump Link Type</em>' attribute.
@@ -282,7 +282,7 @@ public interface EdgeLayoutData extends AbstractLayoutData {
      * Returns the value of the '<em><b>Reverse Jump Link</b></em>' attribute.
      * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc -->
      * The literal value of the Reverse Jump Links. <!-- end-model-doc -->
-     * 
+     *
      * @return the value of the '<em>Reverse Jump Link</em>' attribute.
      * @see #setReverseJumpLink(boolean)
      * @see org.eclipse.sirius.diagram.layoutdata.LayoutdataPackage#getEdgeLayoutData_ReverseJumpLink()
@@ -308,7 +308,7 @@ public interface EdgeLayoutData extends AbstractLayoutData {
      * Returns the value of the '<em><b>Smoothness</b></em>' attribute. <!--
      * begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> The
      * literal value of the smotohness.
-     * 
+     *
      * @see {@link org.eclipse.gmf.runtime.notation.Smoothness} <!--
      *      end-model-doc -->
      * @return the value of the '<em>Smoothness</em>' attribute.
diff --git a/plugins/org.eclipse.sirius.diagram.layoutdata/src-gen/org/eclipse/sirius/diagram/layoutdata/LayoutdataFactory.java b/plugins/org.eclipse.sirius.diagram.layoutdata/src-gen/org/eclipse/sirius/diagram/layoutdata/LayoutdataFactory.java
index 99100cb45b..d9aebc3e96 100644
--- a/plugins/org.eclipse.sirius.diagram.layoutdata/src-gen/org/eclipse/sirius/diagram/layoutdata/LayoutdataFactory.java
+++ b/plugins/org.eclipse.sirius.diagram.layoutdata/src-gen/org/eclipse/sirius/diagram/layoutdata/LayoutdataFactory.java
@@ -31,7 +31,7 @@ public interface LayoutdataFactory extends EFactory {
     /**
      * Returns a new object of class '<em>Node Layout Data</em>'. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @return a new object of class '<em>Node Layout Data</em>'.
      * @generated
      */
@@ -40,7 +40,7 @@ public interface LayoutdataFactory extends EFactory {
     /**
      * Returns a new object of class '<em>Edge Layout Data</em>'. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @return a new object of class '<em>Edge Layout Data</em>'.
      * @generated
      */
diff --git a/plugins/org.eclipse.sirius.diagram.layoutdata/src-gen/org/eclipse/sirius/diagram/layoutdata/LayoutdataPackage.java b/plugins/org.eclipse.sirius.diagram.layoutdata/src-gen/org/eclipse/sirius/diagram/layoutdata/LayoutdataPackage.java
index 0e2911a04b..426482e7bb 100644
--- a/plugins/org.eclipse.sirius.diagram.layoutdata/src-gen/org/eclipse/sirius/diagram/layoutdata/LayoutdataPackage.java
+++ b/plugins/org.eclipse.sirius.diagram.layoutdata/src-gen/org/eclipse/sirius/diagram/layoutdata/LayoutdataPackage.java
@@ -75,7 +75,7 @@ public interface LayoutdataPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Id</b></em>' attribute. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -114,7 +114,7 @@ public interface LayoutdataPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Id</b></em>' attribute. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -132,7 +132,7 @@ public interface LayoutdataPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Width</b></em>' attribute. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -141,7 +141,7 @@ public interface LayoutdataPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Height</b></em>' attribute. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -198,7 +198,7 @@ public interface LayoutdataPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Id</b></em>' attribute. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -216,7 +216,7 @@ public interface LayoutdataPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Source Terminal</b></em>' attribute. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -225,7 +225,7 @@ public interface LayoutdataPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Target Terminal</b></em>' attribute. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -234,7 +234,7 @@ public interface LayoutdataPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Routing</b></em>' attribute. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -270,7 +270,7 @@ public interface LayoutdataPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Jump Link Status</b></em>' attribute. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -279,7 +279,7 @@ public interface LayoutdataPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Jump Link Type</b></em>' attribute. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -297,7 +297,7 @@ public interface LayoutdataPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Smoothness</b></em>' attribute. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -344,7 +344,7 @@ public interface LayoutdataPackage extends EPackage {
     /**
      * The number of structural features of the '<em>Point</em>' class. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -391,7 +391,7 @@ public interface LayoutdataPackage extends EPackage {
      * {@link org.eclipse.sirius.diagram.layoutdata.NodeLayoutData
      * <em>Node Layout Data</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @return the meta object for class '<em>Node Layout Data</em>'.
      * @see org.eclipse.sirius.diagram.layoutdata.NodeLayoutData
      * @generated
@@ -466,7 +466,7 @@ public interface LayoutdataPackage extends EPackage {
      * {@link org.eclipse.sirius.diagram.layoutdata.EdgeLayoutData
      * <em>Edge Layout Data</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @return the meta object for class '<em>Edge Layout Data</em>'.
      * @see org.eclipse.sirius.diagram.layoutdata.EdgeLayoutData
      * @generated
@@ -527,7 +527,7 @@ public interface LayoutdataPackage extends EPackage {
      * {@link org.eclipse.sirius.diagram.layoutdata.EdgeLayoutData#getSourceRefPoint
      * <em>Source Ref Point</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @return the meta object for the containment reference '
      *         <em>Source Ref Point</em>'.
      * @see org.eclipse.sirius.diagram.layoutdata.EdgeLayoutData#getSourceRefPoint()
@@ -541,7 +541,7 @@ public interface LayoutdataPackage extends EPackage {
      * {@link org.eclipse.sirius.diagram.layoutdata.EdgeLayoutData#getTargetRefPoint
      * <em>Target Ref Point</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @return the meta object for the containment reference '
      *         <em>Target Ref Point</em>'.
      * @see org.eclipse.sirius.diagram.layoutdata.EdgeLayoutData#getTargetRefPoint()
@@ -555,7 +555,7 @@ public interface LayoutdataPackage extends EPackage {
      * {@link org.eclipse.sirius.diagram.layoutdata.EdgeLayoutData#getJumpLinkStatus
      * <em>Jump Link Status</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @return the meta object for the attribute '<em>Jump Link Status</em>'.
      * @see org.eclipse.sirius.diagram.layoutdata.EdgeLayoutData#getJumpLinkStatus()
      * @see #getEdgeLayoutData()
@@ -580,7 +580,7 @@ public interface LayoutdataPackage extends EPackage {
      * {@link org.eclipse.sirius.diagram.layoutdata.EdgeLayoutData#isReverseJumpLink
      * <em>Reverse Jump Link</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @return the meta object for the attribute '<em>Reverse Jump Link</em>'.
      * @see org.eclipse.sirius.diagram.layoutdata.EdgeLayoutData#isReverseJumpLink()
      * @see #getEdgeLayoutData()
@@ -604,7 +604,7 @@ public interface LayoutdataPackage extends EPackage {
      * Returns the meta object for class '
      * {@link org.eclipse.sirius.diagram.layoutdata.Point <em>Point</em>}'. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @return the meta object for class '<em>Point</em>'.
      * @see org.eclipse.sirius.diagram.layoutdata.Point
      * @generated
@@ -638,7 +638,7 @@ public interface LayoutdataPackage 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
      */
diff --git a/plugins/org.eclipse.sirius.diagram.layoutdata/src-gen/org/eclipse/sirius/diagram/layoutdata/NodeLayoutData.java b/plugins/org.eclipse.sirius.diagram.layoutdata/src-gen/org/eclipse/sirius/diagram/layoutdata/NodeLayoutData.java
index 55d4f6aafa..af6e8b10e1 100644
--- a/plugins/org.eclipse.sirius.diagram.layoutdata/src-gen/org/eclipse/sirius/diagram/layoutdata/NodeLayoutData.java
+++ b/plugins/org.eclipse.sirius.diagram.layoutdata/src-gen/org/eclipse/sirius/diagram/layoutdata/NodeLayoutData.java
@@ -15,9 +15,9 @@ import org.eclipse.emf.common.util.EList;
 /**
  * <!-- begin-user-doc --> A representation of the model object '
  * <em><b>Node Layout Data</b></em>'. <!-- end-user-doc -->
- * 
+ *
  * <!-- begin-model-doc --> The layout data for a node. <!-- end-model-doc -->
- * 
+ *
  * <p>
  * The following features are supported:
  * <ul>
@@ -34,7 +34,7 @@ import org.eclipse.emf.common.util.EList;
  * <em>Location</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.sirius.diagram.layoutdata.LayoutdataPackage#getNodeLayoutData()
  * @model
  * @generated
@@ -44,7 +44,7 @@ public interface NodeLayoutData extends AbstractLayoutData {
      * Returns the value of the '<em><b>Width</b></em>' attribute. <!--
      * begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> The
      * width of this node. <!-- end-model-doc -->
-     * 
+     *
      * @return the value of the '<em>Width</em>' attribute.
      * @see #setWidth(int)
      * @see org.eclipse.sirius.diagram.layoutdata.LayoutdataPackage#getNodeLayoutData_Width()
@@ -69,7 +69,7 @@ public interface NodeLayoutData extends AbstractLayoutData {
      * Returns the value of the '<em><b>Height</b></em>' attribute. <!--
      * begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> The
      * height of this node. <!-- end-model-doc -->
-     * 
+     *
      * @return the value of the '<em>Height</em>' attribute.
      * @see #setHeight(int)
      * @see org.eclipse.sirius.diagram.layoutdata.LayoutdataPackage#getNodeLayoutData_Height()
@@ -83,7 +83,7 @@ public interface NodeLayoutData extends AbstractLayoutData {
      * {@link org.eclipse.sirius.diagram.layoutdata.NodeLayoutData#getHeight
      * <em>Height</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @param value
      *            the new value of the '<em>Height</em>' attribute.
      * @see #getHeight()
@@ -98,7 +98,7 @@ public interface NodeLayoutData extends AbstractLayoutData {
      * begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc -->
      * Represents the layout of the children of this node. <!-- end-model-doc
      * -->
-     * 
+     *
      * @return the value of the '<em>Children</em>' containment reference list.
      * @see org.eclipse.sirius.diagram.layoutdata.LayoutdataPackage#getNodeLayoutData_Children()
      * @model containment="true" resolveProxies="true"
@@ -113,7 +113,7 @@ public interface NodeLayoutData extends AbstractLayoutData {
      * begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc -->
      * Represents the layout of the edges that go out from this node. <!--
      * end-model-doc -->
-     * 
+     *
      * @return the value of the '<em>Outgoing Edges</em>' containment reference
      *         list.
      * @see org.eclipse.sirius.diagram.layoutdata.LayoutdataPackage#getNodeLayoutData_OutgoingEdges()
@@ -127,7 +127,7 @@ public interface NodeLayoutData extends AbstractLayoutData {
      * reference. <!-- begin-user-doc --> <!-- end-user-doc --> <!--
      * begin-model-doc --> Represents the relative location of this node
      * (relative to the parent layoutData). <!-- end-model-doc -->
-     * 
+     *
      * @return the value of the '<em>Location</em>' containment reference.
      * @see #setLocation(Point)
      * @see org.eclipse.sirius.diagram.layoutdata.LayoutdataPackage#getNodeLayoutData_Location()
diff --git a/plugins/org.eclipse.sirius.diagram.layoutdata/src-gen/org/eclipse/sirius/diagram/layoutdata/Point.java b/plugins/org.eclipse.sirius.diagram.layoutdata/src-gen/org/eclipse/sirius/diagram/layoutdata/Point.java
index d015842bf5..e13a34a7de 100644
--- a/plugins/org.eclipse.sirius.diagram.layoutdata/src-gen/org/eclipse/sirius/diagram/layoutdata/Point.java
+++ b/plugins/org.eclipse.sirius.diagram.layoutdata/src-gen/org/eclipse/sirius/diagram/layoutdata/Point.java
@@ -15,10 +15,10 @@ import org.eclipse.emf.ecore.EObject;
 /**
  * <!-- begin-user-doc --> A representation of the model object '
  * <em><b>Point</b></em>'. <!-- end-user-doc -->
- * 
+ *
  * <!-- begin-model-doc --> Represents a point (x, y) in 2-dimensional space.
  * <!-- end-model-doc -->
- * 
+ *
  * <p>
  * The following features are supported:
  * <ul>
@@ -26,7 +26,7 @@ import org.eclipse.emf.ecore.EObject;
  * <li>{@link org.eclipse.sirius.diagram.layoutdata.Point#getY <em>Y</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.sirius.diagram.layoutdata.LayoutdataPackage#getPoint()
  * @model
  * @generated
@@ -36,7 +36,7 @@ public interface Point extends EObject {
      * Returns the value of the '<em><b>X</b></em>' attribute. <!--
      * begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc -->
      * Represents the x coordinate. <!-- end-model-doc -->
-     * 
+     *
      * @return the value of the '<em>X</em>' attribute.
      * @see #setX(int)
      * @see org.eclipse.sirius.diagram.layoutdata.LayoutdataPackage#getPoint_X()
@@ -61,7 +61,7 @@ public interface Point extends EObject {
      * Returns the value of the '<em><b>Y</b></em>' attribute. <!--
      * begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc -->
      * Represents the y coordinate. <!-- end-model-doc -->
-     * 
+     *
      * @return the value of the '<em>Y</em>' attribute.
      * @see #setY(int)
      * @see org.eclipse.sirius.diagram.layoutdata.LayoutdataPackage#getPoint_Y()
diff --git a/plugins/org.eclipse.sirius.diagram.layoutdata/src-gen/org/eclipse/sirius/diagram/layoutdata/impl/AbstractLayoutDataImpl.java b/plugins/org.eclipse.sirius.diagram.layoutdata/src-gen/org/eclipse/sirius/diagram/layoutdata/impl/AbstractLayoutDataImpl.java
index ed7baaf550..d14116a3d2 100644
--- a/plugins/org.eclipse.sirius.diagram.layoutdata/src-gen/org/eclipse/sirius/diagram/layoutdata/impl/AbstractLayoutDataImpl.java
+++ b/plugins/org.eclipse.sirius.diagram.layoutdata/src-gen/org/eclipse/sirius/diagram/layoutdata/impl/AbstractLayoutDataImpl.java
@@ -34,14 +34,14 @@ import org.eclipse.sirius.diagram.layoutdata.NodeLayoutData;
  * <em>Label</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public abstract class AbstractLayoutDataImpl extends EObjectImpl implements AbstractLayoutData {
     /**
      * The default value of the '{@link #getId() <em>Id</em>}' attribute. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see #getId()
      * @generated
      * @ordered
@@ -51,7 +51,7 @@ public abstract class AbstractLayoutDataImpl extends EObjectImpl implements Abst
     /**
      * The cached value of the '{@link #getId() <em>Id</em>}' attribute. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see #getId()
      * @generated
      * @ordered
@@ -92,6 +92,7 @@ public abstract class AbstractLayoutDataImpl extends EObjectImpl implements Abst
      * 
      * @generated
      */
+    @Override
     public String getId() {
         return id;
     }
@@ -101,6 +102,7 @@ public abstract class AbstractLayoutDataImpl extends EObjectImpl implements Abst
      * 
      * @generated
      */
+    @Override
     public void setId(String newId) {
         String oldId = id;
         id = newId;
@@ -113,6 +115,7 @@ public abstract class AbstractLayoutDataImpl extends EObjectImpl implements Abst
      * 
      * @generated
      */
+    @Override
     public NodeLayoutData getLabel() {
         if (label != null && label.eIsProxy()) {
             InternalEObject oldLabel = (InternalEObject) label;
@@ -164,6 +167,7 @@ public abstract class AbstractLayoutDataImpl extends EObjectImpl implements Abst
      * 
      * @generated
      */
+    @Override
     public void setLabel(NodeLayoutData newLabel) {
         if (newLabel != label) {
             NotificationChain msgs = null;
@@ -273,7 +277,7 @@ public abstract class AbstractLayoutDataImpl extends EObjectImpl implements Abst
             return super.toString();
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (id: ");
+        result.append(" (id: "); //$NON-NLS-1$
         result.append(id);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram.layoutdata/src-gen/org/eclipse/sirius/diagram/layoutdata/impl/EdgeLayoutDataImpl.java b/plugins/org.eclipse.sirius.diagram.layoutdata/src-gen/org/eclipse/sirius/diagram/layoutdata/impl/EdgeLayoutDataImpl.java
index 2988bf2cb1..4c9e15401c 100644
--- a/plugins/org.eclipse.sirius.diagram.layoutdata/src-gen/org/eclipse/sirius/diagram/layoutdata/impl/EdgeLayoutDataImpl.java
+++ b/plugins/org.eclipse.sirius.diagram.layoutdata/src-gen/org/eclipse/sirius/diagram/layoutdata/impl/EdgeLayoutDataImpl.java
@@ -62,7 +62,7 @@ import org.eclipse.sirius.diagram.layoutdata.Point;
  * <em>Smoothness</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class EdgeLayoutDataImpl extends AbstractLayoutDataImpl implements EdgeLayoutData {
@@ -272,6 +272,7 @@ public class EdgeLayoutDataImpl extends AbstractLayoutDataImpl implements EdgeLa
      * 
      * @generated
      */
+    @Override
     public String getSourceTerminal() {
         return sourceTerminal;
     }
@@ -281,6 +282,7 @@ public class EdgeLayoutDataImpl extends AbstractLayoutDataImpl implements EdgeLa
      * 
      * @generated
      */
+    @Override
     public void setSourceTerminal(String newSourceTerminal) {
         String oldSourceTerminal = sourceTerminal;
         sourceTerminal = newSourceTerminal;
@@ -293,6 +295,7 @@ public class EdgeLayoutDataImpl extends AbstractLayoutDataImpl implements EdgeLa
      * 
      * @generated
      */
+    @Override
     public String getTargetTerminal() {
         return targetTerminal;
     }
@@ -302,6 +305,7 @@ public class EdgeLayoutDataImpl extends AbstractLayoutDataImpl implements EdgeLa
      * 
      * @generated
      */
+    @Override
     public void setTargetTerminal(String newTargetTerminal) {
         String oldTargetTerminal = targetTerminal;
         targetTerminal = newTargetTerminal;
@@ -314,6 +318,7 @@ public class EdgeLayoutDataImpl extends AbstractLayoutDataImpl implements EdgeLa
      * 
      * @generated
      */
+    @Override
     public int getRouting() {
         return routing;
     }
@@ -323,6 +328,7 @@ public class EdgeLayoutDataImpl extends AbstractLayoutDataImpl implements EdgeLa
      * 
      * @generated
      */
+    @Override
     public void setRouting(int newRouting) {
         int oldRouting = routing;
         routing = newRouting;
@@ -335,6 +341,7 @@ public class EdgeLayoutDataImpl extends AbstractLayoutDataImpl implements EdgeLa
      * 
      * @generated
      */
+    @Override
     public EList<Point> getPointList() {
         if (pointList == null) {
             pointList = new EObjectContainmentEList.Resolving<Point>(Point.class, this, LayoutdataPackage.EDGE_LAYOUT_DATA__POINT_LIST);
@@ -347,6 +354,7 @@ public class EdgeLayoutDataImpl extends AbstractLayoutDataImpl implements EdgeLa
      * 
      * @generated
      */
+    @Override
     public Point getSourceRefPoint() {
         if (sourceRefPoint != null && sourceRefPoint.eIsProxy()) {
             InternalEObject oldSourceRefPoint = (InternalEObject) sourceRefPoint;
@@ -398,6 +406,7 @@ public class EdgeLayoutDataImpl extends AbstractLayoutDataImpl implements EdgeLa
      * 
      * @generated
      */
+    @Override
     public void setSourceRefPoint(Point newSourceRefPoint) {
         if (newSourceRefPoint != sourceRefPoint) {
             NotificationChain msgs = null;
@@ -417,6 +426,7 @@ public class EdgeLayoutDataImpl extends AbstractLayoutDataImpl implements EdgeLa
      * 
      * @generated
      */
+    @Override
     public Point getTargetRefPoint() {
         if (targetRefPoint != null && targetRefPoint.eIsProxy()) {
             InternalEObject oldTargetRefPoint = (InternalEObject) targetRefPoint;
@@ -468,6 +478,7 @@ public class EdgeLayoutDataImpl extends AbstractLayoutDataImpl implements EdgeLa
      * 
      * @generated
      */
+    @Override
     public void setTargetRefPoint(Point newTargetRefPoint) {
         if (newTargetRefPoint != targetRefPoint) {
             NotificationChain msgs = null;
@@ -487,6 +498,7 @@ public class EdgeLayoutDataImpl extends AbstractLayoutDataImpl implements EdgeLa
      * 
      * @generated
      */
+    @Override
     public int getJumpLinkStatus() {
         return jumpLinkStatus;
     }
@@ -496,6 +508,7 @@ public class EdgeLayoutDataImpl extends AbstractLayoutDataImpl implements EdgeLa
      * 
      * @generated
      */
+    @Override
     public void setJumpLinkStatus(int newJumpLinkStatus) {
         int oldJumpLinkStatus = jumpLinkStatus;
         jumpLinkStatus = newJumpLinkStatus;
@@ -508,6 +521,7 @@ public class EdgeLayoutDataImpl extends AbstractLayoutDataImpl implements EdgeLa
      * 
      * @generated
      */
+    @Override
     public int getJumpLinkType() {
         return jumpLinkType;
     }
@@ -517,6 +531,7 @@ public class EdgeLayoutDataImpl extends AbstractLayoutDataImpl implements EdgeLa
      * 
      * @generated
      */
+    @Override
     public void setJumpLinkType(int newJumpLinkType) {
         int oldJumpLinkType = jumpLinkType;
         jumpLinkType = newJumpLinkType;
@@ -529,6 +544,7 @@ public class EdgeLayoutDataImpl extends AbstractLayoutDataImpl implements EdgeLa
      * 
      * @generated
      */
+    @Override
     public boolean isReverseJumpLink() {
         return reverseJumpLink;
     }
@@ -538,6 +554,7 @@ public class EdgeLayoutDataImpl extends AbstractLayoutDataImpl implements EdgeLa
      * 
      * @generated
      */
+    @Override
     public void setReverseJumpLink(boolean newReverseJumpLink) {
         boolean oldReverseJumpLink = reverseJumpLink;
         reverseJumpLink = newReverseJumpLink;
@@ -550,6 +567,7 @@ public class EdgeLayoutDataImpl extends AbstractLayoutDataImpl implements EdgeLa
      * 
      * @generated
      */
+    @Override
     public int getSmoothness() {
         return smoothness;
     }
@@ -559,6 +577,7 @@ public class EdgeLayoutDataImpl extends AbstractLayoutDataImpl implements EdgeLa
      * 
      * @generated
      */
+    @Override
     public void setSmoothness(int newSmoothness) {
         int oldSmoothness = smoothness;
         smoothness = newSmoothness;
@@ -749,19 +768,19 @@ public class EdgeLayoutDataImpl extends AbstractLayoutDataImpl implements EdgeLa
             return super.toString();
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (sourceTerminal: ");
+        result.append(" (sourceTerminal: "); //$NON-NLS-1$
         result.append(sourceTerminal);
-        result.append(", targetTerminal: ");
+        result.append(", targetTerminal: "); //$NON-NLS-1$
         result.append(targetTerminal);
-        result.append(", routing: ");
+        result.append(", routing: "); //$NON-NLS-1$
         result.append(routing);
-        result.append(", jumpLinkStatus: ");
+        result.append(", jumpLinkStatus: "); //$NON-NLS-1$
         result.append(jumpLinkStatus);
-        result.append(", jumpLinkType: ");
+        result.append(", jumpLinkType: "); //$NON-NLS-1$
         result.append(jumpLinkType);
-        result.append(", reverseJumpLink: ");
+        result.append(", reverseJumpLink: "); //$NON-NLS-1$
         result.append(reverseJumpLink);
-        result.append(", smoothness: ");
+        result.append(", smoothness: "); //$NON-NLS-1$
         result.append(smoothness);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram.layoutdata/src-gen/org/eclipse/sirius/diagram/layoutdata/impl/LayoutdataFactoryImpl.java b/plugins/org.eclipse.sirius.diagram.layoutdata/src-gen/org/eclipse/sirius/diagram/layoutdata/impl/LayoutdataFactoryImpl.java
index 10d0f95bf4..6496985dfd 100644
--- a/plugins/org.eclipse.sirius.diagram.layoutdata/src-gen/org/eclipse/sirius/diagram/layoutdata/impl/LayoutdataFactoryImpl.java
+++ b/plugins/org.eclipse.sirius.diagram.layoutdata/src-gen/org/eclipse/sirius/diagram/layoutdata/impl/LayoutdataFactoryImpl.java
@@ -71,7 +71,7 @@ public class LayoutdataFactoryImpl extends EFactoryImpl implements LayoutdataFac
         case LayoutdataPackage.POINT:
             return createPoint();
         default:
-            throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+            throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
         }
     }
 
@@ -80,6 +80,7 @@ public class LayoutdataFactoryImpl extends EFactoryImpl implements LayoutdataFac
      * 
      * @generated
      */
+    @Override
     public NodeLayoutData createNodeLayoutData() {
         NodeLayoutDataImpl nodeLayoutData = new NodeLayoutDataImpl();
         return nodeLayoutData;
@@ -90,6 +91,7 @@ public class LayoutdataFactoryImpl extends EFactoryImpl implements LayoutdataFac
      * 
      * @generated
      */
+    @Override
     public EdgeLayoutData createEdgeLayoutData() {
         EdgeLayoutDataImpl edgeLayoutData = new EdgeLayoutDataImpl();
         return edgeLayoutData;
@@ -100,6 +102,7 @@ public class LayoutdataFactoryImpl extends EFactoryImpl implements LayoutdataFac
      * 
      * @generated
      */
+    @Override
     public Point createPoint() {
         PointImpl point = new PointImpl();
         return point;
@@ -110,6 +113,7 @@ public class LayoutdataFactoryImpl extends EFactoryImpl implements LayoutdataFac
      * 
      * @generated
      */
+    @Override
     public LayoutdataPackage getLayoutdataPackage() {
         return (LayoutdataPackage) getEPackage();
     }
diff --git a/plugins/org.eclipse.sirius.diagram.layoutdata/src-gen/org/eclipse/sirius/diagram/layoutdata/impl/LayoutdataPackageImpl.java b/plugins/org.eclipse.sirius.diagram.layoutdata/src-gen/org/eclipse/sirius/diagram/layoutdata/impl/LayoutdataPackageImpl.java
index 4ca2bdf7b8..f8e5c51663 100644
--- a/plugins/org.eclipse.sirius.diagram.layoutdata/src-gen/org/eclipse/sirius/diagram/layoutdata/impl/LayoutdataPackageImpl.java
+++ b/plugins/org.eclipse.sirius.diagram.layoutdata/src-gen/org/eclipse/sirius/diagram/layoutdata/impl/LayoutdataPackageImpl.java
@@ -66,7 +66,7 @@ public class LayoutdataPackageImpl extends EPackageImpl implements LayoutdataPac
      * 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.sirius.diagram.layoutdata.LayoutdataPackage#eNS_URI
      * @see #init()
@@ -86,13 +86,13 @@ public class LayoutdataPackageImpl extends EPackageImpl implements LayoutdataPac
     /**
      * Creates, registers, and initializes the <b>Package</b> for this model,
      * and for any others upon which it depends.
-     * 
+     *
      * <p>
      * This method is used to initialize {@link LayoutdataPackage#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()
@@ -127,6 +127,7 @@ public class LayoutdataPackageImpl extends EPackageImpl implements LayoutdataPac
      * 
      * @generated
      */
+    @Override
     public EClass getAbstractLayoutData() {
         return abstractLayoutDataEClass;
     }
@@ -136,6 +137,7 @@ public class LayoutdataPackageImpl extends EPackageImpl implements LayoutdataPac
      * 
      * @generated
      */
+    @Override
     public EAttribute getAbstractLayoutData_Id() {
         return (EAttribute) abstractLayoutDataEClass.getEStructuralFeatures().get(0);
     }
@@ -145,6 +147,7 @@ public class LayoutdataPackageImpl extends EPackageImpl implements LayoutdataPac
      * 
      * @generated
      */
+    @Override
     public EReference getAbstractLayoutData_Label() {
         return (EReference) abstractLayoutDataEClass.getEStructuralFeatures().get(1);
     }
@@ -154,6 +157,7 @@ public class LayoutdataPackageImpl extends EPackageImpl implements LayoutdataPac
      * 
      * @generated
      */
+    @Override
     public EClass getNodeLayoutData() {
         return nodeLayoutDataEClass;
     }
@@ -163,6 +167,7 @@ public class LayoutdataPackageImpl extends EPackageImpl implements LayoutdataPac
      * 
      * @generated
      */
+    @Override
     public EAttribute getNodeLayoutData_Width() {
         return (EAttribute) nodeLayoutDataEClass.getEStructuralFeatures().get(0);
     }
@@ -172,6 +177,7 @@ public class LayoutdataPackageImpl extends EPackageImpl implements LayoutdataPac
      * 
      * @generated
      */
+    @Override
     public EAttribute getNodeLayoutData_Height() {
         return (EAttribute) nodeLayoutDataEClass.getEStructuralFeatures().get(1);
     }
@@ -181,6 +187,7 @@ public class LayoutdataPackageImpl extends EPackageImpl implements LayoutdataPac
      * 
      * @generated
      */
+    @Override
     public EReference getNodeLayoutData_Children() {
         return (EReference) nodeLayoutDataEClass.getEStructuralFeatures().get(2);
     }
@@ -190,6 +197,7 @@ public class LayoutdataPackageImpl extends EPackageImpl implements LayoutdataPac
      * 
      * @generated
      */
+    @Override
     public EReference getNodeLayoutData_OutgoingEdges() {
         return (EReference) nodeLayoutDataEClass.getEStructuralFeatures().get(3);
     }
@@ -199,6 +207,7 @@ public class LayoutdataPackageImpl extends EPackageImpl implements LayoutdataPac
      * 
      * @generated
      */
+    @Override
     public EReference getNodeLayoutData_Location() {
         return (EReference) nodeLayoutDataEClass.getEStructuralFeatures().get(4);
     }
@@ -208,6 +217,7 @@ public class LayoutdataPackageImpl extends EPackageImpl implements LayoutdataPac
      * 
      * @generated
      */
+    @Override
     public EClass getEdgeLayoutData() {
         return edgeLayoutDataEClass;
     }
@@ -217,6 +227,7 @@ public class LayoutdataPackageImpl extends EPackageImpl implements LayoutdataPac
      * 
      * @generated
      */
+    @Override
     public EAttribute getEdgeLayoutData_SourceTerminal() {
         return (EAttribute) edgeLayoutDataEClass.getEStructuralFeatures().get(0);
     }
@@ -226,6 +237,7 @@ public class LayoutdataPackageImpl extends EPackageImpl implements LayoutdataPac
      * 
      * @generated
      */
+    @Override
     public EAttribute getEdgeLayoutData_TargetTerminal() {
         return (EAttribute) edgeLayoutDataEClass.getEStructuralFeatures().get(1);
     }
@@ -235,6 +247,7 @@ public class LayoutdataPackageImpl extends EPackageImpl implements LayoutdataPac
      * 
      * @generated
      */
+    @Override
     public EAttribute getEdgeLayoutData_Routing() {
         return (EAttribute) edgeLayoutDataEClass.getEStructuralFeatures().get(2);
     }
@@ -244,6 +257,7 @@ public class LayoutdataPackageImpl extends EPackageImpl implements LayoutdataPac
      * 
      * @generated
      */
+    @Override
     public EReference getEdgeLayoutData_PointList() {
         return (EReference) edgeLayoutDataEClass.getEStructuralFeatures().get(3);
     }
@@ -253,6 +267,7 @@ public class LayoutdataPackageImpl extends EPackageImpl implements LayoutdataPac
      * 
      * @generated
      */
+    @Override
     public EReference getEdgeLayoutData_SourceRefPoint() {
         return (EReference) edgeLayoutDataEClass.getEStructuralFeatures().get(4);
     }
@@ -262,6 +277,7 @@ public class LayoutdataPackageImpl extends EPackageImpl implements LayoutdataPac
      * 
      * @generated
      */
+    @Override
     public EReference getEdgeLayoutData_TargetRefPoint() {
         return (EReference) edgeLayoutDataEClass.getEStructuralFeatures().get(5);
     }
@@ -271,6 +287,7 @@ public class LayoutdataPackageImpl extends EPackageImpl implements LayoutdataPac
      * 
      * @generated
      */
+    @Override
     public EAttribute getEdgeLayoutData_JumpLinkStatus() {
         return (EAttribute) edgeLayoutDataEClass.getEStructuralFeatures().get(6);
     }
@@ -280,6 +297,7 @@ public class LayoutdataPackageImpl extends EPackageImpl implements LayoutdataPac
      * 
      * @generated
      */
+    @Override
     public EAttribute getEdgeLayoutData_JumpLinkType() {
         return (EAttribute) edgeLayoutDataEClass.getEStructuralFeatures().get(7);
     }
@@ -289,6 +307,7 @@ public class LayoutdataPackageImpl extends EPackageImpl implements LayoutdataPac
      * 
      * @generated
      */
+    @Override
     public EAttribute getEdgeLayoutData_ReverseJumpLink() {
         return (EAttribute) edgeLayoutDataEClass.getEStructuralFeatures().get(8);
     }
@@ -298,6 +317,7 @@ public class LayoutdataPackageImpl extends EPackageImpl implements LayoutdataPac
      * 
      * @generated
      */
+    @Override
     public EAttribute getEdgeLayoutData_Smoothness() {
         return (EAttribute) edgeLayoutDataEClass.getEStructuralFeatures().get(9);
     }
@@ -307,6 +327,7 @@ public class LayoutdataPackageImpl extends EPackageImpl implements LayoutdataPac
      * 
      * @generated
      */
+    @Override
     public EClass getPoint() {
         return pointEClass;
     }
@@ -316,6 +337,7 @@ public class LayoutdataPackageImpl extends EPackageImpl implements LayoutdataPac
      * 
      * @generated
      */
+    @Override
     public EAttribute getPoint_X() {
         return (EAttribute) pointEClass.getEStructuralFeatures().get(0);
     }
@@ -325,6 +347,7 @@ public class LayoutdataPackageImpl extends EPackageImpl implements LayoutdataPac
      * 
      * @generated
      */
+    @Override
     public EAttribute getPoint_Y() {
         return (EAttribute) pointEClass.getEStructuralFeatures().get(1);
     }
@@ -334,6 +357,7 @@ public class LayoutdataPackageImpl extends EPackageImpl implements LayoutdataPac
      * 
      * @generated
      */
+    @Override
     public LayoutdataFactory getLayoutdataFactory() {
         return (LayoutdataFactory) getEFactoryInstance();
     }
@@ -397,7 +421,7 @@ public class LayoutdataPackageImpl extends EPackageImpl implements LayoutdataPac
      * 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() {
@@ -419,49 +443,49 @@ public class LayoutdataPackageImpl extends EPackageImpl implements LayoutdataPac
         edgeLayoutDataEClass.getESuperTypes().add(this.getAbstractLayoutData());
 
         // Initialize classes and features; add operations and parameters
-        initEClass(abstractLayoutDataEClass, AbstractLayoutData.class, "AbstractLayoutData", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getAbstractLayoutData_Id(), ecorePackage.getEString(), "id", null, 1, 1, AbstractLayoutData.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE,
-                !IS_DERIVED, IS_ORDERED);
-        initEReference(getAbstractLayoutData_Label(), this.getNodeLayoutData(), null, "label", null, 0, 1, AbstractLayoutData.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
-                IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        initEClass(nodeLayoutDataEClass, NodeLayoutData.class, "NodeLayoutData", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getNodeLayoutData_Width(), ecorePackage.getEInt(), "width", "-2", 0, 1, NodeLayoutData.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-                !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getNodeLayoutData_Height(), ecorePackage.getEInt(), "height", "-2", 0, 1, NodeLayoutData.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-                !IS_DERIVED, IS_ORDERED);
-        initEReference(getNodeLayoutData_Children(), this.getNodeLayoutData(), null, "children", null, 0, -1, NodeLayoutData.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
-                IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getNodeLayoutData_OutgoingEdges(), this.getEdgeLayoutData(), null, "outgoingEdges", null, 0, -1, NodeLayoutData.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
-                IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getNodeLayoutData_Location(), this.getPoint(), null, "location", null, 0, 1, NodeLayoutData.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
-                !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        initEClass(edgeLayoutDataEClass, EdgeLayoutData.class, "EdgeLayoutData", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getEdgeLayoutData_SourceTerminal(), ecorePackage.getEString(), "sourceTerminal", null, 0, 1, EdgeLayoutData.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
-                !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getEdgeLayoutData_TargetTerminal(), ecorePackage.getEString(), "targetTerminal", null, 0, 1, EdgeLayoutData.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
-                !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getEdgeLayoutData_Routing(), ecorePackage.getEInt(), "routing", null, 0, 1, EdgeLayoutData.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-                !IS_DERIVED, IS_ORDERED);
-        initEReference(getEdgeLayoutData_PointList(), this.getPoint(), null, "pointList", null, 0, -1, EdgeLayoutData.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
-                IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getEdgeLayoutData_SourceRefPoint(), this.getPoint(), null, "sourceRefPoint", null, 0, 1, EdgeLayoutData.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
-                IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getEdgeLayoutData_TargetRefPoint(), this.getPoint(), null, "targetRefPoint", null, 0, 1, EdgeLayoutData.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
-                IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getEdgeLayoutData_JumpLinkStatus(), ecorePackage.getEInt(), "jumpLinkStatus", null, 0, 1, EdgeLayoutData.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
-                !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getEdgeLayoutData_JumpLinkType(), ecorePackage.getEInt(), "jumpLinkType", null, 0, 1, EdgeLayoutData.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
-                IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getEdgeLayoutData_ReverseJumpLink(), ecorePackage.getEBoolean(), "reverseJumpLink", null, 0, 1, EdgeLayoutData.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
-                !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getEdgeLayoutData_Smoothness(), ecorePackage.getEInt(), "smoothness", null, 0, 1, EdgeLayoutData.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
-                IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        initEClass(pointEClass, Point.class, "Point", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getPoint_X(), ecorePackage.getEInt(), "x", null, 0, 1, Point.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getPoint_Y(), ecorePackage.getEInt(), "y", null, 0, 1, Point.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEClass(abstractLayoutDataEClass, AbstractLayoutData.class, "AbstractLayoutData", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(getAbstractLayoutData_Id(), ecorePackage.getEString(),
+                "id", null, 1, 1, AbstractLayoutData.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+        initEReference(getAbstractLayoutData_Label(), this.getNodeLayoutData(), null,
+                "label", null, 0, 1, AbstractLayoutData.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(nodeLayoutDataEClass, NodeLayoutData.class, "NodeLayoutData", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(getNodeLayoutData_Width(), ecorePackage.getEInt(),
+                "width", "-2", 0, 1, NodeLayoutData.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(getNodeLayoutData_Height(), ecorePackage.getEInt(),
+                "height", "-2", 0, 1, NodeLayoutData.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEReference(getNodeLayoutData_Children(), this.getNodeLayoutData(), null,
+                "children", null, 0, -1, NodeLayoutData.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+        initEReference(getNodeLayoutData_OutgoingEdges(), this.getEdgeLayoutData(), null,
+                "outgoingEdges", null, 0, -1, NodeLayoutData.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+        initEReference(getNodeLayoutData_Location(), this.getPoint(), null,
+                "location", null, 0, 1, NodeLayoutData.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(edgeLayoutDataEClass, EdgeLayoutData.class, "EdgeLayoutData", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(getEdgeLayoutData_SourceTerminal(), ecorePackage.getEString(),
+                "sourceTerminal", null, 0, 1, EdgeLayoutData.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(getEdgeLayoutData_TargetTerminal(), ecorePackage.getEString(),
+                "targetTerminal", null, 0, 1, EdgeLayoutData.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(getEdgeLayoutData_Routing(), ecorePackage.getEInt(),
+                "routing", null, 0, 1, EdgeLayoutData.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+        initEReference(getEdgeLayoutData_PointList(), this.getPoint(), null,
+                "pointList", null, 0, -1, EdgeLayoutData.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+        initEReference(getEdgeLayoutData_SourceRefPoint(), this.getPoint(), null,
+                "sourceRefPoint", null, 0, 1, EdgeLayoutData.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+        initEReference(getEdgeLayoutData_TargetRefPoint(), this.getPoint(), null,
+                "targetRefPoint", null, 0, 1, EdgeLayoutData.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(getEdgeLayoutData_JumpLinkStatus(), ecorePackage.getEInt(),
+                "jumpLinkStatus", null, 0, 1, EdgeLayoutData.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(getEdgeLayoutData_JumpLinkType(), ecorePackage.getEInt(),
+                "jumpLinkType", null, 0, 1, EdgeLayoutData.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(getEdgeLayoutData_ReverseJumpLink(), ecorePackage.getEBoolean(),
+                "reverseJumpLink", null, 0, 1, EdgeLayoutData.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(getEdgeLayoutData_Smoothness(), ecorePackage.getEInt(),
+                "smoothness", null, 0, 1, EdgeLayoutData.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(pointEClass, Point.class, "Point", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(getPoint_X(), ecorePackage.getEInt(), "x", null, 0, 1, Point.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(getPoint_Y(), ecorePackage.getEInt(), "y", null, 0, 1, Point.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 
         // Create resource
         createResource(eNS_URI);
diff --git a/plugins/org.eclipse.sirius.diagram.layoutdata/src-gen/org/eclipse/sirius/diagram/layoutdata/impl/NodeLayoutDataImpl.java b/plugins/org.eclipse.sirius.diagram.layoutdata/src-gen/org/eclipse/sirius/diagram/layoutdata/impl/NodeLayoutDataImpl.java
index 69d23af888..a39af605e9 100644
--- a/plugins/org.eclipse.sirius.diagram.layoutdata/src-gen/org/eclipse/sirius/diagram/layoutdata/impl/NodeLayoutDataImpl.java
+++ b/plugins/org.eclipse.sirius.diagram.layoutdata/src-gen/org/eclipse/sirius/diagram/layoutdata/impl/NodeLayoutDataImpl.java
@@ -48,7 +48,7 @@ import org.eclipse.sirius.diagram.layoutdata.Point;
  * <em>Location</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class NodeLayoutDataImpl extends AbstractLayoutDataImpl implements NodeLayoutData {
@@ -147,6 +147,7 @@ public class NodeLayoutDataImpl extends AbstractLayoutDataImpl implements NodeLa
      * 
      * @generated
      */
+    @Override
     public int getWidth() {
         return width;
     }
@@ -156,6 +157,7 @@ public class NodeLayoutDataImpl extends AbstractLayoutDataImpl implements NodeLa
      * 
      * @generated
      */
+    @Override
     public void setWidth(int newWidth) {
         int oldWidth = width;
         width = newWidth;
@@ -168,6 +170,7 @@ public class NodeLayoutDataImpl extends AbstractLayoutDataImpl implements NodeLa
      * 
      * @generated
      */
+    @Override
     public int getHeight() {
         return height;
     }
@@ -177,6 +180,7 @@ public class NodeLayoutDataImpl extends AbstractLayoutDataImpl implements NodeLa
      * 
      * @generated
      */
+    @Override
     public void setHeight(int newHeight) {
         int oldHeight = height;
         height = newHeight;
@@ -189,6 +193,7 @@ public class NodeLayoutDataImpl extends AbstractLayoutDataImpl implements NodeLa
      * 
      * @generated
      */
+    @Override
     public EList<NodeLayoutData> getChildren() {
         if (children == null) {
             children = new EObjectContainmentEList.Resolving<NodeLayoutData>(NodeLayoutData.class, this, LayoutdataPackage.NODE_LAYOUT_DATA__CHILDREN);
@@ -201,6 +206,7 @@ public class NodeLayoutDataImpl extends AbstractLayoutDataImpl implements NodeLa
      * 
      * @generated
      */
+    @Override
     public EList<EdgeLayoutData> getOutgoingEdges() {
         if (outgoingEdges == null) {
             outgoingEdges = new EObjectContainmentEList.Resolving<EdgeLayoutData>(EdgeLayoutData.class, this, LayoutdataPackage.NODE_LAYOUT_DATA__OUTGOING_EDGES);
@@ -213,6 +219,7 @@ public class NodeLayoutDataImpl extends AbstractLayoutDataImpl implements NodeLa
      * 
      * @generated
      */
+    @Override
     public Point getLocation() {
         if (location != null && location.eIsProxy()) {
             InternalEObject oldLocation = (InternalEObject) location;
@@ -264,6 +271,7 @@ public class NodeLayoutDataImpl extends AbstractLayoutDataImpl implements NodeLa
      * 
      * @generated
      */
+    @Override
     public void setLocation(Point newLocation) {
         if (newLocation != location) {
             NotificationChain msgs = null;
@@ -401,13 +409,14 @@ public class NodeLayoutDataImpl extends AbstractLayoutDataImpl implements NodeLa
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @not-generated
      */
     @Override
     public String toString() {
-        if (eIsProxy())
+        if (eIsProxy()) {
             return super.toString();
+        }
 
         StringBuffer result = new StringBuffer(super.toString());
         if (location != null) {
diff --git a/plugins/org.eclipse.sirius.diagram.layoutdata/src-gen/org/eclipse/sirius/diagram/layoutdata/impl/PointImpl.java b/plugins/org.eclipse.sirius.diagram.layoutdata/src-gen/org/eclipse/sirius/diagram/layoutdata/impl/PointImpl.java
index a02659d4ee..dfd79e461a 100644
--- a/plugins/org.eclipse.sirius.diagram.layoutdata/src-gen/org/eclipse/sirius/diagram/layoutdata/impl/PointImpl.java
+++ b/plugins/org.eclipse.sirius.diagram.layoutdata/src-gen/org/eclipse/sirius/diagram/layoutdata/impl/PointImpl.java
@@ -29,14 +29,14 @@ import org.eclipse.sirius.diagram.layoutdata.Point;
  * </em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class PointImpl extends EObjectImpl implements Point {
     /**
      * The default value of the '{@link #getX() <em>X</em>}' attribute. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see #getX()
      * @generated
      * @ordered
@@ -46,7 +46,7 @@ public class PointImpl extends EObjectImpl implements Point {
     /**
      * The cached value of the '{@link #getX() <em>X</em>}' attribute. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see #getX()
      * @generated
      * @ordered
@@ -56,7 +56,7 @@ public class PointImpl extends EObjectImpl implements Point {
     /**
      * The default value of the '{@link #getY() <em>Y</em>}' attribute. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see #getY()
      * @generated
      * @ordered
@@ -66,7 +66,7 @@ public class PointImpl extends EObjectImpl implements Point {
     /**
      * The cached value of the '{@link #getY() <em>Y</em>}' attribute. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see #getY()
      * @generated
      * @ordered
@@ -97,6 +97,7 @@ public class PointImpl extends EObjectImpl implements Point {
      * 
      * @generated
      */
+    @Override
     public int getX() {
         return x;
     }
@@ -106,6 +107,7 @@ public class PointImpl extends EObjectImpl implements Point {
      * 
      * @generated
      */
+    @Override
     public void setX(int newX) {
         int oldX = x;
         x = newX;
@@ -118,6 +120,7 @@ public class PointImpl extends EObjectImpl implements Point {
      * 
      * @generated
      */
+    @Override
     public int getY() {
         return y;
     }
@@ -127,6 +130,7 @@ public class PointImpl extends EObjectImpl implements Point {
      * 
      * @generated
      */
+    @Override
     public void setY(int newY) {
         int oldY = y;
         y = newY;
@@ -213,9 +217,9 @@ public class PointImpl extends EObjectImpl implements Point {
             return super.toString();
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (x: ");
+        result.append(" (x: "); //$NON-NLS-1$
         result.append(x);
-        result.append(", y: ");
+        result.append(", y: "); //$NON-NLS-1$
         result.append(y);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram.layoutdata/src-gen/org/eclipse/sirius/diagram/layoutdata/util/LayoutdataAdapterFactory.java b/plugins/org.eclipse.sirius.diagram.layoutdata/src-gen/org/eclipse/sirius/diagram/layoutdata/util/LayoutdataAdapterFactory.java
index e6bf9ef592..36e6ab0017 100644
--- a/plugins/org.eclipse.sirius.diagram.layoutdata/src-gen/org/eclipse/sirius/diagram/layoutdata/util/LayoutdataAdapterFactory.java
+++ b/plugins/org.eclipse.sirius.diagram.layoutdata/src-gen/org/eclipse/sirius/diagram/layoutdata/util/LayoutdataAdapterFactory.java
@@ -71,7 +71,7 @@ public class LayoutdataAdapterFactory extends AdapterFactoryImpl {
     /**
      * The switch that delegates to the <code>createXXX</code> methods. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected LayoutdataSwitch<Adapter> modelSwitch = new LayoutdataSwitch<Adapter>() {
@@ -169,7 +169,7 @@ public class LayoutdataAdapterFactory extends AdapterFactoryImpl {
      * begin-user-doc --> 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.sirius.diagram.layoutdata.Point
      * @generated
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/BasicMessageMappingItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/BasicMessageMappingItemProvider.java
index aaaddb2ec0..1bb0be284b 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/BasicMessageMappingItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/BasicMessageMappingItemProvider.java
@@ -60,7 +60,7 @@ public class BasicMessageMappingItemProvider extends MessageMappingItemProvider
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/BasicMessageMapping"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/BasicMessageMapping")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/CombinedFragmentMappingItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/CombinedFragmentMappingItemProvider.java
index 48a7f6c089..49bc2c6dd4 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/CombinedFragmentMappingItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/CombinedFragmentMappingItemProvider.java
@@ -61,7 +61,7 @@ public class CombinedFragmentMappingItemProvider extends FrameMappingItemProvide
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/CombinedFragmentMapping"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/CombinedFragmentMapping")); //$NON-NLS-1$
     }
 
     /**
@@ -117,7 +117,8 @@ public class CombinedFragmentMappingItemProvider extends FrameMappingItemProvide
         boolean qualify = childFeature == DescriptionPackage.Literals.ABSTRACT_NODE_MAPPING__BORDERED_NODE_MAPPINGS || childFeature == DescriptionPackage.Literals.CONTAINER_MAPPING__SUB_NODE_MAPPINGS;
 
         if (qualify) {
-            return getString("_UI_CreateChild_text2", new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+            return getString("_UI_CreateChild_text2", //$NON-NLS-1$
+                    new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
         }
         return super.getCreateChildText(owner, feature, child, selection);
     }
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/CoveredLifelinesVariableItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/CoveredLifelinesVariableItemProvider.java
index b5f0f81cf4..d8ed272cd1 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/CoveredLifelinesVariableItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/CoveredLifelinesVariableItemProvider.java
@@ -61,7 +61,7 @@ public class CoveredLifelinesVariableItemProvider extends AbstractVariableItemPr
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/CoveredLifelinesVariable"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/CoveredLifelinesVariable")); //$NON-NLS-1$
     }
 
     /**
@@ -73,7 +73,8 @@ public class CoveredLifelinesVariableItemProvider extends AbstractVariableItemPr
     @Override
     public String getText(Object object) {
         String label = ((CoveredLifelinesVariable) object).getName();
-        return label == null || label.length() == 0 ? getString("_UI_CoveredLifelinesVariable_type") : getString("_UI_CoveredLifelinesVariable_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_CoveredLifelinesVariable_type") : //$NON-NLS-1$
+            getString("_UI_CoveredLifelinesVariable_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/CreationMessageMappingItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/CreationMessageMappingItemProvider.java
index c6e9572fa0..3e5d2288c2 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/CreationMessageMappingItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/CreationMessageMappingItemProvider.java
@@ -60,7 +60,7 @@ public class CreationMessageMappingItemProvider extends MessageMappingItemProvid
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/CreationMessageMapping"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/CreationMessageMapping")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/DelimitedEventMappingItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/DelimitedEventMappingItemProvider.java
index 166a801aec..91a03b7c7d 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/DelimitedEventMappingItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/DelimitedEventMappingItemProvider.java
@@ -64,10 +64,13 @@ public class DelimitedEventMappingItemProvider extends EventMappingItemProvider
      * @generated
      */
     protected void addStartingEndFinderExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DelimitedEventMapping_startingEndFinderExpression_feature"), getString("_UI_DelimitedEventMapping_startingEndFinderExpression_description"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_DelimitedEventMapping_startingEndFinderExpression_feature"), //$NON-NLS-1$
+                getString("_UI_DelimitedEventMapping_startingEndFinderExpression_description"), //$NON-NLS-1$
                 DescriptionPackage.Literals.DELIMITED_EVENT_MAPPING__STARTING_END_FINDER_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -77,10 +80,13 @@ public class DelimitedEventMappingItemProvider extends EventMappingItemProvider
      * @generated
      */
     protected void addFinishingEndFinderExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DelimitedEventMapping_finishingEndFinderExpression_feature"), getString("_UI_DelimitedEventMapping_finishingEndFinderExpression_description"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_DelimitedEventMapping_finishingEndFinderExpression_feature"), //$NON-NLS-1$
+                getString("_UI_DelimitedEventMapping_finishingEndFinderExpression_description"), //$NON-NLS-1$
                 DescriptionPackage.Literals.DELIMITED_EVENT_MAPPING__FINISHING_END_FINDER_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -92,7 +98,8 @@ public class DelimitedEventMappingItemProvider extends EventMappingItemProvider
     @Override
     public String getText(Object object) {
         String label = ((DelimitedEventMapping) object).getStartingEndFinderExpression();
-        return label == null || label.length() == 0 ? getString("_UI_DelimitedEventMapping_type") : getString("_UI_DelimitedEventMapping_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_DelimitedEventMapping_type") : //$NON-NLS-1$
+            getString("_UI_DelimitedEventMapping_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/DestructionMessageMappingItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/DestructionMessageMappingItemProvider.java
index 4a782b27e0..f9e3b2b76d 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/DestructionMessageMappingItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/DestructionMessageMappingItemProvider.java
@@ -60,7 +60,7 @@ public class DestructionMessageMappingItemProvider extends MessageMappingItemPro
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/DestructionMessageMapping"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/DestructionMessageMapping")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/EndOfLifeMappingItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/EndOfLifeMappingItemProvider.java
index 1355b9bc52..d874950aa5 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/EndOfLifeMappingItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/EndOfLifeMappingItemProvider.java
@@ -65,7 +65,7 @@ public class EndOfLifeMappingItemProvider extends NodeMappingItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/EndOfLifeMapping"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/EndOfLifeMapping")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/EventMappingItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/EventMappingItemProvider.java
index 19d4f18cec..41c804bcac 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/EventMappingItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/EventMappingItemProvider.java
@@ -66,7 +66,7 @@ IItemPropertySource {
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_EventMapping_type");
+        return getString("_UI_EventMapping_type"); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/ExecutionMappingItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/ExecutionMappingItemProvider.java
index 40a4377f09..ac6b4e5f70 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/ExecutionMappingItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/ExecutionMappingItemProvider.java
@@ -69,10 +69,13 @@ public class ExecutionMappingItemProvider extends NodeMappingItemProvider {
      * @generated
      */
     protected void addStartingEndFinderExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DelimitedEventMapping_startingEndFinderExpression_feature"), getString("_UI_DelimitedEventMapping_startingEndFinderExpression_description"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_DelimitedEventMapping_startingEndFinderExpression_feature"), //$NON-NLS-1$
+                getString("_UI_DelimitedEventMapping_startingEndFinderExpression_description"), //$NON-NLS-1$
                 DescriptionPackage.Literals.DELIMITED_EVENT_MAPPING__STARTING_END_FINDER_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -82,10 +85,13 @@ public class ExecutionMappingItemProvider extends NodeMappingItemProvider {
      * @generated
      */
     protected void addFinishingEndFinderExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DelimitedEventMapping_finishingEndFinderExpression_feature"), getString("_UI_DelimitedEventMapping_finishingEndFinderExpression_description"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_DelimitedEventMapping_finishingEndFinderExpression_feature"), //$NON-NLS-1$
+                getString("_UI_DelimitedEventMapping_finishingEndFinderExpression_description"), //$NON-NLS-1$
                 DescriptionPackage.Literals.DELIMITED_EVENT_MAPPING__FINISHING_END_FINDER_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -96,7 +102,7 @@ public class ExecutionMappingItemProvider extends NodeMappingItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ExecutionMapping"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/ExecutionMapping")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/FrameMappingItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/FrameMappingItemProvider.java
index 366a9e20ee..5b854b21fb 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/FrameMappingItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/FrameMappingItemProvider.java
@@ -70,10 +70,13 @@ public class FrameMappingItemProvider extends ContainerMappingItemProvider {
      * @generated
      */
     protected void addStartingEndFinderExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DelimitedEventMapping_startingEndFinderExpression_feature"), getString("_UI_DelimitedEventMapping_startingEndFinderExpression_description"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_DelimitedEventMapping_startingEndFinderExpression_feature"), //$NON-NLS-1$
+                getString("_UI_DelimitedEventMapping_startingEndFinderExpression_description"), //$NON-NLS-1$
                 DescriptionPackage.Literals.DELIMITED_EVENT_MAPPING__STARTING_END_FINDER_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -83,10 +86,13 @@ public class FrameMappingItemProvider extends ContainerMappingItemProvider {
      * @generated
      */
     protected void addFinishingEndFinderExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DelimitedEventMapping_finishingEndFinderExpression_feature"), getString("_UI_DelimitedEventMapping_finishingEndFinderExpression_description"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_DelimitedEventMapping_finishingEndFinderExpression_feature"), //$NON-NLS-1$
+                getString("_UI_DelimitedEventMapping_finishingEndFinderExpression_description"), //$NON-NLS-1$
                 DescriptionPackage.Literals.DELIMITED_EVENT_MAPPING__FINISHING_END_FINDER_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -96,12 +102,11 @@ public class FrameMappingItemProvider extends ContainerMappingItemProvider {
      * @generated
      */
     protected void addCoveredLifelinesExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_FrameMapping_coveredLifelinesExpression_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_FrameMapping_coveredLifelinesExpression_feature", "_UI_FrameMapping_type"),
-                DescriptionPackage.Literals.FRAME_MAPPING__COVERED_LIFELINES_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_GeneralPropertyCategory"), null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+                getString("_UI_FrameMapping_coveredLifelinesExpression_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_FrameMapping_coveredLifelinesExpression_feature", "_UI_FrameMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DescriptionPackage.Literals.FRAME_MAPPING__COVERED_LIFELINES_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -112,9 +117,10 @@ public class FrameMappingItemProvider extends ContainerMappingItemProvider {
      */
     protected void addCenterLabelExpressionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_FrameMapping_centerLabelExpression_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_FrameMapping_centerLabelExpression_feature", "_UI_FrameMapping_type"),
-                DescriptionPackage.Literals.FRAME_MAPPING__CENTER_LABEL_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_FrameMapping_centerLabelExpression_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_FrameMapping_centerLabelExpression_feature", "_UI_FrameMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DescriptionPackage.Literals.FRAME_MAPPING__CENTER_LABEL_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -125,7 +131,7 @@ public class FrameMappingItemProvider extends ContainerMappingItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/FrameMapping"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/FrameMapping")); //$NON-NLS-1$
     }
 
     /**
@@ -229,7 +235,8 @@ public class FrameMappingItemProvider extends ContainerMappingItemProvider {
                 || childFeature == org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.CONTAINER_MAPPING__SUB_NODE_MAPPINGS;
 
         if (qualify) {
-            return getString("_UI_CreateChild_text2", new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+            return getString("_UI_CreateChild_text2", //$NON-NLS-1$
+                    new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
         }
         return super.getCreateChildText(owner, feature, child, selection);
     }
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/InstanceRoleMappingItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/InstanceRoleMappingItemProvider.java
index ea81dd0092..484941f7df 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/InstanceRoleMappingItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/InstanceRoleMappingItemProvider.java
@@ -65,7 +65,7 @@ public class InstanceRoleMappingItemProvider extends NodeMappingItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/InstanceRoleMapping"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/InstanceRoleMapping")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/InteractionUseMappingItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/InteractionUseMappingItemProvider.java
index 895653d821..e9c88694d0 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/InteractionUseMappingItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/InteractionUseMappingItemProvider.java
@@ -61,7 +61,7 @@ public class InteractionUseMappingItemProvider extends FrameMappingItemProvider
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/InteractionUseMapping"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/InteractionUseMapping")); //$NON-NLS-1$
     }
 
     /**
@@ -117,7 +117,8 @@ public class InteractionUseMappingItemProvider extends FrameMappingItemProvider
         boolean qualify = childFeature == DescriptionPackage.Literals.ABSTRACT_NODE_MAPPING__BORDERED_NODE_MAPPINGS || childFeature == DescriptionPackage.Literals.CONTAINER_MAPPING__SUB_NODE_MAPPINGS;
 
         if (qualify) {
-            return getString("_UI_CreateChild_text2", new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+            return getString("_UI_CreateChild_text2", //$NON-NLS-1$
+                    new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
         }
         return super.getCreateChildText(owner, feature, child, selection);
     }
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/MessageEndVariableItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/MessageEndVariableItemProvider.java
index 7ddcb6c7fe..62552a8d3a 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/MessageEndVariableItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/MessageEndVariableItemProvider.java
@@ -61,7 +61,7 @@ public class MessageEndVariableItemProvider extends AbstractVariableItemProvider
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/MessageEndVariable"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/MessageEndVariable")); //$NON-NLS-1$
     }
 
     /**
@@ -73,7 +73,8 @@ public class MessageEndVariableItemProvider extends AbstractVariableItemProvider
     @Override
     public String getText(Object object) {
         String label = ((MessageEndVariable) object).getName();
-        return label == null || label.length() == 0 ? getString("_UI_MessageEndVariable_type") : getString("_UI_MessageEndVariable_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_MessageEndVariable_type") : //$NON-NLS-1$
+            getString("_UI_MessageEndVariable_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/MessageMappingItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/MessageMappingItemProvider.java
index e937eda6fb..6fe50dbb39 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/MessageMappingItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/MessageMappingItemProvider.java
@@ -68,9 +68,9 @@ public class MessageMappingItemProvider extends EdgeMappingItemProvider {
      */
     protected void addSendingEndFinderExpressionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_MessageMapping_sendingEndFinderExpression_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_MessageMapping_sendingEndFinderExpression_feature", "_UI_MessageMapping_type"),
-                DescriptionPackage.Literals.MESSAGE_MAPPING__SENDING_END_FINDER_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"),
+                getString("_UI_MessageMapping_sendingEndFinderExpression_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_MessageMapping_sendingEndFinderExpression_feature", "_UI_MessageMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DescriptionPackage.Literals.MESSAGE_MAPPING__SENDING_END_FINDER_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
                 null));
     }
 
@@ -82,9 +82,9 @@ public class MessageMappingItemProvider extends EdgeMappingItemProvider {
      */
     protected void addReceivingEndFinderExpressionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_MessageMapping_receivingEndFinderExpression_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_MessageMapping_receivingEndFinderExpression_feature", "_UI_MessageMapping_type"),
-                DescriptionPackage.Literals.MESSAGE_MAPPING__RECEIVING_END_FINDER_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"),
+                getString("_UI_MessageMapping_receivingEndFinderExpression_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_MessageMapping_receivingEndFinderExpression_feature", "_UI_MessageMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DescriptionPackage.Literals.MESSAGE_MAPPING__RECEIVING_END_FINDER_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
                 null));
     }
 
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/ObservationPointMappingItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/ObservationPointMappingItemProvider.java
index 1e8ed8dba9..c4f7aa9bb2 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/ObservationPointMappingItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/ObservationPointMappingItemProvider.java
@@ -64,7 +64,7 @@ public class ObservationPointMappingItemProvider extends NodeMappingItemProvider
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ObservationPointMapping"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/ObservationPointMapping")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/OperandMappingItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/OperandMappingItemProvider.java
index d8b382d60f..38787983ab 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/OperandMappingItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/OperandMappingItemProvider.java
@@ -68,10 +68,13 @@ public class OperandMappingItemProvider extends ContainerMappingItemProvider {
      * @generated
      */
     protected void addStartingEndFinderExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DelimitedEventMapping_startingEndFinderExpression_feature"), getString("_UI_DelimitedEventMapping_startingEndFinderExpression_description"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_DelimitedEventMapping_startingEndFinderExpression_feature"), //$NON-NLS-1$
+                getString("_UI_DelimitedEventMapping_startingEndFinderExpression_description"), //$NON-NLS-1$
                 DescriptionPackage.Literals.DELIMITED_EVENT_MAPPING__STARTING_END_FINDER_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -81,10 +84,13 @@ public class OperandMappingItemProvider extends ContainerMappingItemProvider {
      * @generated
      */
     protected void addFinishingEndFinderExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DelimitedEventMapping_finishingEndFinderExpression_feature"), getString("_UI_DelimitedEventMapping_finishingEndFinderExpression_description"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_DelimitedEventMapping_finishingEndFinderExpression_feature"), //$NON-NLS-1$
+                getString("_UI_DelimitedEventMapping_finishingEndFinderExpression_description"), //$NON-NLS-1$
                 DescriptionPackage.Literals.DELIMITED_EVENT_MAPPING__FINISHING_END_FINDER_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -95,7 +101,7 @@ public class OperandMappingItemProvider extends ContainerMappingItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/OperandMapping"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/OperandMapping")); //$NON-NLS-1$
     }
 
     /**
@@ -197,7 +203,8 @@ public class OperandMappingItemProvider extends ContainerMappingItemProvider {
                 || childFeature == org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.CONTAINER_MAPPING__SUB_NODE_MAPPINGS;
 
         if (qualify) {
-            return getString("_UI_CreateChild_text2", new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+            return getString("_UI_CreateChild_text2", //$NON-NLS-1$
+                    new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
         }
         return super.getCreateChildText(owner, feature, child, selection);
     }
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/ReturnMessageMappingItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/ReturnMessageMappingItemProvider.java
index 2c8655e612..21d86dd371 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/ReturnMessageMappingItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/ReturnMessageMappingItemProvider.java
@@ -64,11 +64,13 @@ public class ReturnMessageMappingItemProvider extends MessageMappingItemProvider
      * @generated
      */
     protected void addInvocationMessageFinderExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_ReturnMessageMapping_invocationMessageFinderExpression_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_ReturnMessageMapping_invocationMessageFinderExpression_feature", "_UI_ReturnMessageMapping_type"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_ReturnMessageMapping_invocationMessageFinderExpression_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_ReturnMessageMapping_invocationMessageFinderExpression_feature", "_UI_ReturnMessageMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DescriptionPackage.Literals.RETURN_MESSAGE_MAPPING__INVOCATION_MESSAGE_FINDER_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -79,7 +81,7 @@ public class ReturnMessageMappingItemProvider extends MessageMappingItemProvider
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ReturnMessageMapping"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/ReturnMessageMapping")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/SequenceDiagramDescriptionItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/SequenceDiagramDescriptionItemProvider.java
index 18ca8c8746..ed90eb907e 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/SequenceDiagramDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/SequenceDiagramDescriptionItemProvider.java
@@ -68,11 +68,11 @@ public class SequenceDiagramDescriptionItemProvider extends DiagramDescriptionIt
      * @generated
      */
     protected void addEndsOrderingPropertyDescriptor(Object object) {
-        itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_SequenceDiagramDescription_endsOrdering_feature"), getString("_UI_SequenceDiagramDescription_endsOrdering_description"),
-                DescriptionPackage.Literals.SEQUENCE_DIAGRAM_DESCRIPTION__ENDS_ORDERING, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_GeneralPropertyCategory"), null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+                getString("_UI_SequenceDiagramDescription_endsOrdering_feature"), //$NON-NLS-1$
+                getString("_UI_SequenceDiagramDescription_endsOrdering_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.SEQUENCE_DIAGRAM_DESCRIPTION__ENDS_ORDERING, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -83,7 +83,8 @@ public class SequenceDiagramDescriptionItemProvider extends DiagramDescriptionIt
      */
     protected void addInstanceRolesOrderingPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_SequenceDiagramDescription_instanceRolesOrdering_feature"), getString("_UI_SequenceDiagramDescription_instanceRolesOrdering_description"),
+                getString("_UI_SequenceDiagramDescription_instanceRolesOrdering_feature"), //$NON-NLS-1$
+                getString("_UI_SequenceDiagramDescription_instanceRolesOrdering_description"), //$NON-NLS-1$
                 DescriptionPackage.Literals.SEQUENCE_DIAGRAM_DESCRIPTION__INSTANCE_ROLES_ORDERING, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -95,7 +96,7 @@ public class SequenceDiagramDescriptionItemProvider extends DiagramDescriptionIt
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/SequenceDiagramDescription"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/SequenceDiagramDescription")); //$NON-NLS-1$
     }
 
     /**
@@ -195,7 +196,8 @@ public class SequenceDiagramDescriptionItemProvider extends DiagramDescriptionIt
                 || childFeature == org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.DIAGRAM_DESCRIPTION__ADDITIONAL_LAYERS;
 
         if (qualify) {
-            return getString("_UI_CreateChild_text2", new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+            return getString("_UI_CreateChild_text2", //$NON-NLS-1$
+                    new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
         }
         return super.getCreateChildText(owner, feature, child, selection);
     }
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/StateMappingItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/StateMappingItemProvider.java
index 264baaa7ae..2c6c8dbb9e 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/StateMappingItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/StateMappingItemProvider.java
@@ -69,10 +69,13 @@ public class StateMappingItemProvider extends NodeMappingItemProvider {
      * @generated
      */
     protected void addStartingEndFinderExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DelimitedEventMapping_startingEndFinderExpression_feature"), getString("_UI_DelimitedEventMapping_startingEndFinderExpression_description"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_DelimitedEventMapping_startingEndFinderExpression_feature"), //$NON-NLS-1$
+                getString("_UI_DelimitedEventMapping_startingEndFinderExpression_description"), //$NON-NLS-1$
                 DescriptionPackage.Literals.DELIMITED_EVENT_MAPPING__STARTING_END_FINDER_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -82,10 +85,13 @@ public class StateMappingItemProvider extends NodeMappingItemProvider {
      * @generated
      */
     protected void addFinishingEndFinderExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DelimitedEventMapping_finishingEndFinderExpression_feature"), getString("_UI_DelimitedEventMapping_finishingEndFinderExpression_description"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_DelimitedEventMapping_finishingEndFinderExpression_feature"), //$NON-NLS-1$
+                getString("_UI_DelimitedEventMapping_finishingEndFinderExpression_description"), //$NON-NLS-1$
                 DescriptionPackage.Literals.DELIMITED_EVENT_MAPPING__FINISHING_END_FINDER_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -96,7 +102,7 @@ public class StateMappingItemProvider extends NodeMappingItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/StateMapping"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/StateMapping")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/CombinedFragmentCreationToolItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/CombinedFragmentCreationToolItemProvider.java
index 80c988d0e0..8a2b72794b 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/CombinedFragmentCreationToolItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/CombinedFragmentCreationToolItemProvider.java
@@ -102,7 +102,7 @@ public class CombinedFragmentCreationToolItemProvider extends ContainerCreationD
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/CombinedFragmentCreationTool"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/CombinedFragmentCreationTool")); //$NON-NLS-1$
     }
 
     /**
@@ -173,7 +173,8 @@ public class CombinedFragmentCreationToolItemProvider extends ContainerCreationD
                 || childFeature == ToolPackage.Literals.ORDERED_ELEMENT_CREATION_TOOL__FINISHING_END_PREDECESSOR;
 
         if (qualify) {
-            return getString("_UI_CreateChild_text2", new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+            return getString("_UI_CreateChild_text2", //$NON-NLS-1$
+                    new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
         }
         return super.getCreateChildText(owner, feature, child, selection);
     }
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/CoveringElementCreationToolItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/CoveringElementCreationToolItemProvider.java
index dd6507b84f..5f058dd58b 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/CoveringElementCreationToolItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/CoveringElementCreationToolItemProvider.java
@@ -105,7 +105,7 @@ IItemPropertySource {
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_CoveringElementCreationTool_type");
+        return getString("_UI_CoveringElementCreationTool_type"); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/ExecutionCreationToolItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/ExecutionCreationToolItemProvider.java
index aaea3b2ef6..d477807cee 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/ExecutionCreationToolItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/ExecutionCreationToolItemProvider.java
@@ -101,7 +101,7 @@ public class ExecutionCreationToolItemProvider extends NodeCreationDescriptionIt
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ExecutionCreationTool"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/ExecutionCreationTool")); //$NON-NLS-1$
     }
 
     /**
@@ -169,7 +169,8 @@ public class ExecutionCreationToolItemProvider extends NodeCreationDescriptionIt
                 || childFeature == ToolPackage.Literals.ORDERED_ELEMENT_CREATION_TOOL__FINISHING_END_PREDECESSOR;
 
         if (qualify) {
-            return getString("_UI_CreateChild_text2", new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+            return getString("_UI_CreateChild_text2", //$NON-NLS-1$
+                    new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
         }
         return super.getCreateChildText(owner, feature, child, selection);
     }
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/InstanceRoleCreationToolItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/InstanceRoleCreationToolItemProvider.java
index 9d536cee79..bb0fdd03f8 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/InstanceRoleCreationToolItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/InstanceRoleCreationToolItemProvider.java
@@ -100,7 +100,7 @@ public class InstanceRoleCreationToolItemProvider extends NodeCreationDescriptio
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/InstanceRoleCreationTool"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/InstanceRoleCreationTool")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/InstanceRoleReorderToolItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/InstanceRoleReorderToolItemProvider.java
index df1f2574a0..0d2b796747 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/InstanceRoleReorderToolItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/InstanceRoleReorderToolItemProvider.java
@@ -69,8 +69,8 @@ public class InstanceRoleReorderToolItemProvider extends AbstractToolDescription
      */
     protected void addMappingsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_InstanceRoleReorderTool_mappings_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_InstanceRoleReorderTool_mappings_feature", "_UI_InstanceRoleReorderTool_type"),
+                getString("_UI_InstanceRoleReorderTool_mappings_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_InstanceRoleReorderTool_mappings_feature", "_UI_InstanceRoleReorderTool_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 ToolPackage.Literals.INSTANCE_ROLE_REORDER_TOOL__MAPPINGS, true, false, true, null, null, null));
     }
 
@@ -117,7 +117,7 @@ public class InstanceRoleReorderToolItemProvider extends AbstractToolDescription
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/InstanceRoleReorderTool"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/InstanceRoleReorderTool")); //$NON-NLS-1$
     }
 
     /**
@@ -187,7 +187,8 @@ public class InstanceRoleReorderToolItemProvider extends AbstractToolDescription
         boolean qualify = childFeature == ToolPackage.Literals.INSTANCE_ROLE_REORDER_TOOL__PREDECESSOR_BEFORE || childFeature == ToolPackage.Literals.INSTANCE_ROLE_REORDER_TOOL__PREDECESSOR_AFTER;
 
         if (qualify) {
-            return getString("_UI_CreateChild_text2", new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+            return getString("_UI_CreateChild_text2", //$NON-NLS-1$
+                    new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
         }
         return super.getCreateChildText(owner, feature, child, selection);
     }
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/InteractionUseCreationToolItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/InteractionUseCreationToolItemProvider.java
index fea3c38ff6..1666444d7b 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/InteractionUseCreationToolItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/InteractionUseCreationToolItemProvider.java
@@ -102,7 +102,7 @@ public class InteractionUseCreationToolItemProvider extends ContainerCreationDes
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/InteractionUseCreationTool"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/InteractionUseCreationTool")); //$NON-NLS-1$
     }
 
     /**
@@ -173,7 +173,8 @@ public class InteractionUseCreationToolItemProvider extends ContainerCreationDes
                 || childFeature == ToolPackage.Literals.ORDERED_ELEMENT_CREATION_TOOL__FINISHING_END_PREDECESSOR;
 
         if (qualify) {
-            return getString("_UI_CreateChild_text2", new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+            return getString("_UI_CreateChild_text2", //$NON-NLS-1$
+                    new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
         }
         return super.getCreateChildText(owner, feature, child, selection);
     }
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/LifelineCreationToolItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/LifelineCreationToolItemProvider.java
index b4596cb27e..2ec29224fb 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/LifelineCreationToolItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/LifelineCreationToolItemProvider.java
@@ -63,7 +63,7 @@ public class LifelineCreationToolItemProvider extends ContainerCreationDescripti
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/LifelineCreationTool"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/LifelineCreationTool")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/MessageCreationToolItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/MessageCreationToolItemProvider.java
index a0c66f51b3..6312707502 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/MessageCreationToolItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/MessageCreationToolItemProvider.java
@@ -80,8 +80,10 @@ public class MessageCreationToolItemProvider extends SequenceDiagramToolDescript
      */
     protected void addDocumentationPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DocumentedElement_documentation_feature"), getString("_UI_DocumentedElement_documentation_description"), DescriptionPackage.Literals.DOCUMENTED_ELEMENT__DOCUMENTATION,
-                true, true, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_DocumentationPropertyCategory"), null));
+                getString("_UI_DocumentedElement_documentation_feature"), //$NON-NLS-1$
+                getString("_UI_DocumentedElement_documentation_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.DOCUMENTED_ELEMENT__DOCUMENTATION, true, true, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_DocumentationPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -92,8 +94,10 @@ public class MessageCreationToolItemProvider extends SequenceDiagramToolDescript
      */
     protected void addNamePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_IdentifiedElement_name_feature"), getString("_UI_IdentifiedElement_name_description"), DescriptionPackage.Literals.IDENTIFIED_ELEMENT__NAME, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_IdentifiedElement_name_feature"), //$NON-NLS-1$
+                getString("_UI_IdentifiedElement_name_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.IDENTIFIED_ELEMENT__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -104,8 +108,10 @@ public class MessageCreationToolItemProvider extends SequenceDiagramToolDescript
      */
     protected void addLabelPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_IdentifiedElement_label_feature"), getString("_UI_IdentifiedElement_label_description"), DescriptionPackage.Literals.IDENTIFIED_ELEMENT__LABEL, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_IdentifiedElement_label_feature"), //$NON-NLS-1$
+                getString("_UI_IdentifiedElement_label_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.IDENTIFIED_ELEMENT__LABEL, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -129,9 +135,10 @@ public class MessageCreationToolItemProvider extends SequenceDiagramToolDescript
      */
     protected void addForceRefreshPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_AbstractToolDescription_forceRefresh_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_AbstractToolDescription_forceRefresh_feature", "_UI_AbstractToolDescription_type"),
-                ToolPackage.Literals.ABSTRACT_TOOL_DESCRIPTION__FORCE_REFRESH, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_AbstractToolDescription_forceRefresh_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_AbstractToolDescription_forceRefresh_feature", "_UI_AbstractToolDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                ToolPackage.Literals.ABSTRACT_TOOL_DESCRIPTION__FORCE_REFRESH, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -142,8 +149,8 @@ public class MessageCreationToolItemProvider extends SequenceDiagramToolDescript
      */
     protected void addElementsToSelectPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_AbstractToolDescription_elementsToSelect_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_AbstractToolDescription_elementsToSelect_feature", "_UI_AbstractToolDescription_type"),
+                getString("_UI_AbstractToolDescription_elementsToSelect_feature"), //$NON-NLS-1$
+                getString("_UI_AbstractToolDescription_elementsToSelect_description"), //$NON-NLS-1$
                 ToolPackage.Literals.ABSTRACT_TOOL_DESCRIPTION__ELEMENTS_TO_SELECT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -155,8 +162,8 @@ public class MessageCreationToolItemProvider extends SequenceDiagramToolDescript
      */
     protected void addInverseSelectionOrderPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_AbstractToolDescription_inverseSelectionOrder_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_AbstractToolDescription_inverseSelectionOrder_feature", "_UI_AbstractToolDescription_type"),
+                getString("_UI_AbstractToolDescription_inverseSelectionOrder_feature"), //$NON-NLS-1$
+                getString("_UI_AbstractToolDescription_inverseSelectionOrder_description"), //$NON-NLS-1$
                 ToolPackage.Literals.ABSTRACT_TOOL_DESCRIPTION__INVERSE_SELECTION_ORDER, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
     }
 
@@ -168,8 +175,10 @@ public class MessageCreationToolItemProvider extends SequenceDiagramToolDescript
      */
     protected void addEdgeMappingsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_EdgeCreationDescription_edgeMappings_feature"), getString("_UI_EdgeCreationDescription_edgeMappings_description"),
-                org.eclipse.sirius.diagram.description.tool.ToolPackage.Literals.EDGE_CREATION_DESCRIPTION__EDGE_MAPPINGS, true, false, true, null, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_EdgeCreationDescription_edgeMappings_feature"), //$NON-NLS-1$
+                getString("_UI_EdgeCreationDescription_edgeMappings_description"), //$NON-NLS-1$
+                org.eclipse.sirius.diagram.description.tool.ToolPackage.Literals.EDGE_CREATION_DESCRIPTION__EDGE_MAPPINGS, true, false, true, null, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -179,10 +188,13 @@ public class MessageCreationToolItemProvider extends SequenceDiagramToolDescript
      * @generated
      */
     protected void addIconPathPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_EdgeCreationDescription_iconPath_feature"), getString("_UI_EdgeCreationDescription_iconPath_description"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_EdgeCreationDescription_iconPath_feature"), //$NON-NLS-1$
+                getString("_UI_EdgeCreationDescription_iconPath_description"), //$NON-NLS-1$
                 org.eclipse.sirius.diagram.description.tool.ToolPackage.Literals.EDGE_CREATION_DESCRIPTION__ICON_PATH, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_AdvancedPropertyCategory"), null));
+                getString("_UI_AdvancedPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -193,8 +205,9 @@ public class MessageCreationToolItemProvider extends SequenceDiagramToolDescript
      */
     protected void addExtraSourceMappingsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_EdgeCreationDescription_extraSourceMappings_feature"), getString("_UI_EdgeCreationDescription_extraSourceMappings_description"),
-                org.eclipse.sirius.diagram.description.tool.ToolPackage.Literals.EDGE_CREATION_DESCRIPTION__EXTRA_SOURCE_MAPPINGS, true, false, true, null, getString("_UI_AdvancedPropertyCategory"),
+                getString("_UI_EdgeCreationDescription_extraSourceMappings_feature"), //$NON-NLS-1$
+                getString("_UI_EdgeCreationDescription_extraSourceMappings_description"), //$NON-NLS-1$
+                org.eclipse.sirius.diagram.description.tool.ToolPackage.Literals.EDGE_CREATION_DESCRIPTION__EXTRA_SOURCE_MAPPINGS, true, false, true, null, getString("_UI_AdvancedPropertyCategory"), //$NON-NLS-1$
                 null));
     }
 
@@ -206,9 +219,9 @@ public class MessageCreationToolItemProvider extends SequenceDiagramToolDescript
      */
     protected void addExtraTargetMappingsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_EdgeCreationDescription_extraTargetMappings_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_EdgeCreationDescription_extraTargetMappings_feature", "_UI_EdgeCreationDescription_type"),
-                org.eclipse.sirius.diagram.description.tool.ToolPackage.Literals.EDGE_CREATION_DESCRIPTION__EXTRA_TARGET_MAPPINGS, true, false, true, null, getString("_UI_AdvancedPropertyCategory"),
+                getString("_UI_EdgeCreationDescription_extraTargetMappings_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_EdgeCreationDescription_extraTargetMappings_feature", "_UI_EdgeCreationDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                org.eclipse.sirius.diagram.description.tool.ToolPackage.Literals.EDGE_CREATION_DESCRIPTION__EXTRA_TARGET_MAPPINGS, true, false, true, null, getString("_UI_AdvancedPropertyCategory"), //$NON-NLS-1$
                 null));
     }
 
@@ -219,11 +232,13 @@ public class MessageCreationToolItemProvider extends SequenceDiagramToolDescript
      * @generated
      */
     protected void addConnectionStartPreconditionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_EdgeCreationDescription_connectionStartPrecondition_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_EdgeCreationDescription_connectionStartPrecondition_feature", "_UI_EdgeCreationDescription_type"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_EdgeCreationDescription_connectionStartPrecondition_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_EdgeCreationDescription_connectionStartPrecondition_feature", "_UI_EdgeCreationDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 org.eclipse.sirius.diagram.description.tool.ToolPackage.Literals.EDGE_CREATION_DESCRIPTION__CONNECTION_START_PRECONDITION, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -274,7 +289,7 @@ public class MessageCreationToolItemProvider extends SequenceDiagramToolDescript
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/MessageCreationTool"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/MessageCreationTool")); //$NON-NLS-1$
     }
 
     /**
@@ -378,7 +393,8 @@ public class MessageCreationToolItemProvider extends SequenceDiagramToolDescript
                 || childFeature == org.eclipse.sirius.diagram.sequence.description.tool.ToolPackage.Literals.ORDERED_ELEMENT_CREATION_TOOL__FINISHING_END_PREDECESSOR;
 
         if (qualify) {
-            return getString("_UI_CreateChild_text2", new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+            return getString("_UI_CreateChild_text2", //$NON-NLS-1$
+                    new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
         }
         return super.getCreateChildText(owner, feature, child, selection);
     }
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/ObservationPointCreationToolItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/ObservationPointCreationToolItemProvider.java
index 1d5d04c871..f771f379e6 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/ObservationPointCreationToolItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/ObservationPointCreationToolItemProvider.java
@@ -101,7 +101,7 @@ public class ObservationPointCreationToolItemProvider extends NodeCreationDescri
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ObservationPointCreationTool"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/ObservationPointCreationTool")); //$NON-NLS-1$
     }
 
     /**
@@ -169,7 +169,8 @@ public class ObservationPointCreationToolItemProvider extends NodeCreationDescri
                 || childFeature == ToolPackage.Literals.ORDERED_ELEMENT_CREATION_TOOL__FINISHING_END_PREDECESSOR;
 
         if (qualify) {
-            return getString("_UI_CreateChild_text2", new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+            return getString("_UI_CreateChild_text2", //$NON-NLS-1$
+                    new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
         }
         return super.getCreateChildText(owner, feature, child, selection);
     }
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/OperandCreationToolItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/OperandCreationToolItemProvider.java
index e149fbdffd..dd2449e407 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/OperandCreationToolItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/OperandCreationToolItemProvider.java
@@ -101,7 +101,7 @@ public class OperandCreationToolItemProvider extends ContainerCreationDescriptio
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/OperandCreationTool"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/OperandCreationTool")); //$NON-NLS-1$
     }
 
     /**
@@ -169,7 +169,8 @@ public class OperandCreationToolItemProvider extends ContainerCreationDescriptio
                 || childFeature == ToolPackage.Literals.ORDERED_ELEMENT_CREATION_TOOL__FINISHING_END_PREDECESSOR;
 
         if (qualify) {
-            return getString("_UI_CreateChild_text2", new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+            return getString("_UI_CreateChild_text2", //$NON-NLS-1$
+                    new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
         }
         return super.getCreateChildText(owner, feature, child, selection);
     }
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/OrderedElementCreationToolItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/OrderedElementCreationToolItemProvider.java
index 07c9a65734..29afffb5eb 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/OrderedElementCreationToolItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/OrderedElementCreationToolItemProvider.java
@@ -106,7 +106,7 @@ IItemPropertySource {
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_OrderedElementCreationTool_type");
+        return getString("_UI_OrderedElementCreationTool_type"); //$NON-NLS-1$
     }
 
     /**
@@ -162,7 +162,8 @@ IItemPropertySource {
                 || childFeature == ToolPackage.Literals.ORDERED_ELEMENT_CREATION_TOOL__FINISHING_END_PREDECESSOR;
 
         if (qualify) {
-            return getString("_UI_CreateChild_text2", new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+            return getString("_UI_CreateChild_text2", //$NON-NLS-1$
+                    new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
         }
         return super.getCreateChildText(owner, feature, child, selection);
     }
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/ReorderToolItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/ReorderToolItemProvider.java
index a9a23e8a88..cff435ef0a 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/ReorderToolItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/ReorderToolItemProvider.java
@@ -70,8 +70,10 @@ public class ReorderToolItemProvider extends AbstractToolDescriptionItemProvider
      */
     protected void addMappingsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_ReorderTool_mappings_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ReorderTool_mappings_feature", "_UI_ReorderTool_type"),
-                ToolPackage.Literals.REORDER_TOOL__MAPPINGS, true, false, true, null, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_ReorderTool_mappings_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_ReorderTool_mappings_feature", "_UI_ReorderTool_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                ToolPackage.Literals.REORDER_TOOL__MAPPINGS, true, false, true, null, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -119,7 +121,7 @@ public class ReorderToolItemProvider extends AbstractToolDescriptionItemProvider
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ReorderTool"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/ReorderTool")); //$NON-NLS-1$
     }
 
     /**
@@ -196,7 +198,8 @@ public class ReorderToolItemProvider extends AbstractToolDescriptionItemProvider
                 || childFeature == ToolPackage.Literals.REORDER_TOOL__FINISHING_END_PREDECESSOR_BEFORE || childFeature == ToolPackage.Literals.REORDER_TOOL__FINISHING_END_PREDECESSOR_AFTER;
 
         if (qualify) {
-            return getString("_UI_CreateChild_text2", new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+            return getString("_UI_CreateChild_text2", //$NON-NLS-1$
+                    new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
         }
         return super.getCreateChildText(owner, feature, child, selection);
     }
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/SequenceDiagramToolDescriptionItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/SequenceDiagramToolDescriptionItemProvider.java
index a715d9382d..94eddb5685 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/SequenceDiagramToolDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/SequenceDiagramToolDescriptionItemProvider.java
@@ -67,7 +67,7 @@ IItemLabelProvider, IItemPropertySource {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/SequenceDiagramToolDescription"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/SequenceDiagramToolDescription")); //$NON-NLS-1$
     }
 
     /**
@@ -78,7 +78,7 @@ IItemLabelProvider, IItemPropertySource {
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_SequenceDiagramToolDescription_type");
+        return getString("_UI_SequenceDiagramToolDescription_type"); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/StateCreationToolItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/StateCreationToolItemProvider.java
index b08c94699d..253ab899cc 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/StateCreationToolItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/StateCreationToolItemProvider.java
@@ -101,7 +101,7 @@ public class StateCreationToolItemProvider extends NodeCreationDescriptionItemPr
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/StateCreationTool"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/StateCreationTool")); //$NON-NLS-1$
     }
 
     /**
@@ -169,7 +169,8 @@ public class StateCreationToolItemProvider extends NodeCreationDescriptionItemPr
                 || childFeature == ToolPackage.Literals.ORDERED_ELEMENT_CREATION_TOOL__FINISHING_END_PREDECESSOR;
 
         if (qualify) {
-            return getString("_UI_CreateChild_text2", new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+            return getString("_UI_CreateChild_text2", //$NON-NLS-1$
+                    new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
         }
         return super.getCreateChildText(owner, feature, child, selection);
     }
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/ordering/provider/CompoundEventEndItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/ordering/provider/CompoundEventEndItemProvider.java
index 6c8b42c753..0013da2e3d 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/ordering/provider/CompoundEventEndItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/ordering/provider/CompoundEventEndItemProvider.java
@@ -61,7 +61,8 @@ public class CompoundEventEndItemProvider extends EventEndItemProvider {
      */
     protected void addEventEndsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_CompoundEventEnd_eventEnds_feature"), getString("_UI_PropertyDescriptor_description", "_UI_CompoundEventEnd_eventEnds_feature", "_UI_CompoundEventEnd_type"),
+                getString("_UI_CompoundEventEnd_eventEnds_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_CompoundEventEnd_eventEnds_feature", "_UI_CompoundEventEnd_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 OrderingPackage.Literals.COMPOUND_EVENT_END__EVENT_ENDS, true, false, true, null, null, null));
     }
 
@@ -73,7 +74,7 @@ public class CompoundEventEndItemProvider extends EventEndItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/CompoundEventEnd"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/CompoundEventEnd")); //$NON-NLS-1$
     }
 
     /**
@@ -84,7 +85,7 @@ public class CompoundEventEndItemProvider extends EventEndItemProvider {
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_CompoundEventEnd_type");
+        return getString("_UI_CompoundEventEnd_type"); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/ordering/provider/EventEndItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/ordering/provider/EventEndItemProvider.java
index 69d92fd526..ee9fe91fc6 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/ordering/provider/EventEndItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/ordering/provider/EventEndItemProvider.java
@@ -69,7 +69,8 @@ public class EventEndItemProvider extends ItemProviderAdapter implements IEditin
      */
     protected void addSemanticEndPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_EventEnd_semanticEnd_feature"), getString("_UI_PropertyDescriptor_description", "_UI_EventEnd_semanticEnd_feature", "_UI_EventEnd_type"),
+                getString("_UI_EventEnd_semanticEnd_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_EventEnd_semanticEnd_feature", "_UI_EventEnd_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 OrderingPackage.Literals.EVENT_END__SEMANTIC_END, true, false, true, null, null, null));
     }
 
@@ -80,7 +81,7 @@ public class EventEndItemProvider extends ItemProviderAdapter implements IEditin
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/EventEnd"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/EventEnd")); //$NON-NLS-1$
     }
 
     /**
@@ -91,7 +92,7 @@ public class EventEndItemProvider extends ItemProviderAdapter implements IEditin
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_EventEnd_type");
+        return getString("_UI_EventEnd_type"); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/ordering/provider/EventEndsOrderingItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/ordering/provider/EventEndsOrderingItemProvider.java
index 5d2a968bb2..e114f62abc 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/ordering/provider/EventEndsOrderingItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/ordering/provider/EventEndsOrderingItemProvider.java
@@ -71,8 +71,8 @@ IItemPropertySource {
      */
     protected void addSequenceDiagramPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_EventEndsOrdering_sequenceDiagram_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_EventEndsOrdering_sequenceDiagram_feature", "_UI_EventEndsOrdering_type"),
+                getString("_UI_EventEndsOrdering_sequenceDiagram_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_EventEndsOrdering_sequenceDiagram_feature", "_UI_EventEndsOrdering_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 OrderingPackage.Literals.EVENT_ENDS_ORDERING__SEQUENCE_DIAGRAM, true, false, true, null, null, null));
     }
 
@@ -84,7 +84,8 @@ IItemPropertySource {
      */
     protected void addEventEndsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_EventEndsOrdering_eventEnds_feature"), getString("_UI_PropertyDescriptor_description", "_UI_EventEndsOrdering_eventEnds_feature", "_UI_EventEndsOrdering_type"),
+                getString("_UI_EventEndsOrdering_eventEnds_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_EventEndsOrdering_eventEnds_feature", "_UI_EventEndsOrdering_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 OrderingPackage.Literals.EVENT_ENDS_ORDERING__EVENT_ENDS, true, false, true, null, null, null));
     }
 
@@ -96,7 +97,7 @@ IItemPropertySource {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/EventEndsOrdering"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/EventEndsOrdering")); //$NON-NLS-1$
     }
 
     /**
@@ -107,7 +108,7 @@ IItemPropertySource {
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_EventEndsOrdering_type");
+        return getString("_UI_EventEndsOrdering_type"); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/ordering/provider/InstanceRolesOrderingItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/ordering/provider/InstanceRolesOrderingItemProvider.java
index 81775f6a4e..e0e4347697 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/ordering/provider/InstanceRolesOrderingItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/ordering/provider/InstanceRolesOrderingItemProvider.java
@@ -70,8 +70,8 @@ IItemPropertySource {
      */
     protected void addSemanticInstanceRolesPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_InstanceRolesOrdering_semanticInstanceRoles_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_InstanceRolesOrdering_semanticInstanceRoles_feature", "_UI_InstanceRolesOrdering_type"),
+                getString("_UI_InstanceRolesOrdering_semanticInstanceRoles_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_InstanceRolesOrdering_semanticInstanceRoles_feature", "_UI_InstanceRolesOrdering_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 OrderingPackage.Literals.INSTANCE_ROLES_ORDERING__SEMANTIC_INSTANCE_ROLES, true, false, true, null, null, null));
     }
 
@@ -83,7 +83,7 @@ IItemPropertySource {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/InstanceRolesOrdering"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/InstanceRolesOrdering")); //$NON-NLS-1$
     }
 
     /**
@@ -94,7 +94,7 @@ IItemPropertySource {
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_InstanceRolesOrdering_type");
+        return getString("_UI_InstanceRolesOrdering_type"); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/ordering/provider/SingleEventEndItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/ordering/provider/SingleEventEndItemProvider.java
index 89ddb9998d..f90598848d 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/ordering/provider/SingleEventEndItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/ordering/provider/SingleEventEndItemProvider.java
@@ -65,7 +65,8 @@ public class SingleEventEndItemProvider extends EventEndItemProvider {
      */
     protected void addStartPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_SingleEventEnd_start_feature"), getString("_UI_PropertyDescriptor_description", "_UI_SingleEventEnd_start_feature", "_UI_SingleEventEnd_type"),
+                getString("_UI_SingleEventEnd_start_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_SingleEventEnd_start_feature", "_UI_SingleEventEnd_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 OrderingPackage.Literals.SINGLE_EVENT_END__START, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
     }
 
@@ -77,7 +78,8 @@ public class SingleEventEndItemProvider extends EventEndItemProvider {
      */
     protected void addSemanticEventPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_SingleEventEnd_semanticEvent_feature"), getString("_UI_PropertyDescriptor_description", "_UI_SingleEventEnd_semanticEvent_feature", "_UI_SingleEventEnd_type"),
+                getString("_UI_SingleEventEnd_semanticEvent_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_SingleEventEnd_semanticEvent_feature", "_UI_SingleEventEnd_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 OrderingPackage.Literals.SINGLE_EVENT_END__SEMANTIC_EVENT, true, false, true, null, null, null));
     }
 
@@ -90,7 +92,7 @@ public class SingleEventEndItemProvider extends EventEndItemProvider {
     @Override
     public String getText(Object object) {
         SingleEventEnd singleEventEnd = (SingleEventEnd) object;
-        return getString("_UI_SingleEventEnd_type") + " " + singleEventEnd.isStart();
+        return getString("_UI_SingleEventEnd_type") + " " + singleEventEnd.isStart(); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/provider/SequenceDDiagramItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/provider/SequenceDDiagramItemProvider.java
index 60d7f526b2..f0050120b0 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/provider/SequenceDDiagramItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/provider/SequenceDDiagramItemProvider.java
@@ -101,7 +101,7 @@ public class SequenceDDiagramItemProvider extends DSemanticDiagramItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/SequenceDDiagram"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/SequenceDDiagram")); //$NON-NLS-1$
     }
 
     /**
@@ -171,7 +171,8 @@ public class SequenceDDiagramItemProvider extends DSemanticDiagramItemProvider {
         boolean qualify = childFeature == SequencePackage.Literals.SEQUENCE_DDIAGRAM__SEMANTIC_ORDERING || childFeature == SequencePackage.Literals.SEQUENCE_DDIAGRAM__GRAPHICAL_ORDERING;
 
         if (qualify) {
-            return getString("_UI_CreateChild_text2", new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+            return getString("_UI_CreateChild_text2", //$NON-NLS-1$
+                    new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
         }
         return super.getCreateChildText(owner, feature, child, selection);
     }
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/template/provider/TAbstractMappingItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/template/provider/TAbstractMappingItemProvider.java
index 02e1162efe..1832b54906 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/template/provider/TAbstractMappingItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/template/provider/TAbstractMappingItemProvider.java
@@ -66,7 +66,8 @@ public class TAbstractMappingItemProvider extends TTransformerItemProvider {
      */
     protected void addNamePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_TAbstractMapping_name_feature"), getString("_UI_PropertyDescriptor_description", "_UI_TAbstractMapping_name_feature", "_UI_TAbstractMapping_type"),
+                getString("_UI_TAbstractMapping_name_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_TAbstractMapping_name_feature", "_UI_TAbstractMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 TemplatePackage.Literals.TABSTRACT_MAPPING__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -78,7 +79,8 @@ public class TAbstractMappingItemProvider extends TTransformerItemProvider {
      */
     protected void addDomainClassPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_TAbstractMapping_domainClass_feature"), getString("_UI_PropertyDescriptor_description", "_UI_TAbstractMapping_domainClass_feature", "_UI_TAbstractMapping_type"),
+                getString("_UI_TAbstractMapping_domainClass_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_TAbstractMapping_domainClass_feature", "_UI_TAbstractMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 TemplatePackage.Literals.TABSTRACT_MAPPING__DOMAIN_CLASS, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -90,8 +92,8 @@ public class TAbstractMappingItemProvider extends TTransformerItemProvider {
      */
     protected void addSemanticCandidatesExpressionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_TAbstractMapping_semanticCandidatesExpression_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_TAbstractMapping_semanticCandidatesExpression_feature", "_UI_TAbstractMapping_type"),
+                getString("_UI_TAbstractMapping_semanticCandidatesExpression_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_TAbstractMapping_semanticCandidatesExpression_feature", "_UI_TAbstractMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 TemplatePackage.Literals.TABSTRACT_MAPPING__SEMANTIC_CANDIDATES_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -103,7 +105,7 @@ public class TAbstractMappingItemProvider extends TTransformerItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/TAbstractMapping"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/TAbstractMapping")); //$NON-NLS-1$
     }
 
     /**
@@ -115,7 +117,8 @@ public class TAbstractMappingItemProvider extends TTransformerItemProvider {
     @Override
     public String getText(Object object) {
         String label = ((TAbstractMapping) object).getName();
-        return label == null || label.length() == 0 ? getString("_UI_TAbstractMapping_type") : getString("_UI_TAbstractMapping_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_TAbstractMapping_type") : //$NON-NLS-1$
+            getString("_UI_TAbstractMapping_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/template/provider/TBasicMessageMappingItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/template/provider/TBasicMessageMappingItemProvider.java
index 5c57f53c9b..7d3508ca66 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/template/provider/TBasicMessageMappingItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/template/provider/TBasicMessageMappingItemProvider.java
@@ -62,8 +62,10 @@ public class TBasicMessageMappingItemProvider extends TSourceTargetMessageMappin
      */
     protected void addTargetPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_TBasicMessageMapping_target_feature"), getString("_UI_PropertyDescriptor_description", "_UI_TBasicMessageMapping_target_feature", "_UI_TBasicMessageMapping_type"),
-                TemplatePackage.Literals.TBASIC_MESSAGE_MAPPING__TARGET, true, false, true, null, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_TBasicMessageMapping_target_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_TBasicMessageMapping_target_feature", "_UI_TBasicMessageMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                TemplatePackage.Literals.TBASIC_MESSAGE_MAPPING__TARGET, true, false, true, null, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -74,7 +76,7 @@ public class TBasicMessageMappingItemProvider extends TSourceTargetMessageMappin
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/TBasicMessageMapping"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/TBasicMessageMapping")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/template/provider/TConditionalExecutionStyleItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/template/provider/TConditionalExecutionStyleItemProvider.java
index 9869724457..149c34a391 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/template/provider/TConditionalExecutionStyleItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/template/provider/TConditionalExecutionStyleItemProvider.java
@@ -66,8 +66,8 @@ public class TConditionalExecutionStyleItemProvider extends TTransformerItemProv
      */
     protected void addPredicateExpressionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_TConditionalExecutionStyle_predicateExpression_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_TConditionalExecutionStyle_predicateExpression_feature", "_UI_TConditionalExecutionStyle_type"),
+                getString("_UI_TConditionalExecutionStyle_predicateExpression_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_TConditionalExecutionStyle_predicateExpression_feature", "_UI_TConditionalExecutionStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 TemplatePackage.Literals.TCONDITIONAL_EXECUTION_STYLE__PREDICATE_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -112,7 +112,7 @@ public class TConditionalExecutionStyleItemProvider extends TTransformerItemProv
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/TConditionalExecutionStyle"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/TConditionalExecutionStyle")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/template/provider/TConditionalLifelineStyleItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/template/provider/TConditionalLifelineStyleItemProvider.java
index dfb69f97e0..cf8af690a7 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/template/provider/TConditionalLifelineStyleItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/template/provider/TConditionalLifelineStyleItemProvider.java
@@ -66,8 +66,8 @@ public class TConditionalLifelineStyleItemProvider extends TTransformerItemProvi
      */
     protected void addPredicateExpressionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_TConditionalLifelineStyle_predicateExpression_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_TConditionalLifelineStyle_predicateExpression_feature", "_UI_TConditionalLifelineStyle_type"),
+                getString("_UI_TConditionalLifelineStyle_predicateExpression_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_TConditionalLifelineStyle_predicateExpression_feature", "_UI_TConditionalLifelineStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 TemplatePackage.Literals.TCONDITIONAL_LIFELINE_STYLE__PREDICATE_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -112,7 +112,7 @@ public class TConditionalLifelineStyleItemProvider extends TTransformerItemProvi
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/TConditionalLifelineStyle"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/TConditionalLifelineStyle")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/template/provider/TConditionalMessageStyleItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/template/provider/TConditionalMessageStyleItemProvider.java
index 95970dab76..e97f6e8e8c 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/template/provider/TConditionalMessageStyleItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/template/provider/TConditionalMessageStyleItemProvider.java
@@ -66,8 +66,8 @@ public class TConditionalMessageStyleItemProvider extends TTransformerItemProvid
      */
     protected void addPredicateExpressionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_TConditionalMessageStyle_predicateExpression_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_TConditionalMessageStyle_predicateExpression_feature", "_UI_TConditionalMessageStyle_type"),
+                getString("_UI_TConditionalMessageStyle_predicateExpression_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_TConditionalMessageStyle_predicateExpression_feature", "_UI_TConditionalMessageStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 TemplatePackage.Literals.TCONDITIONAL_MESSAGE_STYLE__PREDICATE_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -112,7 +112,7 @@ public class TConditionalMessageStyleItemProvider extends TTransformerItemProvid
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/TConditionalMessageStyle"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/TConditionalMessageStyle")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/template/provider/TCreationMessageMappingItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/template/provider/TCreationMessageMappingItemProvider.java
index 18fa541956..7b72181c6f 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/template/provider/TCreationMessageMappingItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/template/provider/TCreationMessageMappingItemProvider.java
@@ -62,9 +62,10 @@ public class TCreationMessageMappingItemProvider extends TSourceTargetMessageMap
      */
     protected void addTargetPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_TCreationMessageMapping_target_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_TCreationMessageMapping_target_feature", "_UI_TCreationMessageMapping_type"),
-                TemplatePackage.Literals.TCREATION_MESSAGE_MAPPING__TARGET, true, false, true, null, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_TCreationMessageMapping_target_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_TCreationMessageMapping_target_feature", "_UI_TCreationMessageMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                TemplatePackage.Literals.TCREATION_MESSAGE_MAPPING__TARGET, true, false, true, null, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -75,7 +76,7 @@ public class TCreationMessageMappingItemProvider extends TSourceTargetMessageMap
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/TCreationMessageMapping"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/TCreationMessageMapping")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/template/provider/TDestructionMessageMappingItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/template/provider/TDestructionMessageMappingItemProvider.java
index 3108598b44..bb18854b45 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/template/provider/TDestructionMessageMappingItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/template/provider/TDestructionMessageMappingItemProvider.java
@@ -62,8 +62,8 @@ public class TDestructionMessageMappingItemProvider extends TSourceTargetMessage
      */
     protected void addTargetPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_TDestructionMessageMapping_target_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_TDestructionMessageMapping_target_feature", "_UI_TDestructionMessageMapping_type"),
+                getString("_UI_TDestructionMessageMapping_target_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_TDestructionMessageMapping_target_feature", "_UI_TDestructionMessageMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 TemplatePackage.Literals.TDESTRUCTION_MESSAGE_MAPPING__TARGET, true, false, true, null, null, null));
     }
 
@@ -75,7 +75,7 @@ public class TDestructionMessageMappingItemProvider extends TSourceTargetMessage
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/TDestructionMessageMapping"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/TDestructionMessageMapping")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/template/provider/TExecutionMappingItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/template/provider/TExecutionMappingItemProvider.java
index 4e753bcf76..14dfe2f760 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/template/provider/TExecutionMappingItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/template/provider/TExecutionMappingItemProvider.java
@@ -68,8 +68,9 @@ public class TExecutionMappingItemProvider extends TAbstractMappingItemProvider
      */
     protected void addStartingEndFinderExpressionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_TExecutionMapping_startingEndFinderExpression_feature"), getString("_UI_TExecutionMapping_startingEndFinderExpression_description"),
-                TemplatePackage.Literals.TEXECUTION_MAPPING__STARTING_END_FINDER_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"),
+                getString("_UI_TExecutionMapping_startingEndFinderExpression_feature"), //$NON-NLS-1$
+                getString("_UI_TExecutionMapping_startingEndFinderExpression_description"), //$NON-NLS-1$
+                TemplatePackage.Literals.TEXECUTION_MAPPING__STARTING_END_FINDER_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
                 null));
     }
 
@@ -81,8 +82,9 @@ public class TExecutionMappingItemProvider extends TAbstractMappingItemProvider
      */
     protected void addFinishingEndFinderExpressionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_TExecutionMapping_finishingEndFinderExpression_feature"), getString("_UI_TExecutionMapping_finishingEndFinderExpression_description"),
-                TemplatePackage.Literals.TEXECUTION_MAPPING__FINISHING_END_FINDER_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"),
+                getString("_UI_TExecutionMapping_finishingEndFinderExpression_feature"), //$NON-NLS-1$
+                getString("_UI_TExecutionMapping_finishingEndFinderExpression_description"), //$NON-NLS-1$
+                TemplatePackage.Literals.TEXECUTION_MAPPING__FINISHING_END_FINDER_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
                 null));
     }
 
@@ -94,8 +96,10 @@ public class TExecutionMappingItemProvider extends TAbstractMappingItemProvider
      */
     protected void addRecursivePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_TExecutionMapping_recursive_feature"), getString("_UI_TExecutionMapping_recursive_description"), TemplatePackage.Literals.TEXECUTION_MAPPING__RECURSIVE, true, false,
-                false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_TExecutionMapping_recursive_feature"), //$NON-NLS-1$
+                getString("_UI_TExecutionMapping_recursive_description"), //$NON-NLS-1$
+                TemplatePackage.Literals.TEXECUTION_MAPPING__RECURSIVE, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -141,7 +145,7 @@ public class TExecutionMappingItemProvider extends TAbstractMappingItemProvider
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/TExecutionMapping"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/TExecutionMapping")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/template/provider/TExecutionStyleItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/template/provider/TExecutionStyleItemProvider.java
index 7936091ef6..09a4c6dc3c 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/template/provider/TExecutionStyleItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/template/provider/TExecutionStyleItemProvider.java
@@ -65,10 +65,13 @@ public class TExecutionStyleItemProvider extends TTransformerItemProvider {
      * @generated
      */
     protected void addBorderSizeComputationExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_TExecutionStyle_borderSizeComputationExpression_feature"), getString("_UI_TExecutionStyle_borderSizeComputationExpression_description"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_TExecutionStyle_borderSizeComputationExpression_feature"), //$NON-NLS-1$
+                getString("_UI_TExecutionStyle_borderSizeComputationExpression_description"), //$NON-NLS-1$
                 TemplatePackage.Literals.TEXECUTION_STYLE__BORDER_SIZE_COMPUTATION_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -79,8 +82,10 @@ public class TExecutionStyleItemProvider extends TTransformerItemProvider {
      */
     protected void addBorderColorPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_TExecutionStyle_borderColor_feature"), getString("_UI_TExecutionStyle_borderColor_description"), TemplatePackage.Literals.TEXECUTION_STYLE__BORDER_COLOR, true, false,
-                true, null, getString("_UI_ColorPropertyCategory"), null));
+                getString("_UI_TExecutionStyle_borderColor_feature"), //$NON-NLS-1$
+                getString("_UI_TExecutionStyle_borderColor_description"), //$NON-NLS-1$
+                TemplatePackage.Literals.TEXECUTION_STYLE__BORDER_COLOR, true, false, true, null, getString("_UI_ColorPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -91,8 +96,10 @@ public class TExecutionStyleItemProvider extends TTransformerItemProvider {
      */
     protected void addBackgroundColorPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_TExecutionStyle_backgroundColor_feature"), getString("_UI_TExecutionStyle_backgroundColor_description"), TemplatePackage.Literals.TEXECUTION_STYLE__BACKGROUND_COLOR,
-                true, false, true, null, getString("_UI_ColorPropertyCategory"), null));
+                getString("_UI_TExecutionStyle_backgroundColor_feature"), //$NON-NLS-1$
+                getString("_UI_TExecutionStyle_backgroundColor_description"), //$NON-NLS-1$
+                TemplatePackage.Literals.TEXECUTION_STYLE__BACKGROUND_COLOR, true, false, true, null, getString("_UI_ColorPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -103,7 +110,7 @@ public class TExecutionStyleItemProvider extends TTransformerItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/TExecutionStyle"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/TExecutionStyle")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/template/provider/TLifelineMappingItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/template/provider/TLifelineMappingItemProvider.java
index bc16a67b91..c2b9816c6c 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/template/provider/TLifelineMappingItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/template/provider/TLifelineMappingItemProvider.java
@@ -67,8 +67,10 @@ public class TLifelineMappingItemProvider extends TAbstractMappingItemProvider {
      */
     protected void addEolVisibleExpressionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_TLifelineMapping_eolVisibleExpression_feature"), getString("_UI_TLifelineMapping_eolVisibleExpression_description"),
-                TemplatePackage.Literals.TLIFELINE_MAPPING__EOL_VISIBLE_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_TLifelineMapping_eolVisibleExpression_feature"), //$NON-NLS-1$
+                getString("_UI_TLifelineMapping_eolVisibleExpression_description"), //$NON-NLS-1$
+                TemplatePackage.Literals.TLIFELINE_MAPPING__EOL_VISIBLE_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -116,7 +118,7 @@ public class TLifelineMappingItemProvider extends TAbstractMappingItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/TLifelineMapping"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/TLifelineMapping")); //$NON-NLS-1$
     }
 
     /**
@@ -227,7 +229,8 @@ public class TLifelineMappingItemProvider extends TAbstractMappingItemProvider {
         boolean qualify = childFeature == TemplatePackage.Literals.TLIFELINE_MAPPING__INSTANCE_ROLE_STYLE || childFeature == TemplatePackage.Literals.TLIFELINE_MAPPING__END_OF_LIFE_STYLE;
 
         if (qualify) {
-            return getString("_UI_CreateChild_text2", new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+            return getString("_UI_CreateChild_text2", //$NON-NLS-1$
+                    new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
         }
         return super.getCreateChildText(owner, feature, child, selection);
     }
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/template/provider/TLifelineStyleItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/template/provider/TLifelineStyleItemProvider.java
index 7eb62001fb..71ce125900 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/template/provider/TLifelineStyleItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/template/provider/TLifelineStyleItemProvider.java
@@ -64,10 +64,13 @@ public class TLifelineStyleItemProvider extends TTransformerItemProvider {
      * @generated
      */
     protected void addLifelineWidthComputationExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_TLifelineStyle_lifelineWidthComputationExpression_feature"), getString("_UI_TLifelineStyle_lifelineWidthComputationExpression_description"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_TLifelineStyle_lifelineWidthComputationExpression_feature"), //$NON-NLS-1$
+                getString("_UI_TLifelineStyle_lifelineWidthComputationExpression_description"), //$NON-NLS-1$
                 TemplatePackage.Literals.TLIFELINE_STYLE__LIFELINE_WIDTH_COMPUTATION_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -78,8 +81,10 @@ public class TLifelineStyleItemProvider extends TTransformerItemProvider {
      */
     protected void addLifelineColorPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_TLifelineStyle_lifelineColor_feature"), getString("_UI_TLifelineStyle_lifelineColor_description"), TemplatePackage.Literals.TLIFELINE_STYLE__LIFELINE_COLOR, true,
-                false, true, null, getString("_UI_ColorPropertyCategory"), null));
+                getString("_UI_TLifelineStyle_lifelineColor_feature"), //$NON-NLS-1$
+                getString("_UI_TLifelineStyle_lifelineColor_description"), //$NON-NLS-1$
+                TemplatePackage.Literals.TLIFELINE_STYLE__LIFELINE_COLOR, true, false, true, null, getString("_UI_ColorPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -90,7 +95,7 @@ public class TLifelineStyleItemProvider extends TTransformerItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/TLifelineStyle"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/TLifelineStyle")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/template/provider/TMessageExtremityItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/template/provider/TMessageExtremityItemProvider.java
index 8fb45945ed..39b89dfcf8 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/template/provider/TMessageExtremityItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/template/provider/TMessageExtremityItemProvider.java
@@ -67,7 +67,7 @@ IItemPropertySource {
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_TMessageExtremity_type");
+        return getString("_UI_TMessageExtremity_type"); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/template/provider/TMessageMappingItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/template/provider/TMessageMappingItemProvider.java
index 41158092df..d11e305684 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/template/provider/TMessageMappingItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/template/provider/TMessageMappingItemProvider.java
@@ -67,8 +67,9 @@ public class TMessageMappingItemProvider extends TAbstractMappingItemProvider {
      */
     protected void addSendingEndFinderExpressionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_TMessageMapping_sendingEndFinderExpression_feature"), getString("_UI_TMessageMapping_sendingEndFinderExpression_description"),
-                TemplatePackage.Literals.TMESSAGE_MAPPING__SENDING_END_FINDER_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"),
+                getString("_UI_TMessageMapping_sendingEndFinderExpression_feature"), //$NON-NLS-1$
+                getString("_UI_TMessageMapping_sendingEndFinderExpression_description"), //$NON-NLS-1$
+                TemplatePackage.Literals.TMESSAGE_MAPPING__SENDING_END_FINDER_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
                 null));
     }
 
@@ -80,8 +81,9 @@ public class TMessageMappingItemProvider extends TAbstractMappingItemProvider {
      */
     protected void addReceivingEndFinderExpressionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_TMessageMapping_receivingEndFinderExpression_feature"), getString("_UI_TMessageMapping_receivingEndFinderExpression_description"),
-                TemplatePackage.Literals.TMESSAGE_MAPPING__RECEIVING_END_FINDER_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"),
+                getString("_UI_TMessageMapping_receivingEndFinderExpression_feature"), //$NON-NLS-1$
+                getString("_UI_TMessageMapping_receivingEndFinderExpression_description"), //$NON-NLS-1$
+                TemplatePackage.Literals.TMESSAGE_MAPPING__RECEIVING_END_FINDER_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
                 null));
     }
 
@@ -128,7 +130,8 @@ public class TMessageMappingItemProvider extends TAbstractMappingItemProvider {
     @Override
     public String getText(Object object) {
         String label = ((TMessageMapping) object).getName();
-        return label == null || label.length() == 0 ? getString("_UI_TMessageMapping_type") : getString("_UI_TMessageMapping_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_TMessageMapping_type") : //$NON-NLS-1$
+            getString("_UI_TMessageMapping_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/template/provider/TMessageStyleItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/template/provider/TMessageStyleItemProvider.java
index f45d3f85a9..4923dd93b2 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/template/provider/TMessageStyleItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/template/provider/TMessageStyleItemProvider.java
@@ -69,8 +69,10 @@ public class TMessageStyleItemProvider extends TTransformerItemProvider {
      */
     protected void addStrokeColorPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_TMessageStyle_strokeColor_feature"), getString("_UI_TMessageStyle_strokeColor_description"), TemplatePackage.Literals.TMESSAGE_STYLE__STROKE_COLOR, true, false, true,
-                null, getString("_UI_ColorPropertyCategory"), null));
+                getString("_UI_TMessageStyle_strokeColor_feature"), //$NON-NLS-1$
+                getString("_UI_TMessageStyle_strokeColor_description"), //$NON-NLS-1$
+                TemplatePackage.Literals.TMESSAGE_STYLE__STROKE_COLOR, true, false, true, null, getString("_UI_ColorPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -81,8 +83,10 @@ public class TMessageStyleItemProvider extends TTransformerItemProvider {
      */
     protected void addLineStylePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_TMessageStyle_lineStyle_feature"), getString("_UI_TMessageStyle_lineStyle_description"), TemplatePackage.Literals.TMESSAGE_STYLE__LINE_STYLE, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_TMessageStyle_lineStyle_feature"), //$NON-NLS-1$
+                getString("_UI_TMessageStyle_lineStyle_description"), //$NON-NLS-1$
+                TemplatePackage.Literals.TMESSAGE_STYLE__LINE_STYLE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -93,8 +97,10 @@ public class TMessageStyleItemProvider extends TTransformerItemProvider {
      */
     protected void addSourceArrowPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_TMessageStyle_sourceArrow_feature"), getString("_UI_PropertyDescriptor_description", "_UI_TMessageStyle_sourceArrow_feature", "_UI_TMessageStyle_type"),
-                TemplatePackage.Literals.TMESSAGE_STYLE__SOURCE_ARROW, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_TMessageStyle_sourceArrow_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_TMessageStyle_sourceArrow_feature", "_UI_TMessageStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                TemplatePackage.Literals.TMESSAGE_STYLE__SOURCE_ARROW, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -105,8 +111,10 @@ public class TMessageStyleItemProvider extends TTransformerItemProvider {
      */
     protected void addTargetArrowPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_TMessageStyle_targetArrow_feature"), getString("_UI_PropertyDescriptor_description", "_UI_TMessageStyle_targetArrow_feature", "_UI_TMessageStyle_type"),
-                TemplatePackage.Literals.TMESSAGE_STYLE__TARGET_ARROW, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_TMessageStyle_targetArrow_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_TMessageStyle_targetArrow_feature", "_UI_TMessageStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                TemplatePackage.Literals.TMESSAGE_STYLE__TARGET_ARROW, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -117,8 +125,10 @@ public class TMessageStyleItemProvider extends TTransformerItemProvider {
      */
     protected void addLabelExpressionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_TMessageStyle_labelExpression_feature"), getString("_UI_TMessageStyle_labelExpression_description"), TemplatePackage.Literals.TMESSAGE_STYLE__LABEL_EXPRESSION, true,
-                false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_LabelPropertyCategory"), null));
+                getString("_UI_TMessageStyle_labelExpression_feature"), //$NON-NLS-1$
+                getString("_UI_TMessageStyle_labelExpression_description"), //$NON-NLS-1$
+                TemplatePackage.Literals.TMESSAGE_STYLE__LABEL_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_LabelPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -129,7 +139,7 @@ public class TMessageStyleItemProvider extends TTransformerItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/TMessageStyle"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/TMessageStyle")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/template/provider/TReturnMessageMappingItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/template/provider/TReturnMessageMappingItemProvider.java
index 56397acfdd..34e972404d 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/template/provider/TReturnMessageMappingItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/template/provider/TReturnMessageMappingItemProvider.java
@@ -65,8 +65,10 @@ public class TReturnMessageMappingItemProvider extends TMessageMappingItemProvid
      */
     protected void addInvocationMappingPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_TReturnMessageMapping_invocationMapping_feature"), getString("_UI_TReturnMessageMapping_invocationMapping_description"),
-                TemplatePackage.Literals.TRETURN_MESSAGE_MAPPING__INVOCATION_MAPPING, true, false, true, null, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_TReturnMessageMapping_invocationMapping_feature"), //$NON-NLS-1$
+                getString("_UI_TReturnMessageMapping_invocationMapping_description"), //$NON-NLS-1$
+                TemplatePackage.Literals.TRETURN_MESSAGE_MAPPING__INVOCATION_MAPPING, true, false, true, null, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -76,10 +78,13 @@ public class TReturnMessageMappingItemProvider extends TMessageMappingItemProvid
      * @generated
      */
     protected void addInvocationMessageFinderExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_TReturnMessageMapping_invocationMessageFinderExpression_feature"), getString("_UI_TReturnMessageMapping_invocationMessageFinderExpression_description"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_TReturnMessageMapping_invocationMessageFinderExpression_feature"), //$NON-NLS-1$
+                getString("_UI_TReturnMessageMapping_invocationMessageFinderExpression_description"), //$NON-NLS-1$
                 TemplatePackage.Literals.TRETURN_MESSAGE_MAPPING__INVOCATION_MESSAGE_FINDER_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -90,7 +95,7 @@ public class TReturnMessageMappingItemProvider extends TMessageMappingItemProvid
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/TReturnMessageMapping"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/TReturnMessageMapping")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/template/provider/TSequenceDiagramItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/template/provider/TSequenceDiagramItemProvider.java
index dcf790babe..ab364ba417 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/template/provider/TSequenceDiagramItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/template/provider/TSequenceDiagramItemProvider.java
@@ -70,8 +70,10 @@ public class TSequenceDiagramItemProvider extends RepresentationTemplateItemProv
      */
     protected void addEndsOrderingPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_TSequenceDiagram_endsOrdering_feature"), getString("_UI_TSequenceDiagram_endsOrdering_description"), TemplatePackage.Literals.TSEQUENCE_DIAGRAM__ENDS_ORDERING, true,
-                false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_TSequenceDiagram_endsOrdering_feature"), //$NON-NLS-1$
+                getString("_UI_TSequenceDiagram_endsOrdering_description"), //$NON-NLS-1$
+                TemplatePackage.Literals.TSEQUENCE_DIAGRAM__ENDS_ORDERING, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -82,8 +84,10 @@ public class TSequenceDiagramItemProvider extends RepresentationTemplateItemProv
      */
     protected void addDomainClassPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_TSequenceDiagram_domainClass_feature"), getString("_UI_TSequenceDiagram_domainClass_description"), TemplatePackage.Literals.TSEQUENCE_DIAGRAM__DOMAIN_CLASS, true,
-                false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_TSequenceDiagram_domainClass_feature"), //$NON-NLS-1$
+                getString("_UI_TSequenceDiagram_domainClass_description"), //$NON-NLS-1$
+                TemplatePackage.Literals.TSEQUENCE_DIAGRAM__DOMAIN_CLASS, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -130,7 +134,7 @@ public class TSequenceDiagramItemProvider extends RepresentationTemplateItemProv
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/TSequenceDiagram"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/TSequenceDiagram")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/template/provider/TSourceTargetMessageMappingItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/template/provider/TSourceTargetMessageMappingItemProvider.java
index 9358ac92b3..a46caaae43 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/template/provider/TSourceTargetMessageMappingItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/template/provider/TSourceTargetMessageMappingItemProvider.java
@@ -67,9 +67,10 @@ public class TSourceTargetMessageMappingItemProvider extends TMessageMappingItem
      */
     protected void addSourcePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_TSourceTargetMessageMapping_source_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_TSourceTargetMessageMapping_source_feature", "_UI_TSourceTargetMessageMapping_type"),
-                TemplatePackage.Literals.TSOURCE_TARGET_MESSAGE_MAPPING__SOURCE, true, false, true, null, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_TSourceTargetMessageMapping_source_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_TSourceTargetMessageMapping_source_feature", "_UI_TSourceTargetMessageMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                TemplatePackage.Literals.TSOURCE_TARGET_MESSAGE_MAPPING__SOURCE, true, false, true, null, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -79,10 +80,13 @@ public class TSourceTargetMessageMappingItemProvider extends TMessageMappingItem
      * @generated
      */
     protected void addSourceFinderExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_TSourceTargetMessageMapping_sourceFinderExpression_feature"), getString("_UI_TSourceTargetMessageMapping_sourceFinderExpression_description"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_TSourceTargetMessageMapping_sourceFinderExpression_feature"), //$NON-NLS-1$
+                getString("_UI_TSourceTargetMessageMapping_sourceFinderExpression_description"), //$NON-NLS-1$
                 TemplatePackage.Literals.TSOURCE_TARGET_MESSAGE_MAPPING__SOURCE_FINDER_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -92,10 +96,13 @@ public class TSourceTargetMessageMappingItemProvider extends TMessageMappingItem
      * @generated
      */
     protected void addTargetFinderExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_TSourceTargetMessageMapping_targetFinderExpression_feature"), getString("_UI_TSourceTargetMessageMapping_targetFinderExpression_description"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_TSourceTargetMessageMapping_targetFinderExpression_feature"), //$NON-NLS-1$
+                getString("_UI_TSourceTargetMessageMapping_targetFinderExpression_description"), //$NON-NLS-1$
                 TemplatePackage.Literals.TSOURCE_TARGET_MESSAGE_MAPPING__TARGET_FINDER_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -106,8 +113,9 @@ public class TSourceTargetMessageMappingItemProvider extends TMessageMappingItem
      */
     protected void addUseDomainElementPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_TSourceTargetMessageMapping_useDomainElement_feature"), getString("_UI_TSourceTargetMessageMapping_useDomainElement_description"),
-                TemplatePackage.Literals.TSOURCE_TARGET_MESSAGE_MAPPING__USE_DOMAIN_ELEMENT, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"),
+                getString("_UI_TSourceTargetMessageMapping_useDomainElement_feature"), //$NON-NLS-1$
+                getString("_UI_TSourceTargetMessageMapping_useDomainElement_description"), //$NON-NLS-1$
+                TemplatePackage.Literals.TSOURCE_TARGET_MESSAGE_MAPPING__USE_DOMAIN_ELEMENT, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
                 null));
     }
 
@@ -120,7 +128,8 @@ public class TSourceTargetMessageMappingItemProvider extends TMessageMappingItem
     @Override
     public String getText(Object object) {
         String label = ((TSourceTargetMessageMapping) object).getName();
-        return label == null || label.length() == 0 ? getString("_UI_TSourceTargetMessageMapping_type") : getString("_UI_TSourceTargetMessageMapping_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_TSourceTargetMessageMapping_type") : //$NON-NLS-1$
+            getString("_UI_TSourceTargetMessageMapping_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/template/provider/TTransformerItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/template/provider/TTransformerItemProvider.java
index 17ffad402f..046e009cbd 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/template/provider/TTransformerItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/template/provider/TTransformerItemProvider.java
@@ -70,7 +70,7 @@ IItemPropertySource {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/TTransformer"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/TTransformer")); //$NON-NLS-1$
     }
 
     /**
@@ -81,7 +81,7 @@ IItemPropertySource {
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_TTransformer_type");
+        return getString("_UI_TTransformer_type"); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/impl/DelimitedEventMappingImpl.java b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/impl/DelimitedEventMappingImpl.java
index 8b70a08101..07872bc566 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/impl/DelimitedEventMappingImpl.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/impl/DelimitedEventMappingImpl.java
@@ -229,9 +229,9 @@ public abstract class DelimitedEventMappingImpl extends EventMappingImpl impleme
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (startingEndFinderExpression: ");
+        result.append(" (startingEndFinderExpression: "); //$NON-NLS-1$
         result.append(startingEndFinderExpression);
-        result.append(", finishingEndFinderExpression: ");
+        result.append(", finishingEndFinderExpression: "); //$NON-NLS-1$
         result.append(finishingEndFinderExpression);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/impl/DescriptionFactoryImpl.java b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/impl/DescriptionFactoryImpl.java
index 34524646d5..04f877f9a0 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/impl/DescriptionFactoryImpl.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/impl/DescriptionFactoryImpl.java
@@ -120,7 +120,7 @@ public class DescriptionFactoryImpl extends EFactoryImpl implements DescriptionF
         case DescriptionPackage.OBSERVATION_POINT_MAPPING:
             return createObservationPointMapping();
         default:
-            throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+            throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
         }
     }
 
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/impl/DescriptionPackageImpl.java b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/impl/DescriptionPackageImpl.java
index 98d5cf218b..c784afe564 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/impl/DescriptionPackageImpl.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/impl/DescriptionPackageImpl.java
@@ -698,76 +698,85 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
         observationPointMappingEClass.getESuperTypes().add(theDescriptionPackage_1.getNodeMapping());
 
         // Initialize classes and features; add operations and parameters
-        initEClass(sequenceDiagramDescriptionEClass, SequenceDiagramDescription.class, "SequenceDiagramDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getSequenceDiagramDescription_EndsOrdering(), theDescriptionPackage_2.getInterpretedExpression(), "endsOrdering", null, 1, 1, SequenceDiagramDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEAttribute(getSequenceDiagramDescription_InstanceRolesOrdering(), theDescriptionPackage_2.getInterpretedExpression(), "instanceRolesOrdering", null, 1, 1,
-                SequenceDiagramDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(instanceRoleMappingEClass, InstanceRoleMapping.class, "InstanceRoleMapping", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(eventMappingEClass, EventMapping.class, "EventMapping", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(delimitedEventMappingEClass, DelimitedEventMapping.class, "DelimitedEventMapping", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getDelimitedEventMapping_StartingEndFinderExpression(), theDescriptionPackage_2.getInterpretedExpression(), "startingEndFinderExpression", null, 1, 1,
-                DelimitedEventMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getDelimitedEventMapping_FinishingEndFinderExpression(), theDescriptionPackage_2.getInterpretedExpression(), "finishingEndFinderExpression", null, 1, 1,
-                DelimitedEventMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(executionMappingEClass, ExecutionMapping.class, "ExecutionMapping", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(stateMappingEClass, StateMapping.class, "StateMapping", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(endOfLifeMappingEClass, EndOfLifeMapping.class, "EndOfLifeMapping", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(messageMappingEClass, MessageMapping.class, "MessageMapping", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getMessageMapping_SendingEndFinderExpression(), theDescriptionPackage_2.getInterpretedExpression(), "sendingEndFinderExpression", null, 1, 1, MessageMapping.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEAttribute(getMessageMapping_ReceivingEndFinderExpression(), theDescriptionPackage_2.getInterpretedExpression(), "receivingEndFinderExpression", null, 1, 1, MessageMapping.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-
-        initEClass(basicMessageMappingEClass, BasicMessageMapping.class, "BasicMessageMapping", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(returnMessageMappingEClass, ReturnMessageMapping.class, "ReturnMessageMapping", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getReturnMessageMapping_InvocationMessageFinderExpression(), theDescriptionPackage_2.getInterpretedExpression(), "invocationMessageFinderExpression", null, 1, 1,
-                ReturnMessageMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(creationMessageMappingEClass, CreationMessageMapping.class, "CreationMessageMapping", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(destructionMessageMappingEClass, DestructionMessageMapping.class, "DestructionMessageMapping", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(messageEndVariableEClass, MessageEndVariable.class, "MessageEndVariable", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(coveredLifelinesVariableEClass, CoveredLifelinesVariable.class, "CoveredLifelinesVariable", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(frameMappingEClass, FrameMapping.class, "FrameMapping", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getFrameMapping_CoveredLifelinesExpression(), theDescriptionPackage_2.getInterpretedExpression(), "coveredLifelinesExpression", null, 1, 1, FrameMapping.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEAttribute(getFrameMapping_CenterLabelExpression(), theDescriptionPackage_2.getInterpretedExpression(), "centerLabelExpression", null, 0, 1, FrameMapping.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-
-        initEClass(interactionUseMappingEClass, InteractionUseMapping.class, "InteractionUseMapping", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(combinedFragmentMappingEClass, CombinedFragmentMapping.class, "CombinedFragmentMapping", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(operandMappingEClass, OperandMapping.class, "OperandMapping", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(observationPointMappingEClass, ObservationPointMapping.class, "ObservationPointMapping", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
+        initEClass(sequenceDiagramDescriptionEClass, SequenceDiagramDescription.class,
+                "SequenceDiagramDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getSequenceDiagramDescription_EndsOrdering(),
+                theDescriptionPackage_2.getInterpretedExpression(),
+                "endsOrdering", null, 1, 1, SequenceDiagramDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getSequenceDiagramDescription_InstanceRolesOrdering(),
+                theDescriptionPackage_2.getInterpretedExpression(),
+                "instanceRolesOrdering", null, 1, 1, SequenceDiagramDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(instanceRoleMappingEClass, InstanceRoleMapping.class, "InstanceRoleMapping", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(eventMappingEClass, EventMapping.class, "EventMapping", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(delimitedEventMappingEClass, DelimitedEventMapping.class, "DelimitedEventMapping", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getDelimitedEventMapping_StartingEndFinderExpression(),
+                theDescriptionPackage_2.getInterpretedExpression(),
+                "startingEndFinderExpression", null, 1, 1, DelimitedEventMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getDelimitedEventMapping_FinishingEndFinderExpression(),
+                theDescriptionPackage_2.getInterpretedExpression(),
+                "finishingEndFinderExpression", null, 1, 1, DelimitedEventMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(executionMappingEClass, ExecutionMapping.class, "ExecutionMapping", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(stateMappingEClass, StateMapping.class, "StateMapping", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(endOfLifeMappingEClass, EndOfLifeMapping.class, "EndOfLifeMapping", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(messageMappingEClass, MessageMapping.class, "MessageMapping", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getMessageMapping_SendingEndFinderExpression(),
+                theDescriptionPackage_2.getInterpretedExpression(),
+                "sendingEndFinderExpression", null, 1, 1, MessageMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getMessageMapping_ReceivingEndFinderExpression(),
+                theDescriptionPackage_2.getInterpretedExpression(),
+                "receivingEndFinderExpression", null, 1, 1, MessageMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(basicMessageMappingEClass, BasicMessageMapping.class, "BasicMessageMapping", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(returnMessageMappingEClass, ReturnMessageMapping.class, "ReturnMessageMapping", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getReturnMessageMapping_InvocationMessageFinderExpression(),
+                theDescriptionPackage_2.getInterpretedExpression(),
+                "invocationMessageFinderExpression", null, 1, 1, ReturnMessageMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(creationMessageMappingEClass, CreationMessageMapping.class,
+                "CreationMessageMapping", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(destructionMessageMappingEClass, DestructionMessageMapping.class,
+                "DestructionMessageMapping", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(messageEndVariableEClass, MessageEndVariable.class, "MessageEndVariable", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(coveredLifelinesVariableEClass, CoveredLifelinesVariable.class,
+                "CoveredLifelinesVariable", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(frameMappingEClass, FrameMapping.class, "FrameMapping", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getFrameMapping_CoveredLifelinesExpression(),
+                theDescriptionPackage_2.getInterpretedExpression(),
+                "coveredLifelinesExpression", null, 1, 1, FrameMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getFrameMapping_CenterLabelExpression(),
+                theDescriptionPackage_2.getInterpretedExpression(),
+                "centerLabelExpression", null, 0, 1, FrameMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(interactionUseMappingEClass, InteractionUseMapping.class, "InteractionUseMapping", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(combinedFragmentMappingEClass, CombinedFragmentMapping.class,
+                "CombinedFragmentMapping", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(operandMappingEClass, OperandMapping.class, "OperandMapping", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(observationPointMappingEClass, ObservationPointMapping.class,
+                "ObservationPointMapping", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
         // Create annotations
         // http://www.eclipse.org/sirius/interpreted/expression/returnType
@@ -784,17 +793,26 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
      * @generated
      */
     protected void createReturnTypeAnnotations() {
-        String source = "http://www.eclipse.org/sirius/interpreted/expression/returnType";
-        addAnnotation(getSequenceDiagramDescription_EndsOrdering(), source, new String[] { "returnType", "a Collection<EObject> or an EObject." });
-        addAnnotation(getSequenceDiagramDescription_InstanceRolesOrdering(), source, new String[] { "returnType", "a Collection<EObject> or an EObject." });
-        addAnnotation(getDelimitedEventMapping_StartingEndFinderExpression(), source, new String[] { "returnType", "an EObject." });
-        addAnnotation(getDelimitedEventMapping_FinishingEndFinderExpression(), source, new String[] { "returnType", "an EObject." });
-        addAnnotation(getMessageMapping_SendingEndFinderExpression(), source, new String[] { "returnType", "an EObject." });
-        addAnnotation(getMessageMapping_ReceivingEndFinderExpression(), source, new String[] { "returnType", "an EObject." });
-        addAnnotation(getReturnMessageMapping_InvocationMessageFinderExpression(), source, new String[] { "returnType", "an EObject." });
-        addAnnotation(getFrameMapping_CoveredLifelinesExpression(), source, new String[] { "returnType",
-        "the list of semantic EObjects representing the lifelines which are semantically covered by the frame." });
-        addAnnotation(getFrameMapping_CenterLabelExpression(), source, new String[] { "returnType", "the text to show in the center of the IU" });
+        String source = "http://www.eclipse.org/sirius/interpreted/expression/returnType"; //$NON-NLS-1$
+        addAnnotation(getSequenceDiagramDescription_EndsOrdering(), source, new String[] { "returnType", "a Collection<EObject> or an EObject." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getSequenceDiagramDescription_InstanceRolesOrdering(), source, new String[] { "returnType", "a Collection<EObject> or an EObject." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getDelimitedEventMapping_StartingEndFinderExpression(), source, new String[] { "returnType", "an EObject." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getDelimitedEventMapping_FinishingEndFinderExpression(), source, new String[] { "returnType", "an EObject." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getMessageMapping_SendingEndFinderExpression(), source, new String[] { "returnType", "an EObject." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getMessageMapping_ReceivingEndFinderExpression(), source, new String[] { "returnType", "an EObject." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getReturnMessageMapping_InvocationMessageFinderExpression(), source, new String[] { "returnType", "an EObject." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getFrameMapping_CoveredLifelinesExpression(), source, new String[] {
+            "returnType", "the list of semantic EObjects representing the lifelines which are semantically covered by the frame." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getFrameMapping_CenterLabelExpression(), source, new String[] { "returnType", "the text to show in the center of the IU" //$NON-NLS-1$ //$NON-NLS-2$
+        });
     }
 
     /**
@@ -805,8 +823,9 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
      * @generated
      */
     protected void createVariablesAnnotations() {
-        String source = "http://www.eclipse.org/sirius/interpreted/expression/variables";
-        addAnnotation(getSequenceDiagramDescription_EndsOrdering(), source, new String[] { "eventEnds", "a List<EObject> containing the semantic event ends." });
+        String source = "http://www.eclipse.org/sirius/interpreted/expression/variables"; //$NON-NLS-1$
+        addAnnotation(getSequenceDiagramDescription_EndsOrdering(), source, new String[] { "eventEnds", "a List<EObject> containing the semantic event ends." //$NON-NLS-1$ //$NON-NLS-2$
+        });
         addAnnotation(getSequenceDiagramDescription_InstanceRolesOrdering(), source, new String[] {});
         addAnnotation(getDelimitedEventMapping_StartingEndFinderExpression(), source, new String[] {});
         addAnnotation(getDelimitedEventMapping_FinishingEndFinderExpression(), source, new String[] {});
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/impl/ExecutionMappingImpl.java b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/impl/ExecutionMappingImpl.java
index 5ae1113be8..2ffbf0d134 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/impl/ExecutionMappingImpl.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/impl/ExecutionMappingImpl.java
@@ -282,9 +282,9 @@ public class ExecutionMappingImpl extends NodeMappingImpl implements ExecutionMa
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (startingEndFinderExpression: ");
+        result.append(" (startingEndFinderExpression: "); //$NON-NLS-1$
         result.append(startingEndFinderExpression);
-        result.append(", finishingEndFinderExpression: ");
+        result.append(", finishingEndFinderExpression: "); //$NON-NLS-1$
         result.append(finishingEndFinderExpression);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/impl/FrameMappingImpl.java b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/impl/FrameMappingImpl.java
index 4d912a2750..10b7ffcb7f 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/impl/FrameMappingImpl.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/impl/FrameMappingImpl.java
@@ -401,13 +401,13 @@ public abstract class FrameMappingImpl extends ContainerMappingImpl implements F
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (startingEndFinderExpression: ");
+        result.append(" (startingEndFinderExpression: "); //$NON-NLS-1$
         result.append(startingEndFinderExpression);
-        result.append(", finishingEndFinderExpression: ");
+        result.append(", finishingEndFinderExpression: "); //$NON-NLS-1$
         result.append(finishingEndFinderExpression);
-        result.append(", coveredLifelinesExpression: ");
+        result.append(", coveredLifelinesExpression: "); //$NON-NLS-1$
         result.append(coveredLifelinesExpression);
-        result.append(", centerLabelExpression: ");
+        result.append(", centerLabelExpression: "); //$NON-NLS-1$
         result.append(centerLabelExpression);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/impl/MessageMappingImpl.java b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/impl/MessageMappingImpl.java
index 087b289a2c..11924ff2c5 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/impl/MessageMappingImpl.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/impl/MessageMappingImpl.java
@@ -228,9 +228,9 @@ public abstract class MessageMappingImpl extends EdgeMappingImpl implements Mess
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (sendingEndFinderExpression: ");
+        result.append(" (sendingEndFinderExpression: "); //$NON-NLS-1$
         result.append(sendingEndFinderExpression);
-        result.append(", receivingEndFinderExpression: ");
+        result.append(", receivingEndFinderExpression: "); //$NON-NLS-1$
         result.append(receivingEndFinderExpression);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/impl/OperandMappingImpl.java b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/impl/OperandMappingImpl.java
index 6d267eb394..bd0b605a2b 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/impl/OperandMappingImpl.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/impl/OperandMappingImpl.java
@@ -282,9 +282,9 @@ public class OperandMappingImpl extends ContainerMappingImpl implements OperandM
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (startingEndFinderExpression: ");
+        result.append(" (startingEndFinderExpression: "); //$NON-NLS-1$
         result.append(startingEndFinderExpression);
-        result.append(", finishingEndFinderExpression: ");
+        result.append(", finishingEndFinderExpression: "); //$NON-NLS-1$
         result.append(finishingEndFinderExpression);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/impl/ReturnMessageMappingImpl.java b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/impl/ReturnMessageMappingImpl.java
index 8bb6fff330..24c2a10bb5 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/impl/ReturnMessageMappingImpl.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/impl/ReturnMessageMappingImpl.java
@@ -168,7 +168,7 @@ public class ReturnMessageMappingImpl extends MessageMappingImpl implements Retu
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (invocationMessageFinderExpression: ");
+        result.append(" (invocationMessageFinderExpression: "); //$NON-NLS-1$
         result.append(invocationMessageFinderExpression);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/impl/SequenceDiagramDescriptionImpl.java b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/impl/SequenceDiagramDescriptionImpl.java
index 052846c530..59c359af82 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/impl/SequenceDiagramDescriptionImpl.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/impl/SequenceDiagramDescriptionImpl.java
@@ -227,9 +227,9 @@ public class SequenceDiagramDescriptionImpl extends DiagramDescriptionImpl imple
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (endsOrdering: ");
+        result.append(" (endsOrdering: "); //$NON-NLS-1$
         result.append(endsOrdering);
-        result.append(", instanceRolesOrdering: ");
+        result.append(", instanceRolesOrdering: "); //$NON-NLS-1$
         result.append(instanceRolesOrdering);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/impl/StateMappingImpl.java b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/impl/StateMappingImpl.java
index 7e7ef02055..884d6d7c1a 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/impl/StateMappingImpl.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/impl/StateMappingImpl.java
@@ -282,9 +282,9 @@ public class StateMappingImpl extends NodeMappingImpl implements StateMapping {
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (startingEndFinderExpression: ");
+        result.append(" (startingEndFinderExpression: "); //$NON-NLS-1$
         result.append(startingEndFinderExpression);
-        result.append(", finishingEndFinderExpression: ");
+        result.append(", finishingEndFinderExpression: "); //$NON-NLS-1$
         result.append(finishingEndFinderExpression);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/impl/MessageCreationToolImpl.java b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/impl/MessageCreationToolImpl.java
index 32b52d42f6..49c815e183 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/impl/MessageCreationToolImpl.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/impl/MessageCreationToolImpl.java
@@ -1724,23 +1724,23 @@ public class MessageCreationToolImpl extends SequenceDiagramToolDescriptionImpl
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (documentation: ");
+        result.append(" (documentation: "); //$NON-NLS-1$
         result.append(documentation);
-        result.append(", name: ");
+        result.append(", name: "); //$NON-NLS-1$
         result.append(name);
-        result.append(", label: ");
+        result.append(", label: "); //$NON-NLS-1$
         result.append(label);
-        result.append(", precondition: ");
+        result.append(", precondition: "); //$NON-NLS-1$
         result.append(precondition);
-        result.append(", forceRefresh: ");
+        result.append(", forceRefresh: "); //$NON-NLS-1$
         result.append(forceRefresh);
-        result.append(", elementsToSelect: ");
+        result.append(", elementsToSelect: "); //$NON-NLS-1$
         result.append(elementsToSelect);
-        result.append(", inverseSelectionOrder: ");
+        result.append(", inverseSelectionOrder: "); //$NON-NLS-1$
         result.append(inverseSelectionOrder);
-        result.append(", iconPath: ");
+        result.append(", iconPath: "); //$NON-NLS-1$
         result.append(iconPath);
-        result.append(", connectionStartPrecondition: ");
+        result.append(", connectionStartPrecondition: "); //$NON-NLS-1$
         result.append(connectionStartPrecondition);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/impl/ToolFactoryImpl.java b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/impl/ToolFactoryImpl.java
index 0814ded2fa..33edab9a57 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/impl/ToolFactoryImpl.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/impl/ToolFactoryImpl.java
@@ -102,7 +102,7 @@ public class ToolFactoryImpl extends EFactoryImpl implements ToolFactory {
         case ToolPackage.INSTANCE_ROLE_REORDER_TOOL:
             return createInstanceRoleReorderTool();
         default:
-            throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+            throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
         }
     }
 
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/impl/ToolPackageImpl.java b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/impl/ToolPackageImpl.java
index d5b70ad512..533a8a31db 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/impl/ToolPackageImpl.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/impl/ToolPackageImpl.java
@@ -656,83 +656,111 @@ public class ToolPackageImpl extends EPackageImpl implements ToolPackage {
         instanceRoleReorderToolEClass.getESuperTypes().add(this.getSequenceDiagramToolDescription());
 
         // Initialize classes and features; add operations and parameters
-        initEClass(sequenceDiagramToolDescriptionEClass, SequenceDiagramToolDescription.class, "SequenceDiagramToolDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(orderedElementCreationToolEClass, OrderedElementCreationTool.class, "OrderedElementCreationTool", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getOrderedElementCreationTool_StartingEndPredecessor(), theDescriptionPackage.getMessageEndVariable(), null, "startingEndPredecessor", null, 0, 1,
-                OrderedElementCreationTool.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES,
-                !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getOrderedElementCreationTool_FinishingEndPredecessor(), theDescriptionPackage.getMessageEndVariable(), null, "finishingEndPredecessor", null, 0, 1,
-                OrderedElementCreationTool.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES,
-                !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(coveringElementCreationToolEClass, CoveringElementCreationTool.class, "CoveringElementCreationTool", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getCoveringElementCreationTool_CoveredLifelines(), theDescriptionPackage.getCoveredLifelinesVariable(), null, "coveredLifelines", null, 1, 1, CoveringElementCreationTool.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(instanceRoleCreationToolEClass, InstanceRoleCreationTool.class, "InstanceRoleCreationTool", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getInstanceRoleCreationTool_Predecessor(), theToolPackage_2.getElementVariable(), null, "predecessor", null, 0, 1, InstanceRoleCreationTool.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(lifelineCreationToolEClass, LifelineCreationTool.class, "LifelineCreationTool", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(messageCreationToolEClass, MessageCreationTool.class, "MessageCreationTool", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(executionCreationToolEClass, ExecutionCreationTool.class, "ExecutionCreationTool", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(stateCreationToolEClass, StateCreationTool.class, "StateCreationTool", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(interactionUseCreationToolEClass, InteractionUseCreationTool.class, "InteractionUseCreationTool", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(combinedFragmentCreationToolEClass, CombinedFragmentCreationTool.class, "CombinedFragmentCreationTool", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(operandCreationToolEClass, OperandCreationTool.class, "OperandCreationTool", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(observationPointCreationToolEClass, ObservationPointCreationTool.class, "ObservationPointCreationTool", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(reorderToolEClass, ReorderTool.class, "ReorderTool", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getReorderTool_Mappings(), theDescriptionPackage.getEventMapping(), null, "mappings", null, 0, -1, ReorderTool.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getReorderTool_StartingEndPredecessorBefore(), theDescriptionPackage.getMessageEndVariable(), null, "startingEndPredecessorBefore", null, 0, 1, ReorderTool.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getReorderTool_StartingEndPredecessorAfter(), theDescriptionPackage.getMessageEndVariable(), null, "startingEndPredecessorAfter", null, 0, 1, ReorderTool.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getReorderTool_FinishingEndPredecessorBefore(), theDescriptionPackage.getMessageEndVariable(), null, "finishingEndPredecessorBefore", null, 0, 1, ReorderTool.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getReorderTool_FinishingEndPredecessorAfter(), theDescriptionPackage.getMessageEndVariable(), null, "finishingEndPredecessorAfter", null, 0, 1, ReorderTool.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getReorderTool_OnEventMovedOperation(), theToolPackage_2.getInitialOperation(), null, "onEventMovedOperation", null, 1, 1, ReorderTool.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(instanceRoleReorderToolEClass, InstanceRoleReorderTool.class, "InstanceRoleReorderTool", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getInstanceRoleReorderTool_Mappings(), theDescriptionPackage.getInstanceRoleMapping(), null, "mappings", null, 0, -1, InstanceRoleReorderTool.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getInstanceRoleReorderTool_PredecessorBefore(), theToolPackage_2.getElementVariable(), null, "predecessorBefore", null, 0, 1, InstanceRoleReorderTool.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getInstanceRoleReorderTool_PredecessorAfter(), theToolPackage_2.getElementVariable(), null, "predecessorAfter", null, 0, 1, InstanceRoleReorderTool.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getInstanceRoleReorderTool_InstanceRoleMoved(), theToolPackage_2.getInitialOperation(), null, "instanceRoleMoved", null, 1, 1, InstanceRoleReorderTool.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEClass(sequenceDiagramToolDescriptionEClass, SequenceDiagramToolDescription.class,
+                "SequenceDiagramToolDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(orderedElementCreationToolEClass, OrderedElementCreationTool.class,
+                "OrderedElementCreationTool", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getOrderedElementCreationTool_StartingEndPredecessor(),
+                theDescriptionPackage.getMessageEndVariable(),
+                null,
+                "startingEndPredecessor", null, 0, 1, OrderedElementCreationTool.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getOrderedElementCreationTool_FinishingEndPredecessor(),
+                theDescriptionPackage.getMessageEndVariable(),
+                null,
+                "finishingEndPredecessor", null, 0, 1, OrderedElementCreationTool.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(coveringElementCreationToolEClass, CoveringElementCreationTool.class,
+                "CoveringElementCreationTool", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getCoveringElementCreationTool_CoveredLifelines(),
+                theDescriptionPackage.getCoveredLifelinesVariable(),
+                null,
+                "coveredLifelines", null, 1, 1, CoveringElementCreationTool.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(instanceRoleCreationToolEClass, InstanceRoleCreationTool.class,
+                "InstanceRoleCreationTool", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getInstanceRoleCreationTool_Predecessor(),
+                theToolPackage_2.getElementVariable(),
+                null,
+                "predecessor", null, 0, 1, InstanceRoleCreationTool.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(lifelineCreationToolEClass, LifelineCreationTool.class, "LifelineCreationTool", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(messageCreationToolEClass, MessageCreationTool.class, "MessageCreationTool", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(executionCreationToolEClass, ExecutionCreationTool.class, "ExecutionCreationTool", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(stateCreationToolEClass, StateCreationTool.class, "StateCreationTool", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(interactionUseCreationToolEClass, InteractionUseCreationTool.class,
+                "InteractionUseCreationTool", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(combinedFragmentCreationToolEClass, CombinedFragmentCreationTool.class,
+                "CombinedFragmentCreationTool", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(operandCreationToolEClass, OperandCreationTool.class, "OperandCreationTool", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(observationPointCreationToolEClass, ObservationPointCreationTool.class,
+                "ObservationPointCreationTool", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(reorderToolEClass, ReorderTool.class, "ReorderTool", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getReorderTool_Mappings(),
+                theDescriptionPackage.getEventMapping(),
+                null,
+                "mappings", null, 0, -1, ReorderTool.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getReorderTool_StartingEndPredecessorBefore(),
+                theDescriptionPackage.getMessageEndVariable(),
+                null,
+                "startingEndPredecessorBefore", null, 0, 1, ReorderTool.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getReorderTool_StartingEndPredecessorAfter(),
+                theDescriptionPackage.getMessageEndVariable(),
+                null,
+                "startingEndPredecessorAfter", null, 0, 1, ReorderTool.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getReorderTool_FinishingEndPredecessorBefore(),
+                theDescriptionPackage.getMessageEndVariable(),
+                null,
+                "finishingEndPredecessorBefore", null, 0, 1, ReorderTool.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getReorderTool_FinishingEndPredecessorAfter(),
+                theDescriptionPackage.getMessageEndVariable(),
+                null,
+                "finishingEndPredecessorAfter", null, 0, 1, ReorderTool.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getReorderTool_OnEventMovedOperation(),
+                theToolPackage_2.getInitialOperation(),
+                null,
+                "onEventMovedOperation", null, 1, 1, ReorderTool.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(instanceRoleReorderToolEClass, InstanceRoleReorderTool.class,
+                "InstanceRoleReorderTool", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getInstanceRoleReorderTool_Mappings(),
+                theDescriptionPackage.getInstanceRoleMapping(),
+                null,
+                "mappings", null, 0, -1, InstanceRoleReorderTool.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getInstanceRoleReorderTool_PredecessorBefore(),
+                theToolPackage_2.getElementVariable(),
+                null,
+                "predecessorBefore", null, 0, 1, InstanceRoleReorderTool.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getInstanceRoleReorderTool_PredecessorAfter(),
+                theToolPackage_2.getElementVariable(),
+                null,
+                "predecessorAfter", null, 0, 1, InstanceRoleReorderTool.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getInstanceRoleReorderTool_InstanceRoleMoved(),
+                theToolPackage_2.getInitialOperation(),
+                null,
+                "instanceRoleMoved", null, 1, 1, InstanceRoleReorderTool.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
 
         // Create annotations
         // toolVariable
@@ -746,16 +774,25 @@ public class ToolPackageImpl extends EPackageImpl implements ToolPackage {
      * @generated
      */
     protected void createToolVariableAnnotations() {
-        String source = "toolVariable";
-        addAnnotation(getOrderedElementCreationTool_StartingEndPredecessor(), source, new String[] { "name", "startingEndPredecessor" });
-        addAnnotation(getOrderedElementCreationTool_FinishingEndPredecessor(), source, new String[] { "name", "finishingEndPredecessor" });
-        addAnnotation(getInstanceRoleCreationTool_Predecessor(), source, new String[] { "name", "predecessor" });
-        addAnnotation(getReorderTool_StartingEndPredecessorBefore(), source, new String[] { "name", "startingEndPredecessorBefore" });
-        addAnnotation(getReorderTool_StartingEndPredecessorAfter(), source, new String[] { "name", "startingEndPredecessorAfter" });
-        addAnnotation(getReorderTool_FinishingEndPredecessorBefore(), source, new String[] { "name", "finishingEndPredecessorBefore" });
-        addAnnotation(getReorderTool_FinishingEndPredecessorAfter(), source, new String[] { "name", "finishingEndPredecessorAfter" });
-        addAnnotation(getInstanceRoleReorderTool_PredecessorBefore(), source, new String[] { "name", "predecessorBefore" });
-        addAnnotation(getInstanceRoleReorderTool_PredecessorAfter(), source, new String[] { "name", "predecessorAfter" });
+        String source = "toolVariable"; //$NON-NLS-1$
+        addAnnotation(getOrderedElementCreationTool_StartingEndPredecessor(), source, new String[] { "name", "startingEndPredecessor" //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getOrderedElementCreationTool_FinishingEndPredecessor(), source, new String[] { "name", "finishingEndPredecessor" //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getInstanceRoleCreationTool_Predecessor(), source, new String[] { "name", "predecessor" //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getReorderTool_StartingEndPredecessorBefore(), source, new String[] { "name", "startingEndPredecessorBefore" //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getReorderTool_StartingEndPredecessorAfter(), source, new String[] { "name", "startingEndPredecessorAfter" //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getReorderTool_FinishingEndPredecessorBefore(), source, new String[] { "name", "finishingEndPredecessorBefore" //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getReorderTool_FinishingEndPredecessorAfter(), source, new String[] { "name", "finishingEndPredecessorAfter" //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getInstanceRoleReorderTool_PredecessorBefore(), source, new String[] { "name", "predecessorBefore" //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getInstanceRoleReorderTool_PredecessorAfter(), source, new String[] { "name", "predecessorAfter" //$NON-NLS-1$ //$NON-NLS-2$
+        });
     }
 
 } // ToolPackageImpl
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/impl/SequenceFactoryImpl.java b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/impl/SequenceFactoryImpl.java
index 2cc2bc56da..0fbb5318e9 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/impl/SequenceFactoryImpl.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/impl/SequenceFactoryImpl.java
@@ -69,7 +69,7 @@ public class SequenceFactoryImpl extends EFactoryImpl implements SequenceFactory
         case SequencePackage.SEQUENCE_DDIAGRAM:
             return createSequenceDDiagram();
         default:
-            throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+            throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
         }
     }
 
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/impl/SequencePackageImpl.java b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/impl/SequencePackageImpl.java
index a9acdab0d7..1d6374d747 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/impl/SequencePackageImpl.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/impl/SequencePackageImpl.java
@@ -249,16 +249,22 @@ public class SequencePackageImpl extends EPackageImpl implements SequencePackage
         sequenceDDiagramEClass.getESuperTypes().add(theDiagramPackage.getDSemanticDiagram());
 
         // Initialize classes and features; add operations and parameters
-        initEClass(sequenceDDiagramEClass, SequenceDDiagram.class, "SequenceDDiagram", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getSequenceDDiagram_SemanticOrdering(), theOrderingPackage.getEventEndsOrdering(), null, "semanticOrdering", null, 0, 1, SequenceDDiagram.class, EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getSequenceDDiagram_GraphicalOrdering(), theOrderingPackage.getEventEndsOrdering(), null, "graphicalOrdering", null, 0, 1, SequenceDDiagram.class, EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getSequenceDDiagram_InstanceRoleSemanticOrdering(), theOrderingPackage.getInstanceRolesOrdering(), null, "instanceRoleSemanticOrdering", null, 0, 1, SequenceDDiagram.class,
-                EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEClass(sequenceDDiagramEClass, SequenceDDiagram.class, "SequenceDDiagram", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getSequenceDDiagram_SemanticOrdering(),
+                theOrderingPackage.getEventEndsOrdering(),
+                null,
+                "semanticOrdering", null, 0, 1, SequenceDDiagram.class, EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getSequenceDDiagram_GraphicalOrdering(),
+                theOrderingPackage.getEventEndsOrdering(),
+                null,
+                "graphicalOrdering", null, 0, 1, SequenceDDiagram.class, EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getSequenceDDiagram_InstanceRoleSemanticOrdering(),
+                theOrderingPackage.getInstanceRolesOrdering(),
+                null,
+                "instanceRoleSemanticOrdering", null, 0, 1, SequenceDDiagram.class, EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
 
         // Create resource
         createResource(SequencePackage.eNS_URI);
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/ordering/impl/OrderingFactoryImpl.java b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/ordering/impl/OrderingFactoryImpl.java
index b34e402cf3..22db9e419c 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/ordering/impl/OrderingFactoryImpl.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/ordering/impl/OrderingFactoryImpl.java
@@ -76,7 +76,7 @@ public class OrderingFactoryImpl extends EFactoryImpl implements OrderingFactory
         case OrderingPackage.INSTANCE_ROLES_ORDERING:
             return createInstanceRolesOrdering();
         default:
-            throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+            throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
         }
     }
 
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/ordering/impl/OrderingPackageImpl.java b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/ordering/impl/OrderingPackageImpl.java
index 7138cffff0..c605b609bd 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/ordering/impl/OrderingPackageImpl.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/ordering/impl/OrderingPackageImpl.java
@@ -369,37 +369,51 @@ public class OrderingPackageImpl extends EPackageImpl implements OrderingPackage
         compoundEventEndEClass.getESuperTypes().add(this.getEventEnd());
 
         // Initialize classes and features; add operations and parameters
-        initEClass(eventEndsOrderingEClass, EventEndsOrdering.class, "EventEndsOrdering", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getEventEndsOrdering_SequenceDiagram(), theSequencePackage.getSequenceDDiagram(), null, "sequenceDiagram", null, 0, 1, EventEndsOrdering.class, EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getEventEndsOrdering_EventEnds(), this.getEventEnd(), null, "eventEnds", null, 0, -1, EventEndsOrdering.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-
-        initEClass(eventEndEClass, EventEnd.class, "EventEnd", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getEventEnd_SemanticEnd(), theEcorePackage.getEObject(), null, "semanticEnd", null, 1, 1, EventEnd.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-
-        initEClass(singleEventEndEClass, SingleEventEnd.class, "SingleEventEnd", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getSingleEventEnd_Start(), theEcorePackage.getEBoolean(), "start", null, 1, 1, SingleEventEnd.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getSingleEventEnd_SemanticEvent(), theEcorePackage.getEObject(), null, "semanticEvent", null, 1, 1, SingleEventEnd.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-
-        initEClass(compoundEventEndEClass, CompoundEventEnd.class, "CompoundEventEnd", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getCompoundEventEnd_EventEnds(), this.getSingleEventEnd(), null, "eventEnds", null, 1, -1, CompoundEventEnd.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-
-        addEOperation(compoundEventEndEClass, theEcorePackage.getEObject(), "getSemanticEvents", 0, -1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-
-        initEClass(instanceRolesOrderingEClass, InstanceRolesOrdering.class, "InstanceRolesOrdering", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getInstanceRolesOrdering_SemanticInstanceRoles(), theEcorePackage.getEObject(), null, "semanticInstanceRoles", null, 0, -1, InstanceRolesOrdering.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEClass(eventEndsOrderingEClass, EventEndsOrdering.class, "EventEndsOrdering", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getEventEndsOrdering_SequenceDiagram(),
+                theSequencePackage.getSequenceDDiagram(),
+                null,
+                "sequenceDiagram", null, 0, 1, EventEndsOrdering.class, EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getEventEndsOrdering_EventEnds(),
+                this.getEventEnd(),
+                null,
+                "eventEnds", null, 0, -1, EventEndsOrdering.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(eventEndEClass, EventEnd.class, "EventEnd", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getEventEnd_SemanticEnd(),
+                theEcorePackage.getEObject(),
+                null,
+                "semanticEnd", null, 1, 1, EventEnd.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(singleEventEndEClass, SingleEventEnd.class, "SingleEventEnd", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getSingleEventEnd_Start(),
+                theEcorePackage.getEBoolean(),
+                "start", null, 1, 1, SingleEventEnd.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getSingleEventEnd_SemanticEvent(),
+                theEcorePackage.getEObject(),
+                null,
+                "semanticEvent", null, 1, 1, SingleEventEnd.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(compoundEventEndEClass, CompoundEventEnd.class, "CompoundEventEnd", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getCompoundEventEnd_EventEnds(),
+                this.getSingleEventEnd(),
+                null,
+                "eventEnds", null, 1, -1, CompoundEventEnd.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        addEOperation(compoundEventEndEClass, theEcorePackage.getEObject(), "getSemanticEvents", 0, -1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(instanceRolesOrderingEClass, InstanceRolesOrdering.class, "InstanceRolesOrdering", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getInstanceRolesOrdering_SemanticInstanceRoles(),
+                theEcorePackage.getEObject(),
+                null,
+                "semanticInstanceRoles", null, 0, -1, InstanceRolesOrdering.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
     }
 
 } // OrderingPackageImpl
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/ordering/impl/SingleEventEndImpl.java b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/ordering/impl/SingleEventEndImpl.java
index 6c6a798bf2..276c361284 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/ordering/impl/SingleEventEndImpl.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/ordering/impl/SingleEventEndImpl.java
@@ -235,7 +235,7 @@ public class SingleEventEndImpl extends EventEndImpl implements SingleEventEnd {
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (start: ");
+        result.append(" (start: "); //$NON-NLS-1$
         result.append(start);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/template/impl/TAbstractMappingImpl.java b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/template/impl/TAbstractMappingImpl.java
index 91f5f8dbda..6f247f1a80 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/template/impl/TAbstractMappingImpl.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/template/impl/TAbstractMappingImpl.java
@@ -281,11 +281,11 @@ public class TAbstractMappingImpl extends TTransformerImpl implements TAbstractM
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (name: ");
+        result.append(" (name: "); //$NON-NLS-1$
         result.append(name);
-        result.append(", domainClass: ");
+        result.append(", domainClass: "); //$NON-NLS-1$
         result.append(domainClass);
-        result.append(", semanticCandidatesExpression: ");
+        result.append(", semanticCandidatesExpression: "); //$NON-NLS-1$
         result.append(semanticCandidatesExpression);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/template/impl/TConditionalExecutionStyleImpl.java b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/template/impl/TConditionalExecutionStyleImpl.java
index 5115c28a7a..2b1f621fdd 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/template/impl/TConditionalExecutionStyleImpl.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/template/impl/TConditionalExecutionStyleImpl.java
@@ -260,7 +260,7 @@ public class TConditionalExecutionStyleImpl extends TTransformerImpl implements
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (predicateExpression: ");
+        result.append(" (predicateExpression: "); //$NON-NLS-1$
         result.append(predicateExpression);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/template/impl/TConditionalLifelineStyleImpl.java b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/template/impl/TConditionalLifelineStyleImpl.java
index 97d0ec3cee..d1c67c9258 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/template/impl/TConditionalLifelineStyleImpl.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/template/impl/TConditionalLifelineStyleImpl.java
@@ -260,7 +260,7 @@ public class TConditionalLifelineStyleImpl extends TTransformerImpl implements T
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (predicateExpression: ");
+        result.append(" (predicateExpression: "); //$NON-NLS-1$
         result.append(predicateExpression);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/template/impl/TConditionalMessageStyleImpl.java b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/template/impl/TConditionalMessageStyleImpl.java
index 77d4b274c6..6d75d7a56d 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/template/impl/TConditionalMessageStyleImpl.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/template/impl/TConditionalMessageStyleImpl.java
@@ -260,7 +260,7 @@ public class TConditionalMessageStyleImpl extends TTransformerImpl implements TC
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (predicateExpression: ");
+        result.append(" (predicateExpression: "); //$NON-NLS-1$
         result.append(predicateExpression);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/template/impl/TExecutionMappingImpl.java b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/template/impl/TExecutionMappingImpl.java
index c075d08d0a..08a712f369 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/template/impl/TExecutionMappingImpl.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/template/impl/TExecutionMappingImpl.java
@@ -464,11 +464,11 @@ public class TExecutionMappingImpl extends TAbstractMappingImpl implements TExec
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (startingEndFinderExpression: ");
+        result.append(" (startingEndFinderExpression: "); //$NON-NLS-1$
         result.append(startingEndFinderExpression);
-        result.append(", finishingEndFinderExpression: ");
+        result.append(", finishingEndFinderExpression: "); //$NON-NLS-1$
         result.append(finishingEndFinderExpression);
-        result.append(", recursive: ");
+        result.append(", recursive: "); //$NON-NLS-1$
         result.append(recursive);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/template/impl/TExecutionStyleImpl.java b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/template/impl/TExecutionStyleImpl.java
index d0c2264970..a3c79bc9ba 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/template/impl/TExecutionStyleImpl.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/template/impl/TExecutionStyleImpl.java
@@ -307,7 +307,7 @@ public class TExecutionStyleImpl extends TTransformerImpl implements TExecutionS
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (borderSizeComputationExpression: ");
+        result.append(" (borderSizeComputationExpression: "); //$NON-NLS-1$
         result.append(borderSizeComputationExpression);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/template/impl/TLifelineMappingImpl.java b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/template/impl/TLifelineMappingImpl.java
index 93b19daf05..4b19491d61 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/template/impl/TLifelineMappingImpl.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/template/impl/TLifelineMappingImpl.java
@@ -507,7 +507,7 @@ public class TLifelineMappingImpl extends TAbstractMappingImpl implements TLifel
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (eolVisibleExpression: ");
+        result.append(" (eolVisibleExpression: "); //$NON-NLS-1$
         result.append(eolVisibleExpression);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/template/impl/TLifelineStyleImpl.java b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/template/impl/TLifelineStyleImpl.java
index 5d9f538a54..270aa29571 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/template/impl/TLifelineStyleImpl.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/template/impl/TLifelineStyleImpl.java
@@ -240,7 +240,7 @@ public class TLifelineStyleImpl extends TTransformerImpl implements TLifelineSty
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (lifelineWidthComputationExpression: ");
+        result.append(" (lifelineWidthComputationExpression: "); //$NON-NLS-1$
         result.append(lifelineWidthComputationExpression);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/template/impl/TMessageMappingImpl.java b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/template/impl/TMessageMappingImpl.java
index a82fcfcae9..0972ce4477 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/template/impl/TMessageMappingImpl.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/template/impl/TMessageMappingImpl.java
@@ -367,9 +367,9 @@ public abstract class TMessageMappingImpl extends TAbstractMappingImpl implement
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (sendingEndFinderExpression: ");
+        result.append(" (sendingEndFinderExpression: "); //$NON-NLS-1$
         result.append(sendingEndFinderExpression);
-        result.append(", receivingEndFinderExpression: ");
+        result.append(", receivingEndFinderExpression: "); //$NON-NLS-1$
         result.append(receivingEndFinderExpression);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/template/impl/TMessageStyleImpl.java b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/template/impl/TMessageStyleImpl.java
index 1e9cac4e0e..70a9c9bf44 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/template/impl/TMessageStyleImpl.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/template/impl/TMessageStyleImpl.java
@@ -409,13 +409,13 @@ public class TMessageStyleImpl extends TTransformerImpl implements TMessageStyle
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (lineStyle: ");
+        result.append(" (lineStyle: "); //$NON-NLS-1$
         result.append(lineStyle);
-        result.append(", sourceArrow: ");
+        result.append(", sourceArrow: "); //$NON-NLS-1$
         result.append(sourceArrow);
-        result.append(", targetArrow: ");
+        result.append(", targetArrow: "); //$NON-NLS-1$
         result.append(targetArrow);
-        result.append(", labelExpression: ");
+        result.append(", labelExpression: "); //$NON-NLS-1$
         result.append(labelExpression);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/template/impl/TReturnMessageMappingImpl.java b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/template/impl/TReturnMessageMappingImpl.java
index fe14b17e8d..6ecd6592dd 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/template/impl/TReturnMessageMappingImpl.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/template/impl/TReturnMessageMappingImpl.java
@@ -239,7 +239,7 @@ public class TReturnMessageMappingImpl extends TMessageMappingImpl implements TR
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (invocationMessageFinderExpression: ");
+        result.append(" (invocationMessageFinderExpression: "); //$NON-NLS-1$
         result.append(invocationMessageFinderExpression);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/template/impl/TSequenceDiagramImpl.java b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/template/impl/TSequenceDiagramImpl.java
index a953a79fe8..5c376cc3d2 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/template/impl/TSequenceDiagramImpl.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/template/impl/TSequenceDiagramImpl.java
@@ -402,9 +402,9 @@ public class TSequenceDiagramImpl extends RepresentationTemplateImpl implements
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (domainClass: ");
+        result.append(" (domainClass: "); //$NON-NLS-1$
         result.append(domainClass);
-        result.append(", endsOrdering: ");
+        result.append(", endsOrdering: "); //$NON-NLS-1$
         result.append(endsOrdering);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/template/impl/TSourceTargetMessageMappingImpl.java b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/template/impl/TSourceTargetMessageMappingImpl.java
index ab0272214a..f93e995b3f 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/template/impl/TSourceTargetMessageMappingImpl.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/template/impl/TSourceTargetMessageMappingImpl.java
@@ -329,11 +329,11 @@ public abstract class TSourceTargetMessageMappingImpl extends TMessageMappingImp
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (sourceFinderExpression: ");
+        result.append(" (sourceFinderExpression: "); //$NON-NLS-1$
         result.append(sourceFinderExpression);
-        result.append(", targetFinderExpression: ");
+        result.append(", targetFinderExpression: "); //$NON-NLS-1$
         result.append(targetFinderExpression);
-        result.append(", useDomainElement: ");
+        result.append(", useDomainElement: "); //$NON-NLS-1$
         result.append(useDomainElement);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/template/impl/TemplateFactoryImpl.java b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/template/impl/TemplateFactoryImpl.java
index 42f7bec362..02c7179b12 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/template/impl/TemplateFactoryImpl.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/template/impl/TemplateFactoryImpl.java
@@ -108,7 +108,7 @@ public class TemplateFactoryImpl extends EFactoryImpl implements TemplateFactory
         case TemplatePackage.TDESTRUCTION_MESSAGE_MAPPING:
             return createTDestructionMessageMapping();
         default:
-            throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+            throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
         }
     }
 
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/template/impl/TemplatePackageImpl.java b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/template/impl/TemplatePackageImpl.java
index 32c80525f3..9a32f44dd1 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/template/impl/TemplatePackageImpl.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/template/impl/TemplatePackageImpl.java
@@ -1112,186 +1112,268 @@ public class TemplatePackageImpl extends EPackageImpl implements TemplatePackage
         tDestructionMessageMappingEClass.getESuperTypes().add(this.getTSourceTargetMessageMapping());
 
         // Initialize classes and features; add operations and parameters
-        initEClass(tTransformerEClass, TTransformer.class, "TTransformer", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getTTransformer_Outputs(), theEcorePackage.getEObject(), null, "outputs", null, 0, -1, TTransformer.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-
-        initEClass(tAbstractMappingEClass, TAbstractMapping.class, "TAbstractMapping", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getTAbstractMapping_Name(), theEcorePackage.getEString(), "name", null, 1, 1, TAbstractMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getTAbstractMapping_DomainClass(), theDescriptionPackage_1.getTypeName(), "domainClass", null, 1, 1, TAbstractMapping.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getTAbstractMapping_SemanticCandidatesExpression(), theDescriptionPackage_1.getInterpretedExpression(), "semanticCandidatesExpression", null, 0, 1, TAbstractMapping.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-
-        initEClass(tSequenceDiagramEClass, TSequenceDiagram.class, "TSequenceDiagram", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getTSequenceDiagram_DomainClass(), theDescriptionPackage_1.getTypeName(), "domainClass", null, 1, 1, TSequenceDiagram.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getTSequenceDiagram_EndsOrdering(), theDescriptionPackage_1.getInterpretedExpression(), "endsOrdering", null, 1, 1, TSequenceDiagram.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getTSequenceDiagram_LifelineMappings(), this.getTLifelineMapping(), null, "lifelineMappings", null, 0, -1, TSequenceDiagram.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getTSequenceDiagram_MessageMappings(), this.getTMessageMapping(), null, "messageMappings", null, 0, -1, TSequenceDiagram.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(tMessageExtremityEClass, TMessageExtremity.class, "TMessageExtremity", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(tLifelineMappingEClass, TLifelineMapping.class, "TLifelineMapping", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getTLifelineMapping_EolVisibleExpression(), theDescriptionPackage_1.getInterpretedExpression(), "eolVisibleExpression", null, 1, 1, TLifelineMapping.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getTLifelineMapping_ExecutionMappings(), this.getTExecutionMapping(), null, "executionMappings", null, 0, -1, TLifelineMapping.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getTLifelineMapping_InstanceRoleStyle(), theStylePackage.getNodeStyleDescription(), null, "instanceRoleStyle", null, 1, 1, TLifelineMapping.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getTLifelineMapping_LifelineStyle(), this.getTLifelineStyle(), null, "lifelineStyle", null, 1, 1, TLifelineMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getTLifelineMapping_EndOfLifeStyle(), theStylePackage.getNodeStyleDescription(), null, "endOfLifeStyle", null, 1, 1, TLifelineMapping.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getTLifelineMapping_ConditionalLifeLineStyles(), this.getTConditionalLifelineStyle(), null, "conditionalLifeLineStyles", null, 0, -1, TLifelineMapping.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(tLifelineStyleEClass, TLifelineStyle.class, "TLifelineStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getTLifelineStyle_LifelineWidthComputationExpression(), theDescriptionPackage_1.getInterpretedExpression(), "lifelineWidthComputationExpression", "0", 0, 1,
-                TLifelineStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getTLifelineStyle_LifelineColor(), theDescriptionPackage_1.getColorDescription(), null, "lifelineColor", null, 1, 1, TLifelineStyle.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(tConditionalLifelineStyleEClass, TConditionalLifelineStyle.class, "TConditionalLifelineStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getTConditionalLifelineStyle_PredicateExpression(), theDescriptionPackage_1.getInterpretedExpression(), "predicateExpression", null, 1, 1, TConditionalLifelineStyle.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getTConditionalLifelineStyle_Style(), this.getTLifelineStyle(), null, "style", null, 1, 1, TConditionalLifelineStyle.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(tExecutionMappingEClass, TExecutionMapping.class, "TExecutionMapping", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getTExecutionMapping_StartingEndFinderExpression(), theDescriptionPackage_1.getInterpretedExpression(), "startingEndFinderExpression", null, 1, 1, TExecutionMapping.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEAttribute(getTExecutionMapping_FinishingEndFinderExpression(), theDescriptionPackage_1.getInterpretedExpression(), "finishingEndFinderExpression", null, 1, 1, TExecutionMapping.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEAttribute(getTExecutionMapping_Recursive(), ecorePackage.getEBoolean(), "recursive", null, 1, 1, TExecutionMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getTExecutionMapping_ExecutionMappings(), this.getTExecutionMapping(), null, "executionMappings", null, 0, -1, TExecutionMapping.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getTExecutionMapping_Style(), this.getTExecutionStyle(), null, "style", null, 1, 1, TExecutionMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getTExecutionMapping_ConditionalStyles(), this.getTConditionalExecutionStyle(), null, "conditionalStyles", null, 0, -1, TExecutionMapping.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(tExecutionStyleEClass, TExecutionStyle.class, "TExecutionStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getTExecutionStyle_BorderSizeComputationExpression(), theDescriptionPackage_1.getInterpretedExpression(), "borderSizeComputationExpression", "1", 0, 1, TExecutionStyle.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getTExecutionStyle_BorderColor(), theDescriptionPackage_1.getColorDescription(), null, "borderColor", null, 1, 1, TExecutionStyle.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getTExecutionStyle_BackgroundColor(), theDescriptionPackage_1.getColorDescription(), null, "backgroundColor", null, 1, 1, TExecutionStyle.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(tConditionalExecutionStyleEClass, TConditionalExecutionStyle.class, "TConditionalExecutionStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getTConditionalExecutionStyle_PredicateExpression(), theDescriptionPackage_1.getInterpretedExpression(), "predicateExpression", null, 1, 1, TConditionalExecutionStyle.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getTConditionalExecutionStyle_Style(), this.getTExecutionStyle(), null, "style", null, 1, 1, TConditionalExecutionStyle.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(tMessageMappingEClass, TMessageMapping.class, "TMessageMapping", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getTMessageMapping_SendingEndFinderExpression(), theDescriptionPackage_1.getInterpretedExpression(), "sendingEndFinderExpression", null, 1, 1, TMessageMapping.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEAttribute(getTMessageMapping_ReceivingEndFinderExpression(), theDescriptionPackage_1.getInterpretedExpression(), "receivingEndFinderExpression", null, 1, 1, TMessageMapping.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getTMessageMapping_Style(), this.getTMessageStyle(), null, "style", null, 1, 1, TMessageMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getTMessageMapping_ConditionalStyle(), this.getTConditionalMessageStyle(), null, "conditionalStyle", null, 0, -1, TMessageMapping.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(tMessageStyleEClass, TMessageStyle.class, "TMessageStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getTMessageStyle_StrokeColor(), theDescriptionPackage_1.getColorDescription(), null, "strokeColor", null, 1, 1, TMessageStyle.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getTMessageStyle_LineStyle(), theDiagramPackage.getLineStyle(), "lineStyle", null, 0, 1, TMessageStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getTMessageStyle_SourceArrow(), theDiagramPackage.getEdgeArrows(), "sourceArrow", "NoDecoration", 1, 1, TMessageStyle.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getTMessageStyle_TargetArrow(), theDiagramPackage.getEdgeArrows(), "targetArrow", "InputArrow", 1, 1, TMessageStyle.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getTMessageStyle_LabelExpression(), theDescriptionPackage_1.getInterpretedExpression(), "labelExpression", "feature:name", 0, 1, TMessageStyle.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-
-        initEClass(tConditionalMessageStyleEClass, TConditionalMessageStyle.class, "TConditionalMessageStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getTConditionalMessageStyle_PredicateExpression(), theDescriptionPackage_1.getInterpretedExpression(), "predicateExpression", null, 1, 1, TConditionalMessageStyle.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getTConditionalMessageStyle_Style(), this.getTMessageStyle(), null, "style", null, 1, 1, TConditionalMessageStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-
-        initEClass(tBasicMessageMappingEClass, TBasicMessageMapping.class, "TBasicMessageMapping", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getTBasicMessageMapping_Target(), this.getTMessageExtremity(), null, "target", null, 1, -1, TBasicMessageMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-
-        initEClass(tSourceTargetMessageMappingEClass, TSourceTargetMessageMapping.class, "TSourceTargetMessageMapping", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getTSourceTargetMessageMapping_Source(), this.getTMessageExtremity(), null, "source", null, 1, -1, TSourceTargetMessageMapping.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getTSourceTargetMessageMapping_SourceFinderExpression(), theDescriptionPackage_1.getInterpretedExpression(), "sourceFinderExpression", null, 0, 1,
-                TSourceTargetMessageMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getTSourceTargetMessageMapping_TargetFinderExpression(), theDescriptionPackage_1.getInterpretedExpression(), "targetFinderExpression", null, 1, 1,
-                TSourceTargetMessageMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getTSourceTargetMessageMapping_UseDomainElement(), theEcorePackage.getEBoolean(), "useDomainElement", "false", 0, 1, TSourceTargetMessageMapping.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-
-        initEClass(tReturnMessageMappingEClass, TReturnMessageMapping.class, "TReturnMessageMapping", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getTReturnMessageMapping_InvocationMapping(), this.getTBasicMessageMapping(), null, "invocationMapping", null, 1, 1, TReturnMessageMapping.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getTReturnMessageMapping_InvocationMessageFinderExpression(), theDescriptionPackage_1.getInterpretedExpression(), "invocationMessageFinderExpression", null, 1, 1,
-                TReturnMessageMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(tCreationMessageMappingEClass, TCreationMessageMapping.class, "TCreationMessageMapping", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getTCreationMessageMapping_Target(), this.getTLifelineMapping(), null, "target", null, 1, -1, TCreationMessageMapping.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(tDestructionMessageMappingEClass, TDestructionMessageMapping.class, "TDestructionMessageMapping", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getTDestructionMessageMapping_Target(), this.getTLifelineMapping(), null, "target", null, 1, -1, TDestructionMessageMapping.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEClass(tTransformerEClass, TTransformer.class, "TTransformer", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getTTransformer_Outputs(),
+                theEcorePackage.getEObject(),
+                null,
+                "outputs", null, 0, -1, TTransformer.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(tAbstractMappingEClass, TAbstractMapping.class, "TAbstractMapping", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getTAbstractMapping_Name(),
+                theEcorePackage.getEString(),
+                "name", null, 1, 1, TAbstractMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getTAbstractMapping_DomainClass(),
+                theDescriptionPackage_1.getTypeName(),
+                "domainClass", null, 1, 1, TAbstractMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getTAbstractMapping_SemanticCandidatesExpression(),
+                theDescriptionPackage_1.getInterpretedExpression(),
+                "semanticCandidatesExpression", null, 0, 1, TAbstractMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(tSequenceDiagramEClass, TSequenceDiagram.class, "TSequenceDiagram", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getTSequenceDiagram_DomainClass(),
+                theDescriptionPackage_1.getTypeName(),
+                "domainClass", null, 1, 1, TSequenceDiagram.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getTSequenceDiagram_EndsOrdering(),
+                theDescriptionPackage_1.getInterpretedExpression(),
+                "endsOrdering", null, 1, 1, TSequenceDiagram.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getTSequenceDiagram_LifelineMappings(),
+                this.getTLifelineMapping(),
+                null,
+                "lifelineMappings", null, 0, -1, TSequenceDiagram.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getTSequenceDiagram_MessageMappings(),
+                this.getTMessageMapping(),
+                null,
+                "messageMappings", null, 0, -1, TSequenceDiagram.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(tMessageExtremityEClass, TMessageExtremity.class, "TMessageExtremity", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(tLifelineMappingEClass, TLifelineMapping.class, "TLifelineMapping", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getTLifelineMapping_EolVisibleExpression(),
+                theDescriptionPackage_1.getInterpretedExpression(),
+                "eolVisibleExpression", null, 1, 1, TLifelineMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getTLifelineMapping_ExecutionMappings(),
+                this.getTExecutionMapping(),
+                null,
+                "executionMappings", null, 0, -1, TLifelineMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getTLifelineMapping_InstanceRoleStyle(),
+                theStylePackage.getNodeStyleDescription(),
+                null,
+                "instanceRoleStyle", null, 1, 1, TLifelineMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getTLifelineMapping_LifelineStyle(),
+                this.getTLifelineStyle(),
+                null,
+                "lifelineStyle", null, 1, 1, TLifelineMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getTLifelineMapping_EndOfLifeStyle(),
+                theStylePackage.getNodeStyleDescription(),
+                null,
+                "endOfLifeStyle", null, 1, 1, TLifelineMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getTLifelineMapping_ConditionalLifeLineStyles(),
+                this.getTConditionalLifelineStyle(),
+                null,
+                "conditionalLifeLineStyles", null, 0, -1, TLifelineMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(tLifelineStyleEClass, TLifelineStyle.class, "TLifelineStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getTLifelineStyle_LifelineWidthComputationExpression(),
+                theDescriptionPackage_1.getInterpretedExpression(),
+                "lifelineWidthComputationExpression", "0", 0, 1, TLifelineStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEReference(
+                getTLifelineStyle_LifelineColor(),
+                theDescriptionPackage_1.getColorDescription(),
+                null,
+                "lifelineColor", null, 1, 1, TLifelineStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(tConditionalLifelineStyleEClass, TConditionalLifelineStyle.class,
+                "TConditionalLifelineStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getTConditionalLifelineStyle_PredicateExpression(),
+                theDescriptionPackage_1.getInterpretedExpression(),
+                "predicateExpression", null, 1, 1, TConditionalLifelineStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getTConditionalLifelineStyle_Style(),
+                this.getTLifelineStyle(),
+                null,
+                "style", null, 1, 1, TConditionalLifelineStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(tExecutionMappingEClass, TExecutionMapping.class, "TExecutionMapping", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getTExecutionMapping_StartingEndFinderExpression(),
+                theDescriptionPackage_1.getInterpretedExpression(),
+                "startingEndFinderExpression", null, 1, 1, TExecutionMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getTExecutionMapping_FinishingEndFinderExpression(),
+                theDescriptionPackage_1.getInterpretedExpression(),
+                "finishingEndFinderExpression", null, 1, 1, TExecutionMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getTExecutionMapping_Recursive(),
+                ecorePackage.getEBoolean(),
+                "recursive", null, 1, 1, TExecutionMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getTExecutionMapping_ExecutionMappings(),
+                this.getTExecutionMapping(),
+                null,
+                "executionMappings", null, 0, -1, TExecutionMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getTExecutionMapping_Style(),
+                this.getTExecutionStyle(),
+                null,
+                "style", null, 1, 1, TExecutionMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getTExecutionMapping_ConditionalStyles(),
+                this.getTConditionalExecutionStyle(),
+                null,
+                "conditionalStyles", null, 0, -1, TExecutionMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(tExecutionStyleEClass, TExecutionStyle.class, "TExecutionStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getTExecutionStyle_BorderSizeComputationExpression(),
+                theDescriptionPackage_1.getInterpretedExpression(),
+                "borderSizeComputationExpression", "1", 0, 1, TExecutionStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEReference(
+                getTExecutionStyle_BorderColor(),
+                theDescriptionPackage_1.getColorDescription(),
+                null,
+                "borderColor", null, 1, 1, TExecutionStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getTExecutionStyle_BackgroundColor(),
+                theDescriptionPackage_1.getColorDescription(),
+                null,
+                "backgroundColor", null, 1, 1, TExecutionStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(tConditionalExecutionStyleEClass, TConditionalExecutionStyle.class,
+                "TConditionalExecutionStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getTConditionalExecutionStyle_PredicateExpression(),
+                theDescriptionPackage_1.getInterpretedExpression(),
+                "predicateExpression", null, 1, 1, TConditionalExecutionStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getTConditionalExecutionStyle_Style(),
+                this.getTExecutionStyle(),
+                null,
+                "style", null, 1, 1, TConditionalExecutionStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(tMessageMappingEClass, TMessageMapping.class, "TMessageMapping", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getTMessageMapping_SendingEndFinderExpression(),
+                theDescriptionPackage_1.getInterpretedExpression(),
+                "sendingEndFinderExpression", null, 1, 1, TMessageMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getTMessageMapping_ReceivingEndFinderExpression(),
+                theDescriptionPackage_1.getInterpretedExpression(),
+                "receivingEndFinderExpression", null, 1, 1, TMessageMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getTMessageMapping_Style(),
+                this.getTMessageStyle(),
+                null,
+                "style", null, 1, 1, TMessageMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getTMessageMapping_ConditionalStyle(),
+                this.getTConditionalMessageStyle(),
+                null,
+                "conditionalStyle", null, 0, -1, TMessageMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(tMessageStyleEClass, TMessageStyle.class, "TMessageStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getTMessageStyle_StrokeColor(),
+                theDescriptionPackage_1.getColorDescription(),
+                null,
+                "strokeColor", null, 1, 1, TMessageStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getTMessageStyle_LineStyle(),
+                theDiagramPackage.getLineStyle(),
+                "lineStyle", null, 0, 1, TMessageStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getTMessageStyle_SourceArrow(),
+                theDiagramPackage.getEdgeArrows(),
+                "sourceArrow", "NoDecoration", 1, 1, TMessageStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(
+                getTMessageStyle_TargetArrow(),
+                theDiagramPackage.getEdgeArrows(),
+                "targetArrow", "InputArrow", 1, 1, TMessageStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(
+                getTMessageStyle_LabelExpression(),
+                theDescriptionPackage_1.getInterpretedExpression(),
+                "labelExpression", "feature:name", 0, 1, TMessageStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+
+        initEClass(tConditionalMessageStyleEClass, TConditionalMessageStyle.class,
+                "TConditionalMessageStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getTConditionalMessageStyle_PredicateExpression(),
+                theDescriptionPackage_1.getInterpretedExpression(),
+                "predicateExpression", null, 1, 1, TConditionalMessageStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getTConditionalMessageStyle_Style(),
+                this.getTMessageStyle(),
+                null,
+                "style", null, 1, 1, TConditionalMessageStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(tBasicMessageMappingEClass, TBasicMessageMapping.class, "TBasicMessageMapping", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getTBasicMessageMapping_Target(),
+                this.getTMessageExtremity(),
+                null,
+                "target", null, 1, -1, TBasicMessageMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(tSourceTargetMessageMappingEClass, TSourceTargetMessageMapping.class,
+                "TSourceTargetMessageMapping", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getTSourceTargetMessageMapping_Source(),
+                this.getTMessageExtremity(),
+                null,
+                "source", null, 1, -1, TSourceTargetMessageMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getTSourceTargetMessageMapping_SourceFinderExpression(),
+                theDescriptionPackage_1.getInterpretedExpression(),
+                "sourceFinderExpression", null, 0, 1, TSourceTargetMessageMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getTSourceTargetMessageMapping_TargetFinderExpression(),
+                theDescriptionPackage_1.getInterpretedExpression(),
+                "targetFinderExpression", null, 1, 1, TSourceTargetMessageMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getTSourceTargetMessageMapping_UseDomainElement(),
+                theEcorePackage.getEBoolean(),
+                "useDomainElement", "false", 0, 1, TSourceTargetMessageMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+
+        initEClass(tReturnMessageMappingEClass, TReturnMessageMapping.class, "TReturnMessageMapping", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getTReturnMessageMapping_InvocationMapping(),
+                this.getTBasicMessageMapping(),
+                null,
+                "invocationMapping", null, 1, 1, TReturnMessageMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getTReturnMessageMapping_InvocationMessageFinderExpression(),
+                theDescriptionPackage_1.getInterpretedExpression(),
+                "invocationMessageFinderExpression", null, 1, 1, TReturnMessageMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(tCreationMessageMappingEClass, TCreationMessageMapping.class,
+                "TCreationMessageMapping", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getTCreationMessageMapping_Target(),
+                this.getTLifelineMapping(),
+                null,
+                "target", null, 1, -1, TCreationMessageMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(tDestructionMessageMappingEClass, TDestructionMessageMapping.class,
+                "TDestructionMessageMapping", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getTDestructionMessageMapping_Target(),
+                this.getTLifelineMapping(),
+                null,
+                "target", null, 1, -1, TDestructionMessageMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
 
         // Create annotations
         // http://www.eclipse.org/sirius/interpreted/expression/returnType
@@ -1308,23 +1390,39 @@ public class TemplatePackageImpl extends EPackageImpl implements TemplatePackage
      * @generated
      */
     protected void createReturnTypeAnnotations() {
-        String source = "http://www.eclipse.org/sirius/interpreted/expression/returnType";
-        addAnnotation(getTAbstractMapping_SemanticCandidatesExpression(), source, new String[] { "returnType", "a Collection<EObject> or an EObject." });
-        addAnnotation(getTSequenceDiagram_EndsOrdering(), source, new String[] { "returnType", "a Collection<EObject> or an EObject." });
-        addAnnotation(getTLifelineMapping_EolVisibleExpression(), source, new String[] { "returnType", "a boolean." });
-        addAnnotation(getTLifelineStyle_LifelineWidthComputationExpression(), source, new String[] { "returnType", "an integer." });
-        addAnnotation(getTConditionalLifelineStyle_PredicateExpression(), source, new String[] { "returnType", "a boolean." });
-        addAnnotation(getTExecutionMapping_StartingEndFinderExpression(), source, new String[] { "returnType", "an EObject." });
-        addAnnotation(getTExecutionMapping_FinishingEndFinderExpression(), source, new String[] { "returnType", "an EObject." });
-        addAnnotation(getTExecutionStyle_BorderSizeComputationExpression(), source, new String[] { "returnType", "an integer." });
-        addAnnotation(getTConditionalExecutionStyle_PredicateExpression(), source, new String[] { "returnType", "a boolean." });
-        addAnnotation(getTMessageMapping_SendingEndFinderExpression(), source, new String[] { "returnType", "an EObject." });
-        addAnnotation(getTMessageMapping_ReceivingEndFinderExpression(), source, new String[] { "returnType", "an EObject." });
-        addAnnotation(getTMessageStyle_LabelExpression(), source, new String[] { "returnType", "a string." });
-        addAnnotation(getTConditionalMessageStyle_PredicateExpression(), source, new String[] { "returnType", "a boolean." });
-        addAnnotation(getTSourceTargetMessageMapping_SourceFinderExpression(), source, new String[] { "returnType", "a Collection<EObject> or an EObject." });
-        addAnnotation(getTSourceTargetMessageMapping_TargetFinderExpression(), source, new String[] { "returnType", "a Collection<EObject> or an EObject." });
-        addAnnotation(getTReturnMessageMapping_InvocationMessageFinderExpression(), source, new String[] { "returnType", "an EObject." });
+        String source = "http://www.eclipse.org/sirius/interpreted/expression/returnType"; //$NON-NLS-1$
+        addAnnotation(getTAbstractMapping_SemanticCandidatesExpression(), source, new String[] { "returnType", "a Collection<EObject> or an EObject." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getTSequenceDiagram_EndsOrdering(), source, new String[] { "returnType", "a Collection<EObject> or an EObject." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getTLifelineMapping_EolVisibleExpression(), source, new String[] { "returnType", "a boolean." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getTLifelineStyle_LifelineWidthComputationExpression(), source, new String[] { "returnType", "an integer." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getTConditionalLifelineStyle_PredicateExpression(), source, new String[] { "returnType", "a boolean." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getTExecutionMapping_StartingEndFinderExpression(), source, new String[] { "returnType", "an EObject." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getTExecutionMapping_FinishingEndFinderExpression(), source, new String[] { "returnType", "an EObject." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getTExecutionStyle_BorderSizeComputationExpression(), source, new String[] { "returnType", "an integer." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getTConditionalExecutionStyle_PredicateExpression(), source, new String[] { "returnType", "a boolean." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getTMessageMapping_SendingEndFinderExpression(), source, new String[] { "returnType", "an EObject." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getTMessageMapping_ReceivingEndFinderExpression(), source, new String[] { "returnType", "an EObject." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getTMessageStyle_LabelExpression(), source, new String[] { "returnType", "a string." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getTConditionalMessageStyle_PredicateExpression(), source, new String[] { "returnType", "a boolean." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getTSourceTargetMessageMapping_SourceFinderExpression(), source, new String[] { "returnType", "a Collection<EObject> or an EObject." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getTSourceTargetMessageMapping_TargetFinderExpression(), source, new String[] { "returnType", "a Collection<EObject> or an EObject." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getTReturnMessageMapping_InvocationMessageFinderExpression(), source, new String[] { "returnType", "an EObject." //$NON-NLS-1$ //$NON-NLS-2$
+        });
     }
 
     /**
@@ -1335,26 +1433,45 @@ public class TemplatePackageImpl extends EPackageImpl implements TemplatePackage
      * @generated
      */
     protected void createVariablesAnnotations() {
-        String source = "http://www.eclipse.org/sirius/interpreted/expression/variables";
-        addAnnotation(getTAbstractMapping_SemanticCandidatesExpression(), source, new String[] { "containerView", "the parent view of potential candidates.", "diagram", "the current DDiagram.",
-            "viewpoint", "(deprecated) the current DDiagram.", "viewPoint", "(deprecated) the current DDiagram." });
-        addAnnotation(getTSequenceDiagram_EndsOrdering(), source, new String[] { "eventEnds", "a List<EObject> containing the semantic event ends." });
-        addAnnotation(getTLifelineMapping_EolVisibleExpression(), source, new String[] { "containerView", "the view that sould contain the potential views of the checked elements.", "container",
-            "the semantic element of $containerView.", "viewpoint", "(deprecated) the current DSemanticDiagram.", "diagram", "the current DSemanticDiagram." });
+        String source = "http://www.eclipse.org/sirius/interpreted/expression/variables"; //$NON-NLS-1$
+        addAnnotation(getTAbstractMapping_SemanticCandidatesExpression(), source, new String[] { "containerView", "the parent view of potential candidates.", //$NON-NLS-1$ //$NON-NLS-2$
+            "diagram", "the current DDiagram.", //$NON-NLS-1$ //$NON-NLS-2$
+            "viewpoint", "(deprecated) the current DDiagram.", //$NON-NLS-1$ //$NON-NLS-2$
+            "viewPoint", "(deprecated) the current DDiagram." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getTSequenceDiagram_EndsOrdering(), source, new String[] { "eventEnds", "a List<EObject> containing the semantic event ends." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getTLifelineMapping_EolVisibleExpression(), source, new String[] { "containerView", "the view that sould contain the potential views of the checked elements.", //$NON-NLS-1$ //$NON-NLS-2$
+            "container", "the semantic element of $containerView.", //$NON-NLS-1$ //$NON-NLS-2$
+            "viewpoint", "(deprecated) the current DSemanticDiagram.", //$NON-NLS-1$ //$NON-NLS-2$
+            "diagram", "the current DSemanticDiagram." //$NON-NLS-1$ //$NON-NLS-2$
+        });
         addAnnotation(getTLifelineStyle_LifelineWidthComputationExpression(), source, new String[] {});
-        addAnnotation(getTConditionalLifelineStyle_PredicateExpression(), source, new String[] { "view", "the current view.", "container", "the semantic container." });
+        addAnnotation(getTConditionalLifelineStyle_PredicateExpression(), source, new String[] { "view", "the current view.", //$NON-NLS-1$ //$NON-NLS-2$
+            "container", "the semantic container." //$NON-NLS-1$ //$NON-NLS-2$
+        });
         addAnnotation(getTExecutionMapping_StartingEndFinderExpression(), source, new String[] {});
         addAnnotation(getTExecutionMapping_FinishingEndFinderExpression(), source, new String[] {});
         addAnnotation(getTExecutionStyle_BorderSizeComputationExpression(), source, new String[] {});
-        addAnnotation(getTConditionalExecutionStyle_PredicateExpression(), source, new String[] { "view", "the current view.", "container", "the semantic container." });
+        addAnnotation(getTConditionalExecutionStyle_PredicateExpression(), source, new String[] { "view", "the current view.", //$NON-NLS-1$ //$NON-NLS-2$
+            "container", "the semantic container." //$NON-NLS-1$ //$NON-NLS-2$
+        });
         addAnnotation(getTMessageMapping_SendingEndFinderExpression(), source, new String[] {});
         addAnnotation(getTMessageMapping_ReceivingEndFinderExpression(), source, new String[] {});
-        addAnnotation(getTMessageStyle_LabelExpression(), source, new String[] { "diagram", "the current DSemanticDiagram.", "view", "the current view for which the label is calculated." });
-        addAnnotation(getTConditionalMessageStyle_PredicateExpression(), source, new String[] { "view", "the current view.", "container", "the semantic container." });
-        addAnnotation(getTSourceTargetMessageMapping_SourceFinderExpression(), source, new String[] { "diagram", "the current DDiagram.", "viewpoint", "(deprecated) the current DDiagram.",
-            "viewPoint", "(deprecated) the current DDiagram." });
-        addAnnotation(getTSourceTargetMessageMapping_TargetFinderExpression(), source, new String[] { "diagram", "the current DDiagram.", "viewpoint", "(deprecated) the current DDiagram.",
-            "viewPoint", "(deprecated) the current DDiagram." });
+        addAnnotation(getTMessageStyle_LabelExpression(), source, new String[] { "diagram", "the current DSemanticDiagram.", //$NON-NLS-1$ //$NON-NLS-2$
+            "view", "the current view for which the label is calculated." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getTConditionalMessageStyle_PredicateExpression(), source, new String[] { "view", "the current view.", //$NON-NLS-1$ //$NON-NLS-2$
+            "container", "the semantic container." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getTSourceTargetMessageMapping_SourceFinderExpression(), source, new String[] { "diagram", "the current DDiagram.", //$NON-NLS-1$ //$NON-NLS-2$
+            "viewpoint", "(deprecated) the current DDiagram.", //$NON-NLS-1$ //$NON-NLS-2$
+            "viewPoint", "(deprecated) the current DDiagram." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getTSourceTargetMessageMapping_TargetFinderExpression(), source, new String[] { "diagram", "the current DDiagram.", //$NON-NLS-1$ //$NON-NLS-2$
+            "viewpoint", "(deprecated) the current DDiagram.", //$NON-NLS-1$ //$NON-NLS-2$
+            "viewPoint", "(deprecated) the current DDiagram." //$NON-NLS-1$ //$NON-NLS-2$
+        });
         addAnnotation(getTReturnMessageMapping_InvocationMessageFinderExpression(), source, new String[] {});
     }
 
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/concern/provider/ConcernDescriptionItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/concern/provider/ConcernDescriptionItemProvider.java
index de3155d95d..38943c3d8f 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/concern/provider/ConcernDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/concern/provider/ConcernDescriptionItemProvider.java
@@ -74,8 +74,10 @@ public class ConcernDescriptionItemProvider extends DocumentedElementItemProvide
      */
     protected void addNamePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_IdentifiedElement_name_feature"), getString("_UI_IdentifiedElement_name_description"), DescriptionPackage.Literals.IDENTIFIED_ELEMENT__NAME, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_IdentifiedElement_name_feature"), //$NON-NLS-1$
+                getString("_UI_IdentifiedElement_name_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.IDENTIFIED_ELEMENT__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -86,8 +88,10 @@ public class ConcernDescriptionItemProvider extends DocumentedElementItemProvide
      */
     protected void addLabelPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_IdentifiedElement_label_feature"), getString("_UI_IdentifiedElement_label_description"), DescriptionPackage.Literals.IDENTIFIED_ELEMENT__LABEL, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_IdentifiedElement_label_feature"), //$NON-NLS-1$
+                getString("_UI_IdentifiedElement_label_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.IDENTIFIED_ELEMENT__LABEL, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -98,8 +102,10 @@ public class ConcernDescriptionItemProvider extends DocumentedElementItemProvide
      */
     protected void addFiltersPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_ConcernDescription_filters_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ConcernDescription_filters_feature", "_UI_ConcernDescription_type"),
-                ConcernPackage.Literals.CONCERN_DESCRIPTION__FILTERS, true, false, true, null, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_ConcernDescription_filters_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_ConcernDescription_filters_feature", "_UI_ConcernDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                ConcernPackage.Literals.CONCERN_DESCRIPTION__FILTERS, true, false, true, null, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -110,8 +116,10 @@ public class ConcernDescriptionItemProvider extends DocumentedElementItemProvide
      */
     protected void addRulesPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_ConcernDescription_rules_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ConcernDescription_rules_feature", "_UI_ConcernDescription_type"),
-                ConcernPackage.Literals.CONCERN_DESCRIPTION__RULES, true, false, true, null, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_ConcernDescription_rules_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_ConcernDescription_rules_feature", "_UI_ConcernDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                ConcernPackage.Literals.CONCERN_DESCRIPTION__RULES, true, false, true, null, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -122,8 +130,10 @@ public class ConcernDescriptionItemProvider extends DocumentedElementItemProvide
      */
     protected void addBehaviorsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_ConcernDescription_behaviors_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ConcernDescription_behaviors_feature", "_UI_ConcernDescription_type"),
-                ConcernPackage.Literals.CONCERN_DESCRIPTION__BEHAVIORS, true, false, true, null, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_ConcernDescription_behaviors_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_ConcernDescription_behaviors_feature", "_UI_ConcernDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                ConcernPackage.Literals.CONCERN_DESCRIPTION__BEHAVIORS, true, false, true, null, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -134,7 +144,7 @@ public class ConcernDescriptionItemProvider extends DocumentedElementItemProvide
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ConcernDescription"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/ConcernDescription")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/concern/provider/ConcernSetItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/concern/provider/ConcernSetItemProvider.java
index d0583d1801..7ea736b605 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/concern/provider/ConcernSetItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/concern/provider/ConcernSetItemProvider.java
@@ -100,7 +100,7 @@ public class ConcernSetItemProvider extends DocumentedElementItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ConcernSet"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/ConcernSet")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/filter/provider/CompositeFilterDescriptionItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/filter/provider/CompositeFilterDescriptionItemProvider.java
index 360cc05445..dac0b236da 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/filter/provider/CompositeFilterDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/filter/provider/CompositeFilterDescriptionItemProvider.java
@@ -98,7 +98,7 @@ public class CompositeFilterDescriptionItemProvider extends FilterDescriptionIte
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/CompositeFilterDescription"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/CompositeFilterDescription")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/filter/provider/FilterDescriptionItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/filter/provider/FilterDescriptionItemProvider.java
index a805341880..38ce8fdee6 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/filter/provider/FilterDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/filter/provider/FilterDescriptionItemProvider.java
@@ -71,8 +71,10 @@ public class FilterDescriptionItemProvider extends DocumentedElementItemProvider
      */
     protected void addNamePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_IdentifiedElement_name_feature"), getString("_UI_IdentifiedElement_name_description"), DescriptionPackage.Literals.IDENTIFIED_ELEMENT__NAME, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_IdentifiedElement_name_feature"), //$NON-NLS-1$
+                getString("_UI_IdentifiedElement_name_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.IDENTIFIED_ELEMENT__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -83,8 +85,10 @@ public class FilterDescriptionItemProvider extends DocumentedElementItemProvider
      */
     protected void addLabelPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_IdentifiedElement_label_feature"), getString("_UI_IdentifiedElement_label_description"), DescriptionPackage.Literals.IDENTIFIED_ELEMENT__LABEL, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_IdentifiedElement_label_feature"), //$NON-NLS-1$
+                getString("_UI_IdentifiedElement_label_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.IDENTIFIED_ELEMENT__LABEL, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/filter/provider/FilterItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/filter/provider/FilterItemProvider.java
index 4bc5a114f6..46f9c615c5 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/filter/provider/FilterItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/filter/provider/FilterItemProvider.java
@@ -74,8 +74,10 @@ public class FilterItemProvider extends ItemProviderAdapter implements IEditingD
      */
     protected void addFilterKindPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_Filter_filterKind_feature"), getString("_UI_Filter_filterKind_description"), FilterPackage.Literals.FILTER__FILTER_KIND, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_Filter_filterKind_feature"), //$NON-NLS-1$
+                getString("_UI_Filter_filterKind_description"), //$NON-NLS-1$
+                FilterPackage.Literals.FILTER__FILTER_KIND, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -88,7 +90,8 @@ public class FilterItemProvider extends ItemProviderAdapter implements IEditingD
     public String getText(Object object) {
         FilterKind labelValue = ((Filter) object).getFilterKind();
         String label = labelValue == null ? null : labelValue.toString();
-        return label == null || label.length() == 0 ? getString("_UI_Filter_type") : getString("_UI_Filter_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_Filter_type") : //$NON-NLS-1$
+            getString("_UI_Filter_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/filter/provider/FilterVariableItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/filter/provider/FilterVariableItemProvider.java
index 30d1c55c5e..7a5aeada86 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/filter/provider/FilterVariableItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/filter/provider/FilterVariableItemProvider.java
@@ -81,9 +81,9 @@ IItemPropertySource {
      */
     protected void addCandidatesExpressionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_SelectionDescription_candidatesExpression_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_SelectionDescription_candidatesExpression_feature", "_UI_SelectionDescription_type"),
-                DescriptionPackage.Literals.SELECTION_DESCRIPTION__CANDIDATES_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"),
+                getString("_UI_SelectionDescription_candidatesExpression_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_SelectionDescription_candidatesExpression_feature", "_UI_SelectionDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DescriptionPackage.Literals.SELECTION_DESCRIPTION__CANDIDATES_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
                 null));
     }
 
@@ -95,8 +95,10 @@ IItemPropertySource {
      */
     protected void addMultiplePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_SelectionDescription_multiple_feature"), getString("_UI_PropertyDescriptor_description", "_UI_SelectionDescription_multiple_feature", "_UI_SelectionDescription_type"),
-                DescriptionPackage.Literals.SELECTION_DESCRIPTION__MULTIPLE, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_SelectionDescription_multiple_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_SelectionDescription_multiple_feature", "_UI_SelectionDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DescriptionPackage.Literals.SELECTION_DESCRIPTION__MULTIPLE, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -107,8 +109,10 @@ IItemPropertySource {
      */
     protected void addTreePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_SelectionDescription_tree_feature"), getString("_UI_PropertyDescriptor_description", "_UI_SelectionDescription_tree_feature", "_UI_SelectionDescription_type"),
-                DescriptionPackage.Literals.SELECTION_DESCRIPTION__TREE, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_SelectionDescription_tree_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_SelectionDescription_tree_feature", "_UI_SelectionDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DescriptionPackage.Literals.SELECTION_DESCRIPTION__TREE, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -119,9 +123,10 @@ IItemPropertySource {
      */
     protected void addRootExpressionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_SelectionDescription_rootExpression_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_SelectionDescription_rootExpression_feature", "_UI_SelectionDescription_type"),
-                DescriptionPackage.Literals.SELECTION_DESCRIPTION__ROOT_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_SelectionDescription_rootExpression_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_SelectionDescription_rootExpression_feature", "_UI_SelectionDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DescriptionPackage.Literals.SELECTION_DESCRIPTION__ROOT_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -131,12 +136,11 @@ IItemPropertySource {
      * @generated
      */
     protected void addChildrenExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_SelectionDescription_childrenExpression_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_SelectionDescription_childrenExpression_feature", "_UI_SelectionDescription_type"),
-                DescriptionPackage.Literals.SELECTION_DESCRIPTION__CHILDREN_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_GeneralPropertyCategory"), null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+                getString("_UI_SelectionDescription_childrenExpression_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_SelectionDescription_childrenExpression_feature", "_UI_SelectionDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DescriptionPackage.Literals.SELECTION_DESCRIPTION__CHILDREN_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -147,8 +151,10 @@ IItemPropertySource {
      */
     protected void addMessagePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_SelectionDescription_message_feature"), getString("_UI_PropertyDescriptor_description", "_UI_SelectionDescription_message_feature", "_UI_SelectionDescription_type"),
-                DescriptionPackage.Literals.SELECTION_DESCRIPTION__MESSAGE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_SelectionDescription_message_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_SelectionDescription_message_feature", "_UI_SelectionDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DescriptionPackage.Literals.SELECTION_DESCRIPTION__MESSAGE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -159,8 +165,10 @@ IItemPropertySource {
      */
     protected void addNamePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_FilterVariable_name_feature"), getString("_UI_PropertyDescriptor_description", "_UI_FilterVariable_name_feature", "_UI_FilterVariable_type"),
-                FilterPackage.Literals.FILTER_VARIABLE__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_FilterVariable_name_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_FilterVariable_name_feature", "_UI_FilterVariable_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                FilterPackage.Literals.FILTER_VARIABLE__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -171,7 +179,7 @@ IItemPropertySource {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/FilterVariable"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/FilterVariable")); //$NON-NLS-1$
     }
 
     /**
@@ -183,7 +191,8 @@ IItemPropertySource {
     @Override
     public String getText(Object object) {
         String label = ((FilterVariable) object).getName();
-        return label == null || label.length() == 0 ? getString("_UI_FilterVariable_type") : getString("_UI_FilterVariable_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_FilterVariable_type") : //$NON-NLS-1$
+            getString("_UI_FilterVariable_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/filter/provider/MappingFilterItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/filter/provider/MappingFilterItemProvider.java
index bbdf138e35..e73de33386 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/filter/provider/MappingFilterItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/filter/provider/MappingFilterItemProvider.java
@@ -68,8 +68,10 @@ public class MappingFilterItemProvider extends FilterItemProvider {
      */
     protected void addMappingsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_MappingFilter_mappings_feature"), getString("_UI_PropertyDescriptor_description", "_UI_MappingFilter_mappings_feature", "_UI_MappingFilter_type"),
-                FilterPackage.Literals.MAPPING_FILTER__MAPPINGS, true, false, true, null, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_MappingFilter_mappings_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_MappingFilter_mappings_feature", "_UI_MappingFilter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                FilterPackage.Literals.MAPPING_FILTER__MAPPINGS, true, false, true, null, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -80,9 +82,10 @@ public class MappingFilterItemProvider extends FilterItemProvider {
      */
     protected void addSemanticConditionExpressionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_MappingFilter_semanticConditionExpression_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_MappingFilter_semanticConditionExpression_feature", "_UI_MappingFilter_type"),
-                FilterPackage.Literals.MAPPING_FILTER__SEMANTIC_CONDITION_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_MappingFilter_semanticConditionExpression_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_MappingFilter_semanticConditionExpression_feature", "_UI_MappingFilter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                FilterPackage.Literals.MAPPING_FILTER__SEMANTIC_CONDITION_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -93,9 +96,10 @@ public class MappingFilterItemProvider extends FilterItemProvider {
      */
     protected void addViewConditionExpressionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_MappingFilter_viewConditionExpression_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_MappingFilter_viewConditionExpression_feature", "_UI_MappingFilter_type"),
-                FilterPackage.Literals.MAPPING_FILTER__VIEW_CONDITION_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_MappingFilter_viewConditionExpression_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_MappingFilter_viewConditionExpression_feature", "_UI_MappingFilter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                FilterPackage.Literals.MAPPING_FILTER__VIEW_CONDITION_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -106,7 +110,7 @@ public class MappingFilterItemProvider extends FilterItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/MappingFilter"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/MappingFilter")); //$NON-NLS-1$
     }
 
     /**
@@ -119,7 +123,8 @@ public class MappingFilterItemProvider extends FilterItemProvider {
     public String getText(Object object) {
         FilterKind labelValue = ((MappingFilter) object).getFilterKind();
         String label = labelValue == null ? null : labelValue.toString();
-        return label == null || label.length() == 0 ? getString("_UI_MappingFilter_type") : getString("_UI_MappingFilter_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_MappingFilter_type") : //$NON-NLS-1$
+            getString("_UI_MappingFilter_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/filter/provider/VariableFilterItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/filter/provider/VariableFilterItemProvider.java
index edf2988586..12b6de7956 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/filter/provider/VariableFilterItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/filter/provider/VariableFilterItemProvider.java
@@ -68,9 +68,10 @@ public class VariableFilterItemProvider extends FilterItemProvider {
      */
     protected void addSemanticConditionExpressionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_VariableFilter_semanticConditionExpression_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_VariableFilter_semanticConditionExpression_feature", "_UI_VariableFilter_type"),
-                FilterPackage.Literals.VARIABLE_FILTER__SEMANTIC_CONDITION_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_VariableFilter_semanticConditionExpression_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_VariableFilter_semanticConditionExpression_feature", "_UI_VariableFilter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                FilterPackage.Literals.VARIABLE_FILTER__SEMANTIC_CONDITION_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -114,7 +115,7 @@ public class VariableFilterItemProvider extends FilterItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/VariableFilter"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/VariableFilter")); //$NON-NLS-1$
     }
 
     /**
@@ -127,7 +128,8 @@ public class VariableFilterItemProvider extends FilterItemProvider {
     public String getText(Object object) {
         FilterKind labelValue = ((VariableFilter) object).getFilterKind();
         String label = labelValue == null ? null : labelValue.toString();
-        return label == null || label.length() == 0 ? getString("_UI_VariableFilter_type") : getString("_UI_VariableFilter_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_VariableFilter_type") : //$NON-NLS-1$
+            getString("_UI_VariableFilter_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/AbstractNodeMappingItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/AbstractNodeMappingItemProvider.java
index 540d50568d..d30c335195 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/AbstractNodeMappingItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/AbstractNodeMappingItemProvider.java
@@ -72,8 +72,10 @@ public class AbstractNodeMappingItemProvider extends DiagramElementMappingItemPr
      */
     protected void addDocumentationPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DocumentedElement_documentation_feature"), getString("_UI_DocumentedElement_documentation_description"), DescriptionPackage.Literals.DOCUMENTED_ELEMENT__DOCUMENTATION,
-                true, true, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_DocumentationPropertyCategory"), null));
+                getString("_UI_DocumentedElement_documentation_feature"), //$NON-NLS-1$
+                getString("_UI_DocumentedElement_documentation_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.DOCUMENTED_ELEMENT__DOCUMENTATION, true, true, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_DocumentationPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -83,10 +85,13 @@ public class AbstractNodeMappingItemProvider extends DiagramElementMappingItemPr
      * @generated
      */
     protected void addDomainClassPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_AbstractNodeMapping_domainClass_feature"), getString("_UI_AbstractNodeMapping_domainClass_description"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_AbstractNodeMapping_domainClass_feature"), //$NON-NLS-1$
+                getString("_UI_AbstractNodeMapping_domainClass_description"), //$NON-NLS-1$
                 org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.ABSTRACT_NODE_MAPPING__DOMAIN_CLASS, true, false, true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -96,11 +101,13 @@ public class AbstractNodeMappingItemProvider extends DiagramElementMappingItemPr
      * @generated
      */
     protected void addReusedBorderedNodeMappingsPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_AbstractNodeMapping_reusedBorderedNodeMappings_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_AbstractNodeMapping_reusedBorderedNodeMappings_feature", "_UI_AbstractNodeMapping_type"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_AbstractNodeMapping_reusedBorderedNodeMappings_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_AbstractNodeMapping_reusedBorderedNodeMappings_feature", "_UI_AbstractNodeMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.ABSTRACT_NODE_MAPPING__REUSED_BORDERED_NODE_MAPPINGS, true, false, true, null,
-                getString("_UI_ImportPropertyCategory"), null));
+                getString("_UI_ImportPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/AdditionalLayerItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/AdditionalLayerItemProvider.java
index e5e62a37ee..d6adb651c0 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/AdditionalLayerItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/AdditionalLayerItemProvider.java
@@ -71,8 +71,10 @@ public class AdditionalLayerItemProvider extends LayerItemProvider {
      */
     protected void addActiveByDefaultPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_AdditionalLayer_activeByDefault_feature"), getString("_UI_AdditionalLayer_activeByDefault_description"),
-                DescriptionPackage.Literals.ADDITIONAL_LAYER__ACTIVE_BY_DEFAULT, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_AdditionalLayer_activeByDefault_feature"), //$NON-NLS-1$
+                getString("_UI_AdditionalLayer_activeByDefault_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.ADDITIONAL_LAYER__ACTIVE_BY_DEFAULT, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -83,8 +85,10 @@ public class AdditionalLayerItemProvider extends LayerItemProvider {
      */
     protected void addOptionalPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_AdditionalLayer_optional_feature"), getString("_UI_AdditionalLayer_optional_description"), DescriptionPackage.Literals.ADDITIONAL_LAYER__OPTIONAL, true, false, false,
-                ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_AdditionalLayer_optional_feature"), //$NON-NLS-1$
+                getString("_UI_AdditionalLayer_optional_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.ADDITIONAL_LAYER__OPTIONAL, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/CompositeLayoutItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/CompositeLayoutItemProvider.java
index a0c57d8628..ac07ccae20 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/CompositeLayoutItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/CompositeLayoutItemProvider.java
@@ -69,7 +69,8 @@ public class CompositeLayoutItemProvider extends DocumentedElementItemProvider {
      */
     protected void addPaddingPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_CompositeLayout_padding_feature"), getString("_UI_PropertyDescriptor_description", "_UI_CompositeLayout_padding_feature", "_UI_CompositeLayout_type"),
+                getString("_UI_CompositeLayout_padding_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_CompositeLayout_padding_feature", "_UI_CompositeLayout_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DescriptionPackage.Literals.COMPOSITE_LAYOUT__PADDING, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
     }
 
@@ -81,7 +82,8 @@ public class CompositeLayoutItemProvider extends DocumentedElementItemProvider {
      */
     protected void addDirectionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_CompositeLayout_direction_feature"), getString("_UI_PropertyDescriptor_description", "_UI_CompositeLayout_direction_feature", "_UI_CompositeLayout_type"),
+                getString("_UI_CompositeLayout_direction_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_CompositeLayout_direction_feature", "_UI_CompositeLayout_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DescriptionPackage.Literals.COMPOSITE_LAYOUT__DIRECTION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -93,7 +95,7 @@ public class CompositeLayoutItemProvider extends DocumentedElementItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/CompositeLayout"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/CompositeLayout")); //$NON-NLS-1$
     }
 
     /**
@@ -105,7 +107,8 @@ public class CompositeLayoutItemProvider extends DocumentedElementItemProvider {
     @Override
     public String getText(Object object) {
         String label = crop(((CompositeLayout) object).getDocumentation());
-        return label == null || label.length() == 0 ? getString("_UI_CompositeLayout_type") : getString("_UI_CompositeLayout_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_CompositeLayout_type") : //$NON-NLS-1$
+            getString("_UI_CompositeLayout_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/ConditionalContainerStyleDescriptionItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/ConditionalContainerStyleDescriptionItemProvider.java
index dbf2d846bd..b1a9278439 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/ConditionalContainerStyleDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/ConditionalContainerStyleDescriptionItemProvider.java
@@ -102,7 +102,7 @@ public class ConditionalContainerStyleDescriptionItemProvider extends Conditiona
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ConditionalContainerStyleDescription"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/ConditionalContainerStyleDescription")); //$NON-NLS-1$
     }
 
     /**
@@ -114,7 +114,8 @@ public class ConditionalContainerStyleDescriptionItemProvider extends Conditiona
     @Override
     public String getText(Object object) {
         String label = ((ConditionalContainerStyleDescription) object).getPredicateExpression();
-        return label == null || label.length() == 0 ? getString("_UI_ConditionalContainerStyleDescription_type") : getString("_UI_ConditionalContainerStyleDescription_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_ConditionalContainerStyleDescription_type") : //$NON-NLS-1$
+            getString("_UI_ConditionalContainerStyleDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/ConditionalEdgeStyleDescriptionItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/ConditionalEdgeStyleDescriptionItemProvider.java
index 12594c0bb8..8e1f9fcd2a 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/ConditionalEdgeStyleDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/ConditionalEdgeStyleDescriptionItemProvider.java
@@ -102,7 +102,7 @@ public class ConditionalEdgeStyleDescriptionItemProvider extends ConditionalStyl
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ConditionalEdgeStyleDescription"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/ConditionalEdgeStyleDescription")); //$NON-NLS-1$
     }
 
     /**
@@ -114,7 +114,8 @@ public class ConditionalEdgeStyleDescriptionItemProvider extends ConditionalStyl
     @Override
     public String getText(Object object) {
         String label = ((ConditionalEdgeStyleDescription) object).getPredicateExpression();
-        return label == null || label.length() == 0 ? getString("_UI_ConditionalEdgeStyleDescription_type") : getString("_UI_ConditionalEdgeStyleDescription_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_ConditionalEdgeStyleDescription_type") : //$NON-NLS-1$
+            getString("_UI_ConditionalEdgeStyleDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/ConditionalNodeStyleDescriptionItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/ConditionalNodeStyleDescriptionItemProvider.java
index 749823008f..b09efa1702 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/ConditionalNodeStyleDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/ConditionalNodeStyleDescriptionItemProvider.java
@@ -105,7 +105,7 @@ public class ConditionalNodeStyleDescriptionItemProvider extends ConditionalStyl
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ConditionalNodeStyleDescription"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/ConditionalNodeStyleDescription")); //$NON-NLS-1$
     }
 
     /**
@@ -117,7 +117,8 @@ public class ConditionalNodeStyleDescriptionItemProvider extends ConditionalStyl
     @Override
     public String getText(Object object) {
         String label = ((ConditionalNodeStyleDescription) object).getPredicateExpression();
-        return label == null || label.length() == 0 ? getString("_UI_ConditionalNodeStyleDescription_type") : getString("_UI_ConditionalNodeStyleDescription_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_ConditionalNodeStyleDescription_type") : //$NON-NLS-1$
+            getString("_UI_ConditionalNodeStyleDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/ContainerMappingImportItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/ContainerMappingImportItemProvider.java
index 5fca0b13e4..2da3863d31 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/ContainerMappingImportItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/ContainerMappingImportItemProvider.java
@@ -68,9 +68,10 @@ public class ContainerMappingImportItemProvider extends ContainerMappingItemProv
      */
     protected void addHideSubMappingsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_AbstractMappingImport_hideSubMappings_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_AbstractMappingImport_hideSubMappings_feature", "_UI_AbstractMappingImport_type"),
-                DescriptionPackage.Literals.ABSTRACT_MAPPING_IMPORT__HIDE_SUB_MAPPINGS, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, getString("_UI_ImportPropertyCategory"), null));
+                getString("_UI_AbstractMappingImport_hideSubMappings_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_AbstractMappingImport_hideSubMappings_feature", "_UI_AbstractMappingImport_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DescriptionPackage.Literals.ABSTRACT_MAPPING_IMPORT__HIDE_SUB_MAPPINGS, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, getString("_UI_ImportPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -80,10 +81,13 @@ public class ContainerMappingImportItemProvider extends ContainerMappingItemProv
      * @generated
      */
     protected void addInheritsAncestorFiltersPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_AbstractMappingImport_inheritsAncestorFilters_feature"), getString("_UI_AbstractMappingImport_inheritsAncestorFilters_description"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_AbstractMappingImport_inheritsAncestorFilters_feature"), //$NON-NLS-1$
+                getString("_UI_AbstractMappingImport_inheritsAncestorFilters_description"), //$NON-NLS-1$
                 DescriptionPackage.Literals.ABSTRACT_MAPPING_IMPORT__INHERITS_ANCESTOR_FILTERS, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-                getString("_UI_ImportPropertyCategory"), null));
+                getString("_UI_ImportPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -94,8 +98,10 @@ public class ContainerMappingImportItemProvider extends ContainerMappingItemProv
      */
     protected void addImportedMappingPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_ContainerMappingImport_importedMapping_feature"), getString("_UI_ContainerMappingImport_importedMapping_description"),
-                org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.CONTAINER_MAPPING_IMPORT__IMPORTED_MAPPING, true, false, true, null, getString("_UI_ImportPropertyCategory"), null));
+                getString("_UI_ContainerMappingImport_importedMapping_feature"), //$NON-NLS-1$
+                getString("_UI_ContainerMappingImport_importedMapping_description"), //$NON-NLS-1$
+                org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.CONTAINER_MAPPING_IMPORT__IMPORTED_MAPPING, true, false, true, null, getString("_UI_ImportPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -106,7 +112,7 @@ public class ContainerMappingImportItemProvider extends ContainerMappingItemProv
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ContainerMappingImport"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/ContainerMappingImport")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/ContainerMappingItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/ContainerMappingItemProvider.java
index c6a2e1ba76..ca0be7fbfa 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/ContainerMappingItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/ContainerMappingItemProvider.java
@@ -77,8 +77,10 @@ public class ContainerMappingItemProvider extends AbstractNodeMappingItemProvide
      */
     protected void addDropDescriptionsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DragAndDropTargetDescription_dropDescriptions_feature"), getString("_UI_DragAndDropTargetDescription_dropDescriptions_description"),
-                DescriptionPackage.Literals.DRAG_AND_DROP_TARGET_DESCRIPTION__DROP_DESCRIPTIONS, true, false, true, null, getString("_UI_BehaviorPropertyCategory"), null));
+                getString("_UI_DragAndDropTargetDescription_dropDescriptions_feature"), //$NON-NLS-1$
+                getString("_UI_DragAndDropTargetDescription_dropDescriptions_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.DRAG_AND_DROP_TARGET_DESCRIPTION__DROP_DESCRIPTIONS, true, false, true, null, getString("_UI_BehaviorPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -89,8 +91,10 @@ public class ContainerMappingItemProvider extends AbstractNodeMappingItemProvide
      */
     protected void addAllNodeMappingsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_ContainerMapping_allNodeMappings_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ContainerMapping_allNodeMappings_feature", "_UI_ContainerMapping_type"),
-                DescriptionPackage.Literals.CONTAINER_MAPPING__ALL_NODE_MAPPINGS, false, false, false, null, getString("_UI_ImportPropertyCategory"), null));
+                getString("_UI_ContainerMapping_allNodeMappings_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_ContainerMapping_allNodeMappings_feature", "_UI_ContainerMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DescriptionPackage.Literals.CONTAINER_MAPPING__ALL_NODE_MAPPINGS, false, false, false, null, getString("_UI_ImportPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -101,8 +105,10 @@ public class ContainerMappingItemProvider extends AbstractNodeMappingItemProvide
      */
     protected void addReusedNodeMappingsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_ContainerMapping_reusedNodeMappings_feature"), getString("_UI_ContainerMapping_reusedNodeMappings_description"),
-                DescriptionPackage.Literals.CONTAINER_MAPPING__REUSED_NODE_MAPPINGS, true, false, true, null, getString("_UI_ImportPropertyCategory"), null));
+                getString("_UI_ContainerMapping_reusedNodeMappings_feature"), //$NON-NLS-1$
+                getString("_UI_ContainerMapping_reusedNodeMappings_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.CONTAINER_MAPPING__REUSED_NODE_MAPPINGS, true, false, true, null, getString("_UI_ImportPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -113,8 +119,10 @@ public class ContainerMappingItemProvider extends AbstractNodeMappingItemProvide
      */
     protected void addReusedContainerMappingsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_ContainerMapping_reusedContainerMappings_feature"), getString("_UI_ContainerMapping_reusedContainerMappings_description"),
-                DescriptionPackage.Literals.CONTAINER_MAPPING__REUSED_CONTAINER_MAPPINGS, true, false, true, null, getString("_UI_ImportPropertyCategory"), null));
+                getString("_UI_ContainerMapping_reusedContainerMappings_feature"), //$NON-NLS-1$
+                getString("_UI_ContainerMapping_reusedContainerMappings_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.CONTAINER_MAPPING__REUSED_CONTAINER_MAPPINGS, true, false, true, null, getString("_UI_ImportPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -124,10 +132,11 @@ public class ContainerMappingItemProvider extends AbstractNodeMappingItemProvide
      * @generated
      */
     protected void addAllContainerMappingsPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(
-                createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ContainerMapping_allContainerMappings_feature"),
-                        getString("_UI_PropertyDescriptor_description", "_UI_ContainerMapping_allContainerMappings_feature", "_UI_ContainerMapping_type"),
-                        DescriptionPackage.Literals.CONTAINER_MAPPING__ALL_CONTAINER_MAPPINGS, false, false, false, null, getString("_UI_ImportPropertyCategory"), null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+                getString("_UI_ContainerMapping_allContainerMappings_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_ContainerMapping_allContainerMappings_feature", "_UI_ContainerMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DescriptionPackage.Literals.CONTAINER_MAPPING__ALL_CONTAINER_MAPPINGS, false, false, false, null, getString("_UI_ImportPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -138,8 +147,10 @@ public class ContainerMappingItemProvider extends AbstractNodeMappingItemProvide
      */
     protected void addChildrenPresentationPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_ContainerMapping_childrenPresentation_feature"), getString("_UI_ContainerMapping_childrenPresentation_description"),
-                DescriptionPackage.Literals.CONTAINER_MAPPING__CHILDREN_PRESENTATION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_ContainerMapping_childrenPresentation_feature"), //$NON-NLS-1$
+                getString("_UI_ContainerMapping_childrenPresentation_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.CONTAINER_MAPPING__CHILDREN_PRESENTATION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -191,7 +202,7 @@ public class ContainerMappingItemProvider extends AbstractNodeMappingItemProvide
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ContainerMapping"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/ContainerMapping")); //$NON-NLS-1$
     }
 
     /**
@@ -237,8 +248,7 @@ public class ContainerMappingItemProvider extends AbstractNodeMappingItemProvide
      * describing the children that can be created under this object. <!--
      * begin-user-doc --> <!-- end-user-doc -->
      *
-     * @not-generated:
-     *                 <UL>
+     * @not-generated: <UL>
      *                 <LI>Add a default semantic candidate expression at
      *                 creation time.</LI>
      *                 <LI>Set to 1 the default borderSizeComputationExpression
@@ -254,8 +264,8 @@ public class ContainerMappingItemProvider extends AbstractNodeMappingItemProvide
         createNodeMapping.setSemanticCandidatesExpression("feature:eAllContents");
         newChildDescriptors.add(createChildParameter(org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.CONTAINER_MAPPING__SUB_NODE_MAPPINGS, createNodeMapping));
 
-        newChildDescriptors.add(
-                createChildParameter(org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.CONTAINER_MAPPING__SUB_NODE_MAPPINGS, DescriptionFactory.eINSTANCE.createNodeMappingImport()));
+        newChildDescriptors.add(createChildParameter(org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.CONTAINER_MAPPING__SUB_NODE_MAPPINGS,
+                DescriptionFactory.eINSTANCE.createNodeMappingImport()));
 
         ContainerMapping createContainerMapping = DescriptionFactory.eINSTANCE.createContainerMapping();
         createContainerMapping.setSemanticCandidatesExpression("feature:eAllContents");
@@ -272,8 +282,8 @@ public class ContainerMappingItemProvider extends AbstractNodeMappingItemProvide
         shapeContainerStyleDescription.setBorderSizeComputationExpression("1");
         newChildDescriptors.add(createChildParameter(org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.CONTAINER_MAPPING__STYLE, shapeContainerStyleDescription));
 
-        newChildDescriptors
-                .add(createChildParameter(org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.CONTAINER_MAPPING__STYLE, StyleFactory.eINSTANCE.createWorkspaceImageDescription()));
+        newChildDescriptors.add(createChildParameter(org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.CONTAINER_MAPPING__STYLE,
+                StyleFactory.eINSTANCE.createWorkspaceImageDescription()));
 
         newChildDescriptors.add(createChildParameter(org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.CONTAINER_MAPPING__CONDITIONNAL_STYLES,
                 DescriptionFactory.eINSTANCE.createConditionalContainerStyleDescription()));
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/DiagramDescriptionItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/DiagramDescriptionItemProvider.java
index ff3e7d3a8e..21bcf5bd1c 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/DiagramDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/DiagramDescriptionItemProvider.java
@@ -98,8 +98,10 @@ public class DiagramDescriptionItemProvider extends DragAndDropTargetDescription
      */
     protected void addDocumentationPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DocumentedElement_documentation_feature"), getString("_UI_DocumentedElement_documentation_description"), DescriptionPackage.Literals.DOCUMENTED_ELEMENT__DOCUMENTATION,
-                true, true, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_DocumentationPropertyCategory"), null));
+                getString("_UI_DocumentedElement_documentation_feature"), //$NON-NLS-1$
+                getString("_UI_DocumentedElement_documentation_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.DOCUMENTED_ELEMENT__DOCUMENTATION, true, true, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_DocumentationPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -109,10 +111,13 @@ public class DiagramDescriptionItemProvider extends DragAndDropTargetDescription
      * @generated
      */
     protected void addEndUserDocumentationPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_EndUserDocumentedElement_endUserDocumentation_feature"), getString("_UI_EndUserDocumentedElement_endUserDocumentation_description"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_EndUserDocumentedElement_endUserDocumentation_feature"), //$NON-NLS-1$
+                getString("_UI_EndUserDocumentedElement_endUserDocumentation_description"), //$NON-NLS-1$
                 DescriptionPackage.Literals.END_USER_DOCUMENTED_ELEMENT__END_USER_DOCUMENTATION, true, true, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_DocumentationPropertyCategory"), null));
+                getString("_UI_DocumentationPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -123,8 +128,10 @@ public class DiagramDescriptionItemProvider extends DragAndDropTargetDescription
      */
     protected void addNamePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_IdentifiedElement_name_feature"), getString("_UI_IdentifiedElement_name_description"), DescriptionPackage.Literals.IDENTIFIED_ELEMENT__NAME, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_IdentifiedElement_name_feature"), //$NON-NLS-1$
+                getString("_UI_IdentifiedElement_name_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.IDENTIFIED_ELEMENT__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -135,8 +142,10 @@ public class DiagramDescriptionItemProvider extends DragAndDropTargetDescription
      */
     protected void addLabelPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_IdentifiedElement_label_feature"), getString("_UI_IdentifiedElement_label_description"), DescriptionPackage.Literals.IDENTIFIED_ELEMENT__LABEL, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_IdentifiedElement_label_feature"), //$NON-NLS-1$
+                getString("_UI_IdentifiedElement_label_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.IDENTIFIED_ELEMENT__LABEL, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -147,8 +156,9 @@ public class DiagramDescriptionItemProvider extends DragAndDropTargetDescription
      */
     protected void addTitleExpressionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_RepresentationDescription_titleExpression_feature"), getString("_UI_RepresentationDescription_titleExpression_description"),
-                DescriptionPackage.Literals.REPRESENTATION_DESCRIPTION__TITLE_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_AdvancedPropertyCategory"),
+                getString("_UI_RepresentationDescription_titleExpression_feature"), //$NON-NLS-1$
+                getString("_UI_RepresentationDescription_titleExpression_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.REPRESENTATION_DESCRIPTION__TITLE_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_AdvancedPropertyCategory"), //$NON-NLS-1$
                 null));
     }
 
@@ -159,11 +169,11 @@ public class DiagramDescriptionItemProvider extends DragAndDropTargetDescription
      * @generated
      */
     protected void addInitialisationPropertyDescriptor(Object object) {
-        itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_RepresentationDescription_initialisation_feature"), getString("_UI_RepresentationDescription_initialisation_description"),
-                DescriptionPackage.Literals.REPRESENTATION_DESCRIPTION__INITIALISATION, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-                getString("_UI_GeneralPropertyCategory"), null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+                getString("_UI_RepresentationDescription_initialisation_feature"), //$NON-NLS-1$
+                getString("_UI_RepresentationDescription_initialisation_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.REPRESENTATION_DESCRIPTION__INITIALISATION, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -174,8 +184,10 @@ public class DiagramDescriptionItemProvider extends DragAndDropTargetDescription
      */
     protected void addMetamodelPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_RepresentationDescription_metamodel_feature"), getString("_UI_RepresentationDescription_metamodel_description"),
-                DescriptionPackage.Literals.REPRESENTATION_DESCRIPTION__METAMODEL, true, false, true, null, getString("_UI_MetamodelsPropertyCategory"), null));
+                getString("_UI_RepresentationDescription_metamodel_feature"), //$NON-NLS-1$
+                getString("_UI_RepresentationDescription_metamodel_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.REPRESENTATION_DESCRIPTION__METAMODEL, true, false, true, null, getString("_UI_MetamodelsPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -186,11 +198,11 @@ public class DiagramDescriptionItemProvider extends DragAndDropTargetDescription
      * @generated
      */
     protected void addShowOnStartupPropertyDescriptor(Object object) {
-        itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_RepresentationDescription_showOnStartup_feature"), getString("_UI_RepresentationDescription_showOnStartup_description"),
-                DescriptionPackage.Literals.REPRESENTATION_DESCRIPTION__SHOW_ON_STARTUP, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-                getString("_UI_GeneralPropertyCategory"), null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+                getString("_UI_RepresentationDescription_showOnStartup_feature"), //$NON-NLS-1$
+                getString("_UI_RepresentationDescription_showOnStartup_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.REPRESENTATION_DESCRIPTION__SHOW_ON_STARTUP, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -201,8 +213,10 @@ public class DiagramDescriptionItemProvider extends DragAndDropTargetDescription
      */
     protected void addPasteDescriptionsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_PasteTargetDescription_pasteDescriptions_feature"), getString("_UI_PasteTargetDescription_pasteDescriptions_description"),
-                DescriptionPackage.Literals.PASTE_TARGET_DESCRIPTION__PASTE_DESCRIPTIONS, true, false, true, null, getString("_UI_BehaviorPropertyCategory"), null));
+                getString("_UI_PasteTargetDescription_pasteDescriptions_feature"), //$NON-NLS-1$
+                getString("_UI_PasteTargetDescription_pasteDescriptions_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.PASTE_TARGET_DESCRIPTION__PASTE_DESCRIPTIONS, true, false, true, null, getString("_UI_BehaviorPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -213,8 +227,8 @@ public class DiagramDescriptionItemProvider extends DragAndDropTargetDescription
      */
     protected void addAllEdgeMappingsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DiagramDescription_allEdgeMappings_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_DiagramDescription_allEdgeMappings_feature", "_UI_DiagramDescription_type"),
+                getString("_UI_DiagramDescription_allEdgeMappings_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DiagramDescription_allEdgeMappings_feature", "_UI_DiagramDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.DIAGRAM_DESCRIPTION__ALL_EDGE_MAPPINGS, false, false, false, null, null, null));
     }
 
@@ -226,8 +240,8 @@ public class DiagramDescriptionItemProvider extends DragAndDropTargetDescription
      */
     protected void addAllNodeMappingsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DiagramDescription_allNodeMappings_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_DiagramDescription_allNodeMappings_feature", "_UI_DiagramDescription_type"),
+                getString("_UI_DiagramDescription_allNodeMappings_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DiagramDescription_allNodeMappings_feature", "_UI_DiagramDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.DIAGRAM_DESCRIPTION__ALL_NODE_MAPPINGS, false, false, false, null, null, null));
     }
 
@@ -239,8 +253,8 @@ public class DiagramDescriptionItemProvider extends DragAndDropTargetDescription
      */
     protected void addAllContainerMappingsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DiagramDescription_allContainerMappings_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_DiagramDescription_allContainerMappings_feature", "_UI_DiagramDescription_type"),
+                getString("_UI_DiagramDescription_allContainerMappings_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DiagramDescription_allContainerMappings_feature", "_UI_DiagramDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.DIAGRAM_DESCRIPTION__ALL_CONTAINER_MAPPINGS, false, false, false, null, null, null));
     }
 
@@ -252,7 +266,8 @@ public class DiagramDescriptionItemProvider extends DragAndDropTargetDescription
      */
     protected void addAllToolsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DiagramDescription_allTools_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DiagramDescription_allTools_feature", "_UI_DiagramDescription_type"),
+                getString("_UI_DiagramDescription_allTools_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DiagramDescription_allTools_feature", "_UI_DiagramDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.DIAGRAM_DESCRIPTION__ALL_TOOLS, false, false, false, null, null, null));
     }
 
@@ -263,10 +278,13 @@ public class DiagramDescriptionItemProvider extends DragAndDropTargetDescription
      * @generated
      */
     protected void addDomainClassPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DiagramDescription_domainClass_feature"), getString("_UI_DiagramDescription_domainClass_description"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_DiagramDescription_domainClass_feature"), //$NON-NLS-1$
+                getString("_UI_DiagramDescription_domainClass_description"), //$NON-NLS-1$
                 org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.DIAGRAM_DESCRIPTION__DOMAIN_CLASS, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -276,10 +294,13 @@ public class DiagramDescriptionItemProvider extends DragAndDropTargetDescription
      * @generated
      */
     protected void addPreconditionExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DiagramDescription_preconditionExpression_feature"), getString("_UI_DiagramDescription_preconditionExpression_description"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_DiagramDescription_preconditionExpression_feature"), //$NON-NLS-1$
+                getString("_UI_DiagramDescription_preconditionExpression_description"), //$NON-NLS-1$
                 org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.DIAGRAM_DESCRIPTION__PRECONDITION_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -290,8 +311,10 @@ public class DiagramDescriptionItemProvider extends DragAndDropTargetDescription
      */
     protected void addDefaultConcernPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DiagramDescription_defaultConcern_feature"), getString("_UI_DiagramDescription_defaultConcern_description"),
-                org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.DIAGRAM_DESCRIPTION__DEFAULT_CONCERN, true, false, true, null, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_DiagramDescription_defaultConcern_feature"), //$NON-NLS-1$
+                getString("_UI_DiagramDescription_defaultConcern_description"), //$NON-NLS-1$
+                org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.DIAGRAM_DESCRIPTION__DEFAULT_CONCERN, true, false, true, null, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -301,10 +324,13 @@ public class DiagramDescriptionItemProvider extends DragAndDropTargetDescription
      * @generated
      */
     protected void addRootExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DiagramDescription_rootExpression_feature"), getString("_UI_DiagramDescription_rootExpression_description"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_DiagramDescription_rootExpression_feature"), //$NON-NLS-1$
+                getString("_UI_DiagramDescription_rootExpression_description"), //$NON-NLS-1$
                 org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.DIAGRAM_DESCRIPTION__ROOT_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_AdvancedPropertyCategory"), null));
+                getString("_UI_AdvancedPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -315,8 +341,10 @@ public class DiagramDescriptionItemProvider extends DragAndDropTargetDescription
      */
     protected void addInitPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DiagramDescription_init_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DiagramDescription_init_feature", "_UI_DiagramDescription_type"),
-                org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.DIAGRAM_DESCRIPTION__INIT, true, false, true, null, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_DiagramDescription_init_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DiagramDescription_init_feature", "_UI_DiagramDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.DIAGRAM_DESCRIPTION__INIT, true, false, true, null, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -327,7 +355,8 @@ public class DiagramDescriptionItemProvider extends DragAndDropTargetDescription
      */
     protected void addAllLayersPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DiagramDescription_allLayers_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DiagramDescription_allLayers_feature", "_UI_DiagramDescription_type"),
+                getString("_UI_DiagramDescription_allLayers_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DiagramDescription_allLayers_feature", "_UI_DiagramDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.DIAGRAM_DESCRIPTION__ALL_LAYERS, true, false, true, null, null, null));
     }
 
@@ -339,8 +368,8 @@ public class DiagramDescriptionItemProvider extends DragAndDropTargetDescription
      */
     protected void addAllActivatedToolsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DiagramDescription_allActivatedTools_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_DiagramDescription_allActivatedTools_feature", "_UI_DiagramDescription_type"),
+                getString("_UI_DiagramDescription_allActivatedTools_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DiagramDescription_allActivatedTools_feature", "_UI_DiagramDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.DIAGRAM_DESCRIPTION__ALL_ACTIVATED_TOOLS, true, false, true, null, null, null));
     }
 
@@ -352,9 +381,10 @@ public class DiagramDescriptionItemProvider extends DragAndDropTargetDescription
      */
     protected void addReusedMappingsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DiagramDescription_reusedMappings_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_DiagramDescription_reusedMappings_feature", "_UI_DiagramDescription_type"),
-                org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.DIAGRAM_DESCRIPTION__REUSED_MAPPINGS, true, false, true, null, getString("_UI_ImportPropertyCategory"), null));
+                getString("_UI_DiagramDescription_reusedMappings_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DiagramDescription_reusedMappings_feature", "_UI_DiagramDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.DIAGRAM_DESCRIPTION__REUSED_MAPPINGS, true, false, true, null, getString("_UI_ImportPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -365,8 +395,10 @@ public class DiagramDescriptionItemProvider extends DragAndDropTargetDescription
      */
     protected void addReusedToolsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DiagramDescription_reusedTools_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DiagramDescription_reusedTools_feature", "_UI_DiagramDescription_type"),
-                org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.DIAGRAM_DESCRIPTION__REUSED_TOOLS, true, false, true, null, getString("_UI_ImportPropertyCategory"), null));
+                getString("_UI_DiagramDescription_reusedTools_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DiagramDescription_reusedTools_feature", "_UI_DiagramDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.DIAGRAM_DESCRIPTION__REUSED_TOOLS, true, false, true, null, getString("_UI_ImportPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -377,10 +409,13 @@ public class DiagramDescriptionItemProvider extends DragAndDropTargetDescription
      * @generated
      */
     protected void addEnablePopupBarsPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DiagramDescription_enablePopupBars_feature"), getString("_UI_DiagramDescription_enablePopupBars_description"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_DiagramDescription_enablePopupBars_feature"), //$NON-NLS-1$
+                getString("_UI_DiagramDescription_enablePopupBars_description"), //$NON-NLS-1$
                 org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.DIAGRAM_DESCRIPTION__ENABLE_POPUP_BARS, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-                getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -435,7 +470,7 @@ public class DiagramDescriptionItemProvider extends DragAndDropTargetDescription
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/DiagramDescription"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/DiagramDescription")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/DiagramElementMappingItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/DiagramElementMappingItemProvider.java
index 42043d7750..ab7cb92eff 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/DiagramElementMappingItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/DiagramElementMappingItemProvider.java
@@ -76,8 +76,10 @@ public class DiagramElementMappingItemProvider extends RepresentationElementMapp
      */
     protected void addPasteDescriptionsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_PasteTargetDescription_pasteDescriptions_feature"), getString("_UI_PasteTargetDescription_pasteDescriptions_description"),
-                DescriptionPackage.Literals.PASTE_TARGET_DESCRIPTION__PASTE_DESCRIPTIONS, true, false, true, null, getString("_UI_BehaviorPropertyCategory"), null));
+                getString("_UI_PasteTargetDescription_pasteDescriptions_feature"), //$NON-NLS-1$
+                getString("_UI_PasteTargetDescription_pasteDescriptions_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.PASTE_TARGET_DESCRIPTION__PASTE_DESCRIPTIONS, true, false, true, null, getString("_UI_BehaviorPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -87,10 +89,13 @@ public class DiagramElementMappingItemProvider extends RepresentationElementMapp
      * @generated
      */
     protected void addPreconditionExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DiagramElementMapping_preconditionExpression_feature"), getString("_UI_DiagramElementMapping_preconditionExpression_description"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_DiagramElementMapping_preconditionExpression_feature"), //$NON-NLS-1$
+                getString("_UI_DiagramElementMapping_preconditionExpression_description"), //$NON-NLS-1$
                 org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.DIAGRAM_ELEMENT_MAPPING__PRECONDITION_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_AdvancedPropertyCategory"), null));
+                getString("_UI_AdvancedPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -101,8 +106,9 @@ public class DiagramElementMappingItemProvider extends RepresentationElementMapp
      */
     protected void addDeletionDescriptionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DiagramElementMapping_deletionDescription_feature"), getString("_UI_DiagramElementMapping_deletionDescription_description"),
-                org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.DIAGRAM_ELEMENT_MAPPING__DELETION_DESCRIPTION, true, false, true, null, getString("_UI_BehaviorPropertyCategory"),
+                getString("_UI_DiagramElementMapping_deletionDescription_feature"), //$NON-NLS-1$
+                getString("_UI_DiagramElementMapping_deletionDescription_description"), //$NON-NLS-1$
+                org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.DIAGRAM_ELEMENT_MAPPING__DELETION_DESCRIPTION, true, false, true, null, getString("_UI_BehaviorPropertyCategory"), //$NON-NLS-1$
                 null));
     }
 
@@ -113,11 +119,11 @@ public class DiagramElementMappingItemProvider extends RepresentationElementMapp
      * @generated
      */
     protected void addLabelDirectEditPropertyDescriptor(Object object) {
-        itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DiagramElementMapping_labelDirectEdit_feature"), getString("_UI_DiagramElementMapping_labelDirectEdit_description"),
-                org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.DIAGRAM_ELEMENT_MAPPING__LABEL_DIRECT_EDIT, true, false, true, null,
-                getString("_UI_BehaviorPropertyCategory"), null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+                getString("_UI_DiagramElementMapping_labelDirectEdit_feature"), //$NON-NLS-1$
+                getString("_UI_DiagramElementMapping_labelDirectEdit_description"), //$NON-NLS-1$
+                org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.DIAGRAM_ELEMENT_MAPPING__LABEL_DIRECT_EDIT, true, false, true, null, getString("_UI_BehaviorPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -127,10 +133,13 @@ public class DiagramElementMappingItemProvider extends RepresentationElementMapp
      * @generated
      */
     protected void addSemanticCandidatesExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DiagramElementMapping_semanticCandidatesExpression_feature"), getString("_UI_DiagramElementMapping_semanticCandidatesExpression_description"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_DiagramElementMapping_semanticCandidatesExpression_feature"), //$NON-NLS-1$
+                getString("_UI_DiagramElementMapping_semanticCandidatesExpression_description"), //$NON-NLS-1$
                 org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.DIAGRAM_ELEMENT_MAPPING__SEMANTIC_CANDIDATES_EXPRESSION, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -140,10 +149,13 @@ public class DiagramElementMappingItemProvider extends RepresentationElementMapp
      * @generated
      */
     protected void addSemanticElementsPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DiagramElementMapping_semanticElements_feature"), getString("_UI_DiagramElementMapping_semanticElements_description"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_DiagramElementMapping_semanticElements_feature"), //$NON-NLS-1$
+                getString("_UI_DiagramElementMapping_semanticElements_description"), //$NON-NLS-1$
                 org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.DIAGRAM_ELEMENT_MAPPING__SEMANTIC_ELEMENTS, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -153,11 +165,13 @@ public class DiagramElementMappingItemProvider extends RepresentationElementMapp
      * @generated
      */
     protected void addDoubleClickDescriptionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DiagramElementMapping_doubleClickDescription_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_DiagramElementMapping_doubleClickDescription_feature", "_UI_DiagramElementMapping_type"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_DiagramElementMapping_doubleClickDescription_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DiagramElementMapping_doubleClickDescription_feature", "_UI_DiagramElementMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.DIAGRAM_ELEMENT_MAPPING__DOUBLE_CLICK_DESCRIPTION, true, false, true, null,
-                getString("_UI_BehaviorPropertyCategory"), null));
+                getString("_UI_BehaviorPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/DiagramExtensionDescriptionItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/DiagramExtensionDescriptionItemProvider.java
index ef8763d20c..1d3d78b77e 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/DiagramExtensionDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/DiagramExtensionDescriptionItemProvider.java
@@ -81,12 +81,11 @@ IItemPropertySource {
      * @generated
      */
     protected void addNamePropertyDescriptor(Object object) {
-        itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_RepresentationExtensionDescription_name_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_RepresentationExtensionDescription_name_feature", "_UI_RepresentationExtensionDescription_type"),
-                DescriptionPackage.Literals.REPRESENTATION_EXTENSION_DESCRIPTION__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_GeneralPropertyCategory"), null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+                getString("_UI_RepresentationExtensionDescription_name_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_RepresentationExtensionDescription_name_feature", "_UI_RepresentationExtensionDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DescriptionPackage.Literals.REPRESENTATION_EXTENSION_DESCRIPTION__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -96,10 +95,13 @@ IItemPropertySource {
      * @generated
      */
     protected void addViewpointURIPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_RepresentationExtensionDescription_viewpointURI_feature"), getString("_UI_RepresentationExtensionDescription_viewpointURI_description"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_RepresentationExtensionDescription_viewpointURI_feature"), //$NON-NLS-1$
+                getString("_UI_RepresentationExtensionDescription_viewpointURI_description"), //$NON-NLS-1$
                 DescriptionPackage.Literals.REPRESENTATION_EXTENSION_DESCRIPTION__VIEWPOINT_URI, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -109,10 +111,13 @@ IItemPropertySource {
      * @generated
      */
     protected void addRepresentationNamePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_RepresentationExtensionDescription_representationName_feature"), getString("_UI_RepresentationExtensionDescription_representationName_description"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_RepresentationExtensionDescription_representationName_feature"), //$NON-NLS-1$
+                getString("_UI_RepresentationExtensionDescription_representationName_description"), //$NON-NLS-1$
                 DescriptionPackage.Literals.REPRESENTATION_EXTENSION_DESCRIPTION__REPRESENTATION_NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -123,8 +128,10 @@ IItemPropertySource {
      */
     protected void addMetamodelPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_RepresentationExtensionDescription_metamodel_feature"), getString("_UI_RepresentationExtensionDescription_metamodel_description"),
-                DescriptionPackage.Literals.REPRESENTATION_EXTENSION_DESCRIPTION__METAMODEL, true, false, true, null, getString("_UI_AdvancedPropertyCategory"), null));
+                getString("_UI_RepresentationExtensionDescription_metamodel_feature"), //$NON-NLS-1$
+                getString("_UI_RepresentationExtensionDescription_metamodel_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.REPRESENTATION_EXTENSION_DESCRIPTION__METAMODEL, true, false, true, null, getString("_UI_AdvancedPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -170,7 +177,7 @@ IItemPropertySource {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/DiagramExtensionDescription"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/DiagramExtensionDescription")); //$NON-NLS-1$
     }
 
     /**
@@ -182,7 +189,8 @@ IItemPropertySource {
     @Override
     public String getText(Object object) {
         String label = ((DiagramExtensionDescription) object).getName();
-        return label == null || label.length() == 0 ? getString("_UI_DiagramExtensionDescription_type") : getString("_UI_DiagramExtensionDescription_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_DiagramExtensionDescription_type") : //$NON-NLS-1$
+            getString("_UI_DiagramExtensionDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/DiagramImportDescriptionItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/DiagramImportDescriptionItemProvider.java
index 6335ade3ef..e94f47a1de 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/DiagramImportDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/DiagramImportDescriptionItemProvider.java
@@ -100,10 +100,13 @@ public class DiagramImportDescriptionItemProvider extends DocumentedElementItemP
      * @generated
      */
     protected void addEndUserDocumentationPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_EndUserDocumentedElement_endUserDocumentation_feature"), getString("_UI_EndUserDocumentedElement_endUserDocumentation_description"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_EndUserDocumentedElement_endUserDocumentation_feature"), //$NON-NLS-1$
+                getString("_UI_EndUserDocumentedElement_endUserDocumentation_description"), //$NON-NLS-1$
                 DescriptionPackage.Literals.END_USER_DOCUMENTED_ELEMENT__END_USER_DOCUMENTATION, true, true, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_DocumentationPropertyCategory"), null));
+                getString("_UI_DocumentationPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -114,8 +117,10 @@ public class DiagramImportDescriptionItemProvider extends DocumentedElementItemP
      */
     protected void addNamePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_IdentifiedElement_name_feature"), getString("_UI_IdentifiedElement_name_description"), DescriptionPackage.Literals.IDENTIFIED_ELEMENT__NAME, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_IdentifiedElement_name_feature"), //$NON-NLS-1$
+                getString("_UI_IdentifiedElement_name_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.IDENTIFIED_ELEMENT__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -126,8 +131,10 @@ public class DiagramImportDescriptionItemProvider extends DocumentedElementItemP
      */
     protected void addLabelPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_IdentifiedElement_label_feature"), getString("_UI_IdentifiedElement_label_description"), DescriptionPackage.Literals.IDENTIFIED_ELEMENT__LABEL, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_IdentifiedElement_label_feature"), //$NON-NLS-1$
+                getString("_UI_IdentifiedElement_label_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.IDENTIFIED_ELEMENT__LABEL, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -138,8 +145,9 @@ public class DiagramImportDescriptionItemProvider extends DocumentedElementItemP
      */
     protected void addTitleExpressionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_RepresentationDescription_titleExpression_feature"), getString("_UI_RepresentationDescription_titleExpression_description"),
-                DescriptionPackage.Literals.REPRESENTATION_DESCRIPTION__TITLE_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_AdvancedPropertyCategory"),
+                getString("_UI_RepresentationDescription_titleExpression_feature"), //$NON-NLS-1$
+                getString("_UI_RepresentationDescription_titleExpression_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.REPRESENTATION_DESCRIPTION__TITLE_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_AdvancedPropertyCategory"), //$NON-NLS-1$
                 null));
     }
 
@@ -150,11 +158,11 @@ public class DiagramImportDescriptionItemProvider extends DocumentedElementItemP
      * @generated
      */
     protected void addInitialisationPropertyDescriptor(Object object) {
-        itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_RepresentationDescription_initialisation_feature"), getString("_UI_RepresentationDescription_initialisation_description"),
-                DescriptionPackage.Literals.REPRESENTATION_DESCRIPTION__INITIALISATION, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-                getString("_UI_GeneralPropertyCategory"), null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+                getString("_UI_RepresentationDescription_initialisation_feature"), //$NON-NLS-1$
+                getString("_UI_RepresentationDescription_initialisation_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.REPRESENTATION_DESCRIPTION__INITIALISATION, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -165,8 +173,10 @@ public class DiagramImportDescriptionItemProvider extends DocumentedElementItemP
      */
     protected void addMetamodelPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_RepresentationDescription_metamodel_feature"), getString("_UI_RepresentationDescription_metamodel_description"),
-                DescriptionPackage.Literals.REPRESENTATION_DESCRIPTION__METAMODEL, true, false, true, null, getString("_UI_MetamodelsPropertyCategory"), null));
+                getString("_UI_RepresentationDescription_metamodel_feature"), //$NON-NLS-1$
+                getString("_UI_RepresentationDescription_metamodel_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.REPRESENTATION_DESCRIPTION__METAMODEL, true, false, true, null, getString("_UI_MetamodelsPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -177,11 +187,11 @@ public class DiagramImportDescriptionItemProvider extends DocumentedElementItemP
      * @generated
      */
     protected void addShowOnStartupPropertyDescriptor(Object object) {
-        itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_RepresentationDescription_showOnStartup_feature"), getString("_UI_RepresentationDescription_showOnStartup_description"),
-                DescriptionPackage.Literals.REPRESENTATION_DESCRIPTION__SHOW_ON_STARTUP, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-                getString("_UI_GeneralPropertyCategory"), null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+                getString("_UI_RepresentationDescription_showOnStartup_feature"), //$NON-NLS-1$
+                getString("_UI_RepresentationDescription_showOnStartup_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.REPRESENTATION_DESCRIPTION__SHOW_ON_STARTUP, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -191,10 +201,13 @@ public class DiagramImportDescriptionItemProvider extends DocumentedElementItemP
      * @generated
      */
     protected void addDropDescriptionsPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DragAndDropTargetDescription_dropDescriptions_feature"), getString("_UI_DragAndDropTargetDescription_dropDescriptions_description"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_DragAndDropTargetDescription_dropDescriptions_feature"), //$NON-NLS-1$
+                getString("_UI_DragAndDropTargetDescription_dropDescriptions_description"), //$NON-NLS-1$
                 org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.DRAG_AND_DROP_TARGET_DESCRIPTION__DROP_DESCRIPTIONS, true, false, true, null,
-                getString("_UI_BehaviorPropertyCategory"), null));
+                getString("_UI_BehaviorPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -205,8 +218,10 @@ public class DiagramImportDescriptionItemProvider extends DocumentedElementItemP
      */
     protected void addPasteDescriptionsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_PasteTargetDescription_pasteDescriptions_feature"), getString("_UI_PasteTargetDescription_pasteDescriptions_description"),
-                DescriptionPackage.Literals.PASTE_TARGET_DESCRIPTION__PASTE_DESCRIPTIONS, true, false, true, null, getString("_UI_BehaviorPropertyCategory"), null));
+                getString("_UI_PasteTargetDescription_pasteDescriptions_feature"), //$NON-NLS-1$
+                getString("_UI_PasteTargetDescription_pasteDescriptions_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.PASTE_TARGET_DESCRIPTION__PASTE_DESCRIPTIONS, true, false, true, null, getString("_UI_BehaviorPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -217,8 +232,8 @@ public class DiagramImportDescriptionItemProvider extends DocumentedElementItemP
      */
     protected void addAllEdgeMappingsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DiagramDescription_allEdgeMappings_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_DiagramDescription_allEdgeMappings_feature", "_UI_DiagramDescription_type"),
+                getString("_UI_DiagramDescription_allEdgeMappings_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DiagramDescription_allEdgeMappings_feature", "_UI_DiagramDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.DIAGRAM_DESCRIPTION__ALL_EDGE_MAPPINGS, false, false, false, null, null, null));
     }
 
@@ -230,8 +245,8 @@ public class DiagramImportDescriptionItemProvider extends DocumentedElementItemP
      */
     protected void addAllNodeMappingsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DiagramDescription_allNodeMappings_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_DiagramDescription_allNodeMappings_feature", "_UI_DiagramDescription_type"),
+                getString("_UI_DiagramDescription_allNodeMappings_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DiagramDescription_allNodeMappings_feature", "_UI_DiagramDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.DIAGRAM_DESCRIPTION__ALL_NODE_MAPPINGS, false, false, false, null, null, null));
     }
 
@@ -243,8 +258,8 @@ public class DiagramImportDescriptionItemProvider extends DocumentedElementItemP
      */
     protected void addAllContainerMappingsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DiagramDescription_allContainerMappings_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_DiagramDescription_allContainerMappings_feature", "_UI_DiagramDescription_type"),
+                getString("_UI_DiagramDescription_allContainerMappings_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DiagramDescription_allContainerMappings_feature", "_UI_DiagramDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.DIAGRAM_DESCRIPTION__ALL_CONTAINER_MAPPINGS, false, false, false, null, null, null));
     }
 
@@ -256,7 +271,8 @@ public class DiagramImportDescriptionItemProvider extends DocumentedElementItemP
      */
     protected void addAllToolsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DiagramDescription_allTools_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DiagramDescription_allTools_feature", "_UI_DiagramDescription_type"),
+                getString("_UI_DiagramDescription_allTools_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DiagramDescription_allTools_feature", "_UI_DiagramDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.DIAGRAM_DESCRIPTION__ALL_TOOLS, false, false, false, null, null, null));
     }
 
@@ -267,10 +283,13 @@ public class DiagramImportDescriptionItemProvider extends DocumentedElementItemP
      * @generated
      */
     protected void addDomainClassPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DiagramDescription_domainClass_feature"), getString("_UI_DiagramDescription_domainClass_description"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_DiagramDescription_domainClass_feature"), //$NON-NLS-1$
+                getString("_UI_DiagramDescription_domainClass_description"), //$NON-NLS-1$
                 org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.DIAGRAM_DESCRIPTION__DOMAIN_CLASS, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -280,10 +299,13 @@ public class DiagramImportDescriptionItemProvider extends DocumentedElementItemP
      * @generated
      */
     protected void addPreconditionExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DiagramDescription_preconditionExpression_feature"), getString("_UI_DiagramDescription_preconditionExpression_description"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_DiagramDescription_preconditionExpression_feature"), //$NON-NLS-1$
+                getString("_UI_DiagramDescription_preconditionExpression_description"), //$NON-NLS-1$
                 org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.DIAGRAM_DESCRIPTION__PRECONDITION_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -294,8 +316,10 @@ public class DiagramImportDescriptionItemProvider extends DocumentedElementItemP
      */
     protected void addDefaultConcernPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DiagramDescription_defaultConcern_feature"), getString("_UI_DiagramDescription_defaultConcern_description"),
-                org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.DIAGRAM_DESCRIPTION__DEFAULT_CONCERN, true, false, true, null, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_DiagramDescription_defaultConcern_feature"), //$NON-NLS-1$
+                getString("_UI_DiagramDescription_defaultConcern_description"), //$NON-NLS-1$
+                org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.DIAGRAM_DESCRIPTION__DEFAULT_CONCERN, true, false, true, null, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -305,10 +329,13 @@ public class DiagramImportDescriptionItemProvider extends DocumentedElementItemP
      * @generated
      */
     protected void addRootExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DiagramDescription_rootExpression_feature"), getString("_UI_DiagramDescription_rootExpression_description"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_DiagramDescription_rootExpression_feature"), //$NON-NLS-1$
+                getString("_UI_DiagramDescription_rootExpression_description"), //$NON-NLS-1$
                 org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.DIAGRAM_DESCRIPTION__ROOT_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_AdvancedPropertyCategory"), null));
+                getString("_UI_AdvancedPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -319,8 +346,10 @@ public class DiagramImportDescriptionItemProvider extends DocumentedElementItemP
      */
     protected void addInitPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DiagramDescription_init_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DiagramDescription_init_feature", "_UI_DiagramDescription_type"),
-                org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.DIAGRAM_DESCRIPTION__INIT, true, false, true, null, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_DiagramDescription_init_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DiagramDescription_init_feature", "_UI_DiagramDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.DIAGRAM_DESCRIPTION__INIT, true, false, true, null, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -331,7 +360,8 @@ public class DiagramImportDescriptionItemProvider extends DocumentedElementItemP
      */
     protected void addAllLayersPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DiagramDescription_allLayers_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DiagramDescription_allLayers_feature", "_UI_DiagramDescription_type"),
+                getString("_UI_DiagramDescription_allLayers_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DiagramDescription_allLayers_feature", "_UI_DiagramDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.DIAGRAM_DESCRIPTION__ALL_LAYERS, true, false, true, null, null, null));
     }
 
@@ -343,8 +373,8 @@ public class DiagramImportDescriptionItemProvider extends DocumentedElementItemP
      */
     protected void addAllActivatedToolsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DiagramDescription_allActivatedTools_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_DiagramDescription_allActivatedTools_feature", "_UI_DiagramDescription_type"),
+                getString("_UI_DiagramDescription_allActivatedTools_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DiagramDescription_allActivatedTools_feature", "_UI_DiagramDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.DIAGRAM_DESCRIPTION__ALL_ACTIVATED_TOOLS, true, false, true, null, null, null));
     }
 
@@ -356,9 +386,10 @@ public class DiagramImportDescriptionItemProvider extends DocumentedElementItemP
      */
     protected void addReusedMappingsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DiagramDescription_reusedMappings_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_DiagramDescription_reusedMappings_feature", "_UI_DiagramDescription_type"),
-                org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.DIAGRAM_DESCRIPTION__REUSED_MAPPINGS, true, false, true, null, getString("_UI_ImportPropertyCategory"), null));
+                getString("_UI_DiagramDescription_reusedMappings_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DiagramDescription_reusedMappings_feature", "_UI_DiagramDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.DIAGRAM_DESCRIPTION__REUSED_MAPPINGS, true, false, true, null, getString("_UI_ImportPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -369,8 +400,10 @@ public class DiagramImportDescriptionItemProvider extends DocumentedElementItemP
      */
     protected void addReusedToolsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DiagramDescription_reusedTools_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DiagramDescription_reusedTools_feature", "_UI_DiagramDescription_type"),
-                org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.DIAGRAM_DESCRIPTION__REUSED_TOOLS, true, false, true, null, getString("_UI_ImportPropertyCategory"), null));
+                getString("_UI_DiagramDescription_reusedTools_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DiagramDescription_reusedTools_feature", "_UI_DiagramDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.DIAGRAM_DESCRIPTION__REUSED_TOOLS, true, false, true, null, getString("_UI_ImportPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -381,10 +414,13 @@ public class DiagramImportDescriptionItemProvider extends DocumentedElementItemP
      * @generated
      */
     protected void addEnablePopupBarsPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DiagramDescription_enablePopupBars_feature"), getString("_UI_DiagramDescription_enablePopupBars_description"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_DiagramDescription_enablePopupBars_feature"), //$NON-NLS-1$
+                getString("_UI_DiagramDescription_enablePopupBars_description"), //$NON-NLS-1$
                 org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.DIAGRAM_DESCRIPTION__ENABLE_POPUP_BARS, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-                getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -395,8 +431,9 @@ public class DiagramImportDescriptionItemProvider extends DocumentedElementItemP
      */
     protected void addImportedDiagramPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DiagramImportDescription_importedDiagram_feature"), getString("_UI_DiagramImportDescription_importedDiagram_description"),
-                org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.DIAGRAM_IMPORT_DESCRIPTION__IMPORTED_DIAGRAM, true, false, true, null, getString("_UI_GeneralPropertyCategory"),
+                getString("_UI_DiagramImportDescription_importedDiagram_feature"), //$NON-NLS-1$
+                getString("_UI_DiagramImportDescription_importedDiagram_description"), //$NON-NLS-1$
+                org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.DIAGRAM_IMPORT_DESCRIPTION__IMPORTED_DIAGRAM, true, false, true, null, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
                 null));
     }
 
@@ -452,7 +489,7 @@ public class DiagramImportDescriptionItemProvider extends DocumentedElementItemP
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/DiagramImportDescription"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/DiagramImportDescription")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/DragAndDropTargetDescriptionItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/DragAndDropTargetDescriptionItemProvider.java
index ea6a2aa505..929e49df38 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/DragAndDropTargetDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/DragAndDropTargetDescriptionItemProvider.java
@@ -71,8 +71,10 @@ IItemPropertySource {
      */
     protected void addDropDescriptionsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DragAndDropTargetDescription_dropDescriptions_feature"), getString("_UI_DragAndDropTargetDescription_dropDescriptions_description"),
-                DescriptionPackage.Literals.DRAG_AND_DROP_TARGET_DESCRIPTION__DROP_DESCRIPTIONS, true, false, true, null, getString("_UI_BehaviorPropertyCategory"), null));
+                getString("_UI_DragAndDropTargetDescription_dropDescriptions_feature"), //$NON-NLS-1$
+                getString("_UI_DragAndDropTargetDescription_dropDescriptions_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.DRAG_AND_DROP_TARGET_DESCRIPTION__DROP_DESCRIPTIONS, true, false, true, null, getString("_UI_BehaviorPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -83,7 +85,7 @@ IItemPropertySource {
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_DragAndDropTargetDescription_type");
+        return getString("_UI_DragAndDropTargetDescription_type"); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/EdgeMappingImportItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/EdgeMappingImportItemProvider.java
index bf6d2862b1..e253fc2c1b 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/EdgeMappingImportItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/EdgeMappingImportItemProvider.java
@@ -75,8 +75,10 @@ public class EdgeMappingImportItemProvider extends DocumentedElementItemProvider
      */
     protected void addNamePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_IdentifiedElement_name_feature"), getString("_UI_IdentifiedElement_name_description"), DescriptionPackage.Literals.IDENTIFIED_ELEMENT__NAME, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_IdentifiedElement_name_feature"), //$NON-NLS-1$
+                getString("_UI_IdentifiedElement_name_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.IDENTIFIED_ELEMENT__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -87,8 +89,10 @@ public class EdgeMappingImportItemProvider extends DocumentedElementItemProvider
      */
     protected void addLabelPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_IdentifiedElement_label_feature"), getString("_UI_IdentifiedElement_label_description"), DescriptionPackage.Literals.IDENTIFIED_ELEMENT__LABEL, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_IdentifiedElement_label_feature"), //$NON-NLS-1$
+                getString("_UI_IdentifiedElement_label_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.IDENTIFIED_ELEMENT__LABEL, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -99,9 +103,10 @@ public class EdgeMappingImportItemProvider extends DocumentedElementItemProvider
      */
     protected void addImportedMappingPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_EdgeMappingImport_importedMapping_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_EdgeMappingImport_importedMapping_feature", "_UI_EdgeMappingImport_type"),
-                org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.EDGE_MAPPING_IMPORT__IMPORTED_MAPPING, true, false, true, null, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_EdgeMappingImport_importedMapping_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_EdgeMappingImport_importedMapping_feature", "_UI_EdgeMappingImport_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.EDGE_MAPPING_IMPORT__IMPORTED_MAPPING, true, false, true, null, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -111,10 +116,13 @@ public class EdgeMappingImportItemProvider extends DocumentedElementItemProvider
      * @generated
      */
     protected void addInheritsAncestorFiltersPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_EdgeMappingImport_inheritsAncestorFilters_feature"), getString("_UI_EdgeMappingImport_inheritsAncestorFilters_description"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_EdgeMappingImport_inheritsAncestorFilters_feature"), //$NON-NLS-1$
+                getString("_UI_EdgeMappingImport_inheritsAncestorFilters_description"), //$NON-NLS-1$
                 org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.EDGE_MAPPING_IMPORT__INHERITS_ANCESTOR_FILTERS, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-                getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -158,7 +166,7 @@ public class EdgeMappingImportItemProvider extends DocumentedElementItemProvider
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/EdgeMappingImport"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/EdgeMappingImport")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/EdgeMappingItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/EdgeMappingItemProvider.java
index 8e3fcab8db..65ac0ed71a 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/EdgeMappingItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/EdgeMappingItemProvider.java
@@ -83,8 +83,10 @@ public class EdgeMappingItemProvider extends DiagramElementMappingItemProvider {
      */
     protected void addDocumentationPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DocumentedElement_documentation_feature"), getString("_UI_DocumentedElement_documentation_description"), DescriptionPackage.Literals.DOCUMENTED_ELEMENT__DOCUMENTATION,
-                true, true, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_DocumentationPropertyCategory"), null));
+                getString("_UI_DocumentedElement_documentation_feature"), //$NON-NLS-1$
+                getString("_UI_DocumentedElement_documentation_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.DOCUMENTED_ELEMENT__DOCUMENTATION, true, true, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_DocumentationPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -95,8 +97,10 @@ public class EdgeMappingItemProvider extends DiagramElementMappingItemProvider {
      */
     protected void addSourceMappingPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_EdgeMapping_sourceMapping_feature"), getString("_UI_EdgeMapping_sourceMapping_description"),
-                org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.EDGE_MAPPING__SOURCE_MAPPING, true, false, true, null, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_EdgeMapping_sourceMapping_feature"), //$NON-NLS-1$
+                getString("_UI_EdgeMapping_sourceMapping_description"), //$NON-NLS-1$
+                org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.EDGE_MAPPING__SOURCE_MAPPING, true, false, true, null, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -107,8 +111,10 @@ public class EdgeMappingItemProvider extends DiagramElementMappingItemProvider {
      */
     protected void addTargetMappingPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_EdgeMapping_targetMapping_feature"), getString("_UI_EdgeMapping_targetMapping_description"),
-                org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.EDGE_MAPPING__TARGET_MAPPING, true, false, true, null, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_EdgeMapping_targetMapping_feature"), //$NON-NLS-1$
+                getString("_UI_EdgeMapping_targetMapping_description"), //$NON-NLS-1$
+                org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.EDGE_MAPPING__TARGET_MAPPING, true, false, true, null, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -118,10 +124,13 @@ public class EdgeMappingItemProvider extends DiagramElementMappingItemProvider {
      * @generated
      */
     protected void addTargetFinderExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_EdgeMapping_targetFinderExpression_feature"), getString("_UI_EdgeMapping_targetFinderExpression_description"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_EdgeMapping_targetFinderExpression_feature"), //$NON-NLS-1$
+                getString("_UI_EdgeMapping_targetFinderExpression_description"), //$NON-NLS-1$
                 org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.EDGE_MAPPING__TARGET_FINDER_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -131,10 +140,13 @@ public class EdgeMappingItemProvider extends DiagramElementMappingItemProvider {
      * @generated
      */
     protected void addSourceFinderExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_EdgeMapping_sourceFinderExpression_feature"), getString("_UI_EdgeMapping_sourceFinderExpression_description"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_EdgeMapping_sourceFinderExpression_feature"), //$NON-NLS-1$
+                getString("_UI_EdgeMapping_sourceFinderExpression_description"), //$NON-NLS-1$
                 org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.EDGE_MAPPING__SOURCE_FINDER_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -144,10 +156,13 @@ public class EdgeMappingItemProvider extends DiagramElementMappingItemProvider {
      * @generated
      */
     protected void addTargetExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_EdgeMapping_targetExpression_feature"), getString("_UI_EdgeMapping_targetExpression_description"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_EdgeMapping_targetExpression_feature"), //$NON-NLS-1$
+                getString("_UI_EdgeMapping_targetExpression_description"), //$NON-NLS-1$
                 org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.EDGE_MAPPING__TARGET_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_AdvancedPropertyCategory"), null));
+                getString("_UI_AdvancedPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -157,10 +172,13 @@ public class EdgeMappingItemProvider extends DiagramElementMappingItemProvider {
      * @generated
      */
     protected void addDomainClassPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_EdgeMapping_domainClass_feature"), getString("_UI_EdgeMapping_domainClass_description"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_EdgeMapping_domainClass_feature"), //$NON-NLS-1$
+                getString("_UI_EdgeMapping_domainClass_description"), //$NON-NLS-1$
                 org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.EDGE_MAPPING__DOMAIN_CLASS, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -171,7 +189,8 @@ public class EdgeMappingItemProvider extends DiagramElementMappingItemProvider {
      */
     protected void addUseDomainElementPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_EdgeMapping_useDomainElement_feature"), getString("_UI_EdgeMapping_useDomainElement_description"),
+                getString("_UI_EdgeMapping_useDomainElement_feature"), //$NON-NLS-1$
+                getString("_UI_EdgeMapping_useDomainElement_description"), //$NON-NLS-1$
                 org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.EDGE_MAPPING__USE_DOMAIN_ELEMENT, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
     }
 
@@ -183,8 +202,10 @@ public class EdgeMappingItemProvider extends DiagramElementMappingItemProvider {
      */
     protected void addReconnectionsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_EdgeMapping_reconnections_feature"), getString("_UI_PropertyDescriptor_description", "_UI_EdgeMapping_reconnections_feature", "_UI_EdgeMapping_type"),
-                org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.EDGE_MAPPING__RECONNECTIONS, true, false, true, null, getString("_UI_BehaviorPropertyCategory"), null));
+                getString("_UI_EdgeMapping_reconnections_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_EdgeMapping_reconnections_feature", "_UI_EdgeMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.EDGE_MAPPING__RECONNECTIONS, true, false, true, null, getString("_UI_BehaviorPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -194,10 +215,13 @@ public class EdgeMappingItemProvider extends DiagramElementMappingItemProvider {
      * @generated
      */
     protected void addPathExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_EdgeMapping_pathExpression_feature"), getString("_UI_EdgeMapping_pathExpression_description"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_EdgeMapping_pathExpression_feature"), //$NON-NLS-1$
+                getString("_UI_EdgeMapping_pathExpression_description"), //$NON-NLS-1$
                 org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.EDGE_MAPPING__PATH_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_PathPropertyCategory"), null));
+                getString("_UI_PathPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -208,8 +232,10 @@ public class EdgeMappingItemProvider extends DiagramElementMappingItemProvider {
      */
     protected void addPathNodeMappingPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_EdgeMapping_pathNodeMapping_feature"), getString("_UI_EdgeMapping_pathNodeMapping_description"),
-                org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.EDGE_MAPPING__PATH_NODE_MAPPING, true, false, true, null, getString("_UI_PathPropertyCategory"), null));
+                getString("_UI_EdgeMapping_pathNodeMapping_feature"), //$NON-NLS-1$
+                getString("_UI_EdgeMapping_pathNodeMapping_description"), //$NON-NLS-1$
+                org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.EDGE_MAPPING__PATH_NODE_MAPPING, true, false, true, null, getString("_UI_PathPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -254,7 +280,7 @@ public class EdgeMappingItemProvider extends DiagramElementMappingItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/EdgeMapping"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/EdgeMapping")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/LayerItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/LayerItemProvider.java
index cf633d6ef8..8a3b12fc1e 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/LayerItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/LayerItemProvider.java
@@ -87,10 +87,13 @@ public class LayerItemProvider extends DocumentedElementItemProvider {
      * @generated
      */
     protected void addEndUserDocumentationPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_EndUserDocumentedElement_endUserDocumentation_feature"), getString("_UI_EndUserDocumentedElement_endUserDocumentation_description"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_EndUserDocumentedElement_endUserDocumentation_feature"), //$NON-NLS-1$
+                getString("_UI_EndUserDocumentedElement_endUserDocumentation_description"), //$NON-NLS-1$
                 DescriptionPackage.Literals.END_USER_DOCUMENTED_ELEMENT__END_USER_DOCUMENTATION, true, true, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_DocumentationPropertyCategory"), null));
+                getString("_UI_DocumentationPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -101,8 +104,10 @@ public class LayerItemProvider extends DocumentedElementItemProvider {
      */
     protected void addNamePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_IdentifiedElement_name_feature"), getString("_UI_IdentifiedElement_name_description"), DescriptionPackage.Literals.IDENTIFIED_ELEMENT__NAME, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_IdentifiedElement_name_feature"), //$NON-NLS-1$
+                getString("_UI_IdentifiedElement_name_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.IDENTIFIED_ELEMENT__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -113,8 +118,10 @@ public class LayerItemProvider extends DocumentedElementItemProvider {
      */
     protected void addLabelPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_IdentifiedElement_label_feature"), getString("_UI_IdentifiedElement_label_description"), DescriptionPackage.Literals.IDENTIFIED_ELEMENT__LABEL, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_IdentifiedElement_label_feature"), //$NON-NLS-1$
+                getString("_UI_IdentifiedElement_label_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.IDENTIFIED_ELEMENT__LABEL, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -125,8 +132,10 @@ public class LayerItemProvider extends DocumentedElementItemProvider {
      */
     protected void addReusedMappingsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_Layer_reusedMappings_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Layer_reusedMappings_feature", "_UI_Layer_type"),
-                org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.LAYER__REUSED_MAPPINGS, true, false, true, null, getString("_UI_ImportPropertyCategory"), null));
+                getString("_UI_Layer_reusedMappings_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_Layer_reusedMappings_feature", "_UI_Layer_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.LAYER__REUSED_MAPPINGS, true, false, true, null, getString("_UI_ImportPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -136,9 +145,9 @@ public class LayerItemProvider extends DocumentedElementItemProvider {
      * @generated
      */
     protected void addAllToolsPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Layer_allTools_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_Layer_allTools_feature", "_UI_Layer_type"), org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.LAYER__ALL_TOOLS,
-                false, false, false, null, null, null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Layer_allTools_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_Layer_allTools_feature", "_UI_Layer_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.LAYER__ALL_TOOLS, false, false, false, null, null, null));
     }
 
     /**
@@ -149,8 +158,10 @@ public class LayerItemProvider extends DocumentedElementItemProvider {
      */
     protected void addReusedToolsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_Layer_reusedTools_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Layer_reusedTools_feature", "_UI_Layer_type"),
-                org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.LAYER__REUSED_TOOLS, true, false, true, null, getString("_UI_ImportPropertyCategory"), null));
+                getString("_UI_Layer_reusedTools_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_Layer_reusedTools_feature", "_UI_Layer_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.LAYER__REUSED_TOOLS, true, false, true, null, getString("_UI_ImportPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -160,9 +171,12 @@ public class LayerItemProvider extends DocumentedElementItemProvider {
      * @generated
      */
     protected void addIconPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Layer_icon_feature"),
-                getString("_UI_Layer_icon_description"), org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.LAYER__ICON, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_AdvancedPropertyCategory"), null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+                getString("_UI_Layer_icon_feature"), //$NON-NLS-1$
+                getString("_UI_Layer_icon_description"), //$NON-NLS-1$
+                org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.LAYER__ICON, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                getString("_UI_AdvancedPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -173,7 +187,8 @@ public class LayerItemProvider extends DocumentedElementItemProvider {
      */
     protected void addAllEdgeMappingsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_Layer_allEdgeMappings_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Layer_allEdgeMappings_feature", "_UI_Layer_type"),
+                getString("_UI_Layer_allEdgeMappings_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_Layer_allEdgeMappings_feature", "_UI_Layer_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.LAYER__ALL_EDGE_MAPPINGS, false, false, false, null, null, null));
     }
 
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/MappingBasedDecorationItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/MappingBasedDecorationItemProvider.java
index 268963d591..5584337738 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/MappingBasedDecorationItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/MappingBasedDecorationItemProvider.java
@@ -66,8 +66,10 @@ public class MappingBasedDecorationItemProvider extends DecorationDescriptionIte
      */
     protected void addMappingsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_MappingBasedDecoration_mappings_feature"), getString("_UI_MappingBasedDecoration_mappings_description"), DescriptionPackage.Literals.MAPPING_BASED_DECORATION__MAPPINGS,
-                true, false, true, null, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_MappingBasedDecoration_mappings_feature"), //$NON-NLS-1$
+                getString("_UI_MappingBasedDecoration_mappings_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.MAPPING_BASED_DECORATION__MAPPINGS, true, false, true, null, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -78,7 +80,7 @@ public class MappingBasedDecorationItemProvider extends DecorationDescriptionIte
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/MappingBasedDecoration"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/MappingBasedDecoration")); //$NON-NLS-1$
     }
 
     /**
@@ -90,7 +92,8 @@ public class MappingBasedDecorationItemProvider extends DecorationDescriptionIte
     @Override
     public String getText(Object object) {
         String label = ((MappingBasedDecoration) object).getName();
-        return label == null || label.length() == 0 ? getString("_UI_MappingBasedDecoration_type") : getString("_UI_MappingBasedDecoration_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_MappingBasedDecoration_type") : //$NON-NLS-1$
+            getString("_UI_MappingBasedDecoration_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/NodeMappingImportItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/NodeMappingImportItemProvider.java
index 828bd9b71a..9f6b0e764a 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/NodeMappingImportItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/NodeMappingImportItemProvider.java
@@ -70,9 +70,10 @@ public class NodeMappingImportItemProvider extends NodeMappingItemProvider {
      */
     protected void addHideSubMappingsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_AbstractMappingImport_hideSubMappings_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_AbstractMappingImport_hideSubMappings_feature", "_UI_AbstractMappingImport_type"),
-                DescriptionPackage.Literals.ABSTRACT_MAPPING_IMPORT__HIDE_SUB_MAPPINGS, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, getString("_UI_ImportPropertyCategory"), null));
+                getString("_UI_AbstractMappingImport_hideSubMappings_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_AbstractMappingImport_hideSubMappings_feature", "_UI_AbstractMappingImport_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DescriptionPackage.Literals.ABSTRACT_MAPPING_IMPORT__HIDE_SUB_MAPPINGS, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, getString("_UI_ImportPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -82,10 +83,13 @@ public class NodeMappingImportItemProvider extends NodeMappingItemProvider {
      * @generated
      */
     protected void addInheritsAncestorFiltersPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_AbstractMappingImport_inheritsAncestorFilters_feature"), getString("_UI_AbstractMappingImport_inheritsAncestorFilters_description"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_AbstractMappingImport_inheritsAncestorFilters_feature"), //$NON-NLS-1$
+                getString("_UI_AbstractMappingImport_inheritsAncestorFilters_description"), //$NON-NLS-1$
                 DescriptionPackage.Literals.ABSTRACT_MAPPING_IMPORT__INHERITS_ANCESTOR_FILTERS, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-                getString("_UI_ImportPropertyCategory"), null));
+                getString("_UI_ImportPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -96,8 +100,10 @@ public class NodeMappingImportItemProvider extends NodeMappingItemProvider {
      */
     protected void addImportedMappingPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_NodeMappingImport_importedMapping_feature"), getString("_UI_NodeMappingImport_importedMapping_description"),
-                org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.NODE_MAPPING_IMPORT__IMPORTED_MAPPING, true, false, true, null, getString("_UI_ImportPropertyCategory"), null));
+                getString("_UI_NodeMappingImport_importedMapping_feature"), //$NON-NLS-1$
+                getString("_UI_NodeMappingImport_importedMapping_description"), //$NON-NLS-1$
+                org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.NODE_MAPPING_IMPORT__IMPORTED_MAPPING, true, false, true, null, getString("_UI_ImportPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -141,7 +147,8 @@ public class NodeMappingImportItemProvider extends NodeMappingItemProvider {
     @Override
     public String getTextGen(Object object) {
         String label = ((NodeMappingImport) object).getName();
-        return label == null || label.length() == 0 ? getString("_UI_NodeMappingImport_type") : getString("_UI_NodeMappingImport_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_NodeMappingImport_type") : //$NON-NLS-1$
+            getString("_UI_NodeMappingImport_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/NodeMappingItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/NodeMappingItemProvider.java
index 1b0cd6e2ba..eb499ad968 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/NodeMappingItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/NodeMappingItemProvider.java
@@ -74,8 +74,10 @@ public class NodeMappingItemProvider extends AbstractNodeMappingItemProvider {
      */
     protected void addDropDescriptionsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DragAndDropTargetDescription_dropDescriptions_feature"), getString("_UI_DragAndDropTargetDescription_dropDescriptions_description"),
-                DescriptionPackage.Literals.DRAG_AND_DROP_TARGET_DESCRIPTION__DROP_DESCRIPTIONS, true, false, true, null, getString("_UI_BehaviorPropertyCategory"), null));
+                getString("_UI_DragAndDropTargetDescription_dropDescriptions_feature"), //$NON-NLS-1$
+                getString("_UI_DragAndDropTargetDescription_dropDescriptions_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.DRAG_AND_DROP_TARGET_DESCRIPTION__DROP_DESCRIPTIONS, true, false, true, null, getString("_UI_BehaviorPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -151,7 +153,8 @@ public class NodeMappingItemProvider extends AbstractNodeMappingItemProvider {
      */
     public String getTextGen(Object object) {
         String label = ((NodeMapping) object).getName();
-        return label == null || label.length() == 0 ? getString("_UI_NodeMapping_type") : getString("_UI_NodeMapping_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_NodeMapping_type") : //$NON-NLS-1$
+            getString("_UI_NodeMapping_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/OrderedTreeLayoutItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/OrderedTreeLayoutItemProvider.java
index aea32adaba..6516f9a944 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/OrderedTreeLayoutItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/OrderedTreeLayoutItemProvider.java
@@ -69,8 +69,10 @@ public class OrderedTreeLayoutItemProvider extends DocumentedElementItemProvider
      */
     protected void addChildrenExpressionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_OrderedTreeLayout_childrenExpression_feature"), getString("_UI_OrderedTreeLayout_childrenExpression_description"),
-                DescriptionPackage.Literals.ORDERED_TREE_LAYOUT__CHILDREN_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_OrderedTreeLayout_childrenExpression_feature"), //$NON-NLS-1$
+                getString("_UI_OrderedTreeLayout_childrenExpression_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.ORDERED_TREE_LAYOUT__CHILDREN_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -81,8 +83,10 @@ public class OrderedTreeLayoutItemProvider extends DocumentedElementItemProvider
      */
     protected void addNodeMappingPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_OrderedTreeLayout_nodeMapping_feature"), getString("_UI_OrderedTreeLayout_nodeMapping_description"), DescriptionPackage.Literals.ORDERED_TREE_LAYOUT__NODE_MAPPING,
-                true, false, true, null, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_OrderedTreeLayout_nodeMapping_feature"), //$NON-NLS-1$
+                getString("_UI_OrderedTreeLayout_nodeMapping_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.ORDERED_TREE_LAYOUT__NODE_MAPPING, true, false, true, null, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -93,7 +97,7 @@ public class OrderedTreeLayoutItemProvider extends DocumentedElementItemProvider
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/OrderedTreeLayout"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/OrderedTreeLayout")); //$NON-NLS-1$
     }
 
     /**
@@ -105,7 +109,8 @@ public class OrderedTreeLayoutItemProvider extends DocumentedElementItemProvider
     @Override
     public String getText(Object object) {
         String label = crop(((OrderedTreeLayout) object).getDocumentation());
-        return label == null || label.length() == 0 ? getString("_UI_OrderedTreeLayout_type") : getString("_UI_OrderedTreeLayout_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_OrderedTreeLayout_type") : //$NON-NLS-1$
+            getString("_UI_OrderedTreeLayout_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/BeginLabelStyleDescriptionItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/BeginLabelStyleDescriptionItemProvider.java
index a4b94c4839..fdf1c94d11 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/BeginLabelStyleDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/BeginLabelStyleDescriptionItemProvider.java
@@ -63,7 +63,7 @@ public class BeginLabelStyleDescriptionItemProvider extends BasicLabelStyleDescr
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/BeginLabelStyleDescription"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/BeginLabelStyleDescription")); //$NON-NLS-1$
     }
 
     /**
@@ -75,7 +75,7 @@ public class BeginLabelStyleDescriptionItemProvider extends BasicLabelStyleDescr
     @Override
     public String getText(Object object) {
         BeginLabelStyleDescription beginLabelStyleDescription = (BeginLabelStyleDescription) object;
-        return getString("_UI_BeginLabelStyleDescription_type") + " " + beginLabelStyleDescription.getLabelSize();
+        return getString("_UI_BeginLabelStyleDescription_type") + " " + beginLabelStyleDescription.getLabelSize(); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/BorderedStyleDescriptionItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/BorderedStyleDescriptionItemProvider.java
index 5ecc7bb77b..cc0f8bb074 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/BorderedStyleDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/BorderedStyleDescriptionItemProvider.java
@@ -75,10 +75,13 @@ IItemPropertySource {
      * @generated
      */
     protected void addBorderSizeComputationExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_BorderedStyleDescription_borderSizeComputationExpression_feature"), getString("_UI_BorderedStyleDescription_borderSizeComputationExpression_description"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_BorderedStyleDescription_borderSizeComputationExpression_feature"), //$NON-NLS-1$
+                getString("_UI_BorderedStyleDescription_borderSizeComputationExpression_description"), //$NON-NLS-1$
                 StylePackage.Literals.BORDERED_STYLE_DESCRIPTION__BORDER_SIZE_COMPUTATION_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_BorderPropertyCategory"), null));
+                getString("_UI_BorderPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -89,9 +92,10 @@ IItemPropertySource {
      */
     protected void addBorderColorPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_BorderedStyleDescription_borderColor_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_BorderedStyleDescription_borderColor_feature", "_UI_BorderedStyleDescription_type"),
-                StylePackage.Literals.BORDERED_STYLE_DESCRIPTION__BORDER_COLOR, true, false, false, null, getString("_UI_ColorPropertyCategory"), null));
+                getString("_UI_BorderedStyleDescription_borderColor_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_BorderedStyleDescription_borderColor_feature", "_UI_BorderedStyleDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                StylePackage.Literals.BORDERED_STYLE_DESCRIPTION__BORDER_COLOR, true, false, false, null, getString("_UI_ColorPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -102,8 +106,10 @@ IItemPropertySource {
      */
     protected void addBorderLineStylePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_BorderedStyleDescription_borderLineStyle_feature"), getString("_UI_BorderedStyleDescription_borderLineStyle_description"),
-                StylePackage.Literals.BORDERED_STYLE_DESCRIPTION__BORDER_LINE_STYLE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_BorderPropertyCategory"), null));
+                getString("_UI_BorderedStyleDescription_borderLineStyle_feature"), //$NON-NLS-1$
+                getString("_UI_BorderedStyleDescription_borderLineStyle_description"), //$NON-NLS-1$
+                StylePackage.Literals.BORDERED_STYLE_DESCRIPTION__BORDER_LINE_STYLE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_BorderPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -114,7 +120,7 @@ IItemPropertySource {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/BorderedStyleDescription"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/BorderedStyleDescription")); //$NON-NLS-1$
     }
 
     /**
@@ -126,7 +132,8 @@ IItemPropertySource {
     @Override
     public String getText(Object object) {
         String label = ((BorderedStyleDescription) object).getBorderSizeComputationExpression();
-        return label == null || label.length() == 0 ? getString("_UI_BorderedStyleDescription_type") : getString("_UI_BorderedStyleDescription_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_BorderedStyleDescription_type") : //$NON-NLS-1$
+            getString("_UI_BorderedStyleDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/BracketEdgeStyleDescriptionItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/BracketEdgeStyleDescriptionItemProvider.java
index 7b16da4b0d..5b08abcd03 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/BracketEdgeStyleDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/BracketEdgeStyleDescriptionItemProvider.java
@@ -61,7 +61,7 @@ public class BracketEdgeStyleDescriptionItemProvider extends EdgeStyleDescriptio
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/BracketEdgeStyleDescription"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/BracketEdgeStyleDescription")); //$NON-NLS-1$
     }
 
     /**
@@ -74,7 +74,8 @@ public class BracketEdgeStyleDescriptionItemProvider extends EdgeStyleDescriptio
     public String getText(Object object) {
         LineStyle labelValue = ((BracketEdgeStyleDescription) object).getLineStyle();
         String label = labelValue == null ? null : labelValue.toString();
-        return label == null || label.length() == 0 ? getString("_UI_BracketEdgeStyleDescription_type") : getString("_UI_BracketEdgeStyleDescription_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_BracketEdgeStyleDescription_type") : //$NON-NLS-1$
+            getString("_UI_BracketEdgeStyleDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/BundledImageDescriptionItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/BundledImageDescriptionItemProvider.java
index 25c50592df..81563522a1 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/BundledImageDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/BundledImageDescriptionItemProvider.java
@@ -67,9 +67,10 @@ public class BundledImageDescriptionItemProvider extends NodeStyleDescriptionIte
      */
     protected void addShapePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_BundledImageDescription_shape_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_BundledImageDescription_shape_feature", "_UI_BundledImageDescription_type"),
-                StylePackage.Literals.BUNDLED_IMAGE_DESCRIPTION__SHAPE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_BundledImageDescription_shape_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_BundledImageDescription_shape_feature", "_UI_BundledImageDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                StylePackage.Literals.BUNDLED_IMAGE_DESCRIPTION__SHAPE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -80,8 +81,10 @@ public class BundledImageDescriptionItemProvider extends NodeStyleDescriptionIte
      */
     protected void addColorPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_BundledImageDescription_color_feature"), getString("_UI_BundledImageDescription_color_description"), StylePackage.Literals.BUNDLED_IMAGE_DESCRIPTION__COLOR, true,
-                false, false, null, getString("_UI_ColorPropertyCategory"), null));
+                getString("_UI_BundledImageDescription_color_feature"), //$NON-NLS-1$
+                getString("_UI_BundledImageDescription_color_description"), //$NON-NLS-1$
+                StylePackage.Literals.BUNDLED_IMAGE_DESCRIPTION__COLOR, true, false, false, null, getString("_UI_ColorPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -92,7 +95,7 @@ public class BundledImageDescriptionItemProvider extends NodeStyleDescriptionIte
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/BundledImageDescription"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/BundledImageDescription")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/CenterLabelStyleDescriptionItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/CenterLabelStyleDescriptionItemProvider.java
index 9e8787c6d4..3cb07acb21 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/CenterLabelStyleDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/CenterLabelStyleDescriptionItemProvider.java
@@ -63,7 +63,7 @@ public class CenterLabelStyleDescriptionItemProvider extends BasicLabelStyleDesc
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/CenterLabelStyleDescription"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/CenterLabelStyleDescription")); //$NON-NLS-1$
     }
 
     /**
@@ -75,7 +75,7 @@ public class CenterLabelStyleDescriptionItemProvider extends BasicLabelStyleDesc
     @Override
     public String getText(Object object) {
         CenterLabelStyleDescription centerLabelStyleDescription = (CenterLabelStyleDescription) object;
-        return getString("_UI_CenterLabelStyleDescription_type") + " " + centerLabelStyleDescription.getLabelSize();
+        return getString("_UI_CenterLabelStyleDescription_type") + " " + centerLabelStyleDescription.getLabelSize(); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/ContainerStyleDescriptionItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/ContainerStyleDescriptionItemProvider.java
index 9ce62b996e..da653c45c0 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/ContainerStyleDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/ContainerStyleDescriptionItemProvider.java
@@ -76,10 +76,13 @@ public class ContainerStyleDescriptionItemProvider extends RoundedCornerStyleDes
      * @generated
      */
     protected void addBorderSizeComputationExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_BorderedStyleDescription_borderSizeComputationExpression_feature"), getString("_UI_BorderedStyleDescription_borderSizeComputationExpression_description"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_BorderedStyleDescription_borderSizeComputationExpression_feature"), //$NON-NLS-1$
+                getString("_UI_BorderedStyleDescription_borderSizeComputationExpression_description"), //$NON-NLS-1$
                 StylePackage.Literals.BORDERED_STYLE_DESCRIPTION__BORDER_SIZE_COMPUTATION_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_BorderPropertyCategory"), null));
+                getString("_UI_BorderPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -90,9 +93,10 @@ public class ContainerStyleDescriptionItemProvider extends RoundedCornerStyleDes
      */
     protected void addBorderColorPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_BorderedStyleDescription_borderColor_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_BorderedStyleDescription_borderColor_feature", "_UI_BorderedStyleDescription_type"),
-                StylePackage.Literals.BORDERED_STYLE_DESCRIPTION__BORDER_COLOR, true, false, false, null, getString("_UI_ColorPropertyCategory"), null));
+                getString("_UI_BorderedStyleDescription_borderColor_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_BorderedStyleDescription_borderColor_feature", "_UI_BorderedStyleDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                StylePackage.Literals.BORDERED_STYLE_DESCRIPTION__BORDER_COLOR, true, false, false, null, getString("_UI_ColorPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -103,8 +107,10 @@ public class ContainerStyleDescriptionItemProvider extends RoundedCornerStyleDes
      */
     protected void addBorderLineStylePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_BorderedStyleDescription_borderLineStyle_feature"), getString("_UI_BorderedStyleDescription_borderLineStyle_description"),
-                StylePackage.Literals.BORDERED_STYLE_DESCRIPTION__BORDER_LINE_STYLE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_BorderPropertyCategory"), null));
+                getString("_UI_BorderedStyleDescription_borderLineStyle_feature"), //$NON-NLS-1$
+                getString("_UI_BorderedStyleDescription_borderLineStyle_description"), //$NON-NLS-1$
+                StylePackage.Literals.BORDERED_STYLE_DESCRIPTION__BORDER_LINE_STYLE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_BorderPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -114,11 +120,13 @@ public class ContainerStyleDescriptionItemProvider extends RoundedCornerStyleDes
      * @generated
      */
     protected void addLabelSizePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_BasicLabelStyleDescription_labelSize_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_BasicLabelStyleDescription_labelSize_feature", "_UI_BasicLabelStyleDescription_type"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_BasicLabelStyleDescription_labelSize_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_BasicLabelStyleDescription_labelSize_feature", "_UI_BasicLabelStyleDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 org.eclipse.sirius.viewpoint.description.style.StylePackage.Literals.BASIC_LABEL_STYLE_DESCRIPTION__LABEL_SIZE, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
-                getString("_UI_LabelPropertyCategory"), null));
+                getString("_UI_LabelPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -128,11 +136,13 @@ public class ContainerStyleDescriptionItemProvider extends RoundedCornerStyleDes
      * @generated
      */
     protected void addLabelFormatPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_BasicLabelStyleDescription_labelFormat_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_BasicLabelStyleDescription_labelFormat_feature", "_UI_BasicLabelStyleDescription_type"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_BasicLabelStyleDescription_labelFormat_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_BasicLabelStyleDescription_labelFormat_feature", "_UI_BasicLabelStyleDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 org.eclipse.sirius.viewpoint.description.style.StylePackage.Literals.BASIC_LABEL_STYLE_DESCRIPTION__LABEL_FORMAT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_LabelPropertyCategory"), null));
+                getString("_UI_LabelPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -142,11 +152,13 @@ public class ContainerStyleDescriptionItemProvider extends RoundedCornerStyleDes
      * @generated
      */
     protected void addShowIconPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_BasicLabelStyleDescription_showIcon_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_BasicLabelStyleDescription_showIcon_feature", "_UI_BasicLabelStyleDescription_type"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_BasicLabelStyleDescription_showIcon_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_BasicLabelStyleDescription_showIcon_feature", "_UI_BasicLabelStyleDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 org.eclipse.sirius.viewpoint.description.style.StylePackage.Literals.BASIC_LABEL_STYLE_DESCRIPTION__SHOW_ICON, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-                getString("_UI_LabelPropertyCategory"), null));
+                getString("_UI_LabelPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -156,11 +168,13 @@ public class ContainerStyleDescriptionItemProvider extends RoundedCornerStyleDes
      * @generated
      */
     protected void addLabelExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_BasicLabelStyleDescription_labelExpression_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_BasicLabelStyleDescription_labelExpression_feature", "_UI_BasicLabelStyleDescription_type"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_BasicLabelStyleDescription_labelExpression_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_BasicLabelStyleDescription_labelExpression_feature", "_UI_BasicLabelStyleDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 org.eclipse.sirius.viewpoint.description.style.StylePackage.Literals.BASIC_LABEL_STYLE_DESCRIPTION__LABEL_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_LabelPropertyCategory"), null));
+                getString("_UI_LabelPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -170,12 +184,11 @@ public class ContainerStyleDescriptionItemProvider extends RoundedCornerStyleDes
      * @generated
      */
     protected void addLabelColorPropertyDescriptor(Object object) {
-        itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_BasicLabelStyleDescription_labelColor_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_BasicLabelStyleDescription_labelColor_feature", "_UI_BasicLabelStyleDescription_type"),
-                org.eclipse.sirius.viewpoint.description.style.StylePackage.Literals.BASIC_LABEL_STYLE_DESCRIPTION__LABEL_COLOR, true, false, true, null,
-                getString("_UI_ColorPropertyCategory"), null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+                getString("_UI_BasicLabelStyleDescription_labelColor_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_BasicLabelStyleDescription_labelColor_feature", "_UI_BasicLabelStyleDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                org.eclipse.sirius.viewpoint.description.style.StylePackage.Literals.BASIC_LABEL_STYLE_DESCRIPTION__LABEL_COLOR, true, false, true, null, getString("_UI_ColorPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -185,10 +198,13 @@ public class ContainerStyleDescriptionItemProvider extends RoundedCornerStyleDes
      * @generated
      */
     protected void addIconPathPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_BasicLabelStyleDescription_iconPath_feature"), getString("_UI_BasicLabelStyleDescription_iconPath_description"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_BasicLabelStyleDescription_iconPath_feature"), //$NON-NLS-1$
+                getString("_UI_BasicLabelStyleDescription_iconPath_description"), //$NON-NLS-1$
                 org.eclipse.sirius.viewpoint.description.style.StylePackage.Literals.BASIC_LABEL_STYLE_DESCRIPTION__ICON_PATH, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_AdvancedPropertyCategory"), null));
+                getString("_UI_AdvancedPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -199,10 +215,13 @@ public class ContainerStyleDescriptionItemProvider extends RoundedCornerStyleDes
      * @generated
      */
     protected void addLabelAlignmentPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_LabelStyleDescription_labelAlignment_feature"), getString("_UI_LabelStyleDescription_labelAlignment_description"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_LabelStyleDescription_labelAlignment_feature"), //$NON-NLS-1$
+                getString("_UI_LabelStyleDescription_labelAlignment_description"), //$NON-NLS-1$
                 org.eclipse.sirius.viewpoint.description.style.StylePackage.Literals.LABEL_STYLE_DESCRIPTION__LABEL_ALIGNMENT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_LabelPropertyCategory"), null));
+                getString("_UI_LabelPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -213,10 +232,13 @@ public class ContainerStyleDescriptionItemProvider extends RoundedCornerStyleDes
      * @generated
      */
     protected void addTooltipExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_TooltipStyleDescription_tooltipExpression_feature"), getString("_UI_TooltipStyleDescription_tooltipExpression_description"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_TooltipStyleDescription_tooltipExpression_feature"), //$NON-NLS-1$
+                getString("_UI_TooltipStyleDescription_tooltipExpression_description"), //$NON-NLS-1$
                 org.eclipse.sirius.viewpoint.description.style.StylePackage.Literals.TOOLTIP_STYLE_DESCRIPTION__TOOLTIP_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -226,10 +248,13 @@ public class ContainerStyleDescriptionItemProvider extends RoundedCornerStyleDes
      * @generated
      */
     protected void addHideLabelByDefaultPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_HideLabelCapabilityStyleDescription_hideLabelByDefault_feature"), getString("_UI_HideLabelCapabilityStyleDescription_hideLabelByDefault_description"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_HideLabelCapabilityStyleDescription_hideLabelByDefault_feature"), //$NON-NLS-1$
+                getString("_UI_HideLabelCapabilityStyleDescription_hideLabelByDefault_description"), //$NON-NLS-1$
                 StylePackage.Literals.HIDE_LABEL_CAPABILITY_STYLE_DESCRIPTION__HIDE_LABEL_BY_DEFAULT, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-                getString("_UI_LabelPropertyCategory"), null));
+                getString("_UI_LabelPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -240,9 +265,10 @@ public class ContainerStyleDescriptionItemProvider extends RoundedCornerStyleDes
      */
     protected void addRoundedCornerPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_ContainerStyleDescription_roundedCorner_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_ContainerStyleDescription_roundedCorner_feature", "_UI_ContainerStyleDescription_type"),
-                StylePackage.Literals.CONTAINER_STYLE_DESCRIPTION__ROUNDED_CORNER, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, getString("_UI_CornerPropertyCategory"), null));
+                getString("_UI_ContainerStyleDescription_roundedCorner_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_ContainerStyleDescription_roundedCorner_feature", "_UI_ContainerStyleDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                StylePackage.Literals.CONTAINER_STYLE_DESCRIPTION__ROUNDED_CORNER, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, getString("_UI_CornerPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -255,7 +281,8 @@ public class ContainerStyleDescriptionItemProvider extends RoundedCornerStyleDes
     public String getText(Object object) {
         Integer labelValue = ((ContainerStyleDescription) object).getArcWidth();
         String label = labelValue == null ? null : labelValue.toString();
-        return label == null || label.length() == 0 ? getString("_UI_ContainerStyleDescription_type") : getString("_UI_ContainerStyleDescription_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_ContainerStyleDescription_type") : //$NON-NLS-1$
+            getString("_UI_ContainerStyleDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/CustomStyleDescriptionItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/CustomStyleDescriptionItemProvider.java
index 0b39bf6440..94967e947b 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/CustomStyleDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/CustomStyleDescriptionItemProvider.java
@@ -65,8 +65,10 @@ public class CustomStyleDescriptionItemProvider extends NodeStyleDescriptionItem
      */
     protected void addIdPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_CustomStyleDescription_id_feature"), getString("_UI_CustomStyleDescription_id_description"), StylePackage.Literals.CUSTOM_STYLE_DESCRIPTION__ID, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_CustomStyleDescription_id_feature"), //$NON-NLS-1$
+                getString("_UI_CustomStyleDescription_id_description"), //$NON-NLS-1$
+                StylePackage.Literals.CUSTOM_STYLE_DESCRIPTION__ID, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -77,7 +79,7 @@ public class CustomStyleDescriptionItemProvider extends NodeStyleDescriptionItem
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/CustomStyleDescription"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/CustomStyleDescription")); //$NON-NLS-1$
     }
 
     /**
@@ -89,7 +91,8 @@ public class CustomStyleDescriptionItemProvider extends NodeStyleDescriptionItem
     @Override
     public String getText(Object object) {
         String label = ((CustomStyleDescription) object).getId();
-        return label == null || label.length() == 0 ? getString("_UI_CustomStyleDescription_type") : getString("_UI_CustomStyleDescription_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_CustomStyleDescription_type") : //$NON-NLS-1$
+            getString("_UI_CustomStyleDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/DotDescriptionItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/DotDescriptionItemProvider.java
index a58e7823a9..8d79863255 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/DotDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/DotDescriptionItemProvider.java
@@ -67,8 +67,10 @@ public class DotDescriptionItemProvider extends NodeStyleDescriptionItemProvider
      */
     protected void addBackgroundColorPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DotDescription_backgroundColor_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DotDescription_backgroundColor_feature", "_UI_DotDescription_type"),
-                StylePackage.Literals.DOT_DESCRIPTION__BACKGROUND_COLOR, true, false, true, null, getString("_UI_ColorPropertyCategory"), null));
+                getString("_UI_DotDescription_backgroundColor_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DotDescription_backgroundColor_feature", "_UI_DotDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                StylePackage.Literals.DOT_DESCRIPTION__BACKGROUND_COLOR, true, false, true, null, getString("_UI_ColorPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -79,9 +81,9 @@ public class DotDescriptionItemProvider extends NodeStyleDescriptionItemProvider
      */
     protected void addStrokeSizeComputationExpressionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DotDescription_strokeSizeComputationExpression_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_DotDescription_strokeSizeComputationExpression_feature", "_UI_DotDescription_type"),
-                StylePackage.Literals.DOT_DESCRIPTION__STROKE_SIZE_COMPUTATION_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_AdvancedPropertyCategory"),
+                getString("_UI_DotDescription_strokeSizeComputationExpression_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DotDescription_strokeSizeComputationExpression_feature", "_UI_DotDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                StylePackage.Literals.DOT_DESCRIPTION__STROKE_SIZE_COMPUTATION_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_AdvancedPropertyCategory"), //$NON-NLS-1$
                 null));
     }
 
@@ -93,7 +95,7 @@ public class DotDescriptionItemProvider extends NodeStyleDescriptionItemProvider
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/DotDescription"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/DotDescription")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/EdgeStyleDescriptionItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/EdgeStyleDescriptionItemProvider.java
index 3dc8b19b87..6aad34fb15 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/EdgeStyleDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/EdgeStyleDescriptionItemProvider.java
@@ -86,9 +86,10 @@ IItemPropertySource {
      */
     protected void addStrokeColorPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_EdgeStyleDescription_strokeColor_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_EdgeStyleDescription_strokeColor_feature", "_UI_EdgeStyleDescription_type"),
-                StylePackage.Literals.EDGE_STYLE_DESCRIPTION__STROKE_COLOR, true, false, false, null, getString("_UI_ColorPropertyCategory"), null));
+                getString("_UI_EdgeStyleDescription_strokeColor_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_EdgeStyleDescription_strokeColor_feature", "_UI_EdgeStyleDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                StylePackage.Literals.EDGE_STYLE_DESCRIPTION__STROKE_COLOR, true, false, false, null, getString("_UI_ColorPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -99,9 +100,10 @@ IItemPropertySource {
      */
     protected void addLineStylePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_EdgeStyleDescription_lineStyle_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_EdgeStyleDescription_lineStyle_feature", "_UI_EdgeStyleDescription_type"),
-                StylePackage.Literals.EDGE_STYLE_DESCRIPTION__LINE_STYLE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_EdgeStyleDescription_lineStyle_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_EdgeStyleDescription_lineStyle_feature", "_UI_EdgeStyleDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                StylePackage.Literals.EDGE_STYLE_DESCRIPTION__LINE_STYLE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -112,9 +114,10 @@ IItemPropertySource {
      */
     protected void addSourceArrowPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_EdgeStyleDescription_sourceArrow_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_EdgeStyleDescription_sourceArrow_feature", "_UI_EdgeStyleDescription_type"),
-                StylePackage.Literals.EDGE_STYLE_DESCRIPTION__SOURCE_ARROW, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_DecoratorsPropertyCategory"), null));
+                getString("_UI_EdgeStyleDescription_sourceArrow_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_EdgeStyleDescription_sourceArrow_feature", "_UI_EdgeStyleDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                StylePackage.Literals.EDGE_STYLE_DESCRIPTION__SOURCE_ARROW, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_DecoratorsPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -125,9 +128,10 @@ IItemPropertySource {
      */
     protected void addTargetArrowPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_EdgeStyleDescription_targetArrow_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_EdgeStyleDescription_targetArrow_feature", "_UI_EdgeStyleDescription_type"),
-                StylePackage.Literals.EDGE_STYLE_DESCRIPTION__TARGET_ARROW, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_DecoratorsPropertyCategory"), null));
+                getString("_UI_EdgeStyleDescription_targetArrow_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_EdgeStyleDescription_targetArrow_feature", "_UI_EdgeStyleDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                StylePackage.Literals.EDGE_STYLE_DESCRIPTION__TARGET_ARROW, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_DecoratorsPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -138,9 +142,9 @@ IItemPropertySource {
      */
     protected void addSizeComputationExpressionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_EdgeStyleDescription_sizeComputationExpression_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_EdgeStyleDescription_sizeComputationExpression_feature", "_UI_EdgeStyleDescription_type"),
-                StylePackage.Literals.EDGE_STYLE_DESCRIPTION__SIZE_COMPUTATION_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_AdvancedPropertyCategory"),
+                getString("_UI_EdgeStyleDescription_sizeComputationExpression_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_EdgeStyleDescription_sizeComputationExpression_feature", "_UI_EdgeStyleDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                StylePackage.Literals.EDGE_STYLE_DESCRIPTION__SIZE_COMPUTATION_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_AdvancedPropertyCategory"), //$NON-NLS-1$
                 null));
     }
 
@@ -152,9 +156,10 @@ IItemPropertySource {
      */
     protected void addRoutingStylePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_EdgeStyleDescription_routingStyle_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_EdgeStyleDescription_routingStyle_feature", "_UI_EdgeStyleDescription_type"),
-                StylePackage.Literals.EDGE_STYLE_DESCRIPTION__ROUTING_STYLE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_EdgeStyleDescription_routingStyle_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_EdgeStyleDescription_routingStyle_feature", "_UI_EdgeStyleDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                StylePackage.Literals.EDGE_STYLE_DESCRIPTION__ROUTING_STYLE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -165,9 +170,10 @@ IItemPropertySource {
      */
     protected void addFoldingStylePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_EdgeStyleDescription_foldingStyle_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_EdgeStyleDescription_foldingStyle_feature", "_UI_EdgeStyleDescription_type"),
-                StylePackage.Literals.EDGE_STYLE_DESCRIPTION__FOLDING_STYLE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_AdvancedPropertyCategory"), null));
+                getString("_UI_EdgeStyleDescription_foldingStyle_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_EdgeStyleDescription_foldingStyle_feature", "_UI_EdgeStyleDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                StylePackage.Literals.EDGE_STYLE_DESCRIPTION__FOLDING_STYLE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_AdvancedPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -178,7 +184,8 @@ IItemPropertySource {
      */
     protected void addEndsCenteringPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_EdgeStyleDescription_endsCentering_feature"), getString("_UI_EdgeStyleDescription_endsCentering_description"),
+                getString("_UI_EdgeStyleDescription_endsCentering_feature"), //$NON-NLS-1$
+                getString("_UI_EdgeStyleDescription_endsCentering_description"), //$NON-NLS-1$
                 StylePackage.Literals.EDGE_STYLE_DESCRIPTION__ENDS_CENTERING, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -190,8 +197,10 @@ IItemPropertySource {
      */
     protected void addCenteredSourceMappingsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_EdgeStyleDescription_centeredSourceMappings_feature"), getString("_UI_EdgeStyleDescription_centeredSourceMappings_description"),
-                StylePackage.Literals.EDGE_STYLE_DESCRIPTION__CENTERED_SOURCE_MAPPINGS, true, false, true, null, getString("_UI_AdvancedPropertyCategory"), null));
+                getString("_UI_EdgeStyleDescription_centeredSourceMappings_feature"), //$NON-NLS-1$
+                getString("_UI_EdgeStyleDescription_centeredSourceMappings_description"), //$NON-NLS-1$
+                StylePackage.Literals.EDGE_STYLE_DESCRIPTION__CENTERED_SOURCE_MAPPINGS, true, false, true, null, getString("_UI_AdvancedPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -202,8 +211,10 @@ IItemPropertySource {
      */
     protected void addCenteredTargetMappingsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_EdgeStyleDescription_centeredTargetMappings_feature"), getString("_UI_EdgeStyleDescription_centeredTargetMappings_description"),
-                StylePackage.Literals.EDGE_STYLE_DESCRIPTION__CENTERED_TARGET_MAPPINGS, true, false, true, null, getString("_UI_AdvancedPropertyCategory"), null));
+                getString("_UI_EdgeStyleDescription_centeredTargetMappings_feature"), //$NON-NLS-1$
+                getString("_UI_EdgeStyleDescription_centeredTargetMappings_description"), //$NON-NLS-1$
+                StylePackage.Literals.EDGE_STYLE_DESCRIPTION__CENTERED_TARGET_MAPPINGS, true, false, true, null, getString("_UI_AdvancedPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -249,7 +260,7 @@ IItemPropertySource {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/EdgeStyleDescription"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/EdgeStyleDescription")); //$NON-NLS-1$
     }
 
     /**
@@ -262,7 +273,8 @@ IItemPropertySource {
     public String getText(Object object) {
         LineStyle labelValue = ((EdgeStyleDescription) object).getLineStyle();
         String label = labelValue == null ? null : labelValue.toString();
-        return label == null || label.length() == 0 ? getString("_UI_EdgeStyleDescription_type") : getString("_UI_EdgeStyleDescription_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_EdgeStyleDescription_type") : //$NON-NLS-1$
+            getString("_UI_EdgeStyleDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/EllipseNodeDescriptionItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/EllipseNodeDescriptionItemProvider.java
index 4e60207c8f..d2d1454402 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/EllipseNodeDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/EllipseNodeDescriptionItemProvider.java
@@ -68,8 +68,10 @@ public class EllipseNodeDescriptionItemProvider extends NodeStyleDescriptionItem
      */
     protected void addColorPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_EllipseNodeDescription_color_feature"), getString("_UI_PropertyDescriptor_description", "_UI_EllipseNodeDescription_color_feature", "_UI_EllipseNodeDescription_type"),
-                StylePackage.Literals.ELLIPSE_NODE_DESCRIPTION__COLOR, true, false, false, null, getString("_UI_ColorPropertyCategory"), null));
+                getString("_UI_EllipseNodeDescription_color_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_EllipseNodeDescription_color_feature", "_UI_EllipseNodeDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                StylePackage.Literals.ELLIPSE_NODE_DESCRIPTION__COLOR, true, false, false, null, getString("_UI_ColorPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -80,8 +82,8 @@ public class EllipseNodeDescriptionItemProvider extends NodeStyleDescriptionItem
      */
     protected void addHorizontalDiameterComputationExpressionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_EllipseNodeDescription_horizontalDiameterComputationExpression_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_EllipseNodeDescription_horizontalDiameterComputationExpression_feature", "_UI_EllipseNodeDescription_type"),
+                getString("_UI_EllipseNodeDescription_horizontalDiameterComputationExpression_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_EllipseNodeDescription_horizontalDiameterComputationExpression_feature", "_UI_EllipseNodeDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 StylePackage.Literals.ELLIPSE_NODE_DESCRIPTION__HORIZONTAL_DIAMETER_COMPUTATION_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -93,8 +95,8 @@ public class EllipseNodeDescriptionItemProvider extends NodeStyleDescriptionItem
      */
     protected void addVerticalDiameterComputationExpressionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_EllipseNodeDescription_verticalDiameterComputationExpression_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_EllipseNodeDescription_verticalDiameterComputationExpression_feature", "_UI_EllipseNodeDescription_type"),
+                getString("_UI_EllipseNodeDescription_verticalDiameterComputationExpression_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_EllipseNodeDescription_verticalDiameterComputationExpression_feature", "_UI_EllipseNodeDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 StylePackage.Literals.ELLIPSE_NODE_DESCRIPTION__VERTICAL_DIAMETER_COMPUTATION_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -106,7 +108,7 @@ public class EllipseNodeDescriptionItemProvider extends NodeStyleDescriptionItem
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/EllipseNodeDescription"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/EllipseNodeDescription")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/EndLabelStyleDescriptionItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/EndLabelStyleDescriptionItemProvider.java
index d48dd5fe69..2c6637ac27 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/EndLabelStyleDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/EndLabelStyleDescriptionItemProvider.java
@@ -63,7 +63,7 @@ public class EndLabelStyleDescriptionItemProvider extends BasicLabelStyleDescrip
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/EndLabelStyleDescription"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/EndLabelStyleDescription")); //$NON-NLS-1$
     }
 
     /**
@@ -75,7 +75,7 @@ public class EndLabelStyleDescriptionItemProvider extends BasicLabelStyleDescrip
     @Override
     public String getText(Object object) {
         EndLabelStyleDescription endLabelStyleDescription = (EndLabelStyleDescription) object;
-        return getString("_UI_EndLabelStyleDescription_type") + " " + endLabelStyleDescription.getLabelSize();
+        return getString("_UI_EndLabelStyleDescription_type") + " " + endLabelStyleDescription.getLabelSize(); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/FlatContainerStyleDescriptionItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/FlatContainerStyleDescriptionItemProvider.java
index 52df709e49..9ba585107f 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/FlatContainerStyleDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/FlatContainerStyleDescriptionItemProvider.java
@@ -74,10 +74,12 @@ public class FlatContainerStyleDescriptionItemProvider extends ContainerStyleDes
         .add(createItemPropertyDescriptor(
                 ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
                 getResourceLocator(),
-                getString("_UI_SizeComputationContainerStyleDescription_widthComputationExpression_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_SizeComputationContainerStyleDescription_widthComputationExpression_feature",
-                        "_UI_SizeComputationContainerStyleDescription_type"), StylePackage.Literals.SIZE_COMPUTATION_CONTAINER_STYLE_DESCRIPTION__WIDTH_COMPUTATION_EXPRESSION, true, false,
-                        false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_AdvancedPropertyCategory"), null));
+                getString("_UI_SizeComputationContainerStyleDescription_widthComputationExpression_feature"), //$NON-NLS-1$
+                getString(
+                        "_UI_PropertyDescriptor_description", "_UI_SizeComputationContainerStyleDescription_widthComputationExpression_feature", "_UI_SizeComputationContainerStyleDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                        StylePackage.Literals.SIZE_COMPUTATION_CONTAINER_STYLE_DESCRIPTION__WIDTH_COMPUTATION_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        getString("_UI_AdvancedPropertyCategory"), //$NON-NLS-1$
+                        null));
     }
 
     /**
@@ -91,10 +93,12 @@ public class FlatContainerStyleDescriptionItemProvider extends ContainerStyleDes
         .add(createItemPropertyDescriptor(
                 ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
                 getResourceLocator(),
-                getString("_UI_SizeComputationContainerStyleDescription_heightComputationExpression_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_SizeComputationContainerStyleDescription_heightComputationExpression_feature",
-                        "_UI_SizeComputationContainerStyleDescription_type"), StylePackage.Literals.SIZE_COMPUTATION_CONTAINER_STYLE_DESCRIPTION__HEIGHT_COMPUTATION_EXPRESSION, true, false,
-                        false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_AdvancedPropertyCategory"), null));
+                getString("_UI_SizeComputationContainerStyleDescription_heightComputationExpression_feature"), //$NON-NLS-1$
+                getString(
+                        "_UI_PropertyDescriptor_description", "_UI_SizeComputationContainerStyleDescription_heightComputationExpression_feature", "_UI_SizeComputationContainerStyleDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                        StylePackage.Literals.SIZE_COMPUTATION_CONTAINER_STYLE_DESCRIPTION__HEIGHT_COMPUTATION_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        getString("_UI_AdvancedPropertyCategory"), //$NON-NLS-1$
+                        null));
     }
 
     /**
@@ -105,9 +109,9 @@ public class FlatContainerStyleDescriptionItemProvider extends ContainerStyleDes
      */
     protected void addBackgroundStylePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_FlatContainerStyleDescription_backgroundStyle_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_FlatContainerStyleDescription_backgroundStyle_feature", "_UI_FlatContainerStyleDescription_type"),
-                StylePackage.Literals.FLAT_CONTAINER_STYLE_DESCRIPTION__BACKGROUND_STYLE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"),
+                getString("_UI_FlatContainerStyleDescription_backgroundStyle_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_FlatContainerStyleDescription_backgroundStyle_feature", "_UI_FlatContainerStyleDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                StylePackage.Literals.FLAT_CONTAINER_STYLE_DESCRIPTION__BACKGROUND_STYLE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
                 null));
     }
 
@@ -119,9 +123,10 @@ public class FlatContainerStyleDescriptionItemProvider extends ContainerStyleDes
      */
     protected void addBackgroundColorPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_FlatContainerStyleDescription_backgroundColor_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_FlatContainerStyleDescription_backgroundColor_feature", "_UI_FlatContainerStyleDescription_type"),
-                StylePackage.Literals.FLAT_CONTAINER_STYLE_DESCRIPTION__BACKGROUND_COLOR, true, false, false, null, getString("_UI_ColorPropertyCategory"), null));
+                getString("_UI_FlatContainerStyleDescription_backgroundColor_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_FlatContainerStyleDescription_backgroundColor_feature", "_UI_FlatContainerStyleDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                StylePackage.Literals.FLAT_CONTAINER_STYLE_DESCRIPTION__BACKGROUND_COLOR, true, false, false, null, getString("_UI_ColorPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -132,9 +137,10 @@ public class FlatContainerStyleDescriptionItemProvider extends ContainerStyleDes
      */
     protected void addForegroundColorPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_FlatContainerStyleDescription_foregroundColor_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_FlatContainerStyleDescription_foregroundColor_feature", "_UI_FlatContainerStyleDescription_type"),
-                StylePackage.Literals.FLAT_CONTAINER_STYLE_DESCRIPTION__FOREGROUND_COLOR, true, false, false, null, getString("_UI_ColorPropertyCategory"), null));
+                getString("_UI_FlatContainerStyleDescription_foregroundColor_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_FlatContainerStyleDescription_foregroundColor_feature", "_UI_FlatContainerStyleDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                StylePackage.Literals.FLAT_CONTAINER_STYLE_DESCRIPTION__FOREGROUND_COLOR, true, false, false, null, getString("_UI_ColorPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -145,9 +151,10 @@ public class FlatContainerStyleDescriptionItemProvider extends ContainerStyleDes
      */
     protected void addLabelBorderStylePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_FlatContainerStyleDescription_labelBorderStyle_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_FlatContainerStyleDescription_labelBorderStyle_feature", "_UI_FlatContainerStyleDescription_type"),
-                StylePackage.Literals.FLAT_CONTAINER_STYLE_DESCRIPTION__LABEL_BORDER_STYLE, true, false, true, null, getString("_UI_LabelPropertyCategory"), null));
+                getString("_UI_FlatContainerStyleDescription_labelBorderStyle_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_FlatContainerStyleDescription_labelBorderStyle_feature", "_UI_FlatContainerStyleDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                StylePackage.Literals.FLAT_CONTAINER_STYLE_DESCRIPTION__LABEL_BORDER_STYLE, true, false, true, null, getString("_UI_LabelPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -158,7 +165,7 @@ public class FlatContainerStyleDescriptionItemProvider extends ContainerStyleDes
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/FlatContainerStyleDescription"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/FlatContainerStyleDescription")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/GaugeCompositeStyleDescriptionItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/GaugeCompositeStyleDescriptionItemProvider.java
index b7b07696d0..3f8d4e7ee2 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/GaugeCompositeStyleDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/GaugeCompositeStyleDescriptionItemProvider.java
@@ -67,8 +67,10 @@ public class GaugeCompositeStyleDescriptionItemProvider extends NodeStyleDescrip
      */
     protected void addAlignmentPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_GaugeCompositeStyleDescription_alignment_feature"), getString("_UI_GaugeCompositeStyleDescription_alignment_description"),
-                StylePackage.Literals.GAUGE_COMPOSITE_STYLE_DESCRIPTION__ALIGNMENT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_AdvancedPropertyCategory"), null));
+                getString("_UI_GaugeCompositeStyleDescription_alignment_feature"), //$NON-NLS-1$
+                getString("_UI_GaugeCompositeStyleDescription_alignment_description"), //$NON-NLS-1$
+                StylePackage.Literals.GAUGE_COMPOSITE_STYLE_DESCRIPTION__ALIGNMENT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_AdvancedPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -112,7 +114,7 @@ public class GaugeCompositeStyleDescriptionItemProvider extends NodeStyleDescrip
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/GaugeCompositeStyleDescription"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/GaugeCompositeStyleDescription")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/GaugeSectionDescriptionItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/GaugeSectionDescriptionItemProvider.java
index 0c52cd2f46..ca477d135f 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/GaugeSectionDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/GaugeSectionDescriptionItemProvider.java
@@ -80,8 +80,8 @@ IItemPropertySource {
      */
     protected void addMinValueExpressionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_GaugeSectionDescription_minValueExpression_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_GaugeSectionDescription_minValueExpression_feature", "_UI_GaugeSectionDescription_type"),
+                getString("_UI_GaugeSectionDescription_minValueExpression_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_GaugeSectionDescription_minValueExpression_feature", "_UI_GaugeSectionDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 StylePackage.Literals.GAUGE_SECTION_DESCRIPTION__MIN_VALUE_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -93,8 +93,8 @@ IItemPropertySource {
      */
     protected void addMaxValueExpressionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_GaugeSectionDescription_maxValueExpression_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_GaugeSectionDescription_maxValueExpression_feature", "_UI_GaugeSectionDescription_type"),
+                getString("_UI_GaugeSectionDescription_maxValueExpression_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_GaugeSectionDescription_maxValueExpression_feature", "_UI_GaugeSectionDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 StylePackage.Literals.GAUGE_SECTION_DESCRIPTION__MAX_VALUE_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -106,8 +106,8 @@ IItemPropertySource {
      */
     protected void addValueExpressionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_GaugeSectionDescription_valueExpression_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_GaugeSectionDescription_valueExpression_feature", "_UI_GaugeSectionDescription_type"),
+                getString("_UI_GaugeSectionDescription_valueExpression_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_GaugeSectionDescription_valueExpression_feature", "_UI_GaugeSectionDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 StylePackage.Literals.GAUGE_SECTION_DESCRIPTION__VALUE_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -119,9 +119,10 @@ IItemPropertySource {
      */
     protected void addBackgroundColorPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_GaugeSectionDescription_backgroundColor_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_GaugeSectionDescription_backgroundColor_feature", "_UI_GaugeSectionDescription_type"),
-                StylePackage.Literals.GAUGE_SECTION_DESCRIPTION__BACKGROUND_COLOR, true, false, true, null, getString("_UI_ColorPropertyCategory"), null));
+                getString("_UI_GaugeSectionDescription_backgroundColor_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_GaugeSectionDescription_backgroundColor_feature", "_UI_GaugeSectionDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                StylePackage.Literals.GAUGE_SECTION_DESCRIPTION__BACKGROUND_COLOR, true, false, true, null, getString("_UI_ColorPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -132,9 +133,10 @@ IItemPropertySource {
      */
     protected void addForegroundColorPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_GaugeSectionDescription_foregroundColor_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_GaugeSectionDescription_foregroundColor_feature", "_UI_GaugeSectionDescription_type"),
-                StylePackage.Literals.GAUGE_SECTION_DESCRIPTION__FOREGROUND_COLOR, true, false, true, null, getString("_UI_ColorPropertyCategory"), null));
+                getString("_UI_GaugeSectionDescription_foregroundColor_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_GaugeSectionDescription_foregroundColor_feature", "_UI_GaugeSectionDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                StylePackage.Literals.GAUGE_SECTION_DESCRIPTION__FOREGROUND_COLOR, true, false, true, null, getString("_UI_ColorPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -145,8 +147,8 @@ IItemPropertySource {
      */
     protected void addLabelPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_GaugeSectionDescription_label_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_GaugeSectionDescription_label_feature", "_UI_GaugeSectionDescription_type"),
+                getString("_UI_GaugeSectionDescription_label_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_GaugeSectionDescription_label_feature", "_UI_GaugeSectionDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 StylePackage.Literals.GAUGE_SECTION_DESCRIPTION__LABEL, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -158,7 +160,7 @@ IItemPropertySource {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/GaugeSectionDescription"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/GaugeSectionDescription")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/LozengeNodeDescriptionItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/LozengeNodeDescriptionItemProvider.java
index c71a7a37aa..56760618ce 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/LozengeNodeDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/LozengeNodeDescriptionItemProvider.java
@@ -68,8 +68,8 @@ public class LozengeNodeDescriptionItemProvider extends NodeStyleDescriptionItem
      */
     protected void addWidthComputationExpressionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_LozengeNodeDescription_widthComputationExpression_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_LozengeNodeDescription_widthComputationExpression_feature", "_UI_LozengeNodeDescription_type"),
+                getString("_UI_LozengeNodeDescription_widthComputationExpression_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_LozengeNodeDescription_widthComputationExpression_feature", "_UI_LozengeNodeDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 StylePackage.Literals.LOZENGE_NODE_DESCRIPTION__WIDTH_COMPUTATION_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -81,8 +81,8 @@ public class LozengeNodeDescriptionItemProvider extends NodeStyleDescriptionItem
      */
     protected void addHeightComputationExpressionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_LozengeNodeDescription_heightComputationExpression_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_LozengeNodeDescription_heightComputationExpression_feature", "_UI_LozengeNodeDescription_type"),
+                getString("_UI_LozengeNodeDescription_heightComputationExpression_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_LozengeNodeDescription_heightComputationExpression_feature", "_UI_LozengeNodeDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 StylePackage.Literals.LOZENGE_NODE_DESCRIPTION__HEIGHT_COMPUTATION_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -94,8 +94,10 @@ public class LozengeNodeDescriptionItemProvider extends NodeStyleDescriptionItem
      */
     protected void addColorPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_LozengeNodeDescription_color_feature"), getString("_UI_PropertyDescriptor_description", "_UI_LozengeNodeDescription_color_feature", "_UI_LozengeNodeDescription_type"),
-                StylePackage.Literals.LOZENGE_NODE_DESCRIPTION__COLOR, true, false, false, null, getString("_UI_ColorPropertyCategory"), null));
+                getString("_UI_LozengeNodeDescription_color_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_LozengeNodeDescription_color_feature", "_UI_LozengeNodeDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                StylePackage.Literals.LOZENGE_NODE_DESCRIPTION__COLOR, true, false, false, null, getString("_UI_ColorPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -106,7 +108,7 @@ public class LozengeNodeDescriptionItemProvider extends NodeStyleDescriptionItem
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/LozengeNodeDescription"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/LozengeNodeDescription")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/NodeStyleDescriptionItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/NodeStyleDescriptionItemProvider.java
index a47e8cbaf0..67393372ac 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/NodeStyleDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/NodeStyleDescriptionItemProvider.java
@@ -87,10 +87,13 @@ IItemPropertySource {
      * @generated
      */
     protected void addBorderSizeComputationExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_BorderedStyleDescription_borderSizeComputationExpression_feature"), getString("_UI_BorderedStyleDescription_borderSizeComputationExpression_description"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_BorderedStyleDescription_borderSizeComputationExpression_feature"), //$NON-NLS-1$
+                getString("_UI_BorderedStyleDescription_borderSizeComputationExpression_description"), //$NON-NLS-1$
                 StylePackage.Literals.BORDERED_STYLE_DESCRIPTION__BORDER_SIZE_COMPUTATION_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_BorderPropertyCategory"), null));
+                getString("_UI_BorderPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -101,9 +104,10 @@ IItemPropertySource {
      */
     protected void addBorderColorPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_BorderedStyleDescription_borderColor_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_BorderedStyleDescription_borderColor_feature", "_UI_BorderedStyleDescription_type"),
-                StylePackage.Literals.BORDERED_STYLE_DESCRIPTION__BORDER_COLOR, true, false, false, null, getString("_UI_ColorPropertyCategory"), null));
+                getString("_UI_BorderedStyleDescription_borderColor_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_BorderedStyleDescription_borderColor_feature", "_UI_BorderedStyleDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                StylePackage.Literals.BORDERED_STYLE_DESCRIPTION__BORDER_COLOR, true, false, false, null, getString("_UI_ColorPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -114,8 +118,10 @@ IItemPropertySource {
      */
     protected void addBorderLineStylePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_BorderedStyleDescription_borderLineStyle_feature"), getString("_UI_BorderedStyleDescription_borderLineStyle_description"),
-                StylePackage.Literals.BORDERED_STYLE_DESCRIPTION__BORDER_LINE_STYLE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_BorderPropertyCategory"), null));
+                getString("_UI_BorderedStyleDescription_borderLineStyle_feature"), //$NON-NLS-1$
+                getString("_UI_BorderedStyleDescription_borderLineStyle_description"), //$NON-NLS-1$
+                StylePackage.Literals.BORDERED_STYLE_DESCRIPTION__BORDER_LINE_STYLE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_BorderPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -125,11 +131,13 @@ IItemPropertySource {
      * @generated
      */
     protected void addLabelSizePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_BasicLabelStyleDescription_labelSize_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_BasicLabelStyleDescription_labelSize_feature", "_UI_BasicLabelStyleDescription_type"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_BasicLabelStyleDescription_labelSize_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_BasicLabelStyleDescription_labelSize_feature", "_UI_BasicLabelStyleDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 org.eclipse.sirius.viewpoint.description.style.StylePackage.Literals.BASIC_LABEL_STYLE_DESCRIPTION__LABEL_SIZE, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
-                getString("_UI_LabelPropertyCategory"), null));
+                getString("_UI_LabelPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -139,11 +147,13 @@ IItemPropertySource {
      * @generated
      */
     protected void addLabelFormatPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_BasicLabelStyleDescription_labelFormat_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_BasicLabelStyleDescription_labelFormat_feature", "_UI_BasicLabelStyleDescription_type"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_BasicLabelStyleDescription_labelFormat_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_BasicLabelStyleDescription_labelFormat_feature", "_UI_BasicLabelStyleDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 org.eclipse.sirius.viewpoint.description.style.StylePackage.Literals.BASIC_LABEL_STYLE_DESCRIPTION__LABEL_FORMAT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_LabelPropertyCategory"), null));
+                getString("_UI_LabelPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -153,11 +163,13 @@ IItemPropertySource {
      * @generated
      */
     protected void addShowIconPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_BasicLabelStyleDescription_showIcon_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_BasicLabelStyleDescription_showIcon_feature", "_UI_BasicLabelStyleDescription_type"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_BasicLabelStyleDescription_showIcon_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_BasicLabelStyleDescription_showIcon_feature", "_UI_BasicLabelStyleDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 org.eclipse.sirius.viewpoint.description.style.StylePackage.Literals.BASIC_LABEL_STYLE_DESCRIPTION__SHOW_ICON, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-                getString("_UI_LabelPropertyCategory"), null));
+                getString("_UI_LabelPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -167,11 +179,13 @@ IItemPropertySource {
      * @generated
      */
     protected void addLabelExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_BasicLabelStyleDescription_labelExpression_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_BasicLabelStyleDescription_labelExpression_feature", "_UI_BasicLabelStyleDescription_type"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_BasicLabelStyleDescription_labelExpression_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_BasicLabelStyleDescription_labelExpression_feature", "_UI_BasicLabelStyleDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 org.eclipse.sirius.viewpoint.description.style.StylePackage.Literals.BASIC_LABEL_STYLE_DESCRIPTION__LABEL_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_LabelPropertyCategory"), null));
+                getString("_UI_LabelPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -181,12 +195,11 @@ IItemPropertySource {
      * @generated
      */
     protected void addLabelColorPropertyDescriptor(Object object) {
-        itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_BasicLabelStyleDescription_labelColor_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_BasicLabelStyleDescription_labelColor_feature", "_UI_BasicLabelStyleDescription_type"),
-                org.eclipse.sirius.viewpoint.description.style.StylePackage.Literals.BASIC_LABEL_STYLE_DESCRIPTION__LABEL_COLOR, true, false, true, null,
-                getString("_UI_ColorPropertyCategory"), null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+                getString("_UI_BasicLabelStyleDescription_labelColor_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_BasicLabelStyleDescription_labelColor_feature", "_UI_BasicLabelStyleDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                org.eclipse.sirius.viewpoint.description.style.StylePackage.Literals.BASIC_LABEL_STYLE_DESCRIPTION__LABEL_COLOR, true, false, true, null, getString("_UI_ColorPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -196,10 +209,13 @@ IItemPropertySource {
      * @generated
      */
     protected void addIconPathPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_BasicLabelStyleDescription_iconPath_feature"), getString("_UI_BasicLabelStyleDescription_iconPath_description"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_BasicLabelStyleDescription_iconPath_feature"), //$NON-NLS-1$
+                getString("_UI_BasicLabelStyleDescription_iconPath_description"), //$NON-NLS-1$
                 org.eclipse.sirius.viewpoint.description.style.StylePackage.Literals.BASIC_LABEL_STYLE_DESCRIPTION__ICON_PATH, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_AdvancedPropertyCategory"), null));
+                getString("_UI_AdvancedPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -210,10 +226,13 @@ IItemPropertySource {
      * @generated
      */
     protected void addLabelAlignmentPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_LabelStyleDescription_labelAlignment_feature"), getString("_UI_LabelStyleDescription_labelAlignment_description"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_LabelStyleDescription_labelAlignment_feature"), //$NON-NLS-1$
+                getString("_UI_LabelStyleDescription_labelAlignment_description"), //$NON-NLS-1$
                 org.eclipse.sirius.viewpoint.description.style.StylePackage.Literals.LABEL_STYLE_DESCRIPTION__LABEL_ALIGNMENT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_LabelPropertyCategory"), null));
+                getString("_UI_LabelPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -224,10 +243,13 @@ IItemPropertySource {
      * @generated
      */
     protected void addTooltipExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_TooltipStyleDescription_tooltipExpression_feature"), getString("_UI_TooltipStyleDescription_tooltipExpression_description"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_TooltipStyleDescription_tooltipExpression_feature"), //$NON-NLS-1$
+                getString("_UI_TooltipStyleDescription_tooltipExpression_description"), //$NON-NLS-1$
                 org.eclipse.sirius.viewpoint.description.style.StylePackage.Literals.TOOLTIP_STYLE_DESCRIPTION__TOOLTIP_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -238,9 +260,9 @@ IItemPropertySource {
      */
     protected void addSizeComputationExpressionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_NodeStyleDescription_sizeComputationExpression_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_NodeStyleDescription_sizeComputationExpression_feature", "_UI_NodeStyleDescription_type"),
-                StylePackage.Literals.NODE_STYLE_DESCRIPTION__SIZE_COMPUTATION_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_AdvancedPropertyCategory"),
+                getString("_UI_NodeStyleDescription_sizeComputationExpression_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_NodeStyleDescription_sizeComputationExpression_feature", "_UI_NodeStyleDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                StylePackage.Literals.NODE_STYLE_DESCRIPTION__SIZE_COMPUTATION_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_AdvancedPropertyCategory"), //$NON-NLS-1$
                 null));
     }
 
@@ -252,8 +274,10 @@ IItemPropertySource {
      */
     protected void addLabelPositionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_NodeStyleDescription_labelPosition_feature"), getString("_UI_NodeStyleDescription_labelPosition_description"),
-                StylePackage.Literals.NODE_STYLE_DESCRIPTION__LABEL_POSITION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_LabelPropertyCategory"), null));
+                getString("_UI_NodeStyleDescription_labelPosition_feature"), //$NON-NLS-1$
+                getString("_UI_NodeStyleDescription_labelPosition_description"), //$NON-NLS-1$
+                StylePackage.Literals.NODE_STYLE_DESCRIPTION__LABEL_POSITION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_LabelPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -263,10 +287,13 @@ IItemPropertySource {
      * @generated
      */
     protected void addHideLabelByDefaultPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_HideLabelCapabilityStyleDescription_hideLabelByDefault_feature"), getString("_UI_HideLabelCapabilityStyleDescription_hideLabelByDefault_description"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_HideLabelCapabilityStyleDescription_hideLabelByDefault_feature"), //$NON-NLS-1$
+                getString("_UI_HideLabelCapabilityStyleDescription_hideLabelByDefault_description"), //$NON-NLS-1$
                 StylePackage.Literals.HIDE_LABEL_CAPABILITY_STYLE_DESCRIPTION__HIDE_LABEL_BY_DEFAULT, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-                getString("_UI_LabelPropertyCategory"), null));
+                getString("_UI_LabelPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -277,8 +304,10 @@ IItemPropertySource {
      */
     protected void addResizeKindPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_NodeStyleDescription_resizeKind_feature"), getString("_UI_NodeStyleDescription_resizeKind_description"), StylePackage.Literals.NODE_STYLE_DESCRIPTION__RESIZE_KIND,
-                true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_AdvancedPropertyCategory"), null));
+                getString("_UI_NodeStyleDescription_resizeKind_feature"), //$NON-NLS-1$
+                getString("_UI_NodeStyleDescription_resizeKind_description"), //$NON-NLS-1$
+                StylePackage.Literals.NODE_STYLE_DESCRIPTION__RESIZE_KIND, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_AdvancedPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/NoteDescriptionItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/NoteDescriptionItemProvider.java
index 87168289f3..223ea5b9ee 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/NoteDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/NoteDescriptionItemProvider.java
@@ -65,8 +65,10 @@ public class NoteDescriptionItemProvider extends NodeStyleDescriptionItemProvide
      */
     protected void addColorPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_NoteDescription_color_feature"), getString("_UI_PropertyDescriptor_description", "_UI_NoteDescription_color_feature", "_UI_NoteDescription_type"),
-                StylePackage.Literals.NOTE_DESCRIPTION__COLOR, true, false, false, null, getString("_UI_ColorPropertyCategory"), null));
+                getString("_UI_NoteDescription_color_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_NoteDescription_color_feature", "_UI_NoteDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                StylePackage.Literals.NOTE_DESCRIPTION__COLOR, true, false, false, null, getString("_UI_ColorPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -77,7 +79,7 @@ public class NoteDescriptionItemProvider extends NodeStyleDescriptionItemProvide
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/NoteDescription"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/NoteDescription")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/RoundedCornerStyleDescriptionItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/RoundedCornerStyleDescriptionItemProvider.java
index 005e26ede7..66f2c5bb3e 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/RoundedCornerStyleDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/RoundedCornerStyleDescriptionItemProvider.java
@@ -75,9 +75,10 @@ IItemPropertySource {
      */
     protected void addArcWidthPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_RoundedCornerStyleDescription_arcWidth_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_RoundedCornerStyleDescription_arcWidth_feature", "_UI_RoundedCornerStyleDescription_type"),
-                StylePackage.Literals.ROUNDED_CORNER_STYLE_DESCRIPTION__ARC_WIDTH, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_CornerPropertyCategory"), null));
+                getString("_UI_RoundedCornerStyleDescription_arcWidth_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_RoundedCornerStyleDescription_arcWidth_feature", "_UI_RoundedCornerStyleDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                StylePackage.Literals.ROUNDED_CORNER_STYLE_DESCRIPTION__ARC_WIDTH, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_CornerPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -88,9 +89,10 @@ IItemPropertySource {
      */
     protected void addArcHeightPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_RoundedCornerStyleDescription_arcHeight_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_RoundedCornerStyleDescription_arcHeight_feature", "_UI_RoundedCornerStyleDescription_type"),
-                StylePackage.Literals.ROUNDED_CORNER_STYLE_DESCRIPTION__ARC_HEIGHT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_CornerPropertyCategory"), null));
+                getString("_UI_RoundedCornerStyleDescription_arcHeight_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_RoundedCornerStyleDescription_arcHeight_feature", "_UI_RoundedCornerStyleDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                StylePackage.Literals.ROUNDED_CORNER_STYLE_DESCRIPTION__ARC_HEIGHT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_CornerPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -103,7 +105,8 @@ IItemPropertySource {
     public String getText(Object object) {
         Integer labelValue = ((RoundedCornerStyleDescription) object).getArcWidth();
         String label = labelValue == null ? null : labelValue.toString();
-        return label == null || label.length() == 0 ? getString("_UI_RoundedCornerStyleDescription_type") : getString("_UI_RoundedCornerStyleDescription_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_RoundedCornerStyleDescription_type") : //$NON-NLS-1$
+            getString("_UI_RoundedCornerStyleDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/ShapeContainerStyleDescriptionItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/ShapeContainerStyleDescriptionItemProvider.java
index ed6cbabed7..37763b6103 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/ShapeContainerStyleDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/ShapeContainerStyleDescriptionItemProvider.java
@@ -72,10 +72,12 @@ public class ShapeContainerStyleDescriptionItemProvider extends ContainerStyleDe
         .add(createItemPropertyDescriptor(
                 ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
                 getResourceLocator(),
-                getString("_UI_SizeComputationContainerStyleDescription_widthComputationExpression_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_SizeComputationContainerStyleDescription_widthComputationExpression_feature",
-                        "_UI_SizeComputationContainerStyleDescription_type"), StylePackage.Literals.SIZE_COMPUTATION_CONTAINER_STYLE_DESCRIPTION__WIDTH_COMPUTATION_EXPRESSION, true, false,
-                        false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_AdvancedPropertyCategory"), null));
+                getString("_UI_SizeComputationContainerStyleDescription_widthComputationExpression_feature"), //$NON-NLS-1$
+                getString(
+                        "_UI_PropertyDescriptor_description", "_UI_SizeComputationContainerStyleDescription_widthComputationExpression_feature", "_UI_SizeComputationContainerStyleDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                        StylePackage.Literals.SIZE_COMPUTATION_CONTAINER_STYLE_DESCRIPTION__WIDTH_COMPUTATION_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        getString("_UI_AdvancedPropertyCategory"), //$NON-NLS-1$
+                        null));
     }
 
     /**
@@ -89,10 +91,12 @@ public class ShapeContainerStyleDescriptionItemProvider extends ContainerStyleDe
         .add(createItemPropertyDescriptor(
                 ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
                 getResourceLocator(),
-                getString("_UI_SizeComputationContainerStyleDescription_heightComputationExpression_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_SizeComputationContainerStyleDescription_heightComputationExpression_feature",
-                        "_UI_SizeComputationContainerStyleDescription_type"), StylePackage.Literals.SIZE_COMPUTATION_CONTAINER_STYLE_DESCRIPTION__HEIGHT_COMPUTATION_EXPRESSION, true, false,
-                        false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_AdvancedPropertyCategory"), null));
+                getString("_UI_SizeComputationContainerStyleDescription_heightComputationExpression_feature"), //$NON-NLS-1$
+                getString(
+                        "_UI_PropertyDescriptor_description", "_UI_SizeComputationContainerStyleDescription_heightComputationExpression_feature", "_UI_SizeComputationContainerStyleDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                        StylePackage.Literals.SIZE_COMPUTATION_CONTAINER_STYLE_DESCRIPTION__HEIGHT_COMPUTATION_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        getString("_UI_AdvancedPropertyCategory"), //$NON-NLS-1$
+                        null));
     }
 
     /**
@@ -103,9 +107,10 @@ public class ShapeContainerStyleDescriptionItemProvider extends ContainerStyleDe
      */
     protected void addShapePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_ShapeContainerStyleDescription_shape_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_ShapeContainerStyleDescription_shape_feature", "_UI_ShapeContainerStyleDescription_type"),
-                StylePackage.Literals.SHAPE_CONTAINER_STYLE_DESCRIPTION__SHAPE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_ShapeContainerStyleDescription_shape_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_ShapeContainerStyleDescription_shape_feature", "_UI_ShapeContainerStyleDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                StylePackage.Literals.SHAPE_CONTAINER_STYLE_DESCRIPTION__SHAPE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -116,9 +121,10 @@ public class ShapeContainerStyleDescriptionItemProvider extends ContainerStyleDe
      */
     protected void addBackgroundColorPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_ShapeContainerStyleDescription_backgroundColor_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_ShapeContainerStyleDescription_backgroundColor_feature", "_UI_ShapeContainerStyleDescription_type"),
-                StylePackage.Literals.SHAPE_CONTAINER_STYLE_DESCRIPTION__BACKGROUND_COLOR, true, false, false, null, getString("_UI_ColorPropertyCategory"), null));
+                getString("_UI_ShapeContainerStyleDescription_backgroundColor_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_ShapeContainerStyleDescription_backgroundColor_feature", "_UI_ShapeContainerStyleDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                StylePackage.Literals.SHAPE_CONTAINER_STYLE_DESCRIPTION__BACKGROUND_COLOR, true, false, false, null, getString("_UI_ColorPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -129,7 +135,7 @@ public class ShapeContainerStyleDescriptionItemProvider extends ContainerStyleDe
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ShapeContainerStyleDescription"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/ShapeContainerStyleDescription")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/SizeComputationContainerStyleDescriptionItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/SizeComputationContainerStyleDescriptionItemProvider.java
index 44a811ec4f..ed8703d31c 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/SizeComputationContainerStyleDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/SizeComputationContainerStyleDescriptionItemProvider.java
@@ -78,10 +78,12 @@ IItemLabelProvider, IItemPropertySource {
         .add(createItemPropertyDescriptor(
                 ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
                 getResourceLocator(),
-                getString("_UI_SizeComputationContainerStyleDescription_widthComputationExpression_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_SizeComputationContainerStyleDescription_widthComputationExpression_feature",
-                        "_UI_SizeComputationContainerStyleDescription_type"), StylePackage.Literals.SIZE_COMPUTATION_CONTAINER_STYLE_DESCRIPTION__WIDTH_COMPUTATION_EXPRESSION, true, false,
-                        false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_AdvancedPropertyCategory"), null));
+                getString("_UI_SizeComputationContainerStyleDescription_widthComputationExpression_feature"), //$NON-NLS-1$
+                getString(
+                        "_UI_PropertyDescriptor_description", "_UI_SizeComputationContainerStyleDescription_widthComputationExpression_feature", "_UI_SizeComputationContainerStyleDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                        StylePackage.Literals.SIZE_COMPUTATION_CONTAINER_STYLE_DESCRIPTION__WIDTH_COMPUTATION_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        getString("_UI_AdvancedPropertyCategory"), //$NON-NLS-1$
+                        null));
     }
 
     /**
@@ -95,10 +97,12 @@ IItemLabelProvider, IItemPropertySource {
         .add(createItemPropertyDescriptor(
                 ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
                 getResourceLocator(),
-                getString("_UI_SizeComputationContainerStyleDescription_heightComputationExpression_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_SizeComputationContainerStyleDescription_heightComputationExpression_feature",
-                        "_UI_SizeComputationContainerStyleDescription_type"), StylePackage.Literals.SIZE_COMPUTATION_CONTAINER_STYLE_DESCRIPTION__HEIGHT_COMPUTATION_EXPRESSION, true, false,
-                        false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_AdvancedPropertyCategory"), null));
+                getString("_UI_SizeComputationContainerStyleDescription_heightComputationExpression_feature"), //$NON-NLS-1$
+                getString(
+                        "_UI_PropertyDescriptor_description", "_UI_SizeComputationContainerStyleDescription_heightComputationExpression_feature", "_UI_SizeComputationContainerStyleDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                        StylePackage.Literals.SIZE_COMPUTATION_CONTAINER_STYLE_DESCRIPTION__HEIGHT_COMPUTATION_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        getString("_UI_AdvancedPropertyCategory"), //$NON-NLS-1$
+                        null));
     }
 
     /**
@@ -110,7 +114,8 @@ IItemLabelProvider, IItemPropertySource {
     @Override
     public String getText(Object object) {
         String label = ((SizeComputationContainerStyleDescription) object).getWidthComputationExpression();
-        return label == null || label.length() == 0 ? getString("_UI_SizeComputationContainerStyleDescription_type") : getString("_UI_SizeComputationContainerStyleDescription_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_SizeComputationContainerStyleDescription_type") : //$NON-NLS-1$
+            getString("_UI_SizeComputationContainerStyleDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/SquareDescriptionItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/SquareDescriptionItemProvider.java
index 60ebd9c281..98b10bef4a 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/SquareDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/SquareDescriptionItemProvider.java
@@ -68,8 +68,10 @@ public class SquareDescriptionItemProvider extends NodeStyleDescriptionItemProvi
      */
     protected void addWidthPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_SquareDescription_width_feature"), getString("_UI_PropertyDescriptor_description", "_UI_SquareDescription_width_feature", "_UI_SquareDescription_type"),
-                StylePackage.Literals.SQUARE_DESCRIPTION__WIDTH, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_AdvancedPropertyCategory"), null));
+                getString("_UI_SquareDescription_width_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_SquareDescription_width_feature", "_UI_SquareDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                StylePackage.Literals.SQUARE_DESCRIPTION__WIDTH, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_AdvancedPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -80,8 +82,10 @@ public class SquareDescriptionItemProvider extends NodeStyleDescriptionItemProvi
      */
     protected void addHeightPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_SquareDescription_height_feature"), getString("_UI_PropertyDescriptor_description", "_UI_SquareDescription_height_feature", "_UI_SquareDescription_type"),
-                StylePackage.Literals.SQUARE_DESCRIPTION__HEIGHT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_AdvancedPropertyCategory"), null));
+                getString("_UI_SquareDescription_height_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_SquareDescription_height_feature", "_UI_SquareDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                StylePackage.Literals.SQUARE_DESCRIPTION__HEIGHT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_AdvancedPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -92,8 +96,10 @@ public class SquareDescriptionItemProvider extends NodeStyleDescriptionItemProvi
      */
     protected void addColorPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_SquareDescription_color_feature"), getString("_UI_PropertyDescriptor_description", "_UI_SquareDescription_color_feature", "_UI_SquareDescription_type"),
-                StylePackage.Literals.SQUARE_DESCRIPTION__COLOR, true, false, false, null, getString("_UI_ColorPropertyCategory"), null));
+                getString("_UI_SquareDescription_color_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_SquareDescription_color_feature", "_UI_SquareDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                StylePackage.Literals.SQUARE_DESCRIPTION__COLOR, true, false, false, null, getString("_UI_ColorPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -104,7 +110,7 @@ public class SquareDescriptionItemProvider extends NodeStyleDescriptionItemProvi
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/SquareDescription"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/SquareDescription")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/WorkspaceImageDescriptionItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/WorkspaceImageDescriptionItemProvider.java
index cb76de9a35..3b8b4a2a48 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/WorkspaceImageDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/WorkspaceImageDescriptionItemProvider.java
@@ -68,9 +68,10 @@ public class WorkspaceImageDescriptionItemProvider extends NodeStyleDescriptionI
      */
     protected void addArcWidthPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_RoundedCornerStyleDescription_arcWidth_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_RoundedCornerStyleDescription_arcWidth_feature", "_UI_RoundedCornerStyleDescription_type"),
-                StylePackage.Literals.ROUNDED_CORNER_STYLE_DESCRIPTION__ARC_WIDTH, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_CornerPropertyCategory"), null));
+                getString("_UI_RoundedCornerStyleDescription_arcWidth_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_RoundedCornerStyleDescription_arcWidth_feature", "_UI_RoundedCornerStyleDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                StylePackage.Literals.ROUNDED_CORNER_STYLE_DESCRIPTION__ARC_WIDTH, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_CornerPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -81,9 +82,10 @@ public class WorkspaceImageDescriptionItemProvider extends NodeStyleDescriptionI
      */
     protected void addArcHeightPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_RoundedCornerStyleDescription_arcHeight_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_RoundedCornerStyleDescription_arcHeight_feature", "_UI_RoundedCornerStyleDescription_type"),
-                StylePackage.Literals.ROUNDED_CORNER_STYLE_DESCRIPTION__ARC_HEIGHT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_CornerPropertyCategory"), null));
+                getString("_UI_RoundedCornerStyleDescription_arcHeight_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_RoundedCornerStyleDescription_arcHeight_feature", "_UI_RoundedCornerStyleDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                StylePackage.Literals.ROUNDED_CORNER_STYLE_DESCRIPTION__ARC_HEIGHT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_CornerPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -94,9 +96,10 @@ public class WorkspaceImageDescriptionItemProvider extends NodeStyleDescriptionI
      */
     protected void addRoundedCornerPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_ContainerStyleDescription_roundedCorner_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_ContainerStyleDescription_roundedCorner_feature", "_UI_ContainerStyleDescription_type"),
-                StylePackage.Literals.CONTAINER_STYLE_DESCRIPTION__ROUNDED_CORNER, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, getString("_UI_CornerPropertyCategory"), null));
+                getString("_UI_ContainerStyleDescription_roundedCorner_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_ContainerStyleDescription_roundedCorner_feature", "_UI_ContainerStyleDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                StylePackage.Literals.CONTAINER_STYLE_DESCRIPTION__ROUNDED_CORNER, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, getString("_UI_CornerPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -107,8 +110,10 @@ public class WorkspaceImageDescriptionItemProvider extends NodeStyleDescriptionI
      */
     protected void addWorkspacePathPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_WorkspaceImageDescription_workspacePath_feature"), getString("_UI_WorkspaceImageDescription_workspacePath_description"),
-                StylePackage.Literals.WORKSPACE_IMAGE_DESCRIPTION__WORKSPACE_PATH, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_WorkspaceImageDescription_workspacePath_feature"), //$NON-NLS-1$
+                getString("_UI_WorkspaceImageDescription_workspacePath_description"), //$NON-NLS-1$
+                StylePackage.Literals.WORKSPACE_IMAGE_DESCRIPTION__WORKSPACE_PATH, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -119,7 +124,7 @@ public class WorkspaceImageDescriptionItemProvider extends NodeStyleDescriptionI
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/WorkspaceImageDescription"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/WorkspaceImageDescription")); //$NON-NLS-1$
     }
 
     /**
@@ -131,7 +136,8 @@ public class WorkspaceImageDescriptionItemProvider extends NodeStyleDescriptionI
     @Override
     public String getText(Object object) {
         String label = ((WorkspaceImageDescription) object).getWorkspacePath();
-        return label == null || label.length() == 0 ? getString("_UI_WorkspaceImageDescription_type") : getString("_UI_WorkspaceImageDescription_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_WorkspaceImageDescription_type") : //$NON-NLS-1$
+            getString("_UI_WorkspaceImageDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/BehaviorToolItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/BehaviorToolItemProvider.java
index 9d7140cfd9..0d706a1f90 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/BehaviorToolItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/BehaviorToolItemProvider.java
@@ -72,8 +72,10 @@ public class BehaviorToolItemProvider extends AbstractToolDescriptionItemProvide
      */
     protected void addDomainClassPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_BehaviorTool_domainClass_feature"), getString("_UI_BehaviorTool_domainClass_description"), ToolPackage.Literals.BEHAVIOR_TOOL__DOMAIN_CLASS, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_BehaviorTool_domainClass_feature"), //$NON-NLS-1$
+                getString("_UI_BehaviorTool_domainClass_description"), //$NON-NLS-1$
+                ToolPackage.Literals.BEHAVIOR_TOOL__DOMAIN_CLASS, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -117,7 +119,7 @@ public class BehaviorToolItemProvider extends AbstractToolDescriptionItemProvide
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/BehaviorTool"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/BehaviorTool")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/ContainerCreationDescriptionItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/ContainerCreationDescriptionItemProvider.java
index e8786571bd..a85f6c9f87 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/ContainerCreationDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/ContainerCreationDescriptionItemProvider.java
@@ -74,8 +74,10 @@ public class ContainerCreationDescriptionItemProvider extends MappingBasedToolDe
      */
     protected void addContainerMappingsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_ContainerCreationDescription_containerMappings_feature"), getString("_UI_ContainerCreationDescription_containerMappings_description"),
-                ToolPackage.Literals.CONTAINER_CREATION_DESCRIPTION__CONTAINER_MAPPINGS, true, false, true, null, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_ContainerCreationDescription_containerMappings_feature"), //$NON-NLS-1$
+                getString("_UI_ContainerCreationDescription_containerMappings_description"), //$NON-NLS-1$
+                ToolPackage.Literals.CONTAINER_CREATION_DESCRIPTION__CONTAINER_MAPPINGS, true, false, true, null, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -86,8 +88,10 @@ public class ContainerCreationDescriptionItemProvider extends MappingBasedToolDe
      */
     protected void addIconPathPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_ContainerCreationDescription_iconPath_feature"), getString("_UI_ContainerCreationDescription_iconPath_description"),
-                ToolPackage.Literals.CONTAINER_CREATION_DESCRIPTION__ICON_PATH, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_AdvancedPropertyCategory"), null));
+                getString("_UI_ContainerCreationDescription_iconPath_feature"), //$NON-NLS-1$
+                getString("_UI_ContainerCreationDescription_iconPath_description"), //$NON-NLS-1$
+                ToolPackage.Literals.CONTAINER_CREATION_DESCRIPTION__ICON_PATH, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_AdvancedPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -98,8 +102,10 @@ public class ContainerCreationDescriptionItemProvider extends MappingBasedToolDe
      */
     protected void addExtraMappingsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_ContainerCreationDescription_extraMappings_feature"), getString("_UI_ContainerCreationDescription_extraMappings_description"),
-                ToolPackage.Literals.CONTAINER_CREATION_DESCRIPTION__EXTRA_MAPPINGS, true, false, true, null, getString("_UI_AdvancedPropertyCategory"), null));
+                getString("_UI_ContainerCreationDescription_extraMappings_feature"), //$NON-NLS-1$
+                getString("_UI_ContainerCreationDescription_extraMappings_description"), //$NON-NLS-1$
+                ToolPackage.Literals.CONTAINER_CREATION_DESCRIPTION__EXTRA_MAPPINGS, true, false, true, null, getString("_UI_AdvancedPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -145,7 +151,7 @@ public class ContainerCreationDescriptionItemProvider extends MappingBasedToolDe
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ContainerCreationDescription"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/ContainerCreationDescription")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/ContainerDropDescriptionItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/ContainerDropDescriptionItemProvider.java
index c72e28ebcf..2cdbf2cbda 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/ContainerDropDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/ContainerDropDescriptionItemProvider.java
@@ -74,8 +74,10 @@ public class ContainerDropDescriptionItemProvider extends MappingBasedToolDescri
      */
     protected void addMappingsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_ContainerDropDescription_mappings_feature"), getString("_UI_ContainerDropDescription_mappings_description"), ToolPackage.Literals.CONTAINER_DROP_DESCRIPTION__MAPPINGS,
-                true, false, true, null, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_ContainerDropDescription_mappings_feature"), //$NON-NLS-1$
+                getString("_UI_ContainerDropDescription_mappings_description"), //$NON-NLS-1$
+                ToolPackage.Literals.CONTAINER_DROP_DESCRIPTION__MAPPINGS, true, false, true, null, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -86,8 +88,10 @@ public class ContainerDropDescriptionItemProvider extends MappingBasedToolDescri
      */
     protected void addDragSourcePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_ContainerDropDescription_dragSource_feature"), getString("_UI_ContainerDropDescription_dragSource_description"),
-                ToolPackage.Literals.CONTAINER_DROP_DESCRIPTION__DRAG_SOURCE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_ContainerDropDescription_dragSource_feature"), //$NON-NLS-1$
+                getString("_UI_ContainerDropDescription_dragSource_description"), //$NON-NLS-1$
+                ToolPackage.Literals.CONTAINER_DROP_DESCRIPTION__DRAG_SOURCE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -98,8 +102,10 @@ public class ContainerDropDescriptionItemProvider extends MappingBasedToolDescri
      */
     protected void addMoveEdgesPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_ContainerDropDescription_moveEdges_feature"), getString("_UI_ContainerDropDescription_moveEdges_description"),
-                ToolPackage.Literals.CONTAINER_DROP_DESCRIPTION__MOVE_EDGES, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, getString("_UI_AdvancedPropertyCategory"), null));
+                getString("_UI_ContainerDropDescription_moveEdges_feature"), //$NON-NLS-1$
+                getString("_UI_ContainerDropDescription_moveEdges_description"), //$NON-NLS-1$
+                ToolPackage.Literals.CONTAINER_DROP_DESCRIPTION__MOVE_EDGES, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, getString("_UI_AdvancedPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -147,7 +153,7 @@ public class ContainerDropDescriptionItemProvider extends MappingBasedToolDescri
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ContainerDropDescription"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/ContainerDropDescription")); //$NON-NLS-1$
     }
 
     /**
@@ -227,7 +233,8 @@ public class ContainerDropDescriptionItemProvider extends MappingBasedToolDescri
         boolean qualify = childFeature == ToolPackage.Literals.CONTAINER_DROP_DESCRIPTION__OLD_CONTAINER || childFeature == ToolPackage.Literals.CONTAINER_DROP_DESCRIPTION__NEW_CONTAINER;
 
         if (qualify) {
-            return getString("_UI_CreateChild_text2", new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+            return getString("_UI_CreateChild_text2", //$NON-NLS-1$
+                    new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
         }
         return super.getCreateChildText(owner, feature, child, selection);
     }
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/CreateEdgeViewItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/CreateEdgeViewItemProvider.java
index 8817bbff4d..e91a6fac4a 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/CreateEdgeViewItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/CreateEdgeViewItemProvider.java
@@ -66,8 +66,10 @@ public class CreateEdgeViewItemProvider extends CreateViewItemProvider {
      */
     protected void addSourceExpressionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_CreateEdgeView_sourceExpression_feature"), getString("_UI_CreateEdgeView_sourceExpression_description"), ToolPackage.Literals.CREATE_EDGE_VIEW__SOURCE_EXPRESSION, true,
-                false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_CreateEdgeView_sourceExpression_feature"), //$NON-NLS-1$
+                getString("_UI_CreateEdgeView_sourceExpression_description"), //$NON-NLS-1$
+                ToolPackage.Literals.CREATE_EDGE_VIEW__SOURCE_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -78,8 +80,10 @@ public class CreateEdgeViewItemProvider extends CreateViewItemProvider {
      */
     protected void addTargetExpressionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_CreateEdgeView_targetExpression_feature"), getString("_UI_CreateEdgeView_targetExpression_description"), ToolPackage.Literals.CREATE_EDGE_VIEW__TARGET_EXPRESSION, true,
-                false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_CreateEdgeView_targetExpression_feature"), //$NON-NLS-1$
+                getString("_UI_CreateEdgeView_targetExpression_description"), //$NON-NLS-1$
+                ToolPackage.Literals.CREATE_EDGE_VIEW__TARGET_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -90,7 +94,7 @@ public class CreateEdgeViewItemProvider extends CreateViewItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/CreateEdgeView"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/CreateEdgeView")); //$NON-NLS-1$
     }
 
     /**
@@ -102,7 +106,8 @@ public class CreateEdgeViewItemProvider extends CreateViewItemProvider {
     @Override
     public String getText(Object object) {
         String label = ((CreateEdgeView) object).getVariableName();
-        return label == null || label.length() == 0 ? getString("_UI_CreateEdgeView_type") : getString("_UI_CreateEdgeView_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_CreateEdgeView_type") : //$NON-NLS-1$
+            getString("_UI_CreateEdgeView_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/CreateViewItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/CreateViewItemProvider.java
index 087c151f72..c72af44205 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/CreateViewItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/CreateViewItemProvider.java
@@ -71,8 +71,10 @@ public class CreateViewItemProvider extends ContainerModelOperationItemProvider
      */
     protected void addMappingPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_CreateView_mapping_feature"), getString("_UI_CreateView_mapping_description"), ToolPackage.Literals.CREATE_VIEW__MAPPING, true, false, true, null,
-                getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_CreateView_mapping_feature"), //$NON-NLS-1$
+                getString("_UI_CreateView_mapping_description"), //$NON-NLS-1$
+                ToolPackage.Literals.CREATE_VIEW__MAPPING, true, false, true, null, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -83,8 +85,10 @@ public class CreateViewItemProvider extends ContainerModelOperationItemProvider
      */
     protected void addContainerViewExpressionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_CreateView_containerViewExpression_feature"), getString("_UI_CreateView_containerViewExpression_description"),
-                ToolPackage.Literals.CREATE_VIEW__CONTAINER_VIEW_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_CreateView_containerViewExpression_feature"), //$NON-NLS-1$
+                getString("_UI_CreateView_containerViewExpression_description"), //$NON-NLS-1$
+                ToolPackage.Literals.CREATE_VIEW__CONTAINER_VIEW_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -95,8 +99,10 @@ public class CreateViewItemProvider extends ContainerModelOperationItemProvider
      */
     protected void addVariableNamePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_CreateView_variableName_feature"), getString("_UI_CreateView_variableName_description"), ToolPackage.Literals.CREATE_VIEW__VARIABLE_NAME, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_CreateView_variableName_feature"), //$NON-NLS-1$
+                getString("_UI_CreateView_variableName_description"), //$NON-NLS-1$
+                ToolPackage.Literals.CREATE_VIEW__VARIABLE_NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -107,7 +113,7 @@ public class CreateViewItemProvider extends ContainerModelOperationItemProvider
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/CreateView"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/CreateView")); //$NON-NLS-1$
     }
 
     /**
@@ -119,7 +125,8 @@ public class CreateViewItemProvider extends ContainerModelOperationItemProvider
     @Override
     public String getText(Object object) {
         String label = ((CreateView) object).getVariableName();
-        return label == null || label.length() == 0 ? getString("_UI_CreateView_type") : getString("_UI_CreateView_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_CreateView_type") : //$NON-NLS-1$
+            getString("_UI_CreateView_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/DeleteElementDescriptionItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/DeleteElementDescriptionItemProvider.java
index 624ea22759..6b4c8d11c3 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/DeleteElementDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/DeleteElementDescriptionItemProvider.java
@@ -106,7 +106,7 @@ public class DeleteElementDescriptionItemProvider extends MappingBasedToolDescri
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/DeleteElementDescription"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/DeleteElementDescription")); //$NON-NLS-1$
     }
 
     /**
@@ -182,7 +182,8 @@ public class DeleteElementDescriptionItemProvider extends MappingBasedToolDescri
         boolean qualify = childFeature == ToolPackage.Literals.DELETE_ELEMENT_DESCRIPTION__ELEMENT || childFeature == ToolPackage.Literals.DELETE_ELEMENT_DESCRIPTION__ELEMENT_VIEW;
 
         if (qualify) {
-            return getString("_UI_CreateChild_text2", new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+            return getString("_UI_CreateChild_text2", //$NON-NLS-1$
+                    new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
         }
         return super.getCreateChildText(owner, feature, child, selection);
     }
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/DeleteHookItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/DeleteHookItemProvider.java
index ec8292fcab..4282bbad97 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/DeleteHookItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/DeleteHookItemProvider.java
@@ -75,9 +75,10 @@ IItemPropertySource {
      * @generated
      */
     protected void addIdPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DeleteHook_id_feature"),
-                getString("_UI_DeleteHook_id_description"), ToolPackage.Literals.DELETE_HOOK__ID, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_GeneralPropertyCategory"), null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DeleteHook_id_feature"), //$NON-NLS-1$
+                getString("_UI_DeleteHook_id_description"), //$NON-NLS-1$
+                ToolPackage.Literals.DELETE_HOOK__ID, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -121,7 +122,7 @@ IItemPropertySource {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/DeleteHook"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/DeleteHook")); //$NON-NLS-1$
     }
 
     /**
@@ -133,7 +134,8 @@ IItemPropertySource {
     @Override
     public String getText(Object object) {
         String label = ((DeleteHook) object).getId();
-        return label == null || label.length() == 0 ? getString("_UI_DeleteHook_type") : getString("_UI_DeleteHook_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_DeleteHook_type") : //$NON-NLS-1$
+            getString("_UI_DeleteHook_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/DeleteHookParameterItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/DeleteHookParameterItemProvider.java
index f3edf9e328..f381a46725 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/DeleteHookParameterItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/DeleteHookParameterItemProvider.java
@@ -75,7 +75,8 @@ IItemPropertySource {
      */
     protected void addNamePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DeleteHookParameter_name_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DeleteHookParameter_name_feature", "_UI_DeleteHookParameter_type"),
+                getString("_UI_DeleteHookParameter_name_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DeleteHookParameter_name_feature", "_UI_DeleteHookParameter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 ToolPackage.Literals.DELETE_HOOK_PARAMETER__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -87,7 +88,8 @@ IItemPropertySource {
      */
     protected void addValuePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DeleteHookParameter_value_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DeleteHookParameter_value_feature", "_UI_DeleteHookParameter_type"),
+                getString("_UI_DeleteHookParameter_value_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DeleteHookParameter_value_feature", "_UI_DeleteHookParameter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 ToolPackage.Literals.DELETE_HOOK_PARAMETER__VALUE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -99,7 +101,7 @@ IItemPropertySource {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/DeleteHookParameter"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/DeleteHookParameter")); //$NON-NLS-1$
     }
 
     /**
@@ -111,7 +113,8 @@ IItemPropertySource {
     @Override
     public String getText(Object object) {
         String label = ((DeleteHookParameter) object).getName();
-        return label == null || label.length() == 0 ? getString("_UI_DeleteHookParameter_type") : getString("_UI_DeleteHookParameter_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_DeleteHookParameter_type") : //$NON-NLS-1$
+            getString("_UI_DeleteHookParameter_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/DiagramCreationDescriptionItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/DiagramCreationDescriptionItemProvider.java
index 24e1167039..eeea88019f 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/DiagramCreationDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/DiagramCreationDescriptionItemProvider.java
@@ -68,9 +68,10 @@ public class DiagramCreationDescriptionItemProvider extends RepresentationCreati
      */
     protected void addDiagramDescriptionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DiagramCreationDescription_diagramDescription_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_DiagramCreationDescription_diagramDescription_feature", "_UI_DiagramCreationDescription_type"),
-                ToolPackage.Literals.DIAGRAM_CREATION_DESCRIPTION__DIAGRAM_DESCRIPTION, true, false, true, null, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_DiagramCreationDescription_diagramDescription_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DiagramCreationDescription_diagramDescription_feature", "_UI_DiagramCreationDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                ToolPackage.Literals.DIAGRAM_CREATION_DESCRIPTION__DIAGRAM_DESCRIPTION, true, false, true, null, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -81,7 +82,7 @@ public class DiagramCreationDescriptionItemProvider extends RepresentationCreati
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/DiagramCreationDescription"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/DiagramCreationDescription")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/DiagramNavigationDescriptionItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/DiagramNavigationDescriptionItemProvider.java
index 1d80e252f0..bf5f20b6d5 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/DiagramNavigationDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/DiagramNavigationDescriptionItemProvider.java
@@ -68,9 +68,10 @@ public class DiagramNavigationDescriptionItemProvider extends RepresentationNavi
      */
     protected void addDiagramDescriptionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DiagramNavigationDescription_diagramDescription_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_DiagramNavigationDescription_diagramDescription_feature", "_UI_DiagramNavigationDescription_type"),
-                ToolPackage.Literals.DIAGRAM_NAVIGATION_DESCRIPTION__DIAGRAM_DESCRIPTION, true, false, true, null, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_DiagramNavigationDescription_diagramDescription_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DiagramNavigationDescription_diagramDescription_feature", "_UI_DiagramNavigationDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                ToolPackage.Literals.DIAGRAM_NAVIGATION_DESCRIPTION__DIAGRAM_DESCRIPTION, true, false, true, null, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -81,7 +82,7 @@ public class DiagramNavigationDescriptionItemProvider extends RepresentationNavi
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/DiagramNavigationDescription"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/DiagramNavigationDescription")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/DirectEditLabelItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/DirectEditLabelItemProvider.java
index ad57f41097..95edf53ee3 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/DirectEditLabelItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/DirectEditLabelItemProvider.java
@@ -72,8 +72,8 @@ public class DirectEditLabelItemProvider extends MappingBasedToolDescriptionItem
      */
     protected void addInputLabelExpressionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DirectEditLabel_inputLabelExpression_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_DirectEditLabel_inputLabelExpression_feature", "_UI_DirectEditLabel_type"),
+                getString("_UI_DirectEditLabel_inputLabelExpression_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DirectEditLabel_inputLabelExpression_feature", "_UI_DirectEditLabel_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 ToolPackage.Literals.DIRECT_EDIT_LABEL__INPUT_LABEL_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -119,7 +119,7 @@ public class DirectEditLabelItemProvider extends MappingBasedToolDescriptionItem
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/DirectEditLabel"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/DirectEditLabel")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/DoubleClickDescriptionItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/DoubleClickDescriptionItemProvider.java
index 88c1819713..682788fb2a 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/DoubleClickDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/DoubleClickDescriptionItemProvider.java
@@ -71,8 +71,8 @@ public class DoubleClickDescriptionItemProvider extends MappingBasedToolDescript
      */
     protected void addMappingsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DoubleClickDescription_mappings_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_DoubleClickDescription_mappings_feature", "_UI_DoubleClickDescription_type"),
+                getString("_UI_DoubleClickDescription_mappings_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DoubleClickDescription_mappings_feature", "_UI_DoubleClickDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 ToolPackage.Literals.DOUBLE_CLICK_DESCRIPTION__MAPPINGS, true, false, true, null, null, null));
     }
 
@@ -119,7 +119,7 @@ public class DoubleClickDescriptionItemProvider extends MappingBasedToolDescript
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/DoubleClickDescription"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/DoubleClickDescription")); //$NON-NLS-1$
     }
 
     /**
@@ -190,7 +190,8 @@ public class DoubleClickDescriptionItemProvider extends MappingBasedToolDescript
         boolean qualify = childFeature == ToolPackage.Literals.DOUBLE_CLICK_DESCRIPTION__ELEMENT || childFeature == ToolPackage.Literals.DOUBLE_CLICK_DESCRIPTION__ELEMENT_VIEW;
 
         if (qualify) {
-            return getString("_UI_CreateChild_text2", new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+            return getString("_UI_CreateChild_text2", //$NON-NLS-1$
+                    new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
         }
         return super.getCreateChildText(owner, feature, child, selection);
     }
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/EdgeCreationDescriptionItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/EdgeCreationDescriptionItemProvider.java
index 86b04c2c5b..a86ec34b34 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/EdgeCreationDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/EdgeCreationDescriptionItemProvider.java
@@ -76,8 +76,10 @@ public class EdgeCreationDescriptionItemProvider extends MappingBasedToolDescrip
      */
     protected void addEdgeMappingsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_EdgeCreationDescription_edgeMappings_feature"), getString("_UI_EdgeCreationDescription_edgeMappings_description"),
-                ToolPackage.Literals.EDGE_CREATION_DESCRIPTION__EDGE_MAPPINGS, true, false, true, null, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_EdgeCreationDescription_edgeMappings_feature"), //$NON-NLS-1$
+                getString("_UI_EdgeCreationDescription_edgeMappings_description"), //$NON-NLS-1$
+                ToolPackage.Literals.EDGE_CREATION_DESCRIPTION__EDGE_MAPPINGS, true, false, true, null, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -88,8 +90,10 @@ public class EdgeCreationDescriptionItemProvider extends MappingBasedToolDescrip
      */
     protected void addIconPathPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_EdgeCreationDescription_iconPath_feature"), getString("_UI_EdgeCreationDescription_iconPath_description"), ToolPackage.Literals.EDGE_CREATION_DESCRIPTION__ICON_PATH,
-                true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_AdvancedPropertyCategory"), null));
+                getString("_UI_EdgeCreationDescription_iconPath_feature"), //$NON-NLS-1$
+                getString("_UI_EdgeCreationDescription_iconPath_description"), //$NON-NLS-1$
+                ToolPackage.Literals.EDGE_CREATION_DESCRIPTION__ICON_PATH, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_AdvancedPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -100,8 +104,10 @@ public class EdgeCreationDescriptionItemProvider extends MappingBasedToolDescrip
      */
     protected void addExtraSourceMappingsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_EdgeCreationDescription_extraSourceMappings_feature"), getString("_UI_EdgeCreationDescription_extraSourceMappings_description"),
-                ToolPackage.Literals.EDGE_CREATION_DESCRIPTION__EXTRA_SOURCE_MAPPINGS, true, false, true, null, getString("_UI_AdvancedPropertyCategory"), null));
+                getString("_UI_EdgeCreationDescription_extraSourceMappings_feature"), //$NON-NLS-1$
+                getString("_UI_EdgeCreationDescription_extraSourceMappings_description"), //$NON-NLS-1$
+                ToolPackage.Literals.EDGE_CREATION_DESCRIPTION__EXTRA_SOURCE_MAPPINGS, true, false, true, null, getString("_UI_AdvancedPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -112,9 +118,10 @@ public class EdgeCreationDescriptionItemProvider extends MappingBasedToolDescrip
      */
     protected void addExtraTargetMappingsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_EdgeCreationDescription_extraTargetMappings_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_EdgeCreationDescription_extraTargetMappings_feature", "_UI_EdgeCreationDescription_type"),
-                ToolPackage.Literals.EDGE_CREATION_DESCRIPTION__EXTRA_TARGET_MAPPINGS, true, false, true, null, getString("_UI_AdvancedPropertyCategory"), null));
+                getString("_UI_EdgeCreationDescription_extraTargetMappings_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_EdgeCreationDescription_extraTargetMappings_feature", "_UI_EdgeCreationDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                ToolPackage.Literals.EDGE_CREATION_DESCRIPTION__EXTRA_TARGET_MAPPINGS, true, false, true, null, getString("_UI_AdvancedPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -124,11 +131,13 @@ public class EdgeCreationDescriptionItemProvider extends MappingBasedToolDescrip
      * @generated
      */
     protected void addConnectionStartPreconditionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_EdgeCreationDescription_connectionStartPrecondition_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_EdgeCreationDescription_connectionStartPrecondition_feature", "_UI_EdgeCreationDescription_type"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_EdgeCreationDescription_connectionStartPrecondition_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_EdgeCreationDescription_connectionStartPrecondition_feature", "_UI_EdgeCreationDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 ToolPackage.Literals.EDGE_CREATION_DESCRIPTION__CONNECTION_START_PRECONDITION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -191,7 +200,7 @@ public class EdgeCreationDescriptionItemProvider extends MappingBasedToolDescrip
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/EdgeCreationDescription"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/EdgeCreationDescription")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/ElementDoubleClickVariableItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/ElementDoubleClickVariableItemProvider.java
index 8ed903b621..c36b8089e5 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/ElementDoubleClickVariableItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/ElementDoubleClickVariableItemProvider.java
@@ -100,7 +100,7 @@ public class ElementDoubleClickVariableItemProvider extends AbstractVariableItem
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ElementDoubleClickVariable"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/ElementDoubleClickVariable")); //$NON-NLS-1$
     }
 
     /**
@@ -112,7 +112,8 @@ public class ElementDoubleClickVariableItemProvider extends AbstractVariableItem
     @Override
     public String getText(Object object) {
         String label = ((ElementDoubleClickVariable) object).getName();
-        return label == null || label.length() == 0 ? getString("_UI_ElementDoubleClickVariable_type") : getString("_UI_ElementDoubleClickVariable_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_ElementDoubleClickVariable_type") : //$NON-NLS-1$
+            getString("_UI_ElementDoubleClickVariable_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/NavigationItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/NavigationItemProvider.java
index 850b91fe11..cff7422aa5 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/NavigationItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/NavigationItemProvider.java
@@ -70,8 +70,10 @@ public class NavigationItemProvider extends ContainerModelOperationItemProvider
      */
     protected void addCreateIfNotExistentPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_Navigation_createIfNotExistent_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Navigation_createIfNotExistent_feature", "_UI_Navigation_type"),
-                ToolPackage.Literals.NAVIGATION__CREATE_IF_NOT_EXISTENT, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_Navigation_createIfNotExistent_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_Navigation_createIfNotExistent_feature", "_UI_Navigation_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                ToolPackage.Literals.NAVIGATION__CREATE_IF_NOT_EXISTENT, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -82,8 +84,10 @@ public class NavigationItemProvider extends ContainerModelOperationItemProvider
      */
     protected void addDiagramDescriptionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_Navigation_diagramDescription_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Navigation_diagramDescription_feature", "_UI_Navigation_type"),
-                ToolPackage.Literals.NAVIGATION__DIAGRAM_DESCRIPTION, true, false, true, null, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_Navigation_diagramDescription_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_Navigation_diagramDescription_feature", "_UI_Navigation_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                ToolPackage.Literals.NAVIGATION__DIAGRAM_DESCRIPTION, true, false, true, null, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -94,7 +98,7 @@ public class NavigationItemProvider extends ContainerModelOperationItemProvider
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/Navigation"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/Navigation")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/NodeCreationDescriptionItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/NodeCreationDescriptionItemProvider.java
index 7b4cb7b041..627ca3f6a0 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/NodeCreationDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/NodeCreationDescriptionItemProvider.java
@@ -74,8 +74,10 @@ public class NodeCreationDescriptionItemProvider extends MappingBasedToolDescrip
      */
     protected void addNodeMappingsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_NodeCreationDescription_nodeMappings_feature"), getString("_UI_NodeCreationDescription_nodeMappings_description"),
-                ToolPackage.Literals.NODE_CREATION_DESCRIPTION__NODE_MAPPINGS, true, false, true, null, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_NodeCreationDescription_nodeMappings_feature"), //$NON-NLS-1$
+                getString("_UI_NodeCreationDescription_nodeMappings_description"), //$NON-NLS-1$
+                ToolPackage.Literals.NODE_CREATION_DESCRIPTION__NODE_MAPPINGS, true, false, true, null, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -86,8 +88,10 @@ public class NodeCreationDescriptionItemProvider extends MappingBasedToolDescrip
      */
     protected void addIconPathPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_NodeCreationDescription_iconPath_feature"), getString("_UI_NodeCreationDescription_iconPath_description"), ToolPackage.Literals.NODE_CREATION_DESCRIPTION__ICON_PATH,
-                true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_AdvancedPropertyCategory"), null));
+                getString("_UI_NodeCreationDescription_iconPath_feature"), //$NON-NLS-1$
+                getString("_UI_NodeCreationDescription_iconPath_description"), //$NON-NLS-1$
+                ToolPackage.Literals.NODE_CREATION_DESCRIPTION__ICON_PATH, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_AdvancedPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -98,8 +102,10 @@ public class NodeCreationDescriptionItemProvider extends MappingBasedToolDescrip
      */
     protected void addExtraMappingsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_NodeCreationDescription_extraMappings_feature"), getString("_UI_NodeCreationDescription_extraMappings_description"),
-                ToolPackage.Literals.NODE_CREATION_DESCRIPTION__EXTRA_MAPPINGS, true, false, true, null, getString("_UI_AdvancedPropertyCategory"), null));
+                getString("_UI_NodeCreationDescription_extraMappings_feature"), //$NON-NLS-1$
+                getString("_UI_NodeCreationDescription_extraMappings_description"), //$NON-NLS-1$
+                ToolPackage.Literals.NODE_CREATION_DESCRIPTION__EXTRA_MAPPINGS, true, false, true, null, getString("_UI_AdvancedPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -145,7 +151,7 @@ public class NodeCreationDescriptionItemProvider extends MappingBasedToolDescrip
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/NodeCreationDescription"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/NodeCreationDescription")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/NodeCreationVariableItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/NodeCreationVariableItemProvider.java
index 5d56af64e4..56c8668484 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/NodeCreationVariableItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/NodeCreationVariableItemProvider.java
@@ -100,7 +100,7 @@ public class NodeCreationVariableItemProvider extends AbstractVariableItemProvid
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/NodeCreationVariable"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/NodeCreationVariable")); //$NON-NLS-1$
     }
 
     /**
@@ -112,7 +112,8 @@ public class NodeCreationVariableItemProvider extends AbstractVariableItemProvid
     @Override
     public String getText(Object object) {
         String label = ((NodeCreationVariable) object).getName();
-        return label == null || label.length() == 0 ? getString("_UI_NodeCreationVariable_type") : getString("_UI_NodeCreationVariable_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_NodeCreationVariable_type") : //$NON-NLS-1$
+            getString("_UI_NodeCreationVariable_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/ReconnectEdgeDescriptionItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/ReconnectEdgeDescriptionItemProvider.java
index 1b7eb35d07..a7aa525345 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/ReconnectEdgeDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/ReconnectEdgeDescriptionItemProvider.java
@@ -72,9 +72,10 @@ public class ReconnectEdgeDescriptionItemProvider extends MappingBasedToolDescri
      */
     protected void addReconnectionKindPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_ReconnectEdgeDescription_reconnectionKind_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_ReconnectEdgeDescription_reconnectionKind_feature", "_UI_ReconnectEdgeDescription_type"),
-                ToolPackage.Literals.RECONNECT_EDGE_DESCRIPTION__RECONNECTION_KIND, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_ReconnectEdgeDescription_reconnectionKind_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_ReconnectEdgeDescription_reconnectionKind_feature", "_UI_ReconnectEdgeDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                ToolPackage.Literals.RECONNECT_EDGE_DESCRIPTION__RECONNECTION_KIND, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -124,7 +125,7 @@ public class ReconnectEdgeDescriptionItemProvider extends MappingBasedToolDescri
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ReconnectEdgeDescription"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/ReconnectEdgeDescription")); //$NON-NLS-1$
     }
 
     /**
@@ -212,7 +213,8 @@ public class ReconnectEdgeDescriptionItemProvider extends MappingBasedToolDescri
         boolean qualify = childFeature == ToolPackage.Literals.RECONNECT_EDGE_DESCRIPTION__ELEMENT || childFeature == ToolPackage.Literals.RECONNECT_EDGE_DESCRIPTION__EDGE_VIEW;
 
         if (qualify) {
-            return getString("_UI_CreateChild_text2", new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+            return getString("_UI_CreateChild_text2", //$NON-NLS-1$
+                    new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
         }
         return super.getCreateChildText(owner, feature, child, selection);
     }
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/RequestDescriptionItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/RequestDescriptionItemProvider.java
index 261407f30d..eba10fa781 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/RequestDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/RequestDescriptionItemProvider.java
@@ -69,8 +69,10 @@ public class RequestDescriptionItemProvider extends AbstractToolDescriptionItemP
      */
     protected void addTypePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_RequestDescription_type_feature"), getString("_UI_RequestDescription_type_description"), ToolPackage.Literals.REQUEST_DESCRIPTION__TYPE, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_RequestDescription_type_feature"), //$NON-NLS-1$
+                getString("_UI_RequestDescription_type_description"), //$NON-NLS-1$
+                ToolPackage.Literals.REQUEST_DESCRIPTION__TYPE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -81,7 +83,7 @@ public class RequestDescriptionItemProvider extends AbstractToolDescriptionItemP
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/RequestDescription"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/RequestDescription")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/SourceEdgeCreationVariableItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/SourceEdgeCreationVariableItemProvider.java
index 179ceadb99..0ad5dd3a50 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/SourceEdgeCreationVariableItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/SourceEdgeCreationVariableItemProvider.java
@@ -100,7 +100,7 @@ public class SourceEdgeCreationVariableItemProvider extends AbstractVariableItem
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/SourceEdgeCreationVariable"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/SourceEdgeCreationVariable")); //$NON-NLS-1$
     }
 
     /**
@@ -112,7 +112,8 @@ public class SourceEdgeCreationVariableItemProvider extends AbstractVariableItem
     @Override
     public String getText(Object object) {
         String label = ((SourceEdgeCreationVariable) object).getName();
-        return label == null || label.length() == 0 ? getString("_UI_SourceEdgeCreationVariable_type") : getString("_UI_SourceEdgeCreationVariable_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_SourceEdgeCreationVariable_type") : //$NON-NLS-1$
+            getString("_UI_SourceEdgeCreationVariable_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/SourceEdgeViewCreationVariableItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/SourceEdgeViewCreationVariableItemProvider.java
index 5dfb6cf97b..9132ecb46b 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/SourceEdgeViewCreationVariableItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/SourceEdgeViewCreationVariableItemProvider.java
@@ -100,7 +100,7 @@ public class SourceEdgeViewCreationVariableItemProvider extends AbstractVariable
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/SourceEdgeViewCreationVariable"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/SourceEdgeViewCreationVariable")); //$NON-NLS-1$
     }
 
     /**
@@ -112,7 +112,8 @@ public class SourceEdgeViewCreationVariableItemProvider extends AbstractVariable
     @Override
     public String getText(Object object) {
         String label = ((SourceEdgeViewCreationVariable) object).getName();
-        return label == null || label.length() == 0 ? getString("_UI_SourceEdgeViewCreationVariable_type") : getString("_UI_SourceEdgeViewCreationVariable_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_SourceEdgeViewCreationVariable_type") : //$NON-NLS-1$
+            getString("_UI_SourceEdgeViewCreationVariable_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/TargetEdgeCreationVariableItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/TargetEdgeCreationVariableItemProvider.java
index 94f02b6f3a..f0cca9fabf 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/TargetEdgeCreationVariableItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/TargetEdgeCreationVariableItemProvider.java
@@ -100,7 +100,7 @@ public class TargetEdgeCreationVariableItemProvider extends AbstractVariableItem
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/TargetEdgeCreationVariable"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/TargetEdgeCreationVariable")); //$NON-NLS-1$
     }
 
     /**
@@ -112,7 +112,8 @@ public class TargetEdgeCreationVariableItemProvider extends AbstractVariableItem
     @Override
     public String getText(Object object) {
         String label = ((TargetEdgeCreationVariable) object).getName();
-        return label == null || label.length() == 0 ? getString("_UI_TargetEdgeCreationVariable_type") : getString("_UI_TargetEdgeCreationVariable_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_TargetEdgeCreationVariable_type") : //$NON-NLS-1$
+            getString("_UI_TargetEdgeCreationVariable_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/TargetEdgeViewCreationVariableItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/TargetEdgeViewCreationVariableItemProvider.java
index d434a8e5ab..76f5c79dfd 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/TargetEdgeViewCreationVariableItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/TargetEdgeViewCreationVariableItemProvider.java
@@ -100,7 +100,7 @@ public class TargetEdgeViewCreationVariableItemProvider extends AbstractVariable
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/TargetEdgeViewCreationVariable"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/TargetEdgeViewCreationVariable")); //$NON-NLS-1$
     }
 
     /**
@@ -112,7 +112,8 @@ public class TargetEdgeViewCreationVariableItemProvider extends AbstractVariable
     @Override
     public String getText(Object object) {
         String label = ((TargetEdgeViewCreationVariable) object).getName();
-        return label == null || label.length() == 0 ? getString("_UI_TargetEdgeViewCreationVariable_type") : getString("_UI_TargetEdgeViewCreationVariable_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_TargetEdgeViewCreationVariable_type") : //$NON-NLS-1$
+            getString("_UI_TargetEdgeViewCreationVariable_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/ToolGroupExtensionItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/ToolGroupExtensionItemProvider.java
index fdfcc9d4f1..f66d8c4faf 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/ToolGroupExtensionItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/ToolGroupExtensionItemProvider.java
@@ -75,7 +75,8 @@ IItemPropertySource {
      */
     protected void addGroupPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_ToolGroupExtension_group_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ToolGroupExtension_group_feature", "_UI_ToolGroupExtension_type"),
+                getString("_UI_ToolGroupExtension_group_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_ToolGroupExtension_group_feature", "_UI_ToolGroupExtension_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 ToolPackage.Literals.TOOL_GROUP_EXTENSION__GROUP, true, false, true, null, null, null));
     }
 
@@ -120,7 +121,7 @@ IItemPropertySource {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ToolGroupExtension"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/ToolGroupExtension")); //$NON-NLS-1$
     }
 
     /**
@@ -131,7 +132,7 @@ IItemPropertySource {
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_ToolGroupExtension_type");
+        return getString("_UI_ToolGroupExtension_type"); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/ToolGroupItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/ToolGroupItemProvider.java
index 438950db9b..0667c5afa5 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/ToolGroupItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/ToolGroupItemProvider.java
@@ -78,8 +78,10 @@ public class ToolGroupItemProvider extends DocumentedElementItemProvider {
      */
     protected void addNamePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_IdentifiedElement_name_feature"), getString("_UI_IdentifiedElement_name_description"), DescriptionPackage.Literals.IDENTIFIED_ELEMENT__NAME, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_IdentifiedElement_name_feature"), //$NON-NLS-1$
+                getString("_UI_IdentifiedElement_name_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.IDENTIFIED_ELEMENT__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -90,8 +92,10 @@ public class ToolGroupItemProvider extends DocumentedElementItemProvider {
      */
     protected void addLabelPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_IdentifiedElement_label_feature"), getString("_UI_IdentifiedElement_label_description"), DescriptionPackage.Literals.IDENTIFIED_ELEMENT__LABEL, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_IdentifiedElement_label_feature"), //$NON-NLS-1$
+                getString("_UI_IdentifiedElement_label_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.IDENTIFIED_ELEMENT__LABEL, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -134,7 +138,7 @@ public class ToolGroupItemProvider extends DocumentedElementItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ToolGroup"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/ToolGroup")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/ToolSectionItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/ToolSectionItemProvider.java
index cec8b20e33..108a86d94e 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/ToolSectionItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/ToolSectionItemProvider.java
@@ -82,8 +82,10 @@ public class ToolSectionItemProvider extends DocumentedElementItemProvider {
      */
     protected void addNamePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_IdentifiedElement_name_feature"), getString("_UI_IdentifiedElement_name_description"), DescriptionPackage.Literals.IDENTIFIED_ELEMENT__NAME, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_IdentifiedElement_name_feature"), //$NON-NLS-1$
+                getString("_UI_IdentifiedElement_name_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.IDENTIFIED_ELEMENT__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -94,8 +96,10 @@ public class ToolSectionItemProvider extends DocumentedElementItemProvider {
      */
     protected void addLabelPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_IdentifiedElement_label_feature"), getString("_UI_IdentifiedElement_label_description"), DescriptionPackage.Literals.IDENTIFIED_ELEMENT__LABEL, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_IdentifiedElement_label_feature"), //$NON-NLS-1$
+                getString("_UI_IdentifiedElement_label_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.IDENTIFIED_ELEMENT__LABEL, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -105,9 +109,10 @@ public class ToolSectionItemProvider extends DocumentedElementItemProvider {
      * @generated
      */
     protected void addIconPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ToolSection_icon_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_ToolSection_icon_feature", "_UI_ToolSection_type"), ToolPackage.Literals.TOOL_SECTION__ICON, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ToolSection_icon_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_ToolSection_icon_feature", "_UI_ToolSection_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                ToolPackage.Literals.TOOL_SECTION__ICON, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -118,7 +123,8 @@ public class ToolSectionItemProvider extends DocumentedElementItemProvider {
      */
     protected void addPopupMenusPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_ToolSection_popupMenus_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ToolSection_popupMenus_feature", "_UI_ToolSection_type"),
+                getString("_UI_ToolSection_popupMenus_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_ToolSection_popupMenus_feature", "_UI_ToolSection_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 ToolPackage.Literals.TOOL_SECTION__POPUP_MENUS, false, false, false, null, null, null));
     }
 
@@ -130,8 +136,10 @@ public class ToolSectionItemProvider extends DocumentedElementItemProvider {
      */
     protected void addReusedToolsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_ToolSection_reusedTools_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ToolSection_reusedTools_feature", "_UI_ToolSection_type"),
-                ToolPackage.Literals.TOOL_SECTION__REUSED_TOOLS, true, false, true, null, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_ToolSection_reusedTools_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_ToolSection_reusedTools_feature", "_UI_ToolSection_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                ToolPackage.Literals.TOOL_SECTION__REUSED_TOOLS, true, false, true, null, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -177,7 +185,7 @@ public class ToolSectionItemProvider extends DocumentedElementItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ToolSection"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/ToolSection")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/AbsoluteBoundsFilterItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/AbsoluteBoundsFilterItemProvider.java
index 35689ae666..77ada64a2e 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/AbsoluteBoundsFilterItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/AbsoluteBoundsFilterItemProvider.java
@@ -77,7 +77,8 @@ IItemPropertySource {
      */
     protected void addXPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_AbsoluteBoundsFilter_x_feature"), getString("_UI_PropertyDescriptor_description", "_UI_AbsoluteBoundsFilter_x_feature", "_UI_AbsoluteBoundsFilter_type"),
+                getString("_UI_AbsoluteBoundsFilter_x_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_AbsoluteBoundsFilter_x_feature", "_UI_AbsoluteBoundsFilter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DiagramPackage.Literals.ABSOLUTE_BOUNDS_FILTER__X, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -89,7 +90,8 @@ IItemPropertySource {
      */
     protected void addYPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_AbsoluteBoundsFilter_y_feature"), getString("_UI_PropertyDescriptor_description", "_UI_AbsoluteBoundsFilter_y_feature", "_UI_AbsoluteBoundsFilter_type"),
+                getString("_UI_AbsoluteBoundsFilter_y_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_AbsoluteBoundsFilter_y_feature", "_UI_AbsoluteBoundsFilter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DiagramPackage.Literals.ABSOLUTE_BOUNDS_FILTER__Y, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -101,7 +103,8 @@ IItemPropertySource {
      */
     protected void addHeightPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_AbsoluteBoundsFilter_height_feature"), getString("_UI_PropertyDescriptor_description", "_UI_AbsoluteBoundsFilter_height_feature", "_UI_AbsoluteBoundsFilter_type"),
+                getString("_UI_AbsoluteBoundsFilter_height_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_AbsoluteBoundsFilter_height_feature", "_UI_AbsoluteBoundsFilter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DiagramPackage.Literals.ABSOLUTE_BOUNDS_FILTER__HEIGHT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -113,7 +116,8 @@ IItemPropertySource {
      */
     protected void addWidthPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_AbsoluteBoundsFilter_width_feature"), getString("_UI_PropertyDescriptor_description", "_UI_AbsoluteBoundsFilter_width_feature", "_UI_AbsoluteBoundsFilter_type"),
+                getString("_UI_AbsoluteBoundsFilter_width_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_AbsoluteBoundsFilter_width_feature", "_UI_AbsoluteBoundsFilter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DiagramPackage.Literals.ABSOLUTE_BOUNDS_FILTER__WIDTH, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -125,7 +129,7 @@ IItemPropertySource {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/AbsoluteBoundsFilter"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/AbsoluteBoundsFilter")); //$NON-NLS-1$
     }
 
     /**
@@ -138,7 +142,8 @@ IItemPropertySource {
     public String getText(Object object) {
         Integer labelValue = ((AbsoluteBoundsFilter) object).getX();
         String label = labelValue == null ? null : labelValue.toString();
-        return label == null || label.length() == 0 ? getString("_UI_AbsoluteBoundsFilter_type") : getString("_UI_AbsoluteBoundsFilter_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_AbsoluteBoundsFilter_type") : //$NON-NLS-1$
+            getString("_UI_AbsoluteBoundsFilter_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/AppliedCompositeFiltersItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/AppliedCompositeFiltersItemProvider.java
index 3e011eb20d..a3d58b92e4 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/AppliedCompositeFiltersItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/AppliedCompositeFiltersItemProvider.java
@@ -71,8 +71,8 @@ IItemPropertySource {
      */
     protected void addCompositeFilterDescriptionsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_AppliedCompositeFilters_compositeFilterDescriptions_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_AppliedCompositeFilters_compositeFilterDescriptions_feature", "_UI_AppliedCompositeFilters_type"),
+                getString("_UI_AppliedCompositeFilters_compositeFilterDescriptions_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_AppliedCompositeFilters_compositeFilterDescriptions_feature", "_UI_AppliedCompositeFilters_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DiagramPackage.Literals.APPLIED_COMPOSITE_FILTERS__COMPOSITE_FILTER_DESCRIPTIONS, true, false, true, null, null, null));
     }
 
@@ -84,7 +84,7 @@ IItemPropertySource {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/AppliedCompositeFilters"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/AppliedCompositeFilters")); //$NON-NLS-1$
     }
 
     /**
@@ -95,7 +95,7 @@ IItemPropertySource {
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_AppliedCompositeFilters_type");
+        return getString("_UI_AppliedCompositeFilters_type"); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/BeginLabelStyleItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/BeginLabelStyleItemProvider.java
index a7ecb768ad..387702cbb7 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/BeginLabelStyleItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/BeginLabelStyleItemProvider.java
@@ -63,7 +63,7 @@ public class BeginLabelStyleItemProvider extends BasicLabelStyleItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/BeginLabelStyle"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/BeginLabelStyle")); //$NON-NLS-1$
     }
 
     /**
@@ -75,7 +75,7 @@ public class BeginLabelStyleItemProvider extends BasicLabelStyleItemProvider {
     @Override
     public String getText(Object object) {
         BeginLabelStyle beginLabelStyle = (BeginLabelStyle) object;
-        return getString("_UI_BeginLabelStyle_type") + " " + beginLabelStyle.getLabelSize();
+        return getString("_UI_BeginLabelStyle_type") + " " + beginLabelStyle.getLabelSize(); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/BorderedStyleItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/BorderedStyleItemProvider.java
index 5ca2c57515..7be79dcdb3 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/BorderedStyleItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/BorderedStyleItemProvider.java
@@ -70,8 +70,10 @@ public class BorderedStyleItemProvider extends StyleItemProvider {
      */
     protected void addBorderSizePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_BorderedStyle_borderSize_feature"), getString("_UI_PropertyDescriptor_description", "_UI_BorderedStyle_borderSize_feature", "_UI_BorderedStyle_type"),
-                DiagramPackage.Literals.BORDERED_STYLE__BORDER_SIZE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_BorderPropertyCategory"), null));
+                getString("_UI_BorderedStyle_borderSize_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_BorderedStyle_borderSize_feature", "_UI_BorderedStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DiagramPackage.Literals.BORDERED_STYLE__BORDER_SIZE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_BorderPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -82,8 +84,10 @@ public class BorderedStyleItemProvider extends StyleItemProvider {
      */
     protected void addBorderColorPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_BorderedStyle_borderColor_feature"), getString("_UI_PropertyDescriptor_description", "_UI_BorderedStyle_borderColor_feature", "_UI_BorderedStyle_type"),
-                DiagramPackage.Literals.BORDERED_STYLE__BORDER_COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_BorderPropertyCategory"), null));
+                getString("_UI_BorderedStyle_borderColor_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_BorderedStyle_borderColor_feature", "_UI_BorderedStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DiagramPackage.Literals.BORDERED_STYLE__BORDER_COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_BorderPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -94,8 +98,10 @@ public class BorderedStyleItemProvider extends StyleItemProvider {
      */
     protected void addBorderLineStylePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_BorderedStyle_borderLineStyle_feature"), getString("_UI_PropertyDescriptor_description", "_UI_BorderedStyle_borderLineStyle_feature", "_UI_BorderedStyle_type"),
-                DiagramPackage.Literals.BORDERED_STYLE__BORDER_LINE_STYLE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_BorderPropertyCategory"), null));
+                getString("_UI_BorderedStyle_borderLineStyle_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_BorderedStyle_borderLineStyle_feature", "_UI_BorderedStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DiagramPackage.Literals.BORDERED_STYLE__BORDER_LINE_STYLE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_BorderPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -106,7 +112,7 @@ public class BorderedStyleItemProvider extends StyleItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/BorderedStyle"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/BorderedStyle")); //$NON-NLS-1$
     }
 
     /**
@@ -119,7 +125,8 @@ public class BorderedStyleItemProvider extends StyleItemProvider {
     public String getText(Object object) {
         Integer labelValue = ((BorderedStyle) object).getBorderSize();
         String label = labelValue == null ? null : labelValue.toString();
-        return label == null || label.length() == 0 ? getString("_UI_BorderedStyle_type") : getString("_UI_BorderedStyle_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_BorderedStyle_type") : //$NON-NLS-1$
+            getString("_UI_BorderedStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/BracketEdgeStyleItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/BracketEdgeStyleItemProvider.java
index 991d9f9f0c..bf0b7348ec 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/BracketEdgeStyleItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/BracketEdgeStyleItemProvider.java
@@ -61,7 +61,7 @@ public class BracketEdgeStyleItemProvider extends EdgeStyleItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/BracketEdgeStyle"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/BracketEdgeStyle")); //$NON-NLS-1$
     }
 
     /**
@@ -74,7 +74,8 @@ public class BracketEdgeStyleItemProvider extends EdgeStyleItemProvider {
     public String getText(Object object) {
         LineStyle labelValue = ((BracketEdgeStyle) object).getLineStyle();
         String label = labelValue == null ? null : labelValue.toString();
-        return label == null || label.length() == 0 ? getString("_UI_BracketEdgeStyle_type") : getString("_UI_BracketEdgeStyle_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_BracketEdgeStyle_type") : //$NON-NLS-1$
+            getString("_UI_BracketEdgeStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/BundledImageItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/BundledImageItemProvider.java
index 6c273ac8ba..138ae02c61 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/BundledImageItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/BundledImageItemProvider.java
@@ -66,8 +66,10 @@ public class BundledImageItemProvider extends NodeStyleItemProvider {
      */
     protected void addShapePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_BundledImage_shape_feature"), getString("_UI_PropertyDescriptor_description", "_UI_BundledImage_shape_feature", "_UI_BundledImage_type"),
-                DiagramPackage.Literals.BUNDLED_IMAGE__SHAPE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_BundledImage_shape_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_BundledImage_shape_feature", "_UI_BundledImage_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DiagramPackage.Literals.BUNDLED_IMAGE__SHAPE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -78,8 +80,10 @@ public class BundledImageItemProvider extends NodeStyleItemProvider {
      */
     protected void addColorPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_BundledImage_color_feature"), getString("_UI_PropertyDescriptor_description", "_UI_BundledImage_color_feature", "_UI_BundledImage_type"),
-                DiagramPackage.Literals.BUNDLED_IMAGE__COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_BundledImage_color_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_BundledImage_color_feature", "_UI_BundledImage_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DiagramPackage.Literals.BUNDLED_IMAGE__COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -90,7 +94,7 @@ public class BundledImageItemProvider extends NodeStyleItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/BundledImage"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/BundledImage")); //$NON-NLS-1$
     }
 
     /**
@@ -102,7 +106,7 @@ public class BundledImageItemProvider extends NodeStyleItemProvider {
     @Override
     public String getText(Object object) {
         BundledImage bundledImage = (BundledImage) object;
-        return getString("_UI_BundledImage_type") + " " + bundledImage.getLabelSize();
+        return getString("_UI_BundledImage_type") + " " + bundledImage.getLabelSize(); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/CenterLabelStyleItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/CenterLabelStyleItemProvider.java
index 6652de2923..4bc8f8497c 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/CenterLabelStyleItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/CenterLabelStyleItemProvider.java
@@ -63,7 +63,7 @@ public class CenterLabelStyleItemProvider extends BasicLabelStyleItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/CenterLabelStyle"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/CenterLabelStyle")); //$NON-NLS-1$
     }
 
     /**
@@ -75,7 +75,7 @@ public class CenterLabelStyleItemProvider extends BasicLabelStyleItemProvider {
     @Override
     public String getText(Object object) {
         CenterLabelStyle centerLabelStyle = (CenterLabelStyle) object;
-        return getString("_UI_CenterLabelStyle_type") + " " + centerLabelStyle.getLabelSize();
+        return getString("_UI_CenterLabelStyle_type") + " " + centerLabelStyle.getLabelSize(); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/CollapseFilterItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/CollapseFilterItemProvider.java
index 1ee82e2f12..ec88c7858f 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/CollapseFilterItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/CollapseFilterItemProvider.java
@@ -75,7 +75,8 @@ IItemPropertySource {
      */
     protected void addWidthPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_CollapseFilter_width_feature"), getString("_UI_PropertyDescriptor_description", "_UI_CollapseFilter_width_feature", "_UI_CollapseFilter_type"),
+                getString("_UI_CollapseFilter_width_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_CollapseFilter_width_feature", "_UI_CollapseFilter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DiagramPackage.Literals.COLLAPSE_FILTER__WIDTH, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
     }
 
@@ -87,7 +88,8 @@ IItemPropertySource {
      */
     protected void addHeightPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_CollapseFilter_height_feature"), getString("_UI_PropertyDescriptor_description", "_UI_CollapseFilter_height_feature", "_UI_CollapseFilter_type"),
+                getString("_UI_CollapseFilter_height_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_CollapseFilter_height_feature", "_UI_CollapseFilter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DiagramPackage.Literals.COLLAPSE_FILTER__HEIGHT, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
     }
 
@@ -99,7 +101,7 @@ IItemPropertySource {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/CollapseFilter"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/CollapseFilter")); //$NON-NLS-1$
     }
 
     /**
@@ -111,7 +113,7 @@ IItemPropertySource {
     @Override
     public String getText(Object object) {
         CollapseFilter collapseFilter = (CollapseFilter) object;
-        return getString("_UI_CollapseFilter_type") + " " + collapseFilter.getWidth();
+        return getString("_UI_CollapseFilter_type") + " " + collapseFilter.getWidth(); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/ComputedStyleDescriptionRegistryItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/ComputedStyleDescriptionRegistryItemProvider.java
index 6278d6cdcb..6c8e315106 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/ComputedStyleDescriptionRegistryItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/ComputedStyleDescriptionRegistryItemProvider.java
@@ -106,7 +106,7 @@ IItemLabelProvider, IItemPropertySource {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ComputedStyleDescriptionRegistry"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/ComputedStyleDescriptionRegistry")); //$NON-NLS-1$
     }
 
     /**
@@ -117,7 +117,7 @@ IItemLabelProvider, IItemPropertySource {
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_ComputedStyleDescriptionRegistry_type");
+        return getString("_UI_ComputedStyleDescriptionRegistry_type"); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/ContainerStyleItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/ContainerStyleItemProvider.java
index 417a81323e..e1c48197b2 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/ContainerStyleItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/ContainerStyleItemProvider.java
@@ -73,7 +73,8 @@ public class ContainerStyleItemProvider extends LabelStyleItemProvider {
      */
     protected void addDescriptionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_Style_description_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Style_description_feature", "_UI_Style_type"),
+                getString("_UI_Style_description_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_Style_description_feature", "_UI_Style_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 ViewpointPackage.Literals.STYLE__DESCRIPTION, true, false, true, null, null, null));
     }
 
@@ -85,8 +86,10 @@ public class ContainerStyleItemProvider extends LabelStyleItemProvider {
      */
     protected void addBorderSizePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_BorderedStyle_borderSize_feature"), getString("_UI_PropertyDescriptor_description", "_UI_BorderedStyle_borderSize_feature", "_UI_BorderedStyle_type"),
-                DiagramPackage.Literals.BORDERED_STYLE__BORDER_SIZE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_BorderPropertyCategory"), null));
+                getString("_UI_BorderedStyle_borderSize_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_BorderedStyle_borderSize_feature", "_UI_BorderedStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DiagramPackage.Literals.BORDERED_STYLE__BORDER_SIZE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_BorderPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -97,8 +100,10 @@ public class ContainerStyleItemProvider extends LabelStyleItemProvider {
      */
     protected void addBorderColorPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_BorderedStyle_borderColor_feature"), getString("_UI_PropertyDescriptor_description", "_UI_BorderedStyle_borderColor_feature", "_UI_BorderedStyle_type"),
-                DiagramPackage.Literals.BORDERED_STYLE__BORDER_COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_BorderPropertyCategory"), null));
+                getString("_UI_BorderedStyle_borderColor_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_BorderedStyle_borderColor_feature", "_UI_BorderedStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DiagramPackage.Literals.BORDERED_STYLE__BORDER_COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_BorderPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -109,8 +114,10 @@ public class ContainerStyleItemProvider extends LabelStyleItemProvider {
      */
     protected void addBorderLineStylePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_BorderedStyle_borderLineStyle_feature"), getString("_UI_PropertyDescriptor_description", "_UI_BorderedStyle_borderLineStyle_feature", "_UI_BorderedStyle_type"),
-                DiagramPackage.Literals.BORDERED_STYLE__BORDER_LINE_STYLE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_BorderPropertyCategory"), null));
+                getString("_UI_BorderedStyle_borderLineStyle_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_BorderedStyle_borderLineStyle_feature", "_UI_BorderedStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DiagramPackage.Literals.BORDERED_STYLE__BORDER_LINE_STYLE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_BorderPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -121,8 +128,8 @@ public class ContainerStyleItemProvider extends LabelStyleItemProvider {
      */
     protected void addHideLabelByDefaultPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_HideLabelCapabilityStyle_hideLabelByDefault_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_HideLabelCapabilityStyle_hideLabelByDefault_feature", "_UI_HideLabelCapabilityStyle_type"),
+                getString("_UI_HideLabelCapabilityStyle_hideLabelByDefault_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_HideLabelCapabilityStyle_hideLabelByDefault_feature", "_UI_HideLabelCapabilityStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DiagramPackage.Literals.HIDE_LABEL_CAPABILITY_STYLE__HIDE_LABEL_BY_DEFAULT, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
     }
 
@@ -135,7 +142,7 @@ public class ContainerStyleItemProvider extends LabelStyleItemProvider {
     @Override
     public String getText(Object object) {
         ContainerStyle containerStyle = (ContainerStyle) object;
-        return getString("_UI_ContainerStyle_type") + " " + containerStyle.getLabelSize();
+        return getString("_UI_ContainerStyle_type") + " " + containerStyle.getLabelSize(); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/CustomStyleItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/CustomStyleItemProvider.java
index ee74765400..984f5e2902 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/CustomStyleItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/CustomStyleItemProvider.java
@@ -64,9 +64,10 @@ public class CustomStyleItemProvider extends NodeStyleItemProvider {
      * @generated
      */
     protected void addIdPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_CustomStyle_id_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_CustomStyle_id_feature", "_UI_CustomStyle_type"), DiagramPackage.Literals.CUSTOM_STYLE__ID, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_CustomStyle_id_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_CustomStyle_id_feature", "_UI_CustomStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DiagramPackage.Literals.CUSTOM_STYLE__ID, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -77,7 +78,7 @@ public class CustomStyleItemProvider extends NodeStyleItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/CustomStyle"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/CustomStyle")); //$NON-NLS-1$
     }
 
     /**
@@ -89,7 +90,8 @@ public class CustomStyleItemProvider extends NodeStyleItemProvider {
     @Override
     public String getText(Object object) {
         String label = ((CustomStyle) object).getId();
-        return label == null || label.length() == 0 ? getString("_UI_CustomStyle_type") : getString("_UI_CustomStyle_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_CustomStyle_type") : //$NON-NLS-1$
+            getString("_UI_CustomStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/DDiagramElementContainerItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/DDiagramElementContainerItemProvider.java
index 5fc317919a..0b8b064c44 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/DDiagramElementContainerItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/DDiagramElementContainerItemProvider.java
@@ -77,7 +77,8 @@ public class DDiagramElementContainerItemProvider extends DDiagramElementItemPro
      */
     protected void addArrangeConstraintsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_AbstractDNode_arrangeConstraints_feature"), getString("_UI_PropertyDescriptor_description", "_UI_AbstractDNode_arrangeConstraints_feature", "_UI_AbstractDNode_type"),
+                getString("_UI_AbstractDNode_arrangeConstraints_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_AbstractDNode_arrangeConstraints_feature", "_UI_AbstractDNode_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DiagramPackage.Literals.ABSTRACT_DNODE__ARRANGE_CONSTRAINTS, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -89,7 +90,8 @@ public class DDiagramElementContainerItemProvider extends DDiagramElementItemPro
      */
     protected void addOutgoingEdgesPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_EdgeTarget_outgoingEdges_feature"), getString("_UI_PropertyDescriptor_description", "_UI_EdgeTarget_outgoingEdges_feature", "_UI_EdgeTarget_type"),
+                getString("_UI_EdgeTarget_outgoingEdges_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_EdgeTarget_outgoingEdges_feature", "_UI_EdgeTarget_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DiagramPackage.Literals.EDGE_TARGET__OUTGOING_EDGES, false, false, false, null, null, null));
     }
 
@@ -101,7 +103,8 @@ public class DDiagramElementContainerItemProvider extends DDiagramElementItemPro
      */
     protected void addIncomingEdgesPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_EdgeTarget_incomingEdges_feature"), getString("_UI_PropertyDescriptor_description", "_UI_EdgeTarget_incomingEdges_feature", "_UI_EdgeTarget_type"),
+                getString("_UI_EdgeTarget_incomingEdges_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_EdgeTarget_incomingEdges_feature", "_UI_EdgeTarget_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DiagramPackage.Literals.EDGE_TARGET__INCOMING_EDGES, false, false, false, null, null, null));
     }
 
@@ -113,8 +116,8 @@ public class DDiagramElementContainerItemProvider extends DDiagramElementItemPro
      */
     protected void addNodesPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DDiagramElementContainer_nodes_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_DDiagramElementContainer_nodes_feature", "_UI_DDiagramElementContainer_type"),
+                getString("_UI_DDiagramElementContainer_nodes_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DDiagramElementContainer_nodes_feature", "_UI_DDiagramElementContainer_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DiagramPackage.Literals.DDIAGRAM_ELEMENT_CONTAINER__NODES, false, false, false, null, null, null));
     }
 
@@ -126,8 +129,8 @@ public class DDiagramElementContainerItemProvider extends DDiagramElementItemPro
      */
     protected void addContainersPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DDiagramElementContainer_containers_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_DDiagramElementContainer_containers_feature", "_UI_DDiagramElementContainer_type"),
+                getString("_UI_DDiagramElementContainer_containers_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DDiagramElementContainer_containers_feature", "_UI_DDiagramElementContainer_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DiagramPackage.Literals.DDIAGRAM_ELEMENT_CONTAINER__CONTAINERS, false, false, false, null, null, null));
     }
 
@@ -139,8 +142,8 @@ public class DDiagramElementContainerItemProvider extends DDiagramElementItemPro
      */
     protected void addElementsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DDiagramElementContainer_elements_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_DDiagramElementContainer_elements_feature", "_UI_DDiagramElementContainer_type"),
+                getString("_UI_DDiagramElementContainer_elements_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DDiagramElementContainer_elements_feature", "_UI_DDiagramElementContainer_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DiagramPackage.Literals.DDIAGRAM_ELEMENT_CONTAINER__ELEMENTS, false, false, false, null, null, null));
     }
 
@@ -152,8 +155,8 @@ public class DDiagramElementContainerItemProvider extends DDiagramElementItemPro
      */
     protected void addOriginalStylePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DDiagramElementContainer_originalStyle_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_DDiagramElementContainer_originalStyle_feature", "_UI_DDiagramElementContainer_type"),
+                getString("_UI_DDiagramElementContainer_originalStyle_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DDiagramElementContainer_originalStyle_feature", "_UI_DDiagramElementContainer_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DiagramPackage.Literals.DDIAGRAM_ELEMENT_CONTAINER__ORIGINAL_STYLE, true, false, true, null, null, null));
     }
 
@@ -165,8 +168,8 @@ public class DDiagramElementContainerItemProvider extends DDiagramElementItemPro
      */
     protected void addActualMappingPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DDiagramElementContainer_actualMapping_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_DDiagramElementContainer_actualMapping_feature", "_UI_DDiagramElementContainer_type"),
+                getString("_UI_DDiagramElementContainer_actualMapping_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DDiagramElementContainer_actualMapping_feature", "_UI_DDiagramElementContainer_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DiagramPackage.Literals.DDIAGRAM_ELEMENT_CONTAINER__ACTUAL_MAPPING, true, false, true, null, null, null));
     }
 
@@ -178,8 +181,8 @@ public class DDiagramElementContainerItemProvider extends DDiagramElementItemPro
      */
     protected void addCandidatesMappingPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DDiagramElementContainer_candidatesMapping_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_DDiagramElementContainer_candidatesMapping_feature", "_UI_DDiagramElementContainer_type"),
+                getString("_UI_DDiagramElementContainer_candidatesMapping_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DDiagramElementContainer_candidatesMapping_feature", "_UI_DDiagramElementContainer_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DiagramPackage.Literals.DDIAGRAM_ELEMENT_CONTAINER__CANDIDATES_MAPPING, true, false, true, null, null, null));
     }
 
@@ -191,8 +194,8 @@ public class DDiagramElementContainerItemProvider extends DDiagramElementItemPro
      */
     protected void addWidthPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DDiagramElementContainer_width_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_DDiagramElementContainer_width_feature", "_UI_DDiagramElementContainer_type"),
+                getString("_UI_DDiagramElementContainer_width_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DDiagramElementContainer_width_feature", "_UI_DDiagramElementContainer_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DiagramPackage.Literals.DDIAGRAM_ELEMENT_CONTAINER__WIDTH, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -204,8 +207,8 @@ public class DDiagramElementContainerItemProvider extends DDiagramElementItemPro
      */
     protected void addHeightPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DDiagramElementContainer_height_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_DDiagramElementContainer_height_feature", "_UI_DDiagramElementContainer_type"),
+                getString("_UI_DDiagramElementContainer_height_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DDiagramElementContainer_height_feature", "_UI_DDiagramElementContainer_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DiagramPackage.Literals.DDIAGRAM_ELEMENT_CONTAINER__HEIGHT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -252,7 +255,8 @@ public class DDiagramElementContainerItemProvider extends DDiagramElementItemPro
     @Override
     public String getText(Object object) {
         String label = ((DDiagramElementContainer) object).getName();
-        return label == null || label.length() == 0 ? getString("_UI_DDiagramElementContainer_type") : getString("_UI_DDiagramElementContainer_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_DDiagramElementContainer_type") : //$NON-NLS-1$
+            getString("_UI_DDiagramElementContainer_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/DDiagramElementItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/DDiagramElementItemProvider.java
index a4c38f3d97..23a2d4d022 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/DDiagramElementItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/DDiagramElementItemProvider.java
@@ -74,7 +74,8 @@ public class DDiagramElementItemProvider extends DRepresentationElementItemProvi
      */
     protected void addVisiblePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DDiagramElement_visible_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DDiagramElement_visible_feature", "_UI_DDiagramElement_type"),
+                getString("_UI_DDiagramElement_visible_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DDiagramElement_visible_feature", "_UI_DDiagramElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DiagramPackage.Literals.DDIAGRAM_ELEMENT__VISIBLE, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
     }
 
@@ -86,7 +87,8 @@ public class DDiagramElementItemProvider extends DRepresentationElementItemProvi
      */
     protected void addTooltipTextPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DDiagramElement_tooltipText_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DDiagramElement_tooltipText_feature", "_UI_DDiagramElement_type"),
+                getString("_UI_DDiagramElement_tooltipText_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DDiagramElement_tooltipText_feature", "_UI_DDiagramElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DiagramPackage.Literals.DDIAGRAM_ELEMENT__TOOLTIP_TEXT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -98,7 +100,8 @@ public class DDiagramElementItemProvider extends DRepresentationElementItemProvi
      */
     protected void addParentLayersPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DDiagramElement_parentLayers_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DDiagramElement_parentLayers_feature", "_UI_DDiagramElement_type"),
+                getString("_UI_DDiagramElement_parentLayers_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DDiagramElement_parentLayers_feature", "_UI_DDiagramElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DiagramPackage.Literals.DDIAGRAM_ELEMENT__PARENT_LAYERS, true, false, true, null, null, null));
     }
 
@@ -110,8 +113,8 @@ public class DDiagramElementItemProvider extends DRepresentationElementItemProvi
      */
     protected void addDiagramElementMappingPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DDiagramElement_diagramElementMapping_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_DDiagramElement_diagramElementMapping_feature", "_UI_DDiagramElement_type"),
+                getString("_UI_DDiagramElement_diagramElementMapping_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DDiagramElement_diagramElementMapping_feature", "_UI_DDiagramElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DiagramPackage.Literals.DDIAGRAM_ELEMENT__DIAGRAM_ELEMENT_MAPPING, false, false, false, null, null, null));
     }
 
@@ -158,7 +161,8 @@ public class DDiagramElementItemProvider extends DRepresentationElementItemProvi
     @Override
     public String getText(Object object) {
         String label = ((DDiagramElement) object).getName();
-        return label == null || label.length() == 0 ? getString("_UI_DDiagramElement_type") : getString("_UI_DDiagramElement_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_DDiagramElement_type") : //$NON-NLS-1$
+            getString("_UI_DDiagramElement_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/DDiagramItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/DDiagramItemProvider.java
index 8f0e1a168d..a95b17e27b 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/DDiagramItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/DDiagramItemProvider.java
@@ -85,7 +85,8 @@ public class DDiagramItemProvider extends DRepresentationItemProvider {
      */
     protected void addDiagramElementsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DDiagram_diagramElements_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DDiagram_diagramElements_feature", "_UI_DDiagram_type"),
+                getString("_UI_DDiagram_diagramElements_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DDiagram_diagramElements_feature", "_UI_DDiagram_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DiagramPackage.Literals.DDIAGRAM__DIAGRAM_ELEMENTS, false, false, false, null, null, null));
     }
 
@@ -97,7 +98,8 @@ public class DDiagramItemProvider extends DRepresentationItemProvider {
      */
     protected void addDescriptionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DDiagram_description_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DDiagram_description_feature", "_UI_DDiagram_type"),
+                getString("_UI_DDiagram_description_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DDiagram_description_feature", "_UI_DDiagram_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DiagramPackage.Literals.DDIAGRAM__DESCRIPTION, true, false, true, null, null, null));
     }
 
@@ -108,8 +110,9 @@ public class DDiagramItemProvider extends DRepresentationItemProvider {
      * @generated
      */
     protected void addEdgesPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DDiagram_edges_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_DDiagram_edges_feature", "_UI_DDiagram_type"), DiagramPackage.Literals.DDIAGRAM__EDGES, false, false, false, null, null, null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DDiagram_edges_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DDiagram_edges_feature", "_UI_DDiagram_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DiagramPackage.Literals.DDIAGRAM__EDGES, false, false, false, null, null, null));
     }
 
     /**
@@ -119,8 +122,9 @@ public class DDiagramItemProvider extends DRepresentationItemProvider {
      * @generated
      */
     protected void addNodesPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DDiagram_nodes_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_DDiagram_nodes_feature", "_UI_DDiagram_type"), DiagramPackage.Literals.DDIAGRAM__NODES, false, false, false, null, null, null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DDiagram_nodes_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DDiagram_nodes_feature", "_UI_DDiagram_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DiagramPackage.Literals.DDIAGRAM__NODES, false, false, false, null, null, null));
     }
 
     /**
@@ -131,7 +135,8 @@ public class DDiagramItemProvider extends DRepresentationItemProvider {
      */
     protected void addNodeListElementsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DDiagram_nodeListElements_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DDiagram_nodeListElements_feature", "_UI_DDiagram_type"),
+                getString("_UI_DDiagram_nodeListElements_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DDiagram_nodeListElements_feature", "_UI_DDiagram_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DiagramPackage.Literals.DDIAGRAM__NODE_LIST_ELEMENTS, false, false, false, null, null, null));
     }
 
@@ -143,7 +148,8 @@ public class DDiagramItemProvider extends DRepresentationItemProvider {
      */
     protected void addContainersPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DDiagram_containers_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DDiagram_containers_feature", "_UI_DDiagram_type"),
+                getString("_UI_DDiagram_containers_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DDiagram_containers_feature", "_UI_DDiagram_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DiagramPackage.Literals.DDIAGRAM__CONTAINERS, false, false, false, null, null, null));
     }
 
@@ -155,7 +161,8 @@ public class DDiagramItemProvider extends DRepresentationItemProvider {
      */
     protected void addCurrentConcernPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DDiagram_currentConcern_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DDiagram_currentConcern_feature", "_UI_DDiagram_type"),
+                getString("_UI_DDiagram_currentConcern_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DDiagram_currentConcern_feature", "_UI_DDiagram_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DiagramPackage.Literals.DDIAGRAM__CURRENT_CONCERN, true, false, true, null, null, null));
     }
 
@@ -167,7 +174,8 @@ public class DDiagramItemProvider extends DRepresentationItemProvider {
      */
     protected void addActivatedFiltersPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DDiagram_activatedFilters_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DDiagram_activatedFilters_feature", "_UI_DDiagram_type"),
+                getString("_UI_DDiagram_activatedFilters_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DDiagram_activatedFilters_feature", "_UI_DDiagram_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DiagramPackage.Literals.DDIAGRAM__ACTIVATED_FILTERS, true, false, true, null, null, null));
     }
 
@@ -179,7 +187,8 @@ public class DDiagramItemProvider extends DRepresentationItemProvider {
      */
     protected void addAllFiltersPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DDiagram_allFilters_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DDiagram_allFilters_feature", "_UI_DDiagram_type"),
+                getString("_UI_DDiagram_allFilters_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DDiagram_allFilters_feature", "_UI_DDiagram_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DiagramPackage.Literals.DDIAGRAM__ALL_FILTERS, false, false, false, null, null, null));
     }
 
@@ -191,7 +200,8 @@ public class DDiagramItemProvider extends DRepresentationItemProvider {
      */
     protected void addActivatedRulesPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DDiagram_activatedRules_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DDiagram_activatedRules_feature", "_UI_DDiagram_type"),
+                getString("_UI_DDiagram_activatedRules_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DDiagram_activatedRules_feature", "_UI_DDiagram_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DiagramPackage.Literals.DDIAGRAM__ACTIVATED_RULES, true, false, true, null, null, null));
     }
 
@@ -203,7 +213,8 @@ public class DDiagramItemProvider extends DRepresentationItemProvider {
      */
     protected void addActivateBehaviorsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DDiagram_activateBehaviors_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DDiagram_activateBehaviors_feature", "_UI_DDiagram_type"),
+                getString("_UI_DDiagram_activateBehaviors_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DDiagram_activateBehaviors_feature", "_UI_DDiagram_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DiagramPackage.Literals.DDIAGRAM__ACTIVATE_BEHAVIORS, true, false, true, null, null, null));
     }
 
@@ -215,7 +226,8 @@ public class DDiagramItemProvider extends DRepresentationItemProvider {
      */
     protected void addActivatedLayersPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DDiagram_activatedLayers_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DDiagram_activatedLayers_feature", "_UI_DDiagram_type"),
+                getString("_UI_DDiagram_activatedLayers_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DDiagram_activatedLayers_feature", "_UI_DDiagram_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DiagramPackage.Literals.DDIAGRAM__ACTIVATED_LAYERS, true, false, true, null, null, null));
     }
 
@@ -227,7 +239,8 @@ public class DDiagramItemProvider extends DRepresentationItemProvider {
      */
     protected void addSynchronizedPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DDiagram_synchronized_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DDiagram_synchronized_feature", "_UI_DDiagram_type"),
+                getString("_UI_DDiagram_synchronized_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DDiagram_synchronized_feature", "_UI_DDiagram_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DiagramPackage.Literals.DDIAGRAM__SYNCHRONIZED, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
     }
 
@@ -239,7 +252,8 @@ public class DDiagramItemProvider extends DRepresentationItemProvider {
      */
     protected void addHiddenElementsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DDiagram_hiddenElements_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DDiagram_hiddenElements_feature", "_UI_DDiagram_type"),
+                getString("_UI_DDiagram_hiddenElements_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DDiagram_hiddenElements_feature", "_UI_DDiagram_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DiagramPackage.Literals.DDIAGRAM__HIDDEN_ELEMENTS, true, false, true, null, null, null));
     }
 
@@ -251,7 +265,8 @@ public class DDiagramItemProvider extends DRepresentationItemProvider {
      */
     protected void addIsInLayoutingModePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DDiagram_isInLayoutingMode_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DDiagram_isInLayoutingMode_feature", "_UI_DDiagram_type"),
+                getString("_UI_DDiagram_isInLayoutingMode_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DDiagram_isInLayoutingMode_feature", "_UI_DDiagram_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DiagramPackage.Literals.DDIAGRAM__IS_IN_LAYOUTING_MODE, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
     }
 
@@ -263,7 +278,8 @@ public class DDiagramItemProvider extends DRepresentationItemProvider {
      */
     protected void addHeaderHeightPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DDiagram_headerHeight_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DDiagram_headerHeight_feature", "_UI_DDiagram_type"),
+                getString("_UI_DDiagram_headerHeight_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DDiagram_headerHeight_feature", "_UI_DDiagram_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DiagramPackage.Literals.DDIAGRAM__HEADER_HEIGHT, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
     }
 
@@ -308,7 +324,7 @@ public class DDiagramItemProvider extends DRepresentationItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/DDiagram"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/DDiagram")); //$NON-NLS-1$
     }
 
     /**
@@ -320,7 +336,8 @@ public class DDiagramItemProvider extends DRepresentationItemProvider {
     @Override
     public String getText(Object object) {
         String label = ((DDiagram) object).getName();
-        return label == null || label.length() == 0 ? getString("_UI_DDiagram_type") : getString("_UI_DDiagram_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_DDiagram_type") : //$NON-NLS-1$
+            getString("_UI_DDiagram_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/DEdgeItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/DEdgeItemProvider.java
index 6f2cf6c8aa..99e7a1fb57 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/DEdgeItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/DEdgeItemProvider.java
@@ -91,7 +91,8 @@ public class DEdgeItemProvider extends DDiagramElementItemProvider {
      */
     protected void addOutgoingEdgesPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_EdgeTarget_outgoingEdges_feature"), getString("_UI_PropertyDescriptor_description", "_UI_EdgeTarget_outgoingEdges_feature", "_UI_EdgeTarget_type"),
+                getString("_UI_EdgeTarget_outgoingEdges_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_EdgeTarget_outgoingEdges_feature", "_UI_EdgeTarget_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DiagramPackage.Literals.EDGE_TARGET__OUTGOING_EDGES, false, false, false, null, null, null));
     }
 
@@ -103,7 +104,8 @@ public class DEdgeItemProvider extends DDiagramElementItemProvider {
      */
     protected void addIncomingEdgesPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_EdgeTarget_incomingEdges_feature"), getString("_UI_PropertyDescriptor_description", "_UI_EdgeTarget_incomingEdges_feature", "_UI_EdgeTarget_type"),
+                getString("_UI_EdgeTarget_incomingEdges_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_EdgeTarget_incomingEdges_feature", "_UI_EdgeTarget_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DiagramPackage.Literals.EDGE_TARGET__INCOMING_EDGES, false, false, false, null, null, null));
     }
 
@@ -114,9 +116,9 @@ public class DEdgeItemProvider extends DDiagramElementItemProvider {
      * @generated
      */
     protected void addSizePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DEdge_size_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_DEdge_size_feature", "_UI_DEdge_type"), DiagramPackage.Literals.DEDGE__SIZE, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DEdge_size_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DEdge_size_feature", "_UI_DEdge_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DiagramPackage.Literals.DEDGE__SIZE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
     /**
@@ -126,8 +128,9 @@ public class DEdgeItemProvider extends DDiagramElementItemProvider {
      * @generated
      */
     protected void addSourceNodePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DEdge_sourceNode_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_DEdge_sourceNode_feature", "_UI_DEdge_type"), DiagramPackage.Literals.DEDGE__SOURCE_NODE, true, false, true, null, null, null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DEdge_sourceNode_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DEdge_sourceNode_feature", "_UI_DEdge_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DiagramPackage.Literals.DEDGE__SOURCE_NODE, true, false, true, null, null, null));
     }
 
     /**
@@ -137,8 +140,9 @@ public class DEdgeItemProvider extends DDiagramElementItemProvider {
      * @generated
      */
     protected void addTargetNodePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DEdge_targetNode_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_DEdge_targetNode_feature", "_UI_DEdge_type"), DiagramPackage.Literals.DEDGE__TARGET_NODE, true, false, true, null, null, null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DEdge_targetNode_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DEdge_targetNode_feature", "_UI_DEdge_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DiagramPackage.Literals.DEDGE__TARGET_NODE, true, false, true, null, null, null));
     }
 
     /**
@@ -149,7 +153,8 @@ public class DEdgeItemProvider extends DDiagramElementItemProvider {
      */
     protected void addActualMappingPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DEdge_actualMapping_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DEdge_actualMapping_feature", "_UI_DEdge_type"),
+                getString("_UI_DEdge_actualMapping_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DEdge_actualMapping_feature", "_UI_DEdge_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DiagramPackage.Literals.DEDGE__ACTUAL_MAPPING, true, false, true, null, null, null));
     }
 
@@ -161,7 +166,8 @@ public class DEdgeItemProvider extends DDiagramElementItemProvider {
      */
     protected void addRoutingStylePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DEdge_routingStyle_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DEdge_routingStyle_feature", "_UI_DEdge_type"),
+                getString("_UI_DEdge_routingStyle_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DEdge_routingStyle_feature", "_UI_DEdge_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DiagramPackage.Literals.DEDGE__ROUTING_STYLE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -172,9 +178,9 @@ public class DEdgeItemProvider extends DDiagramElementItemProvider {
      * @generated
      */
     protected void addIsFoldPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DEdge_isFold_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_DEdge_isFold_feature", "_UI_DEdge_type"), DiagramPackage.Literals.DEDGE__IS_FOLD, true, false, false,
-                ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DEdge_isFold_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DEdge_isFold_feature", "_UI_DEdge_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DiagramPackage.Literals.DEDGE__IS_FOLD, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
     }
 
     /**
@@ -184,9 +190,9 @@ public class DEdgeItemProvider extends DDiagramElementItemProvider {
      * @generated
      */
     protected void addIsMockEdgePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DEdge_isMockEdge_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_DEdge_isMockEdge_feature", "_UI_DEdge_type"), DiagramPackage.Literals.DEDGE__IS_MOCK_EDGE, true, false, false,
-                ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DEdge_isMockEdge_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DEdge_isMockEdge_feature", "_UI_DEdge_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DiagramPackage.Literals.DEDGE__IS_MOCK_EDGE, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
     }
 
     /**
@@ -197,7 +203,8 @@ public class DEdgeItemProvider extends DDiagramElementItemProvider {
      */
     protected void addOriginalStylePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DEdge_originalStyle_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DEdge_originalStyle_feature", "_UI_DEdge_type"),
+                getString("_UI_DEdge_originalStyle_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DEdge_originalStyle_feature", "_UI_DEdge_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DiagramPackage.Literals.DEDGE__ORIGINAL_STYLE, true, false, true, null, null, null));
     }
 
@@ -208,8 +215,9 @@ public class DEdgeItemProvider extends DDiagramElementItemProvider {
      * @generated
      */
     protected void addPathPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DEdge_path_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_DEdge_path_feature", "_UI_DEdge_type"), DiagramPackage.Literals.DEDGE__PATH, true, false, true, null, null, null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DEdge_path_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DEdge_path_feature", "_UI_DEdge_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DiagramPackage.Literals.DEDGE__PATH, true, false, true, null, null, null));
     }
 
     /**
@@ -220,7 +228,8 @@ public class DEdgeItemProvider extends DDiagramElementItemProvider {
      */
     protected void addArrangeConstraintsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DEdge_arrangeConstraints_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DEdge_arrangeConstraints_feature", "_UI_DEdge_type"),
+                getString("_UI_DEdge_arrangeConstraints_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DEdge_arrangeConstraints_feature", "_UI_DEdge_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DiagramPackage.Literals.DEDGE__ARRANGE_CONSTRAINTS, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -231,9 +240,9 @@ public class DEdgeItemProvider extends DDiagramElementItemProvider {
      * @generated
      */
     protected void addBeginLabelPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DEdge_beginLabel_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_DEdge_beginLabel_feature", "_UI_DEdge_type"), DiagramPackage.Literals.DEDGE__BEGIN_LABEL, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DEdge_beginLabel_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DEdge_beginLabel_feature", "_UI_DEdge_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DiagramPackage.Literals.DEDGE__BEGIN_LABEL, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
     /**
@@ -243,9 +252,9 @@ public class DEdgeItemProvider extends DDiagramElementItemProvider {
      * @generated
      */
     protected void addEndLabelPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DEdge_endLabel_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_DEdge_endLabel_feature", "_UI_DEdge_type"), DiagramPackage.Literals.DEDGE__END_LABEL, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DEdge_endLabel_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DEdge_endLabel_feature", "_UI_DEdge_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DiagramPackage.Literals.DEDGE__END_LABEL, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
     /**
@@ -288,7 +297,7 @@ public class DEdgeItemProvider extends DDiagramElementItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/DEdge"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/DEdge")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/DNodeContainerItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/DNodeContainerItemProvider.java
index 606984669f..ecd887a154 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/DNodeContainerItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/DNodeContainerItemProvider.java
@@ -67,8 +67,8 @@ public class DNodeContainerItemProvider extends DDiagramElementContainerItemProv
      */
     protected void addChildrenPresentationPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DNodeContainer_childrenPresentation_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_DNodeContainer_childrenPresentation_feature", "_UI_DNodeContainer_type"),
+                getString("_UI_DNodeContainer_childrenPresentation_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DNodeContainer_childrenPresentation_feature", "_UI_DNodeContainer_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DiagramPackage.Literals.DNODE_CONTAINER__CHILDREN_PRESENTATION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -113,7 +113,7 @@ public class DNodeContainerItemProvider extends DDiagramElementContainerItemProv
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/DNodeContainer"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/DNodeContainer")); //$NON-NLS-1$
     }
 
     /**
@@ -188,7 +188,8 @@ public class DNodeContainerItemProvider extends DDiagramElementContainerItemProv
         boolean qualify = childFeature == DiagramPackage.Literals.ABSTRACT_DNODE__OWNED_BORDERED_NODES || childFeature == DiagramPackage.Literals.DNODE_CONTAINER__OWNED_DIAGRAM_ELEMENTS;
 
         if (qualify) {
-            return getString("_UI_CreateChild_text2", new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+            return getString("_UI_CreateChild_text2", //$NON-NLS-1$
+                    new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
         }
         return super.getCreateChildText(owner, feature, child, selection);
     }
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/DNodeItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/DNodeItemProvider.java
index bb9d1eb094..9f3beb5027 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/DNodeItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/DNodeItemProvider.java
@@ -87,7 +87,8 @@ public class DNodeItemProvider extends DDiagramElementItemProvider {
      */
     protected void addArrangeConstraintsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_AbstractDNode_arrangeConstraints_feature"), getString("_UI_PropertyDescriptor_description", "_UI_AbstractDNode_arrangeConstraints_feature", "_UI_AbstractDNode_type"),
+                getString("_UI_AbstractDNode_arrangeConstraints_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_AbstractDNode_arrangeConstraints_feature", "_UI_AbstractDNode_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DiagramPackage.Literals.ABSTRACT_DNODE__ARRANGE_CONSTRAINTS, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -99,7 +100,8 @@ public class DNodeItemProvider extends DDiagramElementItemProvider {
      */
     protected void addOutgoingEdgesPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_EdgeTarget_outgoingEdges_feature"), getString("_UI_PropertyDescriptor_description", "_UI_EdgeTarget_outgoingEdges_feature", "_UI_EdgeTarget_type"),
+                getString("_UI_EdgeTarget_outgoingEdges_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_EdgeTarget_outgoingEdges_feature", "_UI_EdgeTarget_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DiagramPackage.Literals.EDGE_TARGET__OUTGOING_EDGES, false, false, false, null, null, null));
     }
 
@@ -111,7 +113,8 @@ public class DNodeItemProvider extends DDiagramElementItemProvider {
      */
     protected void addIncomingEdgesPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_EdgeTarget_incomingEdges_feature"), getString("_UI_PropertyDescriptor_description", "_UI_EdgeTarget_incomingEdges_feature", "_UI_EdgeTarget_type"),
+                getString("_UI_EdgeTarget_incomingEdges_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_EdgeTarget_incomingEdges_feature", "_UI_EdgeTarget_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DiagramPackage.Literals.EDGE_TARGET__INCOMING_EDGES, false, false, false, null, null, null));
     }
 
@@ -122,9 +125,9 @@ public class DNodeItemProvider extends DDiagramElementItemProvider {
      * @generated
      */
     protected void addWidthPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DNode_width_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_DNode_width_feature", "_UI_DNode_type"), DiagramPackage.Literals.DNODE__WIDTH, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DNode_width_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DNode_width_feature", "_UI_DNode_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DiagramPackage.Literals.DNODE__WIDTH, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
     /**
@@ -134,9 +137,9 @@ public class DNodeItemProvider extends DDiagramElementItemProvider {
      * @generated
      */
     protected void addHeightPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DNode_height_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_DNode_height_feature", "_UI_DNode_type"), DiagramPackage.Literals.DNODE__HEIGHT, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DNode_height_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DNode_height_feature", "_UI_DNode_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DiagramPackage.Literals.DNODE__HEIGHT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
     /**
@@ -147,7 +150,8 @@ public class DNodeItemProvider extends DDiagramElementItemProvider {
      */
     protected void addLabelPositionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DNode_labelPosition_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DNode_labelPosition_feature", "_UI_DNode_type"),
+                getString("_UI_DNode_labelPosition_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DNode_labelPosition_feature", "_UI_DNode_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DiagramPackage.Literals.DNODE__LABEL_POSITION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -158,9 +162,9 @@ public class DNodeItemProvider extends DDiagramElementItemProvider {
      * @generated
      */
     protected void addResizeKindPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DNode_resizeKind_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_DNode_resizeKind_feature", "_UI_DNode_type"), DiagramPackage.Literals.DNODE__RESIZE_KIND, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DNode_resizeKind_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DNode_resizeKind_feature", "_UI_DNode_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DiagramPackage.Literals.DNODE__RESIZE_KIND, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
     /**
@@ -171,7 +175,8 @@ public class DNodeItemProvider extends DDiagramElementItemProvider {
      */
     protected void addOriginalStylePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DNode_originalStyle_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DNode_originalStyle_feature", "_UI_DNode_type"),
+                getString("_UI_DNode_originalStyle_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DNode_originalStyle_feature", "_UI_DNode_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DiagramPackage.Literals.DNODE__ORIGINAL_STYLE, true, false, true, null, null, null));
     }
 
@@ -183,7 +188,8 @@ public class DNodeItemProvider extends DDiagramElementItemProvider {
      */
     protected void addActualMappingPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DNode_actualMapping_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DNode_actualMapping_feature", "_UI_DNode_type"),
+                getString("_UI_DNode_actualMapping_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DNode_actualMapping_feature", "_UI_DNode_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DiagramPackage.Literals.DNODE__ACTUAL_MAPPING, true, false, true, null, null, null));
     }
 
@@ -195,7 +201,8 @@ public class DNodeItemProvider extends DDiagramElementItemProvider {
      */
     protected void addCandidatesMappingPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DNode_candidatesMapping_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DNode_candidatesMapping_feature", "_UI_DNode_type"),
+                getString("_UI_DNode_candidatesMapping_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DNode_candidatesMapping_feature", "_UI_DNode_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DiagramPackage.Literals.DNODE__CANDIDATES_MAPPING, true, false, true, null, null, null));
     }
 
@@ -240,7 +247,7 @@ public class DNodeItemProvider extends DDiagramElementItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/DNode"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/DNode")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/DNodeListElementItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/DNodeListElementItemProvider.java
index 69dacdae88..0ad0590601 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/DNodeListElementItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/DNodeListElementItemProvider.java
@@ -70,7 +70,8 @@ public class DNodeListElementItemProvider extends DDiagramElementItemProvider {
      */
     protected void addArrangeConstraintsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_AbstractDNode_arrangeConstraints_feature"), getString("_UI_PropertyDescriptor_description", "_UI_AbstractDNode_arrangeConstraints_feature", "_UI_AbstractDNode_type"),
+                getString("_UI_AbstractDNode_arrangeConstraints_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_AbstractDNode_arrangeConstraints_feature", "_UI_AbstractDNode_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DiagramPackage.Literals.ABSTRACT_DNODE__ARRANGE_CONSTRAINTS, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -82,7 +83,8 @@ public class DNodeListElementItemProvider extends DDiagramElementItemProvider {
      */
     protected void addOriginalStylePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DNodeListElement_originalStyle_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DNodeListElement_originalStyle_feature", "_UI_DNodeListElement_type"),
+                getString("_UI_DNodeListElement_originalStyle_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DNodeListElement_originalStyle_feature", "_UI_DNodeListElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DiagramPackage.Literals.DNODE_LIST_ELEMENT__ORIGINAL_STYLE, true, false, true, null, null, null));
     }
 
@@ -94,7 +96,8 @@ public class DNodeListElementItemProvider extends DDiagramElementItemProvider {
      */
     protected void addActualMappingPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DNodeListElement_actualMapping_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DNodeListElement_actualMapping_feature", "_UI_DNodeListElement_type"),
+                getString("_UI_DNodeListElement_actualMapping_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DNodeListElement_actualMapping_feature", "_UI_DNodeListElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DiagramPackage.Literals.DNODE_LIST_ELEMENT__ACTUAL_MAPPING, true, false, true, null, null, null));
     }
 
@@ -106,8 +109,8 @@ public class DNodeListElementItemProvider extends DDiagramElementItemProvider {
      */
     protected void addCandidatesMappingPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DNodeListElement_candidatesMapping_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_DNodeListElement_candidatesMapping_feature", "_UI_DNodeListElement_type"),
+                getString("_UI_DNodeListElement_candidatesMapping_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DNodeListElement_candidatesMapping_feature", "_UI_DNodeListElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DiagramPackage.Literals.DNODE_LIST_ELEMENT__CANDIDATES_MAPPING, true, false, true, null, null, null));
     }
 
@@ -153,7 +156,7 @@ public class DNodeListElementItemProvider extends DDiagramElementItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/DNodeListElement"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/DNodeListElement")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/DNodeListItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/DNodeListItemProvider.java
index 130faf936c..4acaf2536f 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/DNodeListItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/DNodeListItemProvider.java
@@ -96,7 +96,7 @@ public class DNodeListItemProvider extends DDiagramElementContainerItemProvider
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/DNodeList"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/DNodeList")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/DSemanticDiagramItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/DSemanticDiagramItemProvider.java
index 6a16bfca23..22c9fcdfe7 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/DSemanticDiagramItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/DSemanticDiagramItemProvider.java
@@ -63,7 +63,8 @@ public class DSemanticDiagramItemProvider extends DDiagramItemProvider {
      */
     protected void addTargetPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DSemanticDecorator_target_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DSemanticDecorator_target_feature", "_UI_DSemanticDecorator_type"),
+                getString("_UI_DSemanticDecorator_target_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DSemanticDecorator_target_feature", "_UI_DSemanticDecorator_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 ViewpointPackage.Literals.DSEMANTIC_DECORATOR__TARGET, true, false, true, null, null, null));
     }
 
@@ -75,7 +76,7 @@ public class DSemanticDiagramItemProvider extends DDiagramItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/DSemanticDiagram"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/DSemanticDiagram")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/DotItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/DotItemProvider.java
index b8817ebcdc..2fdc3a79de 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/DotItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/DotItemProvider.java
@@ -66,7 +66,8 @@ public class DotItemProvider extends NodeStyleItemProvider {
      */
     protected void addStrokeSizeComputationExpressionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_Dot_strokeSizeComputationExpression_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Dot_strokeSizeComputationExpression_feature", "_UI_Dot_type"),
+                getString("_UI_Dot_strokeSizeComputationExpression_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_Dot_strokeSizeComputationExpression_feature", "_UI_Dot_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DiagramPackage.Literals.DOT__STROKE_SIZE_COMPUTATION_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -78,7 +79,8 @@ public class DotItemProvider extends NodeStyleItemProvider {
      */
     protected void addBackgroundColorPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_Dot_backgroundColor_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Dot_backgroundColor_feature", "_UI_Dot_type"),
+                getString("_UI_Dot_backgroundColor_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_Dot_backgroundColor_feature", "_UI_Dot_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DiagramPackage.Literals.DOT__BACKGROUND_COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -89,7 +91,7 @@ public class DotItemProvider extends NodeStyleItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/Dot"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/Dot")); //$NON-NLS-1$
     }
 
     /**
@@ -101,7 +103,7 @@ public class DotItemProvider extends NodeStyleItemProvider {
     @Override
     public String getText(Object object) {
         Dot dot = (Dot) object;
-        return getString("_UI_Dot_type") + " " + dot.getLabelSize();
+        return getString("_UI_Dot_type") + " " + dot.getLabelSize(); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/DragAndDropTargetItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/DragAndDropTargetItemProvider.java
index 2dbb5fa57d..f74a14115b 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/DragAndDropTargetItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/DragAndDropTargetItemProvider.java
@@ -68,7 +68,7 @@ IItemPropertySource {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/DragAndDropTarget"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/DragAndDropTarget")); //$NON-NLS-1$
     }
 
     /**
@@ -79,7 +79,7 @@ IItemPropertySource {
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_DragAndDropTarget_type");
+        return getString("_UI_DragAndDropTarget_type"); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/EdgeStyleItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/EdgeStyleItemProvider.java
index 35faa44f39..f5b251afb8 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/EdgeStyleItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/EdgeStyleItemProvider.java
@@ -78,8 +78,10 @@ public class EdgeStyleItemProvider extends StyleItemProvider {
      */
     protected void addLineStylePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_EdgeStyle_lineStyle_feature"), getString("_UI_EdgeStyle_lineStyle_description"), DiagramPackage.Literals.EDGE_STYLE__LINE_STYLE, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_EdgeStyle_lineStyle_feature"), //$NON-NLS-1$
+                getString("_UI_EdgeStyle_lineStyle_description"), //$NON-NLS-1$
+                DiagramPackage.Literals.EDGE_STYLE__LINE_STYLE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -90,7 +92,8 @@ public class EdgeStyleItemProvider extends StyleItemProvider {
      */
     protected void addSourceArrowPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_EdgeStyle_sourceArrow_feature"), getString("_UI_PropertyDescriptor_description", "_UI_EdgeStyle_sourceArrow_feature", "_UI_EdgeStyle_type"),
+                getString("_UI_EdgeStyle_sourceArrow_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_EdgeStyle_sourceArrow_feature", "_UI_EdgeStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DiagramPackage.Literals.EDGE_STYLE__SOURCE_ARROW, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -102,7 +105,8 @@ public class EdgeStyleItemProvider extends StyleItemProvider {
      */
     protected void addTargetArrowPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_EdgeStyle_targetArrow_feature"), getString("_UI_PropertyDescriptor_description", "_UI_EdgeStyle_targetArrow_feature", "_UI_EdgeStyle_type"),
+                getString("_UI_EdgeStyle_targetArrow_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_EdgeStyle_targetArrow_feature", "_UI_EdgeStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DiagramPackage.Literals.EDGE_STYLE__TARGET_ARROW, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -114,7 +118,8 @@ public class EdgeStyleItemProvider extends StyleItemProvider {
      */
     protected void addFoldingStylePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_EdgeStyle_foldingStyle_feature"), getString("_UI_PropertyDescriptor_description", "_UI_EdgeStyle_foldingStyle_feature", "_UI_EdgeStyle_type"),
+                getString("_UI_EdgeStyle_foldingStyle_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_EdgeStyle_foldingStyle_feature", "_UI_EdgeStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DiagramPackage.Literals.EDGE_STYLE__FOLDING_STYLE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -125,9 +130,9 @@ public class EdgeStyleItemProvider extends StyleItemProvider {
      * @generated
      */
     protected void addSizePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_EdgeStyle_size_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_EdgeStyle_size_feature", "_UI_EdgeStyle_type"), DiagramPackage.Literals.EDGE_STYLE__SIZE, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_EdgeStyle_size_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_EdgeStyle_size_feature", "_UI_EdgeStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DiagramPackage.Literals.EDGE_STYLE__SIZE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
     /**
@@ -138,7 +143,8 @@ public class EdgeStyleItemProvider extends StyleItemProvider {
      */
     protected void addRoutingStylePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_EdgeStyle_routingStyle_feature"), getString("_UI_PropertyDescriptor_description", "_UI_EdgeStyle_routingStyle_feature", "_UI_EdgeStyle_type"),
+                getString("_UI_EdgeStyle_routingStyle_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_EdgeStyle_routingStyle_feature", "_UI_EdgeStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DiagramPackage.Literals.EDGE_STYLE__ROUTING_STYLE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -150,7 +156,8 @@ public class EdgeStyleItemProvider extends StyleItemProvider {
      */
     protected void addCenteredPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_EdgeStyle_centered_feature"), getString("_UI_PropertyDescriptor_description", "_UI_EdgeStyle_centered_feature", "_UI_EdgeStyle_type"),
+                getString("_UI_EdgeStyle_centered_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_EdgeStyle_centered_feature", "_UI_EdgeStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DiagramPackage.Literals.EDGE_STYLE__CENTERED, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -162,7 +169,8 @@ public class EdgeStyleItemProvider extends StyleItemProvider {
      */
     protected void addStrokeColorPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_EdgeStyle_strokeColor_feature"), getString("_UI_PropertyDescriptor_description", "_UI_EdgeStyle_strokeColor_feature", "_UI_EdgeStyle_type"),
+                getString("_UI_EdgeStyle_strokeColor_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_EdgeStyle_strokeColor_feature", "_UI_EdgeStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DiagramPackage.Literals.EDGE_STYLE__STROKE_COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -208,7 +216,7 @@ public class EdgeStyleItemProvider extends StyleItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/EdgeStyle"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/EdgeStyle")); //$NON-NLS-1$
     }
 
     /**
@@ -221,7 +229,8 @@ public class EdgeStyleItemProvider extends StyleItemProvider {
     public String getText(Object object) {
         LineStyle labelValue = ((EdgeStyle) object).getLineStyle();
         String label = labelValue == null ? null : labelValue.toString();
-        return label == null || label.length() == 0 ? getString("_UI_EdgeStyle_type") : getString("_UI_EdgeStyle_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_EdgeStyle_type") : //$NON-NLS-1$
+            getString("_UI_EdgeStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/EdgeTargetItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/EdgeTargetItemProvider.java
index 038f57472a..ebfdfaafeb 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/EdgeTargetItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/EdgeTargetItemProvider.java
@@ -72,7 +72,8 @@ IItemPropertySource {
      */
     protected void addOutgoingEdgesPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_EdgeTarget_outgoingEdges_feature"), getString("_UI_PropertyDescriptor_description", "_UI_EdgeTarget_outgoingEdges_feature", "_UI_EdgeTarget_type"),
+                getString("_UI_EdgeTarget_outgoingEdges_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_EdgeTarget_outgoingEdges_feature", "_UI_EdgeTarget_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DiagramPackage.Literals.EDGE_TARGET__OUTGOING_EDGES, false, false, false, null, null, null));
     }
 
@@ -84,7 +85,8 @@ IItemPropertySource {
      */
     protected void addIncomingEdgesPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_EdgeTarget_incomingEdges_feature"), getString("_UI_PropertyDescriptor_description", "_UI_EdgeTarget_incomingEdges_feature", "_UI_EdgeTarget_type"),
+                getString("_UI_EdgeTarget_incomingEdges_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_EdgeTarget_incomingEdges_feature", "_UI_EdgeTarget_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DiagramPackage.Literals.EDGE_TARGET__INCOMING_EDGES, false, false, false, null, null, null));
     }
 
@@ -96,7 +98,7 @@ IItemPropertySource {
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_EdgeTarget_type");
+        return getString("_UI_EdgeTarget_type"); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/EllipseItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/EllipseItemProvider.java
index 5b4bb6a604..30acdd0f56 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/EllipseItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/EllipseItemProvider.java
@@ -67,7 +67,8 @@ public class EllipseItemProvider extends NodeStyleItemProvider {
      */
     protected void addHorizontalDiameterPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_Ellipse_horizontalDiameter_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Ellipse_horizontalDiameter_feature", "_UI_Ellipse_type"),
+                getString("_UI_Ellipse_horizontalDiameter_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_Ellipse_horizontalDiameter_feature", "_UI_Ellipse_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DiagramPackage.Literals.ELLIPSE__HORIZONTAL_DIAMETER, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -79,7 +80,8 @@ public class EllipseItemProvider extends NodeStyleItemProvider {
      */
     protected void addVerticalDiameterPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_Ellipse_verticalDiameter_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Ellipse_verticalDiameter_feature", "_UI_Ellipse_type"),
+                getString("_UI_Ellipse_verticalDiameter_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_Ellipse_verticalDiameter_feature", "_UI_Ellipse_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DiagramPackage.Literals.ELLIPSE__VERTICAL_DIAMETER, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -90,9 +92,9 @@ public class EllipseItemProvider extends NodeStyleItemProvider {
      * @generated
      */
     protected void addColorPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Ellipse_color_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_Ellipse_color_feature", "_UI_Ellipse_type"), DiagramPackage.Literals.ELLIPSE__COLOR, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Ellipse_color_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_Ellipse_color_feature", "_UI_Ellipse_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DiagramPackage.Literals.ELLIPSE__COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
     /**
@@ -102,7 +104,7 @@ public class EllipseItemProvider extends NodeStyleItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/Ellipse"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/Ellipse")); //$NON-NLS-1$
     }
 
     /**
@@ -114,7 +116,7 @@ public class EllipseItemProvider extends NodeStyleItemProvider {
     @Override
     public String getText(Object object) {
         Ellipse ellipse = (Ellipse) object;
-        return getString("_UI_Ellipse_type") + " " + ellipse.getLabelSize();
+        return getString("_UI_Ellipse_type") + " " + ellipse.getLabelSize(); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/EndLabelStyleItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/EndLabelStyleItemProvider.java
index ca365aa5b0..93c638634b 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/EndLabelStyleItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/EndLabelStyleItemProvider.java
@@ -63,7 +63,7 @@ public class EndLabelStyleItemProvider extends BasicLabelStyleItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/EndLabelStyle"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/EndLabelStyle")); //$NON-NLS-1$
     }
 
     /**
@@ -75,7 +75,7 @@ public class EndLabelStyleItemProvider extends BasicLabelStyleItemProvider {
     @Override
     public String getText(Object object) {
         EndLabelStyle endLabelStyle = (EndLabelStyle) object;
-        return getString("_UI_EndLabelStyle_type") + " " + endLabelStyle.getLabelSize();
+        return getString("_UI_EndLabelStyle_type") + " " + endLabelStyle.getLabelSize(); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/FilterVariableHistoryItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/FilterVariableHistoryItemProvider.java
index c0a586f34a..fdb543aef9 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/FilterVariableHistoryItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/FilterVariableHistoryItemProvider.java
@@ -106,7 +106,7 @@ IItemPropertySource {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/FilterVariableHistory"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/FilterVariableHistory")); //$NON-NLS-1$
     }
 
     /**
@@ -117,7 +117,7 @@ IItemPropertySource {
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_FilterVariableHistory_type");
+        return getString("_UI_FilterVariableHistory_type"); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/FilterVariableValueItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/FilterVariableValueItemProvider.java
index 9976b548cf..04c0a94465 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/FilterVariableValueItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/FilterVariableValueItemProvider.java
@@ -72,8 +72,8 @@ IItemPropertySource {
      */
     protected void addVariableDefinitionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_FilterVariableValue_variableDefinition_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_FilterVariableValue_variableDefinition_feature", "_UI_FilterVariableValue_type"),
+                getString("_UI_FilterVariableValue_variableDefinition_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_FilterVariableValue_variableDefinition_feature", "_UI_FilterVariableValue_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DiagramPackage.Literals.FILTER_VARIABLE_VALUE__VARIABLE_DEFINITION, true, false, true, null, null, null));
     }
 
@@ -85,8 +85,8 @@ IItemPropertySource {
      */
     protected void addModelElementPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_FilterVariableValue_modelElement_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_FilterVariableValue_modelElement_feature", "_UI_FilterVariableValue_type"),
+                getString("_UI_FilterVariableValue_modelElement_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_FilterVariableValue_modelElement_feature", "_UI_FilterVariableValue_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DiagramPackage.Literals.FILTER_VARIABLE_VALUE__MODEL_ELEMENT, true, false, true, null, null, null));
     }
 
@@ -98,7 +98,7 @@ IItemPropertySource {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/FilterVariableValue"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/FilterVariableValue")); //$NON-NLS-1$
     }
 
     /**
@@ -109,7 +109,7 @@ IItemPropertySource {
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_FilterVariableValue_type");
+        return getString("_UI_FilterVariableValue_type"); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/FlatContainerStyleItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/FlatContainerStyleItemProvider.java
index 43c7b7cea3..e17209f1b5 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/FlatContainerStyleItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/FlatContainerStyleItemProvider.java
@@ -67,9 +67,10 @@ public class FlatContainerStyleItemProvider extends ContainerStyleItemProvider {
      */
     protected void addBackgroundStylePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_FlatContainerStyle_backgroundStyle_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_FlatContainerStyle_backgroundStyle_feature", "_UI_FlatContainerStyle_type"),
-                DiagramPackage.Literals.FLAT_CONTAINER_STYLE__BACKGROUND_STYLE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_FlatContainerStyle_backgroundStyle_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_FlatContainerStyle_backgroundStyle_feature", "_UI_FlatContainerStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DiagramPackage.Literals.FLAT_CONTAINER_STYLE__BACKGROUND_STYLE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -80,9 +81,10 @@ public class FlatContainerStyleItemProvider extends ContainerStyleItemProvider {
      */
     protected void addBackgroundColorPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_FlatContainerStyle_backgroundColor_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_FlatContainerStyle_backgroundColor_feature", "_UI_FlatContainerStyle_type"),
-                DiagramPackage.Literals.FLAT_CONTAINER_STYLE__BACKGROUND_COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_FlatContainerStyle_backgroundColor_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_FlatContainerStyle_backgroundColor_feature", "_UI_FlatContainerStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DiagramPackage.Literals.FLAT_CONTAINER_STYLE__BACKGROUND_COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -93,9 +95,10 @@ public class FlatContainerStyleItemProvider extends ContainerStyleItemProvider {
      */
     protected void addForegroundColorPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_FlatContainerStyle_foregroundColor_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_FlatContainerStyle_foregroundColor_feature", "_UI_FlatContainerStyle_type"),
-                DiagramPackage.Literals.FLAT_CONTAINER_STYLE__FOREGROUND_COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_FlatContainerStyle_foregroundColor_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_FlatContainerStyle_foregroundColor_feature", "_UI_FlatContainerStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DiagramPackage.Literals.FLAT_CONTAINER_STYLE__FOREGROUND_COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -106,7 +109,7 @@ public class FlatContainerStyleItemProvider extends ContainerStyleItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/FlatContainerStyle"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/FlatContainerStyle")); //$NON-NLS-1$
     }
 
     /**
@@ -118,7 +121,7 @@ public class FlatContainerStyleItemProvider extends ContainerStyleItemProvider {
     @Override
     public String getText(Object object) {
         FlatContainerStyle flatContainerStyle = (FlatContainerStyle) object;
-        return getString("_UI_FlatContainerStyle_type") + " " + flatContainerStyle.getLabelSize();
+        return getString("_UI_FlatContainerStyle_type") + " " + flatContainerStyle.getLabelSize(); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/FoldingFilterItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/FoldingFilterItemProvider.java
index 7feb66a196..b414a4ab99 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/FoldingFilterItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/FoldingFilterItemProvider.java
@@ -68,7 +68,7 @@ IItemPropertySource {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/FoldingFilter"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/FoldingFilter")); //$NON-NLS-1$
     }
 
     /**
@@ -79,7 +79,7 @@ IItemPropertySource {
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_FoldingFilter_type");
+        return getString("_UI_FoldingFilter_type"); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/FoldingPointFilterItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/FoldingPointFilterItemProvider.java
index 2949887204..395e339a48 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/FoldingPointFilterItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/FoldingPointFilterItemProvider.java
@@ -68,7 +68,7 @@ IItemPropertySource {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/FoldingPointFilter"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/FoldingPointFilter")); //$NON-NLS-1$
     }
 
     /**
@@ -79,7 +79,7 @@ IItemPropertySource {
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_FoldingPointFilter_type");
+        return getString("_UI_FoldingPointFilter_type"); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/GaugeCompositeStyleItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/GaugeCompositeStyleItemProvider.java
index e627a0d103..85bf1890af 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/GaugeCompositeStyleItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/GaugeCompositeStyleItemProvider.java
@@ -67,8 +67,10 @@ public class GaugeCompositeStyleItemProvider extends NodeStyleItemProvider {
      */
     protected void addAlignmentPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_GaugeCompositeStyle_alignment_feature"), getString("_UI_PropertyDescriptor_description", "_UI_GaugeCompositeStyle_alignment_feature", "_UI_GaugeCompositeStyle_type"),
-                DiagramPackage.Literals.GAUGE_COMPOSITE_STYLE__ALIGNMENT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_GaugeCompositeStyle_alignment_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_GaugeCompositeStyle_alignment_feature", "_UI_GaugeCompositeStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DiagramPackage.Literals.GAUGE_COMPOSITE_STYLE__ALIGNMENT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -112,7 +114,7 @@ public class GaugeCompositeStyleItemProvider extends NodeStyleItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/GaugeCompositeStyle"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/GaugeCompositeStyle")); //$NON-NLS-1$
     }
 
     /**
@@ -124,7 +126,7 @@ public class GaugeCompositeStyleItemProvider extends NodeStyleItemProvider {
     @Override
     public String getText(Object object) {
         GaugeCompositeStyle gaugeCompositeStyle = (GaugeCompositeStyle) object;
-        return getString("_UI_GaugeCompositeStyle_type") + " " + gaugeCompositeStyle.getLabelSize();
+        return getString("_UI_GaugeCompositeStyle_type") + " " + gaugeCompositeStyle.getLabelSize(); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/GaugeSectionItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/GaugeSectionItemProvider.java
index 6c839a9c07..19eed59f97 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/GaugeSectionItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/GaugeSectionItemProvider.java
@@ -70,8 +70,10 @@ public class GaugeSectionItemProvider extends CustomizableItemProvider {
      */
     protected void addLabelPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_GaugeSection_label_feature"), getString("_UI_PropertyDescriptor_description", "_UI_GaugeSection_label_feature", "_UI_GaugeSection_type"),
-                DiagramPackage.Literals.GAUGE_SECTION__LABEL, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_GaugeSection_label_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_GaugeSection_label_feature", "_UI_GaugeSection_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DiagramPackage.Literals.GAUGE_SECTION__LABEL, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -82,7 +84,8 @@ public class GaugeSectionItemProvider extends CustomizableItemProvider {
      */
     protected void addBackgroundColorPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_GaugeSection_backgroundColor_feature"), getString("_UI_PropertyDescriptor_description", "_UI_GaugeSection_backgroundColor_feature", "_UI_GaugeSection_type"),
+                getString("_UI_GaugeSection_backgroundColor_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_GaugeSection_backgroundColor_feature", "_UI_GaugeSection_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DiagramPackage.Literals.GAUGE_SECTION__BACKGROUND_COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -94,7 +97,8 @@ public class GaugeSectionItemProvider extends CustomizableItemProvider {
      */
     protected void addForegroundColorPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_GaugeSection_foregroundColor_feature"), getString("_UI_PropertyDescriptor_description", "_UI_GaugeSection_foregroundColor_feature", "_UI_GaugeSection_type"),
+                getString("_UI_GaugeSection_foregroundColor_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_GaugeSection_foregroundColor_feature", "_UI_GaugeSection_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DiagramPackage.Literals.GAUGE_SECTION__FOREGROUND_COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -106,7 +110,7 @@ public class GaugeSectionItemProvider extends CustomizableItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/GaugeSection"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/GaugeSection")); //$NON-NLS-1$
     }
 
     /**
@@ -119,7 +123,8 @@ public class GaugeSectionItemProvider extends CustomizableItemProvider {
     public String getText(Object object) {
         Integer labelValue = ((GaugeSection) object).getMin();
         String label = labelValue == null ? null : labelValue.toString();
-        return label == null || label.length() == 0 ? getString("_UI_GaugeSection_type") : getString("_UI_GaugeSection_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_GaugeSection_type") : //$NON-NLS-1$
+            getString("_UI_GaugeSection_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/HideFilterItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/HideFilterItemProvider.java
index b85060551e..4c09eefaab 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/HideFilterItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/HideFilterItemProvider.java
@@ -68,7 +68,7 @@ IItemPropertySource {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/HideFilter"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/HideFilter")); //$NON-NLS-1$
     }
 
     /**
@@ -79,7 +79,7 @@ IItemPropertySource {
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_HideFilter_type");
+        return getString("_UI_HideFilter_type"); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/HideLabelFilterItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/HideLabelFilterItemProvider.java
index 22a415415d..1db22cebc1 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/HideLabelFilterItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/HideLabelFilterItemProvider.java
@@ -68,7 +68,7 @@ IItemPropertySource {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/HideLabelFilter"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/HideLabelFilter")); //$NON-NLS-1$
     }
 
     /**
@@ -79,7 +79,7 @@ IItemPropertySource {
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_HideLabelFilter_type");
+        return getString("_UI_HideLabelFilter_type"); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/IndirectlyCollapseFilterItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/IndirectlyCollapseFilterItemProvider.java
index 8f510b030f..73626da1a8 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/IndirectlyCollapseFilterItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/IndirectlyCollapseFilterItemProvider.java
@@ -60,7 +60,7 @@ public class IndirectlyCollapseFilterItemProvider extends CollapseFilterItemProv
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/IndirectlyCollapseFilter"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/IndirectlyCollapseFilter")); //$NON-NLS-1$
     }
 
     /**
@@ -72,7 +72,7 @@ public class IndirectlyCollapseFilterItemProvider extends CollapseFilterItemProv
     @Override
     public String getText(Object object) {
         IndirectlyCollapseFilter indirectlyCollapseFilter = (IndirectlyCollapseFilter) object;
-        return getString("_UI_IndirectlyCollapseFilter_type") + " " + indirectlyCollapseFilter.getWidth();
+        return getString("_UI_IndirectlyCollapseFilter_type") + " " + indirectlyCollapseFilter.getWidth(); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/LozengeItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/LozengeItemProvider.java
index 5d651362ae..8283c1d631 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/LozengeItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/LozengeItemProvider.java
@@ -66,9 +66,9 @@ public class LozengeItemProvider extends NodeStyleItemProvider {
      * @generated
      */
     protected void addWidthPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Lozenge_width_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_Lozenge_width_feature", "_UI_Lozenge_type"), DiagramPackage.Literals.LOZENGE__WIDTH, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Lozenge_width_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_Lozenge_width_feature", "_UI_Lozenge_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DiagramPackage.Literals.LOZENGE__WIDTH, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
     /**
@@ -78,9 +78,9 @@ public class LozengeItemProvider extends NodeStyleItemProvider {
      * @generated
      */
     protected void addHeightPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Lozenge_height_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_Lozenge_height_feature", "_UI_Lozenge_type"), DiagramPackage.Literals.LOZENGE__HEIGHT, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Lozenge_height_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_Lozenge_height_feature", "_UI_Lozenge_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DiagramPackage.Literals.LOZENGE__HEIGHT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
     /**
@@ -90,9 +90,9 @@ public class LozengeItemProvider extends NodeStyleItemProvider {
      * @generated
      */
     protected void addColorPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Lozenge_color_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_Lozenge_color_feature", "_UI_Lozenge_type"), DiagramPackage.Literals.LOZENGE__COLOR, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Lozenge_color_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_Lozenge_color_feature", "_UI_Lozenge_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DiagramPackage.Literals.LOZENGE__COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
     /**
@@ -102,7 +102,7 @@ public class LozengeItemProvider extends NodeStyleItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/Lozenge"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/Lozenge")); //$NON-NLS-1$
     }
 
     /**
@@ -114,7 +114,7 @@ public class LozengeItemProvider extends NodeStyleItemProvider {
     @Override
     public String getText(Object object) {
         Lozenge lozenge = (Lozenge) object;
-        return getString("_UI_Lozenge_type") + " " + lozenge.getLabelSize();
+        return getString("_UI_Lozenge_type") + " " + lozenge.getLabelSize(); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/NodeStyleItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/NodeStyleItemProvider.java
index fdc705e2de..bebc019b5e 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/NodeStyleItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/NodeStyleItemProvider.java
@@ -74,7 +74,8 @@ public class NodeStyleItemProvider extends LabelStyleItemProvider {
      */
     protected void addDescriptionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_Style_description_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Style_description_feature", "_UI_Style_type"),
+                getString("_UI_Style_description_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_Style_description_feature", "_UI_Style_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 ViewpointPackage.Literals.STYLE__DESCRIPTION, true, false, true, null, null, null));
     }
 
@@ -86,8 +87,10 @@ public class NodeStyleItemProvider extends LabelStyleItemProvider {
      */
     protected void addBorderSizePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_BorderedStyle_borderSize_feature"), getString("_UI_PropertyDescriptor_description", "_UI_BorderedStyle_borderSize_feature", "_UI_BorderedStyle_type"),
-                DiagramPackage.Literals.BORDERED_STYLE__BORDER_SIZE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_BorderPropertyCategory"), null));
+                getString("_UI_BorderedStyle_borderSize_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_BorderedStyle_borderSize_feature", "_UI_BorderedStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DiagramPackage.Literals.BORDERED_STYLE__BORDER_SIZE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_BorderPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -98,8 +101,10 @@ public class NodeStyleItemProvider extends LabelStyleItemProvider {
      */
     protected void addBorderColorPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_BorderedStyle_borderColor_feature"), getString("_UI_PropertyDescriptor_description", "_UI_BorderedStyle_borderColor_feature", "_UI_BorderedStyle_type"),
-                DiagramPackage.Literals.BORDERED_STYLE__BORDER_COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_BorderPropertyCategory"), null));
+                getString("_UI_BorderedStyle_borderColor_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_BorderedStyle_borderColor_feature", "_UI_BorderedStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DiagramPackage.Literals.BORDERED_STYLE__BORDER_COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_BorderPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -110,8 +115,10 @@ public class NodeStyleItemProvider extends LabelStyleItemProvider {
      */
     protected void addBorderLineStylePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_BorderedStyle_borderLineStyle_feature"), getString("_UI_PropertyDescriptor_description", "_UI_BorderedStyle_borderLineStyle_feature", "_UI_BorderedStyle_type"),
-                DiagramPackage.Literals.BORDERED_STYLE__BORDER_LINE_STYLE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_BorderPropertyCategory"), null));
+                getString("_UI_BorderedStyle_borderLineStyle_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_BorderedStyle_borderLineStyle_feature", "_UI_BorderedStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DiagramPackage.Literals.BORDERED_STYLE__BORDER_LINE_STYLE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_BorderPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -122,7 +129,8 @@ public class NodeStyleItemProvider extends LabelStyleItemProvider {
      */
     protected void addLabelPositionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_NodeStyle_labelPosition_feature"), getString("_UI_PropertyDescriptor_description", "_UI_NodeStyle_labelPosition_feature", "_UI_NodeStyle_type"),
+                getString("_UI_NodeStyle_labelPosition_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_NodeStyle_labelPosition_feature", "_UI_NodeStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DiagramPackage.Literals.NODE_STYLE__LABEL_POSITION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -134,8 +142,8 @@ public class NodeStyleItemProvider extends LabelStyleItemProvider {
      */
     protected void addHideLabelByDefaultPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_HideLabelCapabilityStyle_hideLabelByDefault_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_HideLabelCapabilityStyle_hideLabelByDefault_feature", "_UI_HideLabelCapabilityStyle_type"),
+                getString("_UI_HideLabelCapabilityStyle_hideLabelByDefault_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_HideLabelCapabilityStyle_hideLabelByDefault_feature", "_UI_HideLabelCapabilityStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DiagramPackage.Literals.HIDE_LABEL_CAPABILITY_STYLE__HIDE_LABEL_BY_DEFAULT, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
     }
 
@@ -148,7 +156,7 @@ public class NodeStyleItemProvider extends LabelStyleItemProvider {
     @Override
     public String getText(Object object) {
         NodeStyle nodeStyle = (NodeStyle) object;
-        return getString("_UI_NodeStyle_type") + " " + nodeStyle.getLabelSize();
+        return getString("_UI_NodeStyle_type") + " " + nodeStyle.getLabelSize(); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/NoteItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/NoteItemProvider.java
index d282d7512d..a032cbb63c 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/NoteItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/NoteItemProvider.java
@@ -64,9 +64,10 @@ public class NoteItemProvider extends NodeStyleItemProvider {
      * @generated
      */
     protected void addColorPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Note_color_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_Note_color_feature", "_UI_Note_type"), DiagramPackage.Literals.NOTE__COLOR, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Note_color_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_Note_color_feature", "_UI_Note_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DiagramPackage.Literals.NOTE__COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -76,7 +77,7 @@ public class NoteItemProvider extends NodeStyleItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/Note"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/Note")); //$NON-NLS-1$
     }
 
     /**
@@ -88,7 +89,7 @@ public class NoteItemProvider extends NodeStyleItemProvider {
     @Override
     public String getText(Object object) {
         Note note = (Note) object;
-        return getString("_UI_Note_type") + " " + note.getLabelSize();
+        return getString("_UI_Note_type") + " " + note.getLabelSize(); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/ShapeContainerStyleItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/ShapeContainerStyleItemProvider.java
index 0e06eff943..b608cada47 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/ShapeContainerStyleItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/ShapeContainerStyleItemProvider.java
@@ -66,8 +66,10 @@ public class ShapeContainerStyleItemProvider extends ContainerStyleItemProvider
      */
     protected void addShapePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_ShapeContainerStyle_shape_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ShapeContainerStyle_shape_feature", "_UI_ShapeContainerStyle_type"),
-                DiagramPackage.Literals.SHAPE_CONTAINER_STYLE__SHAPE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_ShapeContainerStyle_shape_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_ShapeContainerStyle_shape_feature", "_UI_ShapeContainerStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DiagramPackage.Literals.SHAPE_CONTAINER_STYLE__SHAPE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -78,9 +80,10 @@ public class ShapeContainerStyleItemProvider extends ContainerStyleItemProvider
      */
     protected void addBackgroundColorPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_ShapeContainerStyle_backgroundColor_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_ShapeContainerStyle_backgroundColor_feature", "_UI_ShapeContainerStyle_type"),
-                DiagramPackage.Literals.SHAPE_CONTAINER_STYLE__BACKGROUND_COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_ShapeContainerStyle_backgroundColor_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_ShapeContainerStyle_backgroundColor_feature", "_UI_ShapeContainerStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DiagramPackage.Literals.SHAPE_CONTAINER_STYLE__BACKGROUND_COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -91,7 +94,7 @@ public class ShapeContainerStyleItemProvider extends ContainerStyleItemProvider
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ShapeContainerStyle"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/ShapeContainerStyle")); //$NON-NLS-1$
     }
 
     /**
@@ -103,7 +106,7 @@ public class ShapeContainerStyleItemProvider extends ContainerStyleItemProvider
     @Override
     public String getText(Object object) {
         ShapeContainerStyle shapeContainerStyle = (ShapeContainerStyle) object;
-        return getString("_UI_ShapeContainerStyle_type") + " " + shapeContainerStyle.getLabelSize();
+        return getString("_UI_ShapeContainerStyle_type") + " " + shapeContainerStyle.getLabelSize(); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/SquareItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/SquareItemProvider.java
index f435bb8268..28a6d9782b 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/SquareItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/SquareItemProvider.java
@@ -66,9 +66,10 @@ public class SquareItemProvider extends NodeStyleItemProvider {
      * @generated
      */
     protected void addWidthPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Square_width_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_Square_width_feature", "_UI_Square_type"), DiagramPackage.Literals.SQUARE__WIDTH, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Square_width_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_Square_width_feature", "_UI_Square_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DiagramPackage.Literals.SQUARE__WIDTH, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -78,9 +79,10 @@ public class SquareItemProvider extends NodeStyleItemProvider {
      * @generated
      */
     protected void addHeightPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Square_height_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_Square_height_feature", "_UI_Square_type"), DiagramPackage.Literals.SQUARE__HEIGHT, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Square_height_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_Square_height_feature", "_UI_Square_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DiagramPackage.Literals.SQUARE__HEIGHT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -90,9 +92,9 @@ public class SquareItemProvider extends NodeStyleItemProvider {
      * @generated
      */
     protected void addColorPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Square_color_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_Square_color_feature", "_UI_Square_type"), DiagramPackage.Literals.SQUARE__COLOR, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Square_color_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_Square_color_feature", "_UI_Square_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DiagramPackage.Literals.SQUARE__COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
     /**
@@ -102,7 +104,7 @@ public class SquareItemProvider extends NodeStyleItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/Square"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/Square")); //$NON-NLS-1$
     }
 
     /**
@@ -114,7 +116,7 @@ public class SquareItemProvider extends NodeStyleItemProvider {
     @Override
     public String getText(Object object) {
         Square square = (Square) object;
-        return getString("_UI_Square_type") + " " + square.getLabelSize();
+        return getString("_UI_Square_type") + " " + square.getLabelSize(); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/WorkspaceImageItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/WorkspaceImageItemProvider.java
index 9204fbf8e0..4e729838b1 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/WorkspaceImageItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/WorkspaceImageItemProvider.java
@@ -65,8 +65,10 @@ public class WorkspaceImageItemProvider extends NodeStyleItemProvider {
      */
     protected void addWorkspacePathPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_WorkspaceImage_workspacePath_feature"), getString("_UI_PropertyDescriptor_description", "_UI_WorkspaceImage_workspacePath_feature", "_UI_WorkspaceImage_type"),
-                DiagramPackage.Literals.WORKSPACE_IMAGE__WORKSPACE_PATH, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_WorkspaceImage_workspacePath_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_WorkspaceImage_workspacePath_feature", "_UI_WorkspaceImage_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DiagramPackage.Literals.WORKSPACE_IMAGE__WORKSPACE_PATH, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -77,7 +79,7 @@ public class WorkspaceImageItemProvider extends NodeStyleItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/WorkspaceImage"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/WorkspaceImage")); //$NON-NLS-1$
     }
 
     /**
@@ -89,7 +91,7 @@ public class WorkspaceImageItemProvider extends NodeStyleItemProvider {
     @Override
     public String getText(Object object) {
         WorkspaceImage workspaceImage = (WorkspaceImage) object;
-        return getString("_UI_WorkspaceImage_type") + " " + workspaceImage.getLabelSize();
+        return getString("_UI_WorkspaceImage_type") + " " + workspaceImage.getLabelSize(); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/concern/impl/ConcernDescriptionImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/concern/impl/ConcernDescriptionImpl.java
index 46e0ad6b54..ba42d3365f 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/concern/impl/ConcernDescriptionImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/concern/impl/ConcernDescriptionImpl.java
@@ -384,9 +384,9 @@ public class ConcernDescriptionImpl extends DocumentedElementImpl implements Con
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (name: ");
+        result.append(" (name: "); //$NON-NLS-1$
         result.append(name);
-        result.append(", label: ");
+        result.append(", label: "); //$NON-NLS-1$
         result.append(label);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/concern/impl/ConcernFactoryImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/concern/impl/ConcernFactoryImpl.java
index 60daf97f77..a5ce49d1d1 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/concern/impl/ConcernFactoryImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/concern/impl/ConcernFactoryImpl.java
@@ -69,7 +69,7 @@ public class ConcernFactoryImpl extends EFactoryImpl implements ConcernFactory {
         case ConcernPackage.CONCERN_DESCRIPTION:
             return createConcernDescription();
         default:
-            throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+            throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
         }
     }
 
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/concern/impl/ConcernPackageImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/concern/impl/ConcernPackageImpl.java
index dab378b11b..79ab58f946 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/concern/impl/ConcernPackageImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/concern/impl/ConcernPackageImpl.java
@@ -286,21 +286,29 @@ public class ConcernPackageImpl extends EPackageImpl implements ConcernPackage {
         concernDescriptionEClass.getESuperTypes().add(theDescriptionPackage_1.getIdentifiedElement());
 
         // Initialize classes and features; add operations and parameters
-        initEClass(concernSetEClass, ConcernSet.class, "ConcernSet", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getConcernSet_OwnedConcernDescriptions(), this.getConcernDescription(), null, "ownedConcernDescriptions", null, 0, -1, ConcernSet.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(concernDescriptionEClass, ConcernDescription.class, "ConcernDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getConcernDescription_Filters(), theFilterPackage.getFilterDescription(), null, "filters", null, 0, -1, ConcernDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getConcernDescription_Rules(), theValidationPackage.getValidationRule(), null, "rules", null, 0, -1, ConcernDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getConcernDescription_Behaviors(), theToolPackage.getBehaviorTool(), null, "behaviors", null, 0, -1, ConcernDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEClass(concernSetEClass, ConcernSet.class, "ConcernSet", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getConcernSet_OwnedConcernDescriptions(),
+                this.getConcernDescription(),
+                null,
+                "ownedConcernDescriptions", null, 0, -1, ConcernSet.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(concernDescriptionEClass, ConcernDescription.class, "ConcernDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getConcernDescription_Filters(),
+                theFilterPackage.getFilterDescription(),
+                null,
+                "filters", null, 0, -1, ConcernDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getConcernDescription_Rules(),
+                theValidationPackage.getValidationRule(),
+                null,
+                "rules", null, 0, -1, ConcernDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getConcernDescription_Behaviors(),
+                theToolPackage.getBehaviorTool(),
+                null,
+                "behaviors", null, 0, -1, ConcernDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
 
         // Create annotations
         // TagValues
@@ -314,7 +322,7 @@ public class ConcernPackageImpl extends EPackageImpl implements ConcernPackage {
      * @generated
      */
     protected void createTagValuesAnnotations() {
-        String source = "TagValues";
+        String source = "TagValues"; //$NON-NLS-1$
         addAnnotation(concernSetEClass, source, new String[] {});
         addAnnotation(concernDescriptionEClass, source, new String[] {});
     }
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/filter/impl/FilterDescriptionImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/filter/impl/FilterDescriptionImpl.java
index 3ae1569c67..d0aea497f4 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/filter/impl/FilterDescriptionImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/filter/impl/FilterDescriptionImpl.java
@@ -278,9 +278,9 @@ public abstract class FilterDescriptionImpl extends DocumentedElementImpl implem
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (name: ");
+        result.append(" (name: "); //$NON-NLS-1$
         result.append(name);
-        result.append(", label: ");
+        result.append(", label: "); //$NON-NLS-1$
         result.append(label);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/filter/impl/FilterFactoryImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/filter/impl/FilterFactoryImpl.java
index b4ff4118be..9ad7db5d1f 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/filter/impl/FilterFactoryImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/filter/impl/FilterFactoryImpl.java
@@ -80,7 +80,7 @@ public class FilterFactoryImpl extends EFactoryImpl implements FilterFactory {
         case FilterPackage.FILTER_VARIABLE:
             return createFilterVariable();
         default:
-            throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+            throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
         }
     }
 
@@ -95,7 +95,7 @@ public class FilterFactoryImpl extends EFactoryImpl implements FilterFactory {
         case FilterPackage.FILTER_KIND:
             return createFilterKindFromString(eDataType, initialValue);
         default:
-            throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+            throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
         }
     }
 
@@ -110,7 +110,7 @@ public class FilterFactoryImpl extends EFactoryImpl implements FilterFactory {
         case FilterPackage.FILTER_KIND:
             return convertFilterKindToString(eDataType, instanceValue);
         default:
-            throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+            throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
         }
     }
 
@@ -166,7 +166,7 @@ public class FilterFactoryImpl extends EFactoryImpl implements FilterFactory {
     public FilterKind createFilterKindFromString(EDataType eDataType, String initialValue) {
         FilterKind result = FilterKind.get(initialValue);
         if (result == null) {
-            throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+            throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
         }
         return result;
     }
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/filter/impl/FilterImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/filter/impl/FilterImpl.java
index 8a6e86bc40..e5698e7317 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/filter/impl/FilterImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/filter/impl/FilterImpl.java
@@ -180,7 +180,7 @@ public abstract class FilterImpl extends MinimalEObjectImpl.Container implements
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (filterKind: ");
+        result.append(" (filterKind: "); //$NON-NLS-1$
         result.append(filterKind);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/filter/impl/FilterPackageImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/filter/impl/FilterPackageImpl.java
index 49fb439508..8473674ebc 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/filter/impl/FilterPackageImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/filter/impl/FilterPackageImpl.java
@@ -438,57 +438,70 @@ public class FilterPackageImpl extends EPackageImpl implements FilterPackage {
         filterVariableEClass.getESuperTypes().add(theDescriptionPackage_1.getSelectionDescription());
 
         // Initialize classes and features; add operations and parameters
-        initEClass(filterDescriptionEClass, FilterDescription.class, "FilterDescription", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        EOperation op = addEOperation(filterDescriptionEClass, theEcorePackage.getEBoolean(), "isVisible", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-        addEParameter(op, theDiagramPackage.getDDiagramElement(), "element", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-
-        initEClass(filterEClass, Filter.class, "Filter", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getFilter_FilterKind(), this.getFilterKind(), "filterKind", "HIDE", 0, 1, Filter.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE,
-                !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        op = addEOperation(filterEClass, theEcorePackage.getEBoolean(), "isVisible", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-        addEParameter(op, theDiagramPackage.getDDiagramElement(), "element", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-
-        initEClass(mappingFilterEClass, MappingFilter.class, "MappingFilter", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getMappingFilter_Mappings(), theDescriptionPackage.getDiagramElementMapping(), null, "mappings", null, 0, -1, MappingFilter.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getMappingFilter_SemanticConditionExpression(), theDescriptionPackage_1.getInterpretedExpression(), "semanticConditionExpression", null, 0, 1, MappingFilter.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEAttribute(getMappingFilter_ViewConditionExpression(), theDescriptionPackage_1.getInterpretedExpression(), "viewConditionExpression", null, 0, 1, MappingFilter.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-
-        initEClass(compositeFilterDescriptionEClass, CompositeFilterDescription.class, "CompositeFilterDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getCompositeFilterDescription_Filters(), this.getFilter(), null, "filters", null, 1, -1, CompositeFilterDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(variableFilterEClass, VariableFilter.class, "VariableFilter", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getVariableFilter_OwnedVariables(), this.getFilterVariable(), null, "ownedVariables", null, 0, -1, VariableFilter.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEAttribute(getVariableFilter_SemanticConditionExpression(), theDescriptionPackage_1.getInterpretedExpression(), "semanticConditionExpression", "", 0, 1, VariableFilter.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-
-        op = addEOperation(variableFilterEClass, null, "setFilterContext", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
+        initEClass(filterDescriptionEClass, FilterDescription.class, "FilterDescription", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        EOperation op = addEOperation(filterDescriptionEClass, theEcorePackage.getEBoolean(), "isVisible", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        addEParameter(op, theDiagramPackage.getDDiagramElement(), "element", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(filterEClass, Filter.class, "Filter", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getFilter_FilterKind(),
+                this.getFilterKind(),
+                "filterKind", "HIDE", 0, 1, Filter.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+
+        op = addEOperation(filterEClass, theEcorePackage.getEBoolean(), "isVisible", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        addEParameter(op, theDiagramPackage.getDDiagramElement(), "element", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(mappingFilterEClass, MappingFilter.class, "MappingFilter", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getMappingFilter_Mappings(),
+                theDescriptionPackage.getDiagramElementMapping(),
+                null,
+                "mappings", null, 0, -1, MappingFilter.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getMappingFilter_SemanticConditionExpression(),
+                theDescriptionPackage_1.getInterpretedExpression(),
+                "semanticConditionExpression", null, 0, 1, MappingFilter.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getMappingFilter_ViewConditionExpression(),
+                theDescriptionPackage_1.getInterpretedExpression(),
+                "viewConditionExpression", null, 0, 1, MappingFilter.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(compositeFilterDescriptionEClass, CompositeFilterDescription.class,
+                "CompositeFilterDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getCompositeFilterDescription_Filters(),
+                this.getFilter(),
+                null,
+                "filters", null, 1, -1, CompositeFilterDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(variableFilterEClass, VariableFilter.class, "VariableFilter", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getVariableFilter_OwnedVariables(),
+                this.getFilterVariable(),
+                null,
+                "ownedVariables", null, 0, -1, VariableFilter.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getVariableFilter_SemanticConditionExpression(),
+                theDescriptionPackage_1.getInterpretedExpression(),
+                "semanticConditionExpression", "", 0, 1, VariableFilter.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+
+        op = addEOperation(variableFilterEClass, null, "setFilterContext", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
         EGenericType g1 = createEGenericType(theEcorePackage.getEMap());
         EGenericType g2 = createEGenericType();
         g1.getETypeArguments().add(g2);
         g2 = createEGenericType();
         g1.getETypeArguments().add(g2);
-        addEParameter(op, g1, "variables", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
+        addEParameter(op, g1, "variables", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
 
-        initEClass(filterVariableEClass, FilterVariable.class, "FilterVariable", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getFilterVariable_Name(), theEcorePackage.getEString(), "name", null, 1, 1, FilterVariable.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEClass(filterVariableEClass, FilterVariable.class, "FilterVariable", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getFilterVariable_Name(),
+                theEcorePackage.getEString(),
+                "name", null, 1, 1, FilterVariable.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
 
         // Initialize enums and add enum literals
-        initEEnum(filterKindEEnum, FilterKind.class, "FilterKind");
+        initEEnum(filterKindEEnum, FilterKind.class, "FilterKind"); //$NON-NLS-1$
         addEEnumLiteral(filterKindEEnum, FilterKind.HIDE_LITERAL);
         addEEnumLiteral(filterKindEEnum, FilterKind.COLLAPSE_LITERAL);
 
@@ -507,10 +520,13 @@ public class FilterPackageImpl extends EPackageImpl implements FilterPackage {
      * @generated
      */
     protected void createReturnTypeAnnotations() {
-        String source = "http://www.eclipse.org/sirius/interpreted/expression/returnType";
-        addAnnotation(getMappingFilter_SemanticConditionExpression(), source, new String[] { "returnType", "a boolean." });
-        addAnnotation(getMappingFilter_ViewConditionExpression(), source, new String[] { "returnType", "a boolean." });
-        addAnnotation(getVariableFilter_SemanticConditionExpression(), source, new String[] { "returnType", "a boolean." });
+        String source = "http://www.eclipse.org/sirius/interpreted/expression/returnType"; //$NON-NLS-1$
+        addAnnotation(getMappingFilter_SemanticConditionExpression(), source, new String[] { "returnType", "a boolean." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getMappingFilter_ViewConditionExpression(), source, new String[] { "returnType", "a boolean." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getVariableFilter_SemanticConditionExpression(), source, new String[] { "returnType", "a boolean." //$NON-NLS-1$ //$NON-NLS-2$
+        });
     }
 
     /**
@@ -521,7 +537,7 @@ public class FilterPackageImpl extends EPackageImpl implements FilterPackage {
      * @generated
      */
     protected void createVariablesAnnotations() {
-        String source = "http://www.eclipse.org/sirius/interpreted/expression/variables";
+        String source = "http://www.eclipse.org/sirius/interpreted/expression/variables"; //$NON-NLS-1$
         addAnnotation(getMappingFilter_SemanticConditionExpression(), source, new String[] {});
         addAnnotation(getMappingFilter_ViewConditionExpression(), source, new String[] {});
         addAnnotation(getVariableFilter_SemanticConditionExpression(), source, new String[] {});
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/filter/impl/FilterVariableImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/filter/impl/FilterVariableImpl.java
index acd472aca9..5cd6212b6d 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/filter/impl/FilterVariableImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/filter/impl/FilterVariableImpl.java
@@ -514,19 +514,19 @@ public class FilterVariableImpl extends MinimalEObjectImpl.Container implements
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (candidatesExpression: ");
+        result.append(" (candidatesExpression: "); //$NON-NLS-1$
         result.append(candidatesExpression);
-        result.append(", multiple: ");
+        result.append(", multiple: "); //$NON-NLS-1$
         result.append(multiple);
-        result.append(", tree: ");
+        result.append(", tree: "); //$NON-NLS-1$
         result.append(tree);
-        result.append(", rootExpression: ");
+        result.append(", rootExpression: "); //$NON-NLS-1$
         result.append(rootExpression);
-        result.append(", childrenExpression: ");
+        result.append(", childrenExpression: "); //$NON-NLS-1$
         result.append(childrenExpression);
-        result.append(", message: ");
+        result.append(", message: "); //$NON-NLS-1$
         result.append(message);
-        result.append(", name: ");
+        result.append(", name: "); //$NON-NLS-1$
         result.append(name);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/filter/impl/MappingFilterImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/filter/impl/MappingFilterImpl.java
index d58d784f32..da81c0a200 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/filter/impl/MappingFilterImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/filter/impl/MappingFilterImpl.java
@@ -271,9 +271,9 @@ public class MappingFilterImpl extends FilterImpl implements MappingFilter {
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (semanticConditionExpression: ");
+        result.append(" (semanticConditionExpression: "); //$NON-NLS-1$
         result.append(semanticConditionExpression);
-        result.append(", viewConditionExpression: ");
+        result.append(", viewConditionExpression: "); //$NON-NLS-1$
         result.append(viewConditionExpression);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/filter/impl/VariableFilterImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/filter/impl/VariableFilterImpl.java
index 138273580a..961367866d 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/filter/impl/VariableFilterImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/filter/impl/VariableFilterImpl.java
@@ -242,7 +242,7 @@ public class VariableFilterImpl extends FilterImpl implements VariableFilter {
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (semanticConditionExpression: ");
+        result.append(" (semanticConditionExpression: "); //$NON-NLS-1$
         result.append(semanticConditionExpression);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/impl/AbstractNodeMappingImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/impl/AbstractNodeMappingImpl.java
index 48fbe00b7f..13d182ae40 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/impl/AbstractNodeMappingImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/impl/AbstractNodeMappingImpl.java
@@ -412,9 +412,9 @@ public abstract class AbstractNodeMappingImpl extends DiagramElementMappingImpl
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (documentation: ");
+        result.append(" (documentation: "); //$NON-NLS-1$
         result.append(documentation);
-        result.append(", domainClass: ");
+        result.append(", domainClass: "); //$NON-NLS-1$
         result.append(domainClass);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/impl/AdditionalLayerImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/impl/AdditionalLayerImpl.java
index 7de01cd284..dd28d0b7a8 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/impl/AdditionalLayerImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/impl/AdditionalLayerImpl.java
@@ -224,9 +224,9 @@ public class AdditionalLayerImpl extends LayerImpl implements AdditionalLayer {
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (activeByDefault: ");
+        result.append(" (activeByDefault: "); //$NON-NLS-1$
         result.append(activeByDefault);
-        result.append(", optional: ");
+        result.append(", optional: "); //$NON-NLS-1$
         result.append(optional);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/impl/CompositeLayoutImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/impl/CompositeLayoutImpl.java
index 83179ac373..d77d58e4e4 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/impl/CompositeLayoutImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/impl/CompositeLayoutImpl.java
@@ -224,9 +224,9 @@ public class CompositeLayoutImpl extends DocumentedElementImpl implements Compos
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (padding: ");
+        result.append(" (padding: "); //$NON-NLS-1$
         result.append(padding);
-        result.append(", direction: ");
+        result.append(", direction: "); //$NON-NLS-1$
         result.append(direction);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/impl/ContainerMappingImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/impl/ContainerMappingImpl.java
index 50fb0ae988..5d0f654705 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/impl/ContainerMappingImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/impl/ContainerMappingImpl.java
@@ -636,7 +636,7 @@ public class ContainerMappingImpl extends AbstractNodeMappingImpl implements Con
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (childrenPresentation: ");
+        result.append(" (childrenPresentation: "); //$NON-NLS-1$
         result.append(childrenPresentation);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/impl/ContainerMappingImportImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/impl/ContainerMappingImportImpl.java
index 8bccebea6d..d922804269 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/impl/ContainerMappingImportImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/impl/ContainerMappingImportImpl.java
@@ -338,9 +338,9 @@ public class ContainerMappingImportImpl extends ContainerMappingImpl implements
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (hideSubMappings: ");
+        result.append(" (hideSubMappings: "); //$NON-NLS-1$
         result.append(hideSubMappings);
-        result.append(", inheritsAncestorFilters: ");
+        result.append(", inheritsAncestorFilters: "); //$NON-NLS-1$
         result.append(inheritsAncestorFilters);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/impl/DescriptionFactoryImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/impl/DescriptionFactoryImpl.java
index 306221410c..1cca769791 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/impl/DescriptionFactoryImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/impl/DescriptionFactoryImpl.java
@@ -130,7 +130,7 @@ public class DescriptionFactoryImpl extends EFactoryImpl implements DescriptionF
         case DescriptionPackage.ADDITIONAL_LAYER:
             return createAdditionalLayer();
         default:
-            throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+            throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
         }
     }
 
@@ -149,7 +149,7 @@ public class DescriptionFactoryImpl extends EFactoryImpl implements DescriptionF
         case DescriptionPackage.CENTERING_STYLE:
             return createCenteringStyleFromString(eDataType, initialValue);
         default:
-            throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+            throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
         }
     }
 
@@ -168,7 +168,7 @@ public class DescriptionFactoryImpl extends EFactoryImpl implements DescriptionF
         case DescriptionPackage.CENTERING_STYLE:
             return convertCenteringStyleToString(eDataType, instanceValue);
         default:
-            throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+            throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
         }
     }
 
@@ -380,7 +380,7 @@ public class DescriptionFactoryImpl extends EFactoryImpl implements DescriptionF
     public FoldingStyle createFoldingStyleFromString(EDataType eDataType, String initialValue) {
         FoldingStyle result = FoldingStyle.get(initialValue);
         if (result == null) {
-            throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+            throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
         }
         return result;
     }
@@ -402,7 +402,7 @@ public class DescriptionFactoryImpl extends EFactoryImpl implements DescriptionF
     public LayoutDirection createLayoutDirectionFromString(EDataType eDataType, String initialValue) {
         LayoutDirection result = LayoutDirection.get(initialValue);
         if (result == null) {
-            throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+            throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
         }
         return result;
     }
@@ -424,7 +424,7 @@ public class DescriptionFactoryImpl extends EFactoryImpl implements DescriptionF
     public CenteringStyle createCenteringStyleFromString(EDataType eDataType, String initialValue) {
         CenteringStyle result = CenteringStyle.get(initialValue);
         if (result == null) {
-            throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+            throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
         }
         return result;
     }
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/impl/DescriptionPackageImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/impl/DescriptionPackageImpl.java
index 19070fb565..025d7652c3 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/impl/DescriptionPackageImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/impl/DescriptionPackageImpl.java
@@ -1762,428 +1762,605 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
         additionalLayerEClass.getESuperTypes().add(this.getLayer());
 
         // Initialize classes and features; add operations and parameters
-        initEClass(diagramDescriptionEClass, DiagramDescription.class, "DiagramDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getDiagramDescription_Filters(), theFilterPackage.getFilterDescription(), null, "filters", null, 0, -1, DiagramDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEClass(diagramDescriptionEClass, DiagramDescription.class, "DiagramDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getDiagramDescription_Filters(),
+                theFilterPackage.getFilterDescription(),
+                null,
+                "filters", null, 0, -1, DiagramDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
         getDiagramDescription_Filters().getEKeys().add(theDescriptionPackage_1.getIdentifiedElement_Name());
-        initEReference(getDiagramDescription_AllEdgeMappings(), this.getEdgeMapping(), null, "allEdgeMappings", null, 0, -1, DiagramDescription.class, EPackageImpl.IS_TRANSIENT,
-                EPackageImpl.IS_VOLATILE, !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getDiagramDescription_AllNodeMappings(), this.getNodeMapping(), null, "allNodeMappings", null, 0, -1, DiagramDescription.class, EPackageImpl.IS_TRANSIENT,
-                EPackageImpl.IS_VOLATILE, !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getDiagramDescription_AllContainerMappings(), this.getContainerMapping(), null, "allContainerMappings", null, 0, -1, DiagramDescription.class, EPackageImpl.IS_TRANSIENT,
-                EPackageImpl.IS_VOLATILE, !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getDiagramDescription_ValidationSet(), theValidationPackage.getValidationSet(), null, "validationSet", null, 0, 1, DiagramDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getDiagramDescription_Concerns(), theConcernPackage.getConcernSet(), null, "concerns", null, 0, 1, DiagramDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getDiagramDescription_AllTools(), theToolPackage_1.getAbstractToolDescription(), null, "allTools", null, 0, -1, DiagramDescription.class, EPackageImpl.IS_TRANSIENT,
-                EPackageImpl.IS_VOLATILE, !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getDiagramDescription_DomainClass(), theDescriptionPackage_1.getTypeName(), "domainClass", null, 1, 1, DiagramDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getDiagramDescription_PreconditionExpression(), theDescriptionPackage_1.getInterpretedExpression(), "preconditionExpression", null, 0, 1, DiagramDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getDiagramDescription_DefaultConcern(), theConcernPackage.getConcernDescription(), null, "defaultConcern", null, 0, 1, DiagramDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getDiagramDescription_RootExpression(), theDescriptionPackage_1.getInterpretedExpression(), "rootExpression", null, 0, 1, DiagramDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getDiagramDescription_Init(), theToolPackage_1.getRepresentationCreationDescription(), null, "init", null, 0, 1, DiagramDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getDiagramDescription_Layout(), this.getLayout(), null, "layout", null, 0, 1, DiagramDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getDiagramDescription_DiagramInitialisation(), theToolPackage_1.getInitialOperation(), null, "diagramInitialisation", null, 0, 1, DiagramDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getDiagramDescription_DefaultLayer(), this.getLayer(), null, "defaultLayer", null, 0, 1, DiagramDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getDiagramDescription_AdditionalLayers(), this.getAdditionalLayer(), null, "additionalLayers", null, 0, -1, DiagramDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEReference(
+                getDiagramDescription_AllEdgeMappings(),
+                this.getEdgeMapping(),
+                null,
+                "allEdgeMappings", null, 0, -1, DiagramDescription.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE, !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDiagramDescription_AllNodeMappings(),
+                this.getNodeMapping(),
+                null,
+                "allNodeMappings", null, 0, -1, DiagramDescription.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE, !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDiagramDescription_AllContainerMappings(),
+                this.getContainerMapping(),
+                null,
+                "allContainerMappings", null, 0, -1, DiagramDescription.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE, !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDiagramDescription_ValidationSet(),
+                theValidationPackage.getValidationSet(),
+                null,
+                "validationSet", null, 0, 1, DiagramDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDiagramDescription_Concerns(),
+                theConcernPackage.getConcernSet(),
+                null,
+                "concerns", null, 0, 1, DiagramDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDiagramDescription_AllTools(),
+                theToolPackage_1.getAbstractToolDescription(),
+                null,
+                "allTools", null, 0, -1, DiagramDescription.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE, !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getDiagramDescription_DomainClass(),
+                theDescriptionPackage_1.getTypeName(),
+                "domainClass", null, 1, 1, DiagramDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getDiagramDescription_PreconditionExpression(),
+                theDescriptionPackage_1.getInterpretedExpression(),
+                "preconditionExpression", null, 0, 1, DiagramDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDiagramDescription_DefaultConcern(),
+                theConcernPackage.getConcernDescription(),
+                null,
+                "defaultConcern", null, 0, 1, DiagramDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getDiagramDescription_RootExpression(),
+                theDescriptionPackage_1.getInterpretedExpression(),
+                "rootExpression", null, 0, 1, DiagramDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDiagramDescription_Init(),
+                theToolPackage_1.getRepresentationCreationDescription(),
+                null,
+                "init", null, 0, 1, DiagramDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDiagramDescription_Layout(),
+                this.getLayout(),
+                null,
+                "layout", null, 0, 1, DiagramDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDiagramDescription_DiagramInitialisation(),
+                theToolPackage_1.getInitialOperation(),
+                null,
+                "diagramInitialisation", null, 0, 1, DiagramDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDiagramDescription_DefaultLayer(),
+                this.getLayer(),
+                null,
+                "defaultLayer", null, 0, 1, DiagramDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDiagramDescription_AdditionalLayers(),
+                this.getAdditionalLayer(),
+                null,
+                "additionalLayers", null, 0, -1, DiagramDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
         getDiagramDescription_AdditionalLayers().getEKeys().add(theDescriptionPackage_1.getIdentifiedElement_Name());
-        initEReference(getDiagramDescription_AllLayers(), this.getLayer(), null, "allLayers", null, 0, -1, DiagramDescription.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getDiagramDescription_AllActivatedTools(), theToolPackage_1.getAbstractToolDescription(), null, "allActivatedTools", null, 0, -1, DiagramDescription.class,
-                EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getDiagramDescription_NodeMappings(), this.getNodeMapping(), null, "nodeMappings", null, 0, -1, DiagramDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
+        initEReference(
+                getDiagramDescription_AllLayers(),
+                this.getLayer(),
+                null,
+                "allLayers", null, 0, -1, DiagramDescription.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDiagramDescription_AllActivatedTools(),
+                theToolPackage_1.getAbstractToolDescription(),
+                null,
+                "allActivatedTools", null, 0, -1, DiagramDescription.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDiagramDescription_NodeMappings(),
+                this.getNodeMapping(),
+                null,
+                "nodeMappings", null, 0, -1, DiagramDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
         getDiagramDescription_NodeMappings().getEKeys().add(theDescriptionPackage_1.getIdentifiedElement_Name());
-        initEReference(getDiagramDescription_EdgeMappings(), this.getEdgeMapping(), null, "edgeMappings", null, 0, -1, DiagramDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
+        initEReference(
+                getDiagramDescription_EdgeMappings(),
+                this.getEdgeMapping(),
+                null,
+                "edgeMappings", null, 0, -1, DiagramDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
         getDiagramDescription_EdgeMappings().getEKeys().add(theDescriptionPackage_1.getIdentifiedElement_Name());
-        initEReference(getDiagramDescription_EdgeMappingImports(), this.getEdgeMappingImport(), null, "edgeMappingImports", null, 0, -1, DiagramDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEReference(
+                getDiagramDescription_EdgeMappingImports(),
+                this.getEdgeMappingImport(),
+                null,
+                "edgeMappingImports", null, 0, -1, DiagramDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
         getDiagramDescription_EdgeMappingImports().getEKeys().add(theDescriptionPackage_1.getIdentifiedElement_Name());
-        initEReference(getDiagramDescription_ContainerMappings(), this.getContainerMapping(), null, "containerMappings", null, 0, -1, DiagramDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEReference(
+                getDiagramDescription_ContainerMappings(),
+                this.getContainerMapping(),
+                null,
+                "containerMappings", null, 0, -1, DiagramDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
         getDiagramDescription_ContainerMappings().getEKeys().add(theDescriptionPackage_1.getIdentifiedElement_Name());
-        initEReference(getDiagramDescription_ReusedMappings(), this.getDiagramElementMapping(), null, "reusedMappings", null, 0, -1, DiagramDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getDiagramDescription_ToolSection(), theToolPackage.getToolSection(), null, "toolSection", null, 0, 1, DiagramDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEReference(
+                getDiagramDescription_ReusedMappings(),
+                this.getDiagramElementMapping(),
+                null,
+                "reusedMappings", null, 0, -1, DiagramDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDiagramDescription_ToolSection(),
+                theToolPackage.getToolSection(),
+                null,
+                "toolSection", null, 0, 1, DiagramDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
         getDiagramDescription_ToolSection().getEKeys().add(theDescriptionPackage_1.getIdentifiedElement_Name());
-        initEReference(getDiagramDescription_ReusedTools(), theToolPackage_1.getAbstractToolDescription(), null, "reusedTools", null, 0, -1, DiagramDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getDiagramDescription_EnablePopupBars(), theEcorePackage.getEBoolean(), "enablePopupBars", null, 0, 1, DiagramDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        addEOperation(diagramDescriptionEClass, theDiagramPackage.getDSemanticDiagram(), "createDiagram", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-
-        initEClass(diagramImportDescriptionEClass, DiagramImportDescription.class, "DiagramImportDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getDiagramImportDescription_ImportedDiagram(), this.getDiagramDescription(), null, "importedDiagram", null, 0, 1, DiagramImportDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(diagramExtensionDescriptionEClass, DiagramExtensionDescription.class, "DiagramExtensionDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getDiagramExtensionDescription_Layers(), this.getAdditionalLayer(), null, "layers", null, 0, -1, DiagramExtensionDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEReference(
+                getDiagramDescription_ReusedTools(),
+                theToolPackage_1.getAbstractToolDescription(),
+                null,
+                "reusedTools", null, 0, -1, DiagramDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getDiagramDescription_EnablePopupBars(),
+                theEcorePackage.getEBoolean(),
+                "enablePopupBars", null, 0, 1, DiagramDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        addEOperation(diagramDescriptionEClass, theDiagramPackage.getDSemanticDiagram(), "createDiagram", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(diagramImportDescriptionEClass, DiagramImportDescription.class,
+                "DiagramImportDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getDiagramImportDescription_ImportedDiagram(),
+                this.getDiagramDescription(),
+                null,
+                "importedDiagram", null, 0, 1, DiagramImportDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(diagramExtensionDescriptionEClass, DiagramExtensionDescription.class,
+                "DiagramExtensionDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getDiagramExtensionDescription_Layers(),
+                this.getAdditionalLayer(),
+                null,
+                "layers", null, 0, -1, DiagramExtensionDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
         getDiagramExtensionDescription_Layers().getEKeys().add(theDescriptionPackage_1.getIdentifiedElement_Name());
-        initEReference(getDiagramExtensionDescription_ValidationSet(), theValidationPackage.getValidationSet(), null, "validationSet", null, 0, 1, DiagramExtensionDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getDiagramExtensionDescription_Concerns(), theConcernPackage.getConcernSet(), null, "concerns", null, 0, 1, DiagramExtensionDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(diagramElementMappingEClass, DiagramElementMapping.class, "DiagramElementMapping", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getDiagramElementMapping_PreconditionExpression(), theDescriptionPackage_1.getInterpretedExpression(), "preconditionExpression", "", 0, 1, DiagramElementMapping.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getDiagramElementMapping_DeletionDescription(), theToolPackage.getDeleteElementDescription(), null, "deletionDescription", null, 0, 1, DiagramElementMapping.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getDiagramElementMapping_LabelDirectEdit(), theToolPackage.getDirectEditLabel(), null, "labelDirectEdit", null, 0, 1, DiagramElementMapping.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getDiagramElementMapping_SemanticCandidatesExpression(), theDescriptionPackage_1.getInterpretedExpression(), "semanticCandidatesExpression", null, 0, 1,
-                DiagramElementMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getDiagramElementMapping_CreateElements(), theEcorePackage.getEBoolean(), "createElements", "true", 1, 1, DiagramElementMapping.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getDiagramElementMapping_SemanticElements(), theDescriptionPackage_1.getInterpretedExpression(), "semanticElements", null, 0, 1, DiagramElementMapping.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getDiagramElementMapping_DoubleClickDescription(), theToolPackage.getDoubleClickDescription(), theToolPackage.getDoubleClickDescription_Mappings(), "doubleClickDescription",
-                null, 0, 1, DiagramElementMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE,
-                EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getDiagramElementMapping_SynchronizationLock(), theEcorePackage.getEBoolean(), "synchronizationLock", "false", 0, 1, DiagramElementMapping.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        EOperation op = addEOperation(diagramElementMappingEClass, theEcorePackage.getEBoolean(), "checkPrecondition", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-        addEParameter(op, theEcorePackage.getEObject(), "modelElement", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-        addEParameter(op, theEcorePackage.getEObject(), "container", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-        addEParameter(op, theEcorePackage.getEObject(), "containerView", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-
-        addEOperation(diagramElementMappingEClass, this.getDiagramElementMapping(), "getAllMappings", 0, -1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-
-        op = addEOperation(diagramElementMappingEClass, theEcorePackage.getEBoolean(), "isFrom", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-        addEParameter(op, theViewpointPackage.getDMappingBased(), "element", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-
-        initEClass(abstractNodeMappingEClass, AbstractNodeMapping.class, "AbstractNodeMapping", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getAbstractNodeMapping_DomainClass(), theDescriptionPackage_1.getTypeName(), "domainClass", null, 1, 1, AbstractNodeMapping.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getAbstractNodeMapping_BorderedNodeMappings(), this.getNodeMapping(), null, "borderedNodeMappings", null, 0, -1, AbstractNodeMapping.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEReference(
+                getDiagramExtensionDescription_ValidationSet(),
+                theValidationPackage.getValidationSet(),
+                null,
+                "validationSet", null, 0, 1, DiagramExtensionDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDiagramExtensionDescription_Concerns(),
+                theConcernPackage.getConcernSet(),
+                null,
+                "concerns", null, 0, 1, DiagramExtensionDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(diagramElementMappingEClass, DiagramElementMapping.class, "DiagramElementMapping", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getDiagramElementMapping_PreconditionExpression(),
+                theDescriptionPackage_1.getInterpretedExpression(),
+                "preconditionExpression", "", 0, 1, DiagramElementMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEReference(
+                getDiagramElementMapping_DeletionDescription(),
+                theToolPackage.getDeleteElementDescription(),
+                null,
+                "deletionDescription", null, 0, 1, DiagramElementMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDiagramElementMapping_LabelDirectEdit(),
+                theToolPackage.getDirectEditLabel(),
+                null,
+                "labelDirectEdit", null, 0, 1, DiagramElementMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getDiagramElementMapping_SemanticCandidatesExpression(),
+                theDescriptionPackage_1.getInterpretedExpression(),
+                "semanticCandidatesExpression", null, 0, 1, DiagramElementMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getDiagramElementMapping_CreateElements(),
+                theEcorePackage.getEBoolean(),
+                "createElements", "true", 1, 1, DiagramElementMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(
+                getDiagramElementMapping_SemanticElements(),
+                theDescriptionPackage_1.getInterpretedExpression(),
+                "semanticElements", null, 0, 1, DiagramElementMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDiagramElementMapping_DoubleClickDescription(),
+                theToolPackage.getDoubleClickDescription(),
+                theToolPackage.getDoubleClickDescription_Mappings(),
+                "doubleClickDescription", null, 0, 1, DiagramElementMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getDiagramElementMapping_SynchronizationLock(),
+                theEcorePackage.getEBoolean(),
+                "synchronizationLock", "false", 0, 1, DiagramElementMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+
+        EOperation op = addEOperation(diagramElementMappingEClass, theEcorePackage.getEBoolean(), "checkPrecondition", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        addEParameter(op, theEcorePackage.getEObject(), "modelElement", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        addEParameter(op, theEcorePackage.getEObject(), "container", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        addEParameter(op, theEcorePackage.getEObject(), "containerView", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        addEOperation(diagramElementMappingEClass, this.getDiagramElementMapping(), "getAllMappings", 0, -1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        op = addEOperation(diagramElementMappingEClass, theEcorePackage.getEBoolean(), "isFrom", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        addEParameter(op, theViewpointPackage.getDMappingBased(), "element", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(abstractNodeMappingEClass, AbstractNodeMapping.class, "AbstractNodeMapping", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getAbstractNodeMapping_DomainClass(),
+                theDescriptionPackage_1.getTypeName(),
+                "domainClass", null, 1, 1, AbstractNodeMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getAbstractNodeMapping_BorderedNodeMappings(),
+                this.getNodeMapping(),
+                null,
+                "borderedNodeMappings", null, 0, -1, AbstractNodeMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
         getAbstractNodeMapping_BorderedNodeMappings().getEKeys().add(theDescriptionPackage_1.getIdentifiedElement_Name());
-        initEReference(getAbstractNodeMapping_ReusedBorderedNodeMappings(), this.getNodeMapping(), null, "reusedBorderedNodeMappings", null, 0, -1, AbstractNodeMapping.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        op = addEOperation(abstractNodeMappingEClass, theDiagramPackage.getDDiagramElement(), "findDNodeFromEObject", 0, -1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-        addEParameter(op, theEcorePackage.getEObject(), "eObject", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-
-        addEOperation(abstractNodeMappingEClass, null, "clearDNodesDone", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-
-        op = addEOperation(abstractNodeMappingEClass, null, "addDoneNode", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-        addEParameter(op, theViewpointPackage.getDSemanticDecorator(), "node", 1, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-
-        addEOperation(abstractNodeMappingEClass, this.getNodeMapping(), "getAllBorderedNodeMappings", 0, -1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-
-        initEClass(nodeMappingEClass, NodeMapping.class, "NodeMapping", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getNodeMapping_Style(), theStylePackage.getNodeStyleDescription(), null, "style", null, 0, 1, NodeMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getNodeMapping_ConditionnalStyles(), this.getConditionalNodeStyleDescription(), null, "conditionnalStyles", null, 0, -1, NodeMapping.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        op = addEOperation(nodeMappingEClass, theDiagramPackage.getDNode(), "createNode", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-        addEParameter(op, theEcorePackage.getEObject(), "modelElement", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-        addEParameter(op, theEcorePackage.getEObject(), "container", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-        addEParameter(op, theDiagramPackage.getDDiagram(), "viewPoint", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-
-        op = addEOperation(nodeMappingEClass, null, "updateNode", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-        addEParameter(op, theDiagramPackage.getDNode(), "node", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-
-        op = addEOperation(nodeMappingEClass, null, "updateListElement", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-        addEParameter(op, theDiagramPackage.getDNodeListElement(), "listElement", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-
-        op = addEOperation(nodeMappingEClass, theEcorePackage.getEObject(), "getNodesCandidates", 0, -1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-        addEParameter(op, theEcorePackage.getEObject(), "semanticOrigin", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-        addEParameter(op, theEcorePackage.getEObject(), "container", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-
-        op = addEOperation(nodeMappingEClass, theEcorePackage.getEObject(), "getNodesCandidates", 0, -1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-        addEParameter(op, theEcorePackage.getEObject(), "semanticOrigin", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-        addEParameter(op, theEcorePackage.getEObject(), "container", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-        addEParameter(op, theEcorePackage.getEObject(), "containerView", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-
-        initEClass(containerMappingEClass, ContainerMapping.class, "ContainerMapping", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getContainerMapping_SubNodeMappings(), this.getNodeMapping(), null, "subNodeMappings", null, 0, -1, ContainerMapping.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEReference(
+                getAbstractNodeMapping_ReusedBorderedNodeMappings(),
+                this.getNodeMapping(),
+                null,
+                "reusedBorderedNodeMappings", null, 0, -1, AbstractNodeMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        op = addEOperation(abstractNodeMappingEClass, theDiagramPackage.getDDiagramElement(), "findDNodeFromEObject", 0, -1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        addEParameter(op, theEcorePackage.getEObject(), "eObject", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        addEOperation(abstractNodeMappingEClass, null, "clearDNodesDone", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        op = addEOperation(abstractNodeMappingEClass, null, "addDoneNode", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        addEParameter(op, theViewpointPackage.getDSemanticDecorator(), "node", 1, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        addEOperation(abstractNodeMappingEClass, this.getNodeMapping(), "getAllBorderedNodeMappings", 0, -1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(nodeMappingEClass, NodeMapping.class, "NodeMapping", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getNodeMapping_Style(),
+                theStylePackage.getNodeStyleDescription(),
+                null,
+                "style", null, 0, 1, NodeMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getNodeMapping_ConditionnalStyles(),
+                this.getConditionalNodeStyleDescription(),
+                null,
+                "conditionnalStyles", null, 0, -1, NodeMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        op = addEOperation(nodeMappingEClass, theDiagramPackage.getDNode(), "createNode", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        addEParameter(op, theEcorePackage.getEObject(), "modelElement", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        addEParameter(op, theEcorePackage.getEObject(), "container", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        addEParameter(op, theDiagramPackage.getDDiagram(), "viewPoint", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        op = addEOperation(nodeMappingEClass, null, "updateNode", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        addEParameter(op, theDiagramPackage.getDNode(), "node", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        op = addEOperation(nodeMappingEClass, null, "updateListElement", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        addEParameter(op, theDiagramPackage.getDNodeListElement(), "listElement", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        op = addEOperation(nodeMappingEClass, theEcorePackage.getEObject(), "getNodesCandidates", 0, -1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        addEParameter(op, theEcorePackage.getEObject(), "semanticOrigin", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        addEParameter(op, theEcorePackage.getEObject(), "container", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        op = addEOperation(nodeMappingEClass, theEcorePackage.getEObject(), "getNodesCandidates", 0, -1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        addEParameter(op, theEcorePackage.getEObject(), "semanticOrigin", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        addEParameter(op, theEcorePackage.getEObject(), "container", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        addEParameter(op, theEcorePackage.getEObject(), "containerView", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(containerMappingEClass, ContainerMapping.class, "ContainerMapping", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getContainerMapping_SubNodeMappings(),
+                this.getNodeMapping(),
+                null,
+                "subNodeMappings", null, 0, -1, ContainerMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
         getContainerMapping_SubNodeMappings().getEKeys().add(theDescriptionPackage_1.getIdentifiedElement_Name());
-        initEReference(getContainerMapping_AllNodeMappings(), this.getNodeMapping(), null, "allNodeMappings", null, 0, -1, ContainerMapping.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE,
-                !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getContainerMapping_ReusedNodeMappings(), this.getNodeMapping(), null, "reusedNodeMappings", null, 0, -1, ContainerMapping.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getContainerMapping_SubContainerMappings(), this.getContainerMapping(), null, "subContainerMappings", null, 0, -1, ContainerMapping.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEReference(
+                getContainerMapping_AllNodeMappings(),
+                this.getNodeMapping(),
+                null,
+                "allNodeMappings", null, 0, -1, ContainerMapping.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE, !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getContainerMapping_ReusedNodeMappings(),
+                this.getNodeMapping(),
+                null,
+                "reusedNodeMappings", null, 0, -1, ContainerMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getContainerMapping_SubContainerMappings(),
+                this.getContainerMapping(),
+                null,
+                "subContainerMappings", null, 0, -1, ContainerMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
         getContainerMapping_SubContainerMappings().getEKeys().add(theDescriptionPackage_1.getIdentifiedElement_Name());
-        initEReference(getContainerMapping_ReusedContainerMappings(), this.getContainerMapping(), null, "reusedContainerMappings", null, 0, -1, ContainerMapping.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getContainerMapping_AllContainerMappings(), this.getContainerMapping(), null, "allContainerMappings", null, 0, -1, ContainerMapping.class, EPackageImpl.IS_TRANSIENT,
-                EPackageImpl.IS_VOLATILE, !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getContainerMapping_Style(), theStylePackage.getContainerStyleDescription(), null, "style", null, 0, 1, ContainerMapping.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getContainerMapping_ConditionnalStyles(), this.getConditionalContainerStyleDescription(), null, "conditionnalStyles", null, 0, -1, ContainerMapping.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getContainerMapping_ChildrenPresentation(), theDiagramPackage.getContainerLayout(), "childrenPresentation", "FreeForm", 1, 1, ContainerMapping.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-
-        op = addEOperation(containerMappingEClass, theDiagramPackage.getContainerStyle(), "getBestStyle", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-        addEParameter(op, theEcorePackage.getEObject(), "modelElement", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-        addEParameter(op, theEcorePackage.getEObject(), "viewVariable", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-        addEParameter(op, theEcorePackage.getEObject(), "containerVariable", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-
-        initEClass(nodeMappingImportEClass, NodeMappingImport.class, "NodeMappingImport", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getNodeMappingImport_ImportedMapping(), this.getNodeMapping(), null, "importedMapping", null, 1, 1, NodeMappingImport.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(containerMappingImportEClass, ContainerMappingImport.class, "ContainerMappingImport", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getContainerMappingImport_ImportedMapping(), this.getContainerMapping(), null, "importedMapping", null, 1, 1, ContainerMappingImport.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(edgeMappingEClass, EdgeMapping.class, "EdgeMapping", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getEdgeMapping_SourceMapping(), this.getDiagramElementMapping(), null, "sourceMapping", null, 1, -1, EdgeMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getEdgeMapping_TargetMapping(), this.getDiagramElementMapping(), null, "targetMapping", null, 1, -1, EdgeMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEAttribute(getEdgeMapping_TargetFinderExpression(), theDescriptionPackage_1.getInterpretedExpression(), "targetFinderExpression", "", 1, 1, EdgeMapping.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getEdgeMapping_SourceFinderExpression(), theDescriptionPackage_1.getInterpretedExpression(), "sourceFinderExpression", null, 0, 1, EdgeMapping.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getEdgeMapping_Style(), theStylePackage.getEdgeStyleDescription(), null, "style", null, 0, 1, EdgeMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getEdgeMapping_ConditionnalStyles(), this.getConditionalEdgeStyleDescription(), null, "conditionnalStyles", null, 0, -1, EdgeMapping.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getEdgeMapping_TargetExpression(), theDescriptionPackage_1.getInterpretedExpression(), "targetExpression", null, 0, 1, EdgeMapping.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getEdgeMapping_DomainClass(), theDescriptionPackage_1.getTypeName(), "domainClass", null, 0, 1, EdgeMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getEdgeMapping_UseDomainElement(), theEcorePackage.getEBoolean(), "useDomainElement", "false", 0, 1, EdgeMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getEdgeMapping_Reconnections(), theToolPackage.getReconnectEdgeDescription(), null, "reconnections", null, 0, -1, EdgeMapping.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getEdgeMapping_PathExpression(), theDescriptionPackage_1.getInterpretedExpression(), "pathExpression", null, 0, 1, EdgeMapping.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getEdgeMapping_PathNodeMapping(), this.getAbstractNodeMapping(), null, "pathNodeMapping", null, 0, -1, EdgeMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-
-        op = addEOperation(edgeMappingEClass, theDiagramPackage.getDEdge(), "createEdge", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-        addEParameter(op, theDiagramPackage.getEdgeTarget(), "source", 1, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-        addEParameter(op, theDiagramPackage.getEdgeTarget(), "target", 1, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-        addEParameter(op, theEcorePackage.getEObject(), "semanticTarget", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-
-        op = addEOperation(edgeMappingEClass, theDiagramPackage.getDEdge(), "createEdge", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-        addEParameter(op, theDiagramPackage.getEdgeTarget(), "source", 1, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-        addEParameter(op, theDiagramPackage.getEdgeTarget(), "target", 1, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-        addEParameter(op, theEcorePackage.getEObject(), "container", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-        addEParameter(op, theEcorePackage.getEObject(), "semanticTarget", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-
-        op = addEOperation(edgeMappingEClass, theDiagramPackage.getEdgeStyle(), "getBestStyle", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-        addEParameter(op, theEcorePackage.getEObject(), "modelElement", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-        addEParameter(op, theEcorePackage.getEObject(), "viewVariable", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-        addEParameter(op, theEcorePackage.getEObject(), "containerVariable", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-
-        op = addEOperation(edgeMappingEClass, null, "updateEdge", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-        addEParameter(op, theDiagramPackage.getDEdge(), "viewEdge", 1, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-
-        op = addEOperation(edgeMappingEClass, theEcorePackage.getEObject(), "getEdgeTargetCandidates", 0, -1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-        addEParameter(op, theEcorePackage.getEObject(), "semanticOrigin", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-        addEParameter(op, theDiagramPackage.getDDiagram(), "viewPoint", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-
-        op = addEOperation(edgeMappingEClass, theEcorePackage.getEObject(), "getEdgeSourceCandidates", 0, -1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-        addEParameter(op, theEcorePackage.getEObject(), "semanticOrigin", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-        addEParameter(op, theDiagramPackage.getDDiagram(), "viewPoint", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-
-        op = addEOperation(edgeMappingEClass, theEcorePackage.getEObject(), "getEdgeTargetCandidates", 0, -1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-        addEParameter(op, theEcorePackage.getEObject(), "semanticOrigin", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-        addEParameter(op, theEcorePackage.getEObject(), "container", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-        addEParameter(op, theEcorePackage.getEObject(), "containerView", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-
-        initEClass(iEdgeMappingEClass, IEdgeMapping.class, "IEdgeMapping", EPackageImpl.IS_ABSTRACT, EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        op = addEOperation(iEdgeMappingEClass, theDiagramPackage.getEdgeStyle(), "getBestStyle", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-        addEParameter(op, theEcorePackage.getEObject(), "modelElement", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-        addEParameter(op, theEcorePackage.getEObject(), "viewVariable", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-        addEParameter(op, theEcorePackage.getEObject(), "containerVariable", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-
-        initEClass(edgeMappingImportEClass, EdgeMappingImport.class, "EdgeMappingImport", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getEdgeMappingImport_ImportedMapping(), this.getIEdgeMapping(), null, "importedMapping", null, 1, 1, EdgeMappingImport.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getEdgeMappingImport_ConditionnalStyles(), this.getConditionalEdgeStyleDescription(), null, "conditionnalStyles", null, 0, -1, EdgeMappingImport.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getEdgeMappingImport_InheritsAncestorFilters(), theEcorePackage.getEBoolean(), "inheritsAncestorFilters", "true", 0, 1, EdgeMappingImport.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(conditionalNodeStyleDescriptionEClass, ConditionalNodeStyleDescription.class, "ConditionalNodeStyleDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getConditionalNodeStyleDescription_Style(), theStylePackage.getNodeStyleDescription(), null, "style", null, 0, 1, ConditionalNodeStyleDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(conditionalEdgeStyleDescriptionEClass, ConditionalEdgeStyleDescription.class, "ConditionalEdgeStyleDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getConditionalEdgeStyleDescription_Style(), theStylePackage.getEdgeStyleDescription(), null, "style", null, 0, 1, ConditionalEdgeStyleDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(conditionalContainerStyleDescriptionEClass, ConditionalContainerStyleDescription.class, "ConditionalContainerStyleDescription", !EPackageImpl.IS_ABSTRACT,
-                !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getConditionalContainerStyleDescription_Style(), theStylePackage.getContainerStyleDescription(), null, "style", null, 0, 1, ConditionalContainerStyleDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(layoutEClass, Layout.class, "Layout", EPackageImpl.IS_ABSTRACT, EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(orderedTreeLayoutEClass, OrderedTreeLayout.class, "OrderedTreeLayout", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getOrderedTreeLayout_ChildrenExpression(), theDescriptionPackage_1.getInterpretedExpression(), "childrenExpression", null, 1, 1, OrderedTreeLayout.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getOrderedTreeLayout_NodeMapping(), this.getAbstractNodeMapping(), null, "nodeMapping", null, 1, -1, OrderedTreeLayout.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(compositeLayoutEClass, CompositeLayout.class, "CompositeLayout", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getCompositeLayout_Padding(), theEcorePackage.getEInt(), "padding", "30", 1, 1, CompositeLayout.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getCompositeLayout_Direction(), this.getLayoutDirection(), "direction", "topToBottom", 1, 1, CompositeLayout.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(mappingBasedDecorationEClass, MappingBasedDecoration.class, "MappingBasedDecoration", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getMappingBasedDecoration_Mappings(), this.getDiagramElementMapping(), null, "mappings", null, 1, -1, MappingBasedDecoration.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(layerEClass, Layer.class, "Layer", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getLayer_NodeMappings(), this.getNodeMapping(), null, "nodeMappings", null, 0, -1, Layer.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
+        initEReference(
+                getContainerMapping_ReusedContainerMappings(),
+                this.getContainerMapping(),
+                null,
+                "reusedContainerMappings", null, 0, -1, ContainerMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getContainerMapping_AllContainerMappings(),
+                this.getContainerMapping(),
+                null,
+                "allContainerMappings", null, 0, -1, ContainerMapping.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE, !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getContainerMapping_Style(),
+                theStylePackage.getContainerStyleDescription(),
+                null,
+                "style", null, 0, 1, ContainerMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getContainerMapping_ConditionnalStyles(),
+                this.getConditionalContainerStyleDescription(),
+                null,
+                "conditionnalStyles", null, 0, -1, ContainerMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getContainerMapping_ChildrenPresentation(),
+                theDiagramPackage.getContainerLayout(),
+                "childrenPresentation", "FreeForm", 1, 1, ContainerMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+
+        op = addEOperation(containerMappingEClass, theDiagramPackage.getContainerStyle(), "getBestStyle", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        addEParameter(op, theEcorePackage.getEObject(), "modelElement", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        addEParameter(op, theEcorePackage.getEObject(), "viewVariable", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        addEParameter(op, theEcorePackage.getEObject(), "containerVariable", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(nodeMappingImportEClass, NodeMappingImport.class, "NodeMappingImport", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getNodeMappingImport_ImportedMapping(),
+                this.getNodeMapping(),
+                null,
+                "importedMapping", null, 1, 1, NodeMappingImport.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(containerMappingImportEClass, ContainerMappingImport.class,
+                "ContainerMappingImport", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getContainerMappingImport_ImportedMapping(),
+                this.getContainerMapping(),
+                null,
+                "importedMapping", null, 1, 1, ContainerMappingImport.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(edgeMappingEClass, EdgeMapping.class, "EdgeMapping", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getEdgeMapping_SourceMapping(),
+                this.getDiagramElementMapping(),
+                null,
+                "sourceMapping", null, 1, -1, EdgeMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getEdgeMapping_TargetMapping(),
+                this.getDiagramElementMapping(),
+                null,
+                "targetMapping", null, 1, -1, EdgeMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getEdgeMapping_TargetFinderExpression(),
+                theDescriptionPackage_1.getInterpretedExpression(),
+                "targetFinderExpression", "", 1, 1, EdgeMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(
+                getEdgeMapping_SourceFinderExpression(),
+                theDescriptionPackage_1.getInterpretedExpression(),
+                "sourceFinderExpression", null, 0, 1, EdgeMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getEdgeMapping_Style(),
+                theStylePackage.getEdgeStyleDescription(),
+                null,
+                "style", null, 0, 1, EdgeMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getEdgeMapping_ConditionnalStyles(),
+                this.getConditionalEdgeStyleDescription(),
+                null,
+                "conditionnalStyles", null, 0, -1, EdgeMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getEdgeMapping_TargetExpression(),
+                theDescriptionPackage_1.getInterpretedExpression(),
+                "targetExpression", null, 0, 1, EdgeMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getEdgeMapping_DomainClass(),
+                theDescriptionPackage_1.getTypeName(),
+                "domainClass", null, 0, 1, EdgeMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getEdgeMapping_UseDomainElement(),
+                theEcorePackage.getEBoolean(),
+                "useDomainElement", "false", 0, 1, EdgeMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEReference(
+                getEdgeMapping_Reconnections(),
+                theToolPackage.getReconnectEdgeDescription(),
+                null,
+                "reconnections", null, 0, -1, EdgeMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getEdgeMapping_PathExpression(),
+                theDescriptionPackage_1.getInterpretedExpression(),
+                "pathExpression", null, 0, 1, EdgeMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getEdgeMapping_PathNodeMapping(),
+                this.getAbstractNodeMapping(),
+                null,
+                "pathNodeMapping", null, 0, -1, EdgeMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        op = addEOperation(edgeMappingEClass, theDiagramPackage.getDEdge(), "createEdge", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        addEParameter(op, theDiagramPackage.getEdgeTarget(), "source", 1, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        addEParameter(op, theDiagramPackage.getEdgeTarget(), "target", 1, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        addEParameter(op, theEcorePackage.getEObject(), "semanticTarget", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        op = addEOperation(edgeMappingEClass, theDiagramPackage.getDEdge(), "createEdge", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        addEParameter(op, theDiagramPackage.getEdgeTarget(), "source", 1, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        addEParameter(op, theDiagramPackage.getEdgeTarget(), "target", 1, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        addEParameter(op, theEcorePackage.getEObject(), "container", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        addEParameter(op, theEcorePackage.getEObject(), "semanticTarget", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        op = addEOperation(edgeMappingEClass, theDiagramPackage.getEdgeStyle(), "getBestStyle", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        addEParameter(op, theEcorePackage.getEObject(), "modelElement", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        addEParameter(op, theEcorePackage.getEObject(), "viewVariable", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        addEParameter(op, theEcorePackage.getEObject(), "containerVariable", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        op = addEOperation(edgeMappingEClass, null, "updateEdge", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        addEParameter(op, theDiagramPackage.getDEdge(), "viewEdge", 1, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        op = addEOperation(edgeMappingEClass, theEcorePackage.getEObject(), "getEdgeTargetCandidates", 0, -1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        addEParameter(op, theEcorePackage.getEObject(), "semanticOrigin", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        addEParameter(op, theDiagramPackage.getDDiagram(), "viewPoint", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        op = addEOperation(edgeMappingEClass, theEcorePackage.getEObject(), "getEdgeSourceCandidates", 0, -1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        addEParameter(op, theEcorePackage.getEObject(), "semanticOrigin", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        addEParameter(op, theDiagramPackage.getDDiagram(), "viewPoint", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        op = addEOperation(edgeMappingEClass, theEcorePackage.getEObject(), "getEdgeTargetCandidates", 0, -1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        addEParameter(op, theEcorePackage.getEObject(), "semanticOrigin", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        addEParameter(op, theEcorePackage.getEObject(), "container", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        addEParameter(op, theEcorePackage.getEObject(), "containerView", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(iEdgeMappingEClass, IEdgeMapping.class, "IEdgeMapping", EPackageImpl.IS_ABSTRACT, EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        op = addEOperation(iEdgeMappingEClass, theDiagramPackage.getEdgeStyle(), "getBestStyle", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        addEParameter(op, theEcorePackage.getEObject(), "modelElement", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        addEParameter(op, theEcorePackage.getEObject(), "viewVariable", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        addEParameter(op, theEcorePackage.getEObject(), "containerVariable", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(edgeMappingImportEClass, EdgeMappingImport.class, "EdgeMappingImport", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getEdgeMappingImport_ImportedMapping(),
+                this.getIEdgeMapping(),
+                null,
+                "importedMapping", null, 1, 1, EdgeMappingImport.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getEdgeMappingImport_ConditionnalStyles(),
+                this.getConditionalEdgeStyleDescription(),
+                null,
+                "conditionnalStyles", null, 0, -1, EdgeMappingImport.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getEdgeMappingImport_InheritsAncestorFilters(),
+                theEcorePackage.getEBoolean(),
+                "inheritsAncestorFilters", "true", 0, 1, EdgeMappingImport.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+
+        initEClass(conditionalNodeStyleDescriptionEClass, ConditionalNodeStyleDescription.class,
+                "ConditionalNodeStyleDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getConditionalNodeStyleDescription_Style(),
+                theStylePackage.getNodeStyleDescription(),
+                null,
+                "style", null, 0, 1, ConditionalNodeStyleDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(conditionalEdgeStyleDescriptionEClass, ConditionalEdgeStyleDescription.class,
+                "ConditionalEdgeStyleDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getConditionalEdgeStyleDescription_Style(),
+                theStylePackage.getEdgeStyleDescription(),
+                null,
+                "style", null, 0, 1, ConditionalEdgeStyleDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(conditionalContainerStyleDescriptionEClass, ConditionalContainerStyleDescription.class,
+                "ConditionalContainerStyleDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getConditionalContainerStyleDescription_Style(),
+                theStylePackage.getContainerStyleDescription(),
+                null,
+                "style", null, 0, 1, ConditionalContainerStyleDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(layoutEClass, Layout.class, "Layout", EPackageImpl.IS_ABSTRACT, EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(orderedTreeLayoutEClass, OrderedTreeLayout.class, "OrderedTreeLayout", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getOrderedTreeLayout_ChildrenExpression(),
+                theDescriptionPackage_1.getInterpretedExpression(),
+                "childrenExpression", null, 1, 1, OrderedTreeLayout.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getOrderedTreeLayout_NodeMapping(),
+                this.getAbstractNodeMapping(),
+                null,
+                "nodeMapping", null, 1, -1, OrderedTreeLayout.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(compositeLayoutEClass, CompositeLayout.class, "CompositeLayout", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getCompositeLayout_Padding(),
+                theEcorePackage.getEInt(),
+                "padding", "30", 1, 1, CompositeLayout.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(
+                getCompositeLayout_Direction(),
+                this.getLayoutDirection(),
+                "direction", "topToBottom", 1, 1, CompositeLayout.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+
+        initEClass(mappingBasedDecorationEClass, MappingBasedDecoration.class,
+                "MappingBasedDecoration", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getMappingBasedDecoration_Mappings(),
+                this.getDiagramElementMapping(),
+                null,
+                "mappings", null, 1, -1, MappingBasedDecoration.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(layerEClass, Layer.class, "Layer", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getLayer_NodeMappings(),
+                this.getNodeMapping(),
+                null,
+                "nodeMappings", null, 0, -1, Layer.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
         getLayer_NodeMappings().getEKeys().add(theDescriptionPackage_1.getIdentifiedElement_Name());
-        initEReference(getLayer_EdgeMappings(), this.getEdgeMapping(), null, "edgeMappings", null, 0, -1, Layer.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
+        initEReference(
+                getLayer_EdgeMappings(),
+                this.getEdgeMapping(),
+                null,
+                "edgeMappings", null, 0, -1, Layer.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
         getLayer_EdgeMappings().getEKeys().add(theDescriptionPackage_1.getIdentifiedElement_Name());
-        initEReference(getLayer_EdgeMappingImports(), this.getEdgeMappingImport(), null, "edgeMappingImports", null, 0, -1, Layer.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
+        initEReference(
+                getLayer_EdgeMappingImports(),
+                this.getEdgeMappingImport(),
+                null,
+                "edgeMappingImports", null, 0, -1, Layer.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
         getLayer_EdgeMappingImports().getEKeys().add(theDescriptionPackage_1.getIdentifiedElement_Name());
-        initEReference(getLayer_ContainerMappings(), this.getContainerMapping(), null, "containerMappings", null, 0, -1, Layer.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
+        initEReference(
+                getLayer_ContainerMappings(),
+                this.getContainerMapping(),
+                null,
+                "containerMappings", null, 0, -1, Layer.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
         getLayer_ContainerMappings().getEKeys().add(theDescriptionPackage_1.getIdentifiedElement_Name());
-        initEReference(getLayer_ReusedMappings(), this.getDiagramElementMapping(), null, "reusedMappings", null, 0, -1, Layer.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getLayer_AllTools(), theToolPackage_1.getAbstractToolDescription(), null, "allTools", null, 0, -1, Layer.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE,
-                !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getLayer_ToolSections(), theToolPackage.getToolSection(), null, "toolSections", null, 0, -1, Layer.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getLayer_ReusedTools(), theToolPackage_1.getAbstractToolDescription(), null, "reusedTools", null, 0, -1, Layer.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getLayer_DecorationDescriptionsSet(), theDescriptionPackage_1.getDecorationDescriptionsSet(), null, "decorationDescriptionsSet", null, 0, 1, Layer.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getLayer_Icon(), theDescriptionPackage_1.getImagePath(), "icon", null, 0, 1, Layer.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE,
-                !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getLayer_AllEdgeMappings(), this.getEdgeMapping(), null, "allEdgeMappings", null, 0, -1, Layer.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE,
-                !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getLayer_Customization(), theDescriptionPackage_1.getCustomization(), null, "customization", null, 0, 1, Layer.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-
-        initEClass(additionalLayerEClass, AdditionalLayer.class, "AdditionalLayer", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getAdditionalLayer_ActiveByDefault(), theEcorePackage.getEBoolean(), "activeByDefault", null, 0, 1, AdditionalLayer.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getAdditionalLayer_Optional(), theEcorePackage.getEBoolean(), "optional", "true", 0, 1, AdditionalLayer.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(dragAndDropTargetDescriptionEClass, DragAndDropTargetDescription.class, "DragAndDropTargetDescription", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getDragAndDropTargetDescription_DropDescriptions(), theToolPackage.getContainerDropDescription(), null, "dropDescriptions", null, 0, -1, DragAndDropTargetDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEReference(
+                getLayer_ReusedMappings(),
+                this.getDiagramElementMapping(),
+                null,
+                "reusedMappings", null, 0, -1, Layer.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getLayer_AllTools(),
+                theToolPackage_1.getAbstractToolDescription(),
+                null,
+                "allTools", null, 0, -1, Layer.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE, !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getLayer_ToolSections(),
+                theToolPackage.getToolSection(),
+                null,
+                "toolSections", null, 0, -1, Layer.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getLayer_ReusedTools(),
+                theToolPackage_1.getAbstractToolDescription(),
+                null,
+                "reusedTools", null, 0, -1, Layer.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getLayer_DecorationDescriptionsSet(),
+                theDescriptionPackage_1.getDecorationDescriptionsSet(),
+                null,
+                "decorationDescriptionsSet", null, 0, 1, Layer.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getLayer_Icon(),
+                theDescriptionPackage_1.getImagePath(),
+                "icon", null, 0, 1, Layer.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getLayer_AllEdgeMappings(),
+                this.getEdgeMapping(),
+                null,
+                "allEdgeMappings", null, 0, -1, Layer.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE, !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getLayer_Customization(),
+                theDescriptionPackage_1.getCustomization(),
+                null,
+                "customization", null, 0, 1, Layer.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(additionalLayerEClass, AdditionalLayer.class, "AdditionalLayer", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getAdditionalLayer_ActiveByDefault(),
+                theEcorePackage.getEBoolean(),
+                "activeByDefault", null, 0, 1, AdditionalLayer.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getAdditionalLayer_Optional(),
+                theEcorePackage.getEBoolean(),
+                "optional", "true", 0, 1, AdditionalLayer.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+
+        initEClass(dragAndDropTargetDescriptionEClass, DragAndDropTargetDescription.class,
+                "DragAndDropTargetDescription", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getDragAndDropTargetDescription_DropDescriptions(),
+                theToolPackage.getContainerDropDescription(),
+                null,
+                "dropDescriptions", null, 0, -1, DragAndDropTargetDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
 
         // Initialize enums and add enum literals
-        initEEnum(foldingStyleEEnum, FoldingStyle.class, "FoldingStyle");
+        initEEnum(foldingStyleEEnum, FoldingStyle.class, "FoldingStyle"); //$NON-NLS-1$
         addEEnumLiteral(foldingStyleEEnum, FoldingStyle.NONE_LITERAL);
         addEEnumLiteral(foldingStyleEEnum, FoldingStyle.SOURCE_LITERAL);
         addEEnumLiteral(foldingStyleEEnum, FoldingStyle.TARGET_LITERAL);
 
-        initEEnum(layoutDirectionEEnum, LayoutDirection.class, "LayoutDirection");
+        initEEnum(layoutDirectionEEnum, LayoutDirection.class, "LayoutDirection"); //$NON-NLS-1$
         addEEnumLiteral(layoutDirectionEEnum, LayoutDirection.TOP_TO_BOTTOM);
         addEEnumLiteral(layoutDirectionEEnum, LayoutDirection.LEFT_TO_RIGHT);
         addEEnumLiteral(layoutDirectionEEnum, LayoutDirection.BOTTOM_TO_TOP);
 
-        initEEnum(centeringStyleEEnum, CenteringStyle.class, "CenteringStyle");
+        initEEnum(centeringStyleEEnum, CenteringStyle.class, "CenteringStyle"); //$NON-NLS-1$
         addEEnumLiteral(centeringStyleEEnum, CenteringStyle.NONE);
         addEEnumLiteral(centeringStyleEEnum, CenteringStyle.BOTH);
         addEEnumLiteral(centeringStyleEEnum, CenteringStyle.SOURCE);
@@ -2206,17 +2383,27 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
      * @generated
      */
     protected void createReturnTypeAnnotations() {
-        String source = "http://www.eclipse.org/sirius/interpreted/expression/returnType";
-        addAnnotation(getDiagramDescription_PreconditionExpression(), source, new String[] { "returnType", "a boolean." });
-        addAnnotation(getDiagramDescription_RootExpression(), source, new String[] { "returnType", "an EObject." });
-        addAnnotation(getDiagramElementMapping_PreconditionExpression(), source, new String[] { "returnType", "a boolean." });
-        addAnnotation(getDiagramElementMapping_SemanticCandidatesExpression(), source, new String[] { "returnType", "a Collection<EObject> or an EObject." });
-        addAnnotation(getDiagramElementMapping_SemanticElements(), source, new String[] { "returnType", "a Collection<EObject> or an EObject." });
-        addAnnotation(getEdgeMapping_TargetFinderExpression(), source, new String[] { "returnType", "a Collection<EObject> or an EObject." });
-        addAnnotation(getEdgeMapping_SourceFinderExpression(), source, new String[] { "returnType", "a Collection<EObject> or an EObject." });
-        addAnnotation(getEdgeMapping_TargetExpression(), source, new String[] { "returnType", "an EObject." });
-        addAnnotation(getEdgeMapping_PathExpression(), source, new String[] { "returnType", "a Collection<EObject> or an EObject." });
-        addAnnotation(getOrderedTreeLayout_ChildrenExpression(), source, new String[] { "returnType", "a Collection<EObject> or an EObject." });
+        String source = "http://www.eclipse.org/sirius/interpreted/expression/returnType"; //$NON-NLS-1$
+        addAnnotation(getDiagramDescription_PreconditionExpression(), source, new String[] { "returnType", "a boolean." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getDiagramDescription_RootExpression(), source, new String[] { "returnType", "an EObject." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getDiagramElementMapping_PreconditionExpression(), source, new String[] { "returnType", "a boolean." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getDiagramElementMapping_SemanticCandidatesExpression(), source, new String[] { "returnType", "a Collection<EObject> or an EObject." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getDiagramElementMapping_SemanticElements(), source, new String[] { "returnType", "a Collection<EObject> or an EObject." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getEdgeMapping_TargetFinderExpression(), source, new String[] { "returnType", "a Collection<EObject> or an EObject." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getEdgeMapping_SourceFinderExpression(), source, new String[] { "returnType", "a Collection<EObject> or an EObject." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getEdgeMapping_TargetExpression(), source, new String[] { "returnType", "an EObject." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getEdgeMapping_PathExpression(), source, new String[] { "returnType", "a Collection<EObject> or an EObject." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getOrderedTreeLayout_ChildrenExpression(), source, new String[] { "returnType", "a Collection<EObject> or an EObject." //$NON-NLS-1$ //$NON-NLS-2$
+        });
     }
 
     /**
@@ -2227,29 +2414,48 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
      * @generated
      */
     protected void createVariablesAnnotations() {
-        String source = "http://www.eclipse.org/sirius/interpreted/expression/variables";
+        String source = "http://www.eclipse.org/sirius/interpreted/expression/variables"; //$NON-NLS-1$
         addAnnotation(getDiagramDescription_PreconditionExpression(), source, new String[] {});
-        addAnnotation(getDiagramDescription_RootExpression(), source, new String[] { "diagram", "diagram.DDiagram | the current DDiagram.", "viewpoint",
-        "diagram.DDiagram | (deprecated) the current DDiagram." });
-        addAnnotation(getDiagramElementMapping_PreconditionExpression(), source, new String[] { "containerView",
-            "diagram.DragAndDropTarget | the view that should contain the potential views of the checked elements.", "container", "ecore.EObject | the semantic element of containerView.",
-            "viewpoint", "diagram.DSemanticDiagram | (deprecated) the current DSemanticDiagram.", "diagram", "diagram.DSemanticDiagram | the current DSemanticDiagram.", "sourceView",
-            "viewpoint.DSemanticDecorator | (edge only) the source view of the current potential edge.", "source", "ecore.EObject | (edge only) the semantic element of sourceView.", "targetView",
-            "viewpoint.DSemanticDecorator | (edge only) the target view of the current potential edge.", "target", "ecore.EObject | (edge only) the semantic element of targetView." });
-        addAnnotation(getDiagramElementMapping_SemanticCandidatesExpression(), source,
-                new String[] { "containerView", "diagram.DDiagram | the parent view of potential candidates.", "diagram", "diagram.DDiagram | the current DDiagram.", "viewpoint",
-            "diagram.DDiagram | (deprecated) the current DDiagram.", "viewPoint", "diagram.DDiagram | (deprecated) the current DDiagram." });
-        addAnnotation(getDiagramElementMapping_SemanticElements(), source, new String[] { "diagram", "diagram.DDiagram | the current DSemanticDiagram.", "view",
-            "diagram.DDiagramElement | the current view created from the current mapping.", "viewpoint", "diagram.DDiagram | (deprecated) the current DSemanticDiagram." });
-        addAnnotation(getEdgeMapping_TargetFinderExpression(), source, new String[] { "diagram", "diagram.DDiagram | the current DDiagram.", "viewpoint",
-            "diagram.DDiagram | (deprecated) the current DDiagram.", "viewPoint", "diagram.DDiagram | (deprecated) the current DDiagram." });
-        addAnnotation(getEdgeMapping_SourceFinderExpression(), source, new String[] { "diagram", "diagram.DDiagram | the current DDiagram.", "viewpoint",
-            "diagram.DDiagram | (deprecated) the current DDiagram.", "viewPoint", "diagram.DDiagram | (deprecated) the current DDiagram." });
-        addAnnotation(getEdgeMapping_TargetExpression(), source, new String[] { "diagram", "diagram.DDiagram | the current DDiagram.", "viewpoint",
-            "diagram.DDiagram | (deprecated) the current DDiagram.", "viewPoint", "diagram.DDiagram | (deprecated) the current DDiagram." });
-        addAnnotation(getEdgeMapping_PathExpression(), source, new String[] { "diagram", "diagram.DDiagram | the current DDiagram.", "viewpoint",
-            "diagram.DDiagram | (deprecated) the current DDiagram.", "element", "ecore.EObject | the semantic element  of the current edge.", "source",
-            "ecore.EObject | the semantic target of the current source node.", "target", "ecore.EObject | the semantic element of the current target node." });
+        addAnnotation(getDiagramDescription_RootExpression(), source, new String[] { "diagram", "diagram.DDiagram | the current DDiagram.", //$NON-NLS-1$ //$NON-NLS-2$
+            "viewpoint", "diagram.DDiagram | (deprecated) the current DDiagram." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getDiagramElementMapping_PreconditionExpression(), source, new String[] {
+            "containerView", "diagram.DragAndDropTarget | the view that should contain the potential views of the checked elements.", //$NON-NLS-1$ //$NON-NLS-2$
+            "container", "ecore.EObject | the semantic element of containerView.", //$NON-NLS-1$ //$NON-NLS-2$
+            "viewpoint", "diagram.DSemanticDiagram | (deprecated) the current DSemanticDiagram.", //$NON-NLS-1$ //$NON-NLS-2$
+            "diagram", "diagram.DSemanticDiagram | the current DSemanticDiagram.", //$NON-NLS-1$ //$NON-NLS-2$
+            "sourceView", "viewpoint.DSemanticDecorator | (edge only) the source view of the current potential edge.", //$NON-NLS-1$ //$NON-NLS-2$
+            "source", "ecore.EObject | (edge only) the semantic element of sourceView.", //$NON-NLS-1$ //$NON-NLS-2$
+            "targetView", "viewpoint.DSemanticDecorator | (edge only) the target view of the current potential edge.", //$NON-NLS-1$ //$NON-NLS-2$
+            "target", "ecore.EObject | (edge only) the semantic element of targetView." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getDiagramElementMapping_SemanticCandidatesExpression(), source, new String[] { "containerView", "diagram.DDiagram | the parent view of potential candidates.", //$NON-NLS-1$ //$NON-NLS-2$
+            "diagram", "diagram.DDiagram | the current DDiagram.", //$NON-NLS-1$ //$NON-NLS-2$
+            "viewpoint", "diagram.DDiagram | (deprecated) the current DDiagram.", //$NON-NLS-1$ //$NON-NLS-2$
+            "viewPoint", "diagram.DDiagram | (deprecated) the current DDiagram." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getDiagramElementMapping_SemanticElements(), source, new String[] { "diagram", "diagram.DDiagram | the current DSemanticDiagram.", //$NON-NLS-1$ //$NON-NLS-2$
+            "view", "diagram.DDiagramElement | the current view created from the current mapping.", //$NON-NLS-1$ //$NON-NLS-2$
+            "viewpoint", "diagram.DDiagram | (deprecated) the current DSemanticDiagram." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getEdgeMapping_TargetFinderExpression(), source, new String[] { "diagram", "diagram.DDiagram | the current DDiagram.", //$NON-NLS-1$ //$NON-NLS-2$
+            "viewpoint", "diagram.DDiagram | (deprecated) the current DDiagram.", //$NON-NLS-1$ //$NON-NLS-2$
+            "viewPoint", "diagram.DDiagram | (deprecated) the current DDiagram." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getEdgeMapping_SourceFinderExpression(), source, new String[] { "diagram", "diagram.DDiagram | the current DDiagram.", //$NON-NLS-1$ //$NON-NLS-2$
+            "viewpoint", "diagram.DDiagram | (deprecated) the current DDiagram.", //$NON-NLS-1$ //$NON-NLS-2$
+            "viewPoint", "diagram.DDiagram | (deprecated) the current DDiagram." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getEdgeMapping_TargetExpression(), source, new String[] { "diagram", "diagram.DDiagram | the current DDiagram.", //$NON-NLS-1$ //$NON-NLS-2$
+            "viewpoint", "diagram.DDiagram | (deprecated) the current DDiagram.", //$NON-NLS-1$ //$NON-NLS-2$
+            "viewPoint", "diagram.DDiagram | (deprecated) the current DDiagram." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getEdgeMapping_PathExpression(), source, new String[] { "diagram", "diagram.DDiagram | the current DDiagram.", //$NON-NLS-1$ //$NON-NLS-2$
+            "viewpoint", "diagram.DDiagram | (deprecated) the current DDiagram.", //$NON-NLS-1$ //$NON-NLS-2$
+            "element", "ecore.EObject | the semantic element  of the current edge.", //$NON-NLS-1$ //$NON-NLS-2$
+            "source", "ecore.EObject | the semantic target of the current source node.", //$NON-NLS-1$ //$NON-NLS-2$
+            "target", "ecore.EObject | the semantic element of the current target node." //$NON-NLS-1$ //$NON-NLS-2$
+        });
         addAnnotation(getOrderedTreeLayout_ChildrenExpression(), source, new String[] {});
     }
 
@@ -2260,7 +2466,7 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
      * @generated
      */
     protected void createTagValuesAnnotations() {
-        String source = "TagValues";
+        String source = "TagValues"; //$NON-NLS-1$
         addAnnotation(getDiagramDescription_DefaultConcern(), source, new String[] {});
         addAnnotation(getDiagramDescription_Init(), source, new String[] {});
         addAnnotation(getDiagramDescription_NodeMappings(), source, new String[] {});
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/impl/DiagramDescriptionImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/impl/DiagramDescriptionImpl.java
index 8c463cb5c3..548595d85b 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/impl/DiagramDescriptionImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/impl/DiagramDescriptionImpl.java
@@ -2262,27 +2262,27 @@ public class DiagramDescriptionImpl extends DragAndDropTargetDescriptionImpl imp
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (documentation: ");
+        result.append(" (documentation: "); //$NON-NLS-1$
         result.append(documentation);
-        result.append(", endUserDocumentation: ");
+        result.append(", endUserDocumentation: "); //$NON-NLS-1$
         result.append(endUserDocumentation);
-        result.append(", name: ");
+        result.append(", name: "); //$NON-NLS-1$
         result.append(name);
-        result.append(", label: ");
+        result.append(", label: "); //$NON-NLS-1$
         result.append(label);
-        result.append(", titleExpression: ");
+        result.append(", titleExpression: "); //$NON-NLS-1$
         result.append(titleExpression);
-        result.append(", initialisation: ");
+        result.append(", initialisation: "); //$NON-NLS-1$
         result.append(initialisation);
-        result.append(", showOnStartup: ");
+        result.append(", showOnStartup: "); //$NON-NLS-1$
         result.append(showOnStartup);
-        result.append(", domainClass: ");
+        result.append(", domainClass: "); //$NON-NLS-1$
         result.append(domainClass);
-        result.append(", preconditionExpression: ");
+        result.append(", preconditionExpression: "); //$NON-NLS-1$
         result.append(preconditionExpression);
-        result.append(", rootExpression: ");
+        result.append(", rootExpression: "); //$NON-NLS-1$
         result.append(rootExpression);
-        result.append(", enablePopupBars: ");
+        result.append(", enablePopupBars: "); //$NON-NLS-1$
         result.append(enablePopupBars);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/impl/DiagramElementMappingImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/impl/DiagramElementMappingImpl.java
index ca61e082e2..4a84bc14f0 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/impl/DiagramElementMappingImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/impl/DiagramElementMappingImpl.java
@@ -800,15 +800,15 @@ public abstract class DiagramElementMappingImpl extends RepresentationElementMap
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (preconditionExpression: ");
+        result.append(" (preconditionExpression: "); //$NON-NLS-1$
         result.append(preconditionExpression);
-        result.append(", semanticCandidatesExpression: ");
+        result.append(", semanticCandidatesExpression: "); //$NON-NLS-1$
         result.append(semanticCandidatesExpression);
-        result.append(", createElements: ");
+        result.append(", createElements: "); //$NON-NLS-1$
         result.append(createElements);
-        result.append(", semanticElements: ");
+        result.append(", semanticElements: "); //$NON-NLS-1$
         result.append(semanticElements);
-        result.append(", synchronizationLock: ");
+        result.append(", synchronizationLock: "); //$NON-NLS-1$
         result.append(synchronizationLock);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/impl/DiagramExtensionDescriptionImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/impl/DiagramExtensionDescriptionImpl.java
index 648ad4ef94..ddecb9d0a2 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/impl/DiagramExtensionDescriptionImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/impl/DiagramExtensionDescriptionImpl.java
@@ -601,11 +601,11 @@ public class DiagramExtensionDescriptionImpl extends MinimalEObjectImpl.Containe
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (name: ");
+        result.append(" (name: "); //$NON-NLS-1$
         result.append(name);
-        result.append(", viewpointURI: ");
+        result.append(", viewpointURI: "); //$NON-NLS-1$
         result.append(viewpointURI);
-        result.append(", representationName: ");
+        result.append(", representationName: "); //$NON-NLS-1$
         result.append(representationName);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/impl/DiagramImportDescriptionImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/impl/DiagramImportDescriptionImpl.java
index e5bf775eda..ef1bb16405 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/impl/DiagramImportDescriptionImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/impl/DiagramImportDescriptionImpl.java
@@ -2401,25 +2401,25 @@ public class DiagramImportDescriptionImpl extends DocumentedElementImpl implemen
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (endUserDocumentation: ");
+        result.append(" (endUserDocumentation: "); //$NON-NLS-1$
         result.append(endUserDocumentation);
-        result.append(", name: ");
+        result.append(", name: "); //$NON-NLS-1$
         result.append(name);
-        result.append(", label: ");
+        result.append(", label: "); //$NON-NLS-1$
         result.append(label);
-        result.append(", titleExpression: ");
+        result.append(", titleExpression: "); //$NON-NLS-1$
         result.append(titleExpression);
-        result.append(", initialisation: ");
+        result.append(", initialisation: "); //$NON-NLS-1$
         result.append(initialisation);
-        result.append(", showOnStartup: ");
+        result.append(", showOnStartup: "); //$NON-NLS-1$
         result.append(showOnStartup);
-        result.append(", domainClass: ");
+        result.append(", domainClass: "); //$NON-NLS-1$
         result.append(domainClass);
-        result.append(", preconditionExpression: ");
+        result.append(", preconditionExpression: "); //$NON-NLS-1$
         result.append(preconditionExpression);
-        result.append(", rootExpression: ");
+        result.append(", rootExpression: "); //$NON-NLS-1$
         result.append(rootExpression);
-        result.append(", enablePopupBars: ");
+        result.append(", enablePopupBars: "); //$NON-NLS-1$
         result.append(enablePopupBars);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/impl/EdgeMappingImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/impl/EdgeMappingImpl.java
index cbbd373106..ad37b1e175 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/impl/EdgeMappingImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/impl/EdgeMappingImpl.java
@@ -986,19 +986,19 @@ public class EdgeMappingImpl extends DiagramElementMappingImpl implements EdgeMa
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (documentation: ");
+        result.append(" (documentation: "); //$NON-NLS-1$
         result.append(documentation);
-        result.append(", targetFinderExpression: ");
+        result.append(", targetFinderExpression: "); //$NON-NLS-1$
         result.append(targetFinderExpression);
-        result.append(", sourceFinderExpression: ");
+        result.append(", sourceFinderExpression: "); //$NON-NLS-1$
         result.append(sourceFinderExpression);
-        result.append(", targetExpression: ");
+        result.append(", targetExpression: "); //$NON-NLS-1$
         result.append(targetExpression);
-        result.append(", domainClass: ");
+        result.append(", domainClass: "); //$NON-NLS-1$
         result.append(domainClass);
-        result.append(", useDomainElement: ");
+        result.append(", useDomainElement: "); //$NON-NLS-1$
         result.append(useDomainElement);
-        result.append(", pathExpression: ");
+        result.append(", pathExpression: "); //$NON-NLS-1$
         result.append(pathExpression);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/impl/EdgeMappingImportImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/impl/EdgeMappingImportImpl.java
index 5bd560740d..08f67dafb6 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/impl/EdgeMappingImportImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/impl/EdgeMappingImportImpl.java
@@ -481,11 +481,11 @@ public class EdgeMappingImportImpl extends DocumentedElementImpl implements Edge
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (name: ");
+        result.append(" (name: "); //$NON-NLS-1$
         result.append(name);
-        result.append(", label: ");
+        result.append(", label: "); //$NON-NLS-1$
         result.append(label);
-        result.append(", inheritsAncestorFilters: ");
+        result.append(", inheritsAncestorFilters: "); //$NON-NLS-1$
         result.append(inheritsAncestorFilters);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/impl/LayerImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/impl/LayerImpl.java
index 406b9a8c4c..9b6bd50e95 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/impl/LayerImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/impl/LayerImpl.java
@@ -964,13 +964,13 @@ public class LayerImpl extends DocumentedElementImpl implements Layer {
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (endUserDocumentation: ");
+        result.append(" (endUserDocumentation: "); //$NON-NLS-1$
         result.append(endUserDocumentation);
-        result.append(", name: ");
+        result.append(", name: "); //$NON-NLS-1$
         result.append(name);
-        result.append(", label: ");
+        result.append(", label: "); //$NON-NLS-1$
         result.append(label);
-        result.append(", icon: ");
+        result.append(", icon: "); //$NON-NLS-1$
         result.append(icon);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/impl/NodeMappingImportImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/impl/NodeMappingImportImpl.java
index 7f87ad667a..7a140a7f8d 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/impl/NodeMappingImportImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/impl/NodeMappingImportImpl.java
@@ -338,9 +338,9 @@ public class NodeMappingImportImpl extends NodeMappingImpl implements NodeMappin
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (hideSubMappings: ");
+        result.append(" (hideSubMappings: "); //$NON-NLS-1$
         result.append(hideSubMappings);
-        result.append(", inheritsAncestorFilters: ");
+        result.append(", inheritsAncestorFilters: "); //$NON-NLS-1$
         result.append(inheritsAncestorFilters);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/impl/OrderedTreeLayoutImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/impl/OrderedTreeLayoutImpl.java
index c210660b39..31e5df72dc 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/impl/OrderedTreeLayoutImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/impl/OrderedTreeLayoutImpl.java
@@ -211,7 +211,7 @@ public class OrderedTreeLayoutImpl extends DocumentedElementImpl implements Orde
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (childrenExpression: ");
+        result.append(" (childrenExpression: "); //$NON-NLS-1$
         result.append(childrenExpression);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/impl/BorderedStyleDescriptionImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/impl/BorderedStyleDescriptionImpl.java
index 1b6231649a..6ccacf1b3b 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/impl/BorderedStyleDescriptionImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/impl/BorderedStyleDescriptionImpl.java
@@ -300,9 +300,9 @@ public class BorderedStyleDescriptionImpl extends MinimalEObjectImpl.Container i
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (borderSizeComputationExpression: ");
+        result.append(" (borderSizeComputationExpression: "); //$NON-NLS-1$
         result.append(borderSizeComputationExpression);
-        result.append(", borderLineStyle: ");
+        result.append(", borderLineStyle: "); //$NON-NLS-1$
         result.append(borderLineStyle);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/impl/BundledImageDescriptionImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/impl/BundledImageDescriptionImpl.java
index 6def2dee17..29ea1fce66 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/impl/BundledImageDescriptionImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/impl/BundledImageDescriptionImpl.java
@@ -236,7 +236,7 @@ public class BundledImageDescriptionImpl extends NodeStyleDescriptionImpl implem
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (shape: ");
+        result.append(" (shape: "); //$NON-NLS-1$
         result.append(shape);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/impl/ContainerStyleDescriptionImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/impl/ContainerStyleDescriptionImpl.java
index 823d559a41..1c208b8d47 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/impl/ContainerStyleDescriptionImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/impl/ContainerStyleDescriptionImpl.java
@@ -1011,27 +1011,27 @@ public abstract class ContainerStyleDescriptionImpl extends RoundedCornerStyleDe
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (borderSizeComputationExpression: ");
+        result.append(" (borderSizeComputationExpression: "); //$NON-NLS-1$
         result.append(borderSizeComputationExpression);
-        result.append(", borderLineStyle: ");
+        result.append(", borderLineStyle: "); //$NON-NLS-1$
         result.append(borderLineStyle);
-        result.append(", labelSize: ");
+        result.append(", labelSize: "); //$NON-NLS-1$
         result.append(labelSize);
-        result.append(", labelFormat: ");
+        result.append(", labelFormat: "); //$NON-NLS-1$
         result.append(labelFormat);
-        result.append(", showIcon: ");
+        result.append(", showIcon: "); //$NON-NLS-1$
         result.append(showIcon);
-        result.append(", labelExpression: ");
+        result.append(", labelExpression: "); //$NON-NLS-1$
         result.append(labelExpression);
-        result.append(", iconPath: ");
+        result.append(", iconPath: "); //$NON-NLS-1$
         result.append(iconPath);
-        result.append(", labelAlignment: ");
+        result.append(", labelAlignment: "); //$NON-NLS-1$
         result.append(labelAlignment);
-        result.append(", tooltipExpression: ");
+        result.append(", tooltipExpression: "); //$NON-NLS-1$
         result.append(tooltipExpression);
-        result.append(", hideLabelByDefault: ");
+        result.append(", hideLabelByDefault: "); //$NON-NLS-1$
         result.append(hideLabelByDefault);
-        result.append(", roundedCorner: ");
+        result.append(", roundedCorner: "); //$NON-NLS-1$
         result.append(roundedCorner);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/impl/CustomStyleDescriptionImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/impl/CustomStyleDescriptionImpl.java
index 1ac61a251a..70c7487805 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/impl/CustomStyleDescriptionImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/impl/CustomStyleDescriptionImpl.java
@@ -165,7 +165,7 @@ public class CustomStyleDescriptionImpl extends NodeStyleDescriptionImpl impleme
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (id: ");
+        result.append(" (id: "); //$NON-NLS-1$
         result.append(id);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/impl/DotDescriptionImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/impl/DotDescriptionImpl.java
index 75a409978a..ac0b2b473a 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/impl/DotDescriptionImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/impl/DotDescriptionImpl.java
@@ -239,7 +239,7 @@ public class DotDescriptionImpl extends NodeStyleDescriptionImpl implements DotD
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (strokeSizeComputationExpression: ");
+        result.append(" (strokeSizeComputationExpression: "); //$NON-NLS-1$
         result.append(strokeSizeComputationExpression);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/impl/EdgeStyleDescriptionImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/impl/EdgeStyleDescriptionImpl.java
index 303ebc84d4..1ea00ba2ae 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/impl/EdgeStyleDescriptionImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/impl/EdgeStyleDescriptionImpl.java
@@ -1028,19 +1028,19 @@ public class EdgeStyleDescriptionImpl extends MinimalEObjectImpl.Container imple
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (lineStyle: ");
+        result.append(" (lineStyle: "); //$NON-NLS-1$
         result.append(lineStyle);
-        result.append(", sourceArrow: ");
+        result.append(", sourceArrow: "); //$NON-NLS-1$
         result.append(sourceArrow);
-        result.append(", targetArrow: ");
+        result.append(", targetArrow: "); //$NON-NLS-1$
         result.append(targetArrow);
-        result.append(", sizeComputationExpression: ");
+        result.append(", sizeComputationExpression: "); //$NON-NLS-1$
         result.append(sizeComputationExpression);
-        result.append(", routingStyle: ");
+        result.append(", routingStyle: "); //$NON-NLS-1$
         result.append(routingStyle);
-        result.append(", foldingStyle: ");
+        result.append(", foldingStyle: "); //$NON-NLS-1$
         result.append(foldingStyle);
-        result.append(", endsCentering: ");
+        result.append(", endsCentering: "); //$NON-NLS-1$
         result.append(endsCentering);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/impl/EllipseNodeDescriptionImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/impl/EllipseNodeDescriptionImpl.java
index ef321a241c..85a16a4a23 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/impl/EllipseNodeDescriptionImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/impl/EllipseNodeDescriptionImpl.java
@@ -304,9 +304,9 @@ public class EllipseNodeDescriptionImpl extends NodeStyleDescriptionImpl impleme
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (horizontalDiameterComputationExpression: ");
+        result.append(" (horizontalDiameterComputationExpression: "); //$NON-NLS-1$
         result.append(horizontalDiameterComputationExpression);
-        result.append(", verticalDiameterComputationExpression: ");
+        result.append(", verticalDiameterComputationExpression: "); //$NON-NLS-1$
         result.append(verticalDiameterComputationExpression);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/impl/FlatContainerStyleDescriptionImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/impl/FlatContainerStyleDescriptionImpl.java
index 30271b0b91..a897ec4c0d 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/impl/FlatContainerStyleDescriptionImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/impl/FlatContainerStyleDescriptionImpl.java
@@ -541,11 +541,11 @@ public class FlatContainerStyleDescriptionImpl extends ContainerStyleDescription
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (widthComputationExpression: ");
+        result.append(" (widthComputationExpression: "); //$NON-NLS-1$
         result.append(widthComputationExpression);
-        result.append(", heightComputationExpression: ");
+        result.append(", heightComputationExpression: "); //$NON-NLS-1$
         result.append(heightComputationExpression);
-        result.append(", backgroundStyle: ");
+        result.append(", backgroundStyle: "); //$NON-NLS-1$
         result.append(backgroundStyle);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/impl/GaugeCompositeStyleDescriptionImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/impl/GaugeCompositeStyleDescriptionImpl.java
index 647813c72a..c28cadbbc4 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/impl/GaugeCompositeStyleDescriptionImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/impl/GaugeCompositeStyleDescriptionImpl.java
@@ -226,7 +226,7 @@ public class GaugeCompositeStyleDescriptionImpl extends NodeStyleDescriptionImpl
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (alignment: ");
+        result.append(" (alignment: "); //$NON-NLS-1$
         result.append(alignment);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/impl/GaugeSectionDescriptionImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/impl/GaugeSectionDescriptionImpl.java
index adf955620c..4bf1966df3 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/impl/GaugeSectionDescriptionImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/impl/GaugeSectionDescriptionImpl.java
@@ -485,13 +485,13 @@ public class GaugeSectionDescriptionImpl extends MinimalEObjectImpl.Container im
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (minValueExpression: ");
+        result.append(" (minValueExpression: "); //$NON-NLS-1$
         result.append(minValueExpression);
-        result.append(", maxValueExpression: ");
+        result.append(", maxValueExpression: "); //$NON-NLS-1$
         result.append(maxValueExpression);
-        result.append(", valueExpression: ");
+        result.append(", valueExpression: "); //$NON-NLS-1$
         result.append(valueExpression);
-        result.append(", label: ");
+        result.append(", label: "); //$NON-NLS-1$
         result.append(label);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/impl/LozengeNodeDescriptionImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/impl/LozengeNodeDescriptionImpl.java
index 2df6e47b8c..6cef20d544 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/impl/LozengeNodeDescriptionImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/impl/LozengeNodeDescriptionImpl.java
@@ -298,9 +298,9 @@ public class LozengeNodeDescriptionImpl extends NodeStyleDescriptionImpl impleme
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (widthComputationExpression: ");
+        result.append(" (widthComputationExpression: "); //$NON-NLS-1$
         result.append(widthComputationExpression);
-        result.append(", heightComputationExpression: ");
+        result.append(", heightComputationExpression: "); //$NON-NLS-1$
         result.append(heightComputationExpression);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/impl/NodeStyleDescriptionImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/impl/NodeStyleDescriptionImpl.java
index 6ef36ba4f6..d09a716ca4 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/impl/NodeStyleDescriptionImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/impl/NodeStyleDescriptionImpl.java
@@ -1131,31 +1131,31 @@ public abstract class NodeStyleDescriptionImpl extends MinimalEObjectImpl.Contai
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (borderSizeComputationExpression: ");
+        result.append(" (borderSizeComputationExpression: "); //$NON-NLS-1$
         result.append(borderSizeComputationExpression);
-        result.append(", borderLineStyle: ");
+        result.append(", borderLineStyle: "); //$NON-NLS-1$
         result.append(borderLineStyle);
-        result.append(", labelSize: ");
+        result.append(", labelSize: "); //$NON-NLS-1$
         result.append(labelSize);
-        result.append(", labelFormat: ");
+        result.append(", labelFormat: "); //$NON-NLS-1$
         result.append(labelFormat);
-        result.append(", showIcon: ");
+        result.append(", showIcon: "); //$NON-NLS-1$
         result.append(showIcon);
-        result.append(", labelExpression: ");
+        result.append(", labelExpression: "); //$NON-NLS-1$
         result.append(labelExpression);
-        result.append(", iconPath: ");
+        result.append(", iconPath: "); //$NON-NLS-1$
         result.append(iconPath);
-        result.append(", labelAlignment: ");
+        result.append(", labelAlignment: "); //$NON-NLS-1$
         result.append(labelAlignment);
-        result.append(", tooltipExpression: ");
+        result.append(", tooltipExpression: "); //$NON-NLS-1$
         result.append(tooltipExpression);
-        result.append(", hideLabelByDefault: ");
+        result.append(", hideLabelByDefault: "); //$NON-NLS-1$
         result.append(hideLabelByDefault);
-        result.append(", sizeComputationExpression: ");
+        result.append(", sizeComputationExpression: "); //$NON-NLS-1$
         result.append(sizeComputationExpression);
-        result.append(", labelPosition: ");
+        result.append(", labelPosition: "); //$NON-NLS-1$
         result.append(labelPosition);
-        result.append(", resizeKind: ");
+        result.append(", resizeKind: "); //$NON-NLS-1$
         result.append(resizeKind);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/impl/RoundedCornerStyleDescriptionImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/impl/RoundedCornerStyleDescriptionImpl.java
index 71aa3ca127..2ae67fb0d1 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/impl/RoundedCornerStyleDescriptionImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/impl/RoundedCornerStyleDescriptionImpl.java
@@ -223,9 +223,9 @@ public abstract class RoundedCornerStyleDescriptionImpl extends MinimalEObjectIm
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (arcWidth: ");
+        result.append(" (arcWidth: "); //$NON-NLS-1$
         result.append(arcWidth);
-        result.append(", arcHeight: ");
+        result.append(", arcHeight: "); //$NON-NLS-1$
         result.append(arcHeight);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/impl/ShapeContainerStyleDescriptionImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/impl/ShapeContainerStyleDescriptionImpl.java
index 09adec8b0a..872f14799c 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/impl/ShapeContainerStyleDescriptionImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/impl/ShapeContainerStyleDescriptionImpl.java
@@ -400,11 +400,11 @@ public class ShapeContainerStyleDescriptionImpl extends ContainerStyleDescriptio
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (widthComputationExpression: ");
+        result.append(" (widthComputationExpression: "); //$NON-NLS-1$
         result.append(widthComputationExpression);
-        result.append(", heightComputationExpression: ");
+        result.append(", heightComputationExpression: "); //$NON-NLS-1$
         result.append(heightComputationExpression);
-        result.append(", shape: ");
+        result.append(", shape: "); //$NON-NLS-1$
         result.append(shape);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/impl/SizeComputationContainerStyleDescriptionImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/impl/SizeComputationContainerStyleDescriptionImpl.java
index f14624a67a..1cba50b6b0 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/impl/SizeComputationContainerStyleDescriptionImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/impl/SizeComputationContainerStyleDescriptionImpl.java
@@ -232,9 +232,9 @@ public abstract class SizeComputationContainerStyleDescriptionImpl extends Minim
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (widthComputationExpression: ");
+        result.append(" (widthComputationExpression: "); //$NON-NLS-1$
         result.append(widthComputationExpression);
-        result.append(", heightComputationExpression: ");
+        result.append(", heightComputationExpression: "); //$NON-NLS-1$
         result.append(heightComputationExpression);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/impl/SquareDescriptionImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/impl/SquareDescriptionImpl.java
index 851338f471..ffdb1989b8 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/impl/SquareDescriptionImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/impl/SquareDescriptionImpl.java
@@ -292,9 +292,9 @@ public class SquareDescriptionImpl extends NodeStyleDescriptionImpl implements S
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (width: ");
+        result.append(" (width: "); //$NON-NLS-1$
         result.append(width);
-        result.append(", height: ");
+        result.append(", height: "); //$NON-NLS-1$
         result.append(height);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/impl/StyleFactoryImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/impl/StyleFactoryImpl.java
index d5866da56f..f97d3f37eb 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/impl/StyleFactoryImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/impl/StyleFactoryImpl.java
@@ -121,7 +121,7 @@ public class StyleFactoryImpl extends EFactoryImpl implements StyleFactory {
         case StylePackage.BRACKET_EDGE_STYLE_DESCRIPTION:
             return createBracketEdgeStyleDescription();
         default:
-            throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+            throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
         }
     }
 
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/impl/StylePackageImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/impl/StylePackageImpl.java
index 127a410d18..5640ba6540 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/impl/StylePackageImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/impl/StylePackageImpl.java
@@ -1298,215 +1298,309 @@ public class StylePackageImpl extends EPackageImpl implements StylePackage {
         bracketEdgeStyleDescriptionEClass.getESuperTypes().add(this.getEdgeStyleDescription());
 
         // Initialize classes and features; add operations and parameters
-        initEClass(borderedStyleDescriptionEClass, BorderedStyleDescription.class, "BorderedStyleDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getBorderedStyleDescription_BorderSizeComputationExpression(), theDescriptionPackage_1.getInterpretedExpression(), "borderSizeComputationExpression", "0", 0, 1,
-                BorderedStyleDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getBorderedStyleDescription_BorderColor(), theDescriptionPackage_1.getColorDescription(), null, "borderColor", null, 1, 1, BorderedStyleDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getBorderedStyleDescription_BorderLineStyle(), theDiagramPackage.getLineStyle(), "borderLineStyle", "solid", 0, 1, BorderedStyleDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(nodeStyleDescriptionEClass, NodeStyleDescription.class, "NodeStyleDescription", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getNodeStyleDescription_SizeComputationExpression(), theDescriptionPackage_1.getInterpretedExpression(), "sizeComputationExpression", "3", 0, 1, NodeStyleDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEAttribute(getNodeStyleDescription_LabelPosition(), theDiagramPackage.getLabelPosition(), "labelPosition", "border", 0, 1, NodeStyleDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getNodeStyleDescription_ResizeKind(), theDiagramPackage.getResizeKind(), "resizeKind", "NONE", 1, 1, NodeStyleDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(customStyleDescriptionEClass, CustomStyleDescription.class, "CustomStyleDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getCustomStyleDescription_Id(), theEcorePackage.getEString(), "id", null, 0, 1, CustomStyleDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(squareDescriptionEClass, SquareDescription.class, "SquareDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getSquareDescription_Width(), theEcorePackage.getEIntegerObject(), "width", "0", 0, 1, SquareDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getSquareDescription_Height(), theEcorePackage.getEIntegerObject(), "height", "0", 0, 1, SquareDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getSquareDescription_Color(), theDescriptionPackage_1.getColorDescription(), null, "color", null, 1, 1, SquareDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(lozengeNodeDescriptionEClass, LozengeNodeDescription.class, "LozengeNodeDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getLozengeNodeDescription_WidthComputationExpression(), theDescriptionPackage_1.getInterpretedExpression(), "widthComputationExpression", null, 0, 1,
-                LozengeNodeDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getLozengeNodeDescription_HeightComputationExpression(), theDescriptionPackage_1.getInterpretedExpression(), "heightComputationExpression", null, 0, 1,
-                LozengeNodeDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getLozengeNodeDescription_Color(), theDescriptionPackage_1.getColorDescription(), null, "color", null, 1, 1, LozengeNodeDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(ellipseNodeDescriptionEClass, EllipseNodeDescription.class, "EllipseNodeDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getEllipseNodeDescription_Color(), theDescriptionPackage_1.getColorDescription(), null, "color", null, 1, 1, EllipseNodeDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getEllipseNodeDescription_HorizontalDiameterComputationExpression(), theDescriptionPackage_1.getInterpretedExpression(), "horizontalDiameterComputationExpression", "0", 0, 1,
-                EllipseNodeDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getEllipseNodeDescription_VerticalDiameterComputationExpression(), theDescriptionPackage_1.getInterpretedExpression(), "verticalDiameterComputationExpression", "0", 0, 1,
-                EllipseNodeDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(bundledImageDescriptionEClass, BundledImageDescription.class, "BundledImageDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getBundledImageDescription_Shape(), theDiagramPackage.getBundledImageShape(), "shape", null, 1, 1, BundledImageDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getBundledImageDescription_Color(), theDescriptionPackage_1.getColorDescription(), null, "color", null, 1, 1, BundledImageDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(noteDescriptionEClass, NoteDescription.class, "NoteDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getNoteDescription_Color(), theDescriptionPackage_1.getColorDescription(), null, "color", null, 1, 1, NoteDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(dotDescriptionEClass, DotDescription.class, "DotDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getDotDescription_BackgroundColor(), theDescriptionPackage_1.getColorDescription(), null, "backgroundColor", null, 1, 1, DotDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getDotDescription_StrokeSizeComputationExpression(), theDescriptionPackage_1.getInterpretedExpression(), "strokeSizeComputationExpression", "2", 0, 1, DotDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-
-        initEClass(gaugeCompositeStyleDescriptionEClass, GaugeCompositeStyleDescription.class, "GaugeCompositeStyleDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getGaugeCompositeStyleDescription_Alignment(), theDiagramPackage.getAlignmentKind(), "alignment", "SQUARE", 0, 1, GaugeCompositeStyleDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getGaugeCompositeStyleDescription_Sections(), this.getGaugeSectionDescription(), null, "sections", null, 0, -1, GaugeCompositeStyleDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(gaugeSectionDescriptionEClass, GaugeSectionDescription.class, "GaugeSectionDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getGaugeSectionDescription_MinValueExpression(), theDescriptionPackage_1.getInterpretedExpression(), "minValueExpression", "0", 0, 1, GaugeSectionDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEAttribute(getGaugeSectionDescription_MaxValueExpression(), theDescriptionPackage_1.getInterpretedExpression(), "maxValueExpression", "0", 0, 1, GaugeSectionDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEAttribute(getGaugeSectionDescription_ValueExpression(), theDescriptionPackage_1.getInterpretedExpression(), "valueExpression", "0", 0, 1, GaugeSectionDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getGaugeSectionDescription_BackgroundColor(), theDescriptionPackage_1.getColorDescription(), null, "backgroundColor", null, 1, 1, GaugeSectionDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getGaugeSectionDescription_ForegroundColor(), theDescriptionPackage_1.getColorDescription(), null, "foregroundColor", null, 1, 1, GaugeSectionDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getGaugeSectionDescription_Label(), theEcorePackage.getEString(), "label", null, 0, 1, GaugeSectionDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(sizeComputationContainerStyleDescriptionEClass, SizeComputationContainerStyleDescription.class, "SizeComputationContainerStyleDescription", EPackageImpl.IS_ABSTRACT,
-                !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getSizeComputationContainerStyleDescription_WidthComputationExpression(), theDescriptionPackage_1.getInterpretedExpression(), "widthComputationExpression", "-1", 0, 1,
-                SizeComputationContainerStyleDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getSizeComputationContainerStyleDescription_HeightComputationExpression(), theDescriptionPackage_1.getInterpretedExpression(), "heightComputationExpression", "-1", 0, 1,
-                SizeComputationContainerStyleDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(roundedCornerStyleDescriptionEClass, RoundedCornerStyleDescription.class, "RoundedCornerStyleDescription", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getRoundedCornerStyleDescription_ArcWidth(), theEcorePackage.getEIntegerObject(), "arcWidth", "10", 0, 1, RoundedCornerStyleDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getRoundedCornerStyleDescription_ArcHeight(), theEcorePackage.getEIntegerObject(), "arcHeight", "10", 0, 1, RoundedCornerStyleDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(containerStyleDescriptionEClass, ContainerStyleDescription.class, "ContainerStyleDescription", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getContainerStyleDescription_RoundedCorner(), theEcorePackage.getEBoolean(), "roundedCorner", null, 0, 1, ContainerStyleDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(flatContainerStyleDescriptionEClass, FlatContainerStyleDescription.class, "FlatContainerStyleDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getFlatContainerStyleDescription_BackgroundStyle(), theDiagramPackage.getBackgroundStyle(), "backgroundStyle", null, 1, 1, FlatContainerStyleDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getFlatContainerStyleDescription_BackgroundColor(), theDescriptionPackage_1.getColorDescription(), null, "backgroundColor", null, 1, 1, FlatContainerStyleDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getFlatContainerStyleDescription_ForegroundColor(), theDescriptionPackage_1.getColorDescription(), null, "foregroundColor", null, 1, 1, FlatContainerStyleDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getFlatContainerStyleDescription_LabelBorderStyle(), theStylePackage_1.getLabelBorderStyleDescription(), null, "labelBorderStyle", null, 0, 1,
-                FlatContainerStyleDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES,
-                !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(shapeContainerStyleDescriptionEClass, ShapeContainerStyleDescription.class, "ShapeContainerStyleDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getShapeContainerStyleDescription_Shape(), theDiagramPackage.getContainerShape(), "shape", null, 1, 1, ShapeContainerStyleDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getShapeContainerStyleDescription_BackgroundColor(), theDescriptionPackage_1.getColorDescription(), null, "backgroundColor", null, 1, 1, ShapeContainerStyleDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(workspaceImageDescriptionEClass, WorkspaceImageDescription.class, "WorkspaceImageDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getWorkspaceImageDescription_WorkspacePath(), theDescriptionPackage_1.getImagePath(), "workspacePath", null, 1, 1, WorkspaceImageDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(edgeStyleDescriptionEClass, EdgeStyleDescription.class, "EdgeStyleDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getEdgeStyleDescription_StrokeColor(), theDescriptionPackage_1.getColorDescription(), null, "strokeColor", null, 1, 1, EdgeStyleDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getEdgeStyleDescription_LineStyle(), theDiagramPackage.getLineStyle(), "lineStyle", null, 0, 1, EdgeStyleDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getEdgeStyleDescription_SourceArrow(), theDiagramPackage.getEdgeArrows(), "sourceArrow", "NoDecoration", 1, 1, EdgeStyleDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getEdgeStyleDescription_TargetArrow(), theDiagramPackage.getEdgeArrows(), "targetArrow", "InputArrow", 1, 1, EdgeStyleDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getEdgeStyleDescription_SizeComputationExpression(), theDescriptionPackage_1.getInterpretedExpression(), "sizeComputationExpression", "1", 1, 1, EdgeStyleDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEAttribute(getEdgeStyleDescription_RoutingStyle(), theDiagramPackage.getEdgeRouting(), "routingStyle", "straight", 1, 1, EdgeStyleDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getEdgeStyleDescription_FoldingStyle(), theDescriptionPackage.getFoldingStyle(), "foldingStyle", null, 0, 1, EdgeStyleDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getEdgeStyleDescription_BeginLabelStyleDescription(), this.getBeginLabelStyleDescription(), null, "beginLabelStyleDescription", null, 0, 1, EdgeStyleDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getEdgeStyleDescription_CenterLabelStyleDescription(), this.getCenterLabelStyleDescription(), null, "centerLabelStyleDescription", null, 0, 1, EdgeStyleDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getEdgeStyleDescription_EndLabelStyleDescription(), this.getEndLabelStyleDescription(), null, "endLabelStyleDescription", null, 0, 1, EdgeStyleDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getEdgeStyleDescription_EndsCentering(), theDescriptionPackage.getCenteringStyle(), "endsCentering", "None", 0, 1, EdgeStyleDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getEdgeStyleDescription_CenteredSourceMappings(), theDescriptionPackage.getDiagramElementMapping(), null, "centeredSourceMappings", null, 0, -1, EdgeStyleDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getEdgeStyleDescription_CenteredTargetMappings(), theDescriptionPackage.getDiagramElementMapping(), null, "centeredTargetMappings", null, 0, -1, EdgeStyleDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(beginLabelStyleDescriptionEClass, BeginLabelStyleDescription.class, "BeginLabelStyleDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(centerLabelStyleDescriptionEClass, CenterLabelStyleDescription.class, "CenterLabelStyleDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(endLabelStyleDescriptionEClass, EndLabelStyleDescription.class, "EndLabelStyleDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(bracketEdgeStyleDescriptionEClass, BracketEdgeStyleDescription.class, "BracketEdgeStyleDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(hideLabelCapabilityStyleDescriptionEClass, HideLabelCapabilityStyleDescription.class, "HideLabelCapabilityStyleDescription", EPackageImpl.IS_ABSTRACT, EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getHideLabelCapabilityStyleDescription_HideLabelByDefault(), ecorePackage.getEBoolean(), "hideLabelByDefault", "false", 0, 1, HideLabelCapabilityStyleDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
+        initEClass(borderedStyleDescriptionEClass, BorderedStyleDescription.class,
+                "BorderedStyleDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getBorderedStyleDescription_BorderSizeComputationExpression(),
+                theDescriptionPackage_1.getInterpretedExpression(),
+                "borderSizeComputationExpression", "0", 0, 1, BorderedStyleDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEReference(
+                getBorderedStyleDescription_BorderColor(),
+                theDescriptionPackage_1.getColorDescription(),
+                null,
+                "borderColor", null, 1, 1, BorderedStyleDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getBorderedStyleDescription_BorderLineStyle(),
+                theDiagramPackage.getLineStyle(),
+                "borderLineStyle", "solid", 0, 1, BorderedStyleDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+
+        initEClass(nodeStyleDescriptionEClass, NodeStyleDescription.class, "NodeStyleDescription", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getNodeStyleDescription_SizeComputationExpression(),
+                theDescriptionPackage_1.getInterpretedExpression(),
+                "sizeComputationExpression", "3", 0, 1, NodeStyleDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(
+                getNodeStyleDescription_LabelPosition(),
+                theDiagramPackage.getLabelPosition(),
+                "labelPosition", "border", 0, 1, NodeStyleDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(
+                getNodeStyleDescription_ResizeKind(),
+                theDiagramPackage.getResizeKind(),
+                "resizeKind", "NONE", 1, 1, NodeStyleDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+
+        initEClass(customStyleDescriptionEClass, CustomStyleDescription.class,
+                "CustomStyleDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getCustomStyleDescription_Id(),
+                theEcorePackage.getEString(),
+                "id", null, 0, 1, CustomStyleDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(squareDescriptionEClass, SquareDescription.class, "SquareDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getSquareDescription_Width(),
+                theEcorePackage.getEIntegerObject(),
+                "width", "0", 0, 1, SquareDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(
+                getSquareDescription_Height(),
+                theEcorePackage.getEIntegerObject(),
+                "height", "0", 0, 1, SquareDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEReference(
+                getSquareDescription_Color(),
+                theDescriptionPackage_1.getColorDescription(),
+                null,
+                "color", null, 1, 1, SquareDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(lozengeNodeDescriptionEClass, LozengeNodeDescription.class,
+                "LozengeNodeDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getLozengeNodeDescription_WidthComputationExpression(),
+                theDescriptionPackage_1.getInterpretedExpression(),
+                "widthComputationExpression", null, 0, 1, LozengeNodeDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getLozengeNodeDescription_HeightComputationExpression(),
+                theDescriptionPackage_1.getInterpretedExpression(),
+                "heightComputationExpression", null, 0, 1, LozengeNodeDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getLozengeNodeDescription_Color(),
+                theDescriptionPackage_1.getColorDescription(),
+                null,
+                "color", null, 1, 1, LozengeNodeDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(ellipseNodeDescriptionEClass, EllipseNodeDescription.class,
+                "EllipseNodeDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getEllipseNodeDescription_Color(),
+                theDescriptionPackage_1.getColorDescription(),
+                null,
+                "color", null, 1, 1, EllipseNodeDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getEllipseNodeDescription_HorizontalDiameterComputationExpression(),
+                theDescriptionPackage_1.getInterpretedExpression(),
+                "horizontalDiameterComputationExpression", "0", 0, 1, EllipseNodeDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(
+                getEllipseNodeDescription_VerticalDiameterComputationExpression(),
+                theDescriptionPackage_1.getInterpretedExpression(),
+                "verticalDiameterComputationExpression", "0", 0, 1, EllipseNodeDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+
+        initEClass(bundledImageDescriptionEClass, BundledImageDescription.class,
+                "BundledImageDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getBundledImageDescription_Shape(),
+                theDiagramPackage.getBundledImageShape(),
+                "shape", null, 1, 1, BundledImageDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getBundledImageDescription_Color(),
+                theDescriptionPackage_1.getColorDescription(),
+                null,
+                "color", null, 1, 1, BundledImageDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(noteDescriptionEClass, NoteDescription.class, "NoteDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getNoteDescription_Color(),
+                theDescriptionPackage_1.getColorDescription(),
+                null,
+                "color", null, 1, 1, NoteDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(dotDescriptionEClass, DotDescription.class, "DotDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getDotDescription_BackgroundColor(),
+                theDescriptionPackage_1.getColorDescription(),
+                null,
+                "backgroundColor", null, 1, 1, DotDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getDotDescription_StrokeSizeComputationExpression(),
+                theDescriptionPackage_1.getInterpretedExpression(),
+                "strokeSizeComputationExpression", "2", 0, 1, DotDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+
+        initEClass(gaugeCompositeStyleDescriptionEClass, GaugeCompositeStyleDescription.class,
+                "GaugeCompositeStyleDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getGaugeCompositeStyleDescription_Alignment(),
+                theDiagramPackage.getAlignmentKind(),
+                "alignment", "SQUARE", 0, 1, GaugeCompositeStyleDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEReference(
+                getGaugeCompositeStyleDescription_Sections(),
+                this.getGaugeSectionDescription(),
+                null,
+                "sections", null, 0, -1, GaugeCompositeStyleDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(gaugeSectionDescriptionEClass, GaugeSectionDescription.class,
+                "GaugeSectionDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getGaugeSectionDescription_MinValueExpression(),
+                theDescriptionPackage_1.getInterpretedExpression(),
+                "minValueExpression", "0", 0, 1, GaugeSectionDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(
+                getGaugeSectionDescription_MaxValueExpression(),
+                theDescriptionPackage_1.getInterpretedExpression(),
+                "maxValueExpression", "0", 0, 1, GaugeSectionDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(
+                getGaugeSectionDescription_ValueExpression(),
+                theDescriptionPackage_1.getInterpretedExpression(),
+                "valueExpression", "0", 0, 1, GaugeSectionDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEReference(
+                getGaugeSectionDescription_BackgroundColor(),
+                theDescriptionPackage_1.getColorDescription(),
+                null,
+                "backgroundColor", null, 1, 1, GaugeSectionDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getGaugeSectionDescription_ForegroundColor(),
+                theDescriptionPackage_1.getColorDescription(),
+                null,
+                "foregroundColor", null, 1, 1, GaugeSectionDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getGaugeSectionDescription_Label(),
+                theEcorePackage.getEString(),
+                "label", null, 0, 1, GaugeSectionDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(sizeComputationContainerStyleDescriptionEClass, SizeComputationContainerStyleDescription.class,
+                "SizeComputationContainerStyleDescription", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getSizeComputationContainerStyleDescription_WidthComputationExpression(),
+                theDescriptionPackage_1.getInterpretedExpression(),
+                "widthComputationExpression", "-1", 0, 1, SizeComputationContainerStyleDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(
+                getSizeComputationContainerStyleDescription_HeightComputationExpression(),
+                theDescriptionPackage_1.getInterpretedExpression(),
+                "heightComputationExpression", "-1", 0, 1, SizeComputationContainerStyleDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+
+        initEClass(roundedCornerStyleDescriptionEClass, RoundedCornerStyleDescription.class,
+                "RoundedCornerStyleDescription", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getRoundedCornerStyleDescription_ArcWidth(),
+                theEcorePackage.getEIntegerObject(),
+                "arcWidth", "10", 0, 1, RoundedCornerStyleDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(
+                getRoundedCornerStyleDescription_ArcHeight(),
+                theEcorePackage.getEIntegerObject(),
+                "arcHeight", "10", 0, 1, RoundedCornerStyleDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+
+        initEClass(containerStyleDescriptionEClass, ContainerStyleDescription.class,
+                "ContainerStyleDescription", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getContainerStyleDescription_RoundedCorner(),
+                theEcorePackage.getEBoolean(),
+                "roundedCorner", null, 0, 1, ContainerStyleDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(flatContainerStyleDescriptionEClass, FlatContainerStyleDescription.class,
+                "FlatContainerStyleDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getFlatContainerStyleDescription_BackgroundStyle(),
+                theDiagramPackage.getBackgroundStyle(),
+                "backgroundStyle", null, 1, 1, FlatContainerStyleDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getFlatContainerStyleDescription_BackgroundColor(),
+                theDescriptionPackage_1.getColorDescription(),
+                null,
+                "backgroundColor", null, 1, 1, FlatContainerStyleDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getFlatContainerStyleDescription_ForegroundColor(),
+                theDescriptionPackage_1.getColorDescription(),
+                null,
+                "foregroundColor", null, 1, 1, FlatContainerStyleDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getFlatContainerStyleDescription_LabelBorderStyle(),
+                theStylePackage_1.getLabelBorderStyleDescription(),
+                null,
+                "labelBorderStyle", null, 0, 1, FlatContainerStyleDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(shapeContainerStyleDescriptionEClass, ShapeContainerStyleDescription.class,
+                "ShapeContainerStyleDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getShapeContainerStyleDescription_Shape(),
+                theDiagramPackage.getContainerShape(),
+                "shape", null, 1, 1, ShapeContainerStyleDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getShapeContainerStyleDescription_BackgroundColor(),
+                theDescriptionPackage_1.getColorDescription(),
+                null,
+                "backgroundColor", null, 1, 1, ShapeContainerStyleDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(workspaceImageDescriptionEClass, WorkspaceImageDescription.class,
+                "WorkspaceImageDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getWorkspaceImageDescription_WorkspacePath(),
+                theDescriptionPackage_1.getImagePath(),
+                "workspacePath", null, 1, 1, WorkspaceImageDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(edgeStyleDescriptionEClass, EdgeStyleDescription.class, "EdgeStyleDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getEdgeStyleDescription_StrokeColor(),
+                theDescriptionPackage_1.getColorDescription(),
+                null,
+                "strokeColor", null, 1, 1, EdgeStyleDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getEdgeStyleDescription_LineStyle(),
+                theDiagramPackage.getLineStyle(),
+                "lineStyle", null, 0, 1, EdgeStyleDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getEdgeStyleDescription_SourceArrow(),
+                theDiagramPackage.getEdgeArrows(),
+                "sourceArrow", "NoDecoration", 1, 1, EdgeStyleDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(
+                getEdgeStyleDescription_TargetArrow(),
+                theDiagramPackage.getEdgeArrows(),
+                "targetArrow", "InputArrow", 1, 1, EdgeStyleDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(
+                getEdgeStyleDescription_SizeComputationExpression(),
+                theDescriptionPackage_1.getInterpretedExpression(),
+                "sizeComputationExpression", "1", 1, 1, EdgeStyleDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(
+                getEdgeStyleDescription_RoutingStyle(),
+                theDiagramPackage.getEdgeRouting(),
+                "routingStyle", "straight", 1, 1, EdgeStyleDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(
+                getEdgeStyleDescription_FoldingStyle(),
+                theDescriptionPackage.getFoldingStyle(),
+                "foldingStyle", null, 0, 1, EdgeStyleDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getEdgeStyleDescription_BeginLabelStyleDescription(),
+                this.getBeginLabelStyleDescription(),
+                null,
+                "beginLabelStyleDescription", null, 0, 1, EdgeStyleDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getEdgeStyleDescription_CenterLabelStyleDescription(),
+                this.getCenterLabelStyleDescription(),
+                null,
+                "centerLabelStyleDescription", null, 0, 1, EdgeStyleDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getEdgeStyleDescription_EndLabelStyleDescription(),
+                this.getEndLabelStyleDescription(),
+                null,
+                "endLabelStyleDescription", null, 0, 1, EdgeStyleDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getEdgeStyleDescription_EndsCentering(),
+                theDescriptionPackage.getCenteringStyle(),
+                "endsCentering", "None", 0, 1, EdgeStyleDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEReference(
+                getEdgeStyleDescription_CenteredSourceMappings(),
+                theDescriptionPackage.getDiagramElementMapping(),
+                null,
+                "centeredSourceMappings", null, 0, -1, EdgeStyleDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getEdgeStyleDescription_CenteredTargetMappings(),
+                theDescriptionPackage.getDiagramElementMapping(),
+                null,
+                "centeredTargetMappings", null, 0, -1, EdgeStyleDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(beginLabelStyleDescriptionEClass, BeginLabelStyleDescription.class,
+                "BeginLabelStyleDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(centerLabelStyleDescriptionEClass, CenterLabelStyleDescription.class,
+                "CenterLabelStyleDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(endLabelStyleDescriptionEClass, EndLabelStyleDescription.class,
+                "EndLabelStyleDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(bracketEdgeStyleDescriptionEClass, BracketEdgeStyleDescription.class,
+                "BracketEdgeStyleDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(hideLabelCapabilityStyleDescriptionEClass, HideLabelCapabilityStyleDescription.class,
+                "HideLabelCapabilityStyleDescription", EPackageImpl.IS_ABSTRACT, EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getHideLabelCapabilityStyleDescription_HideLabelByDefault(),
+                ecorePackage.getEBoolean(),
+                "hideLabelByDefault", "false", 0, 1, HideLabelCapabilityStyleDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
 
         // Create annotations
         // http://www.eclipse.org/sirius/interpreted/expression/returnType
@@ -1525,20 +1619,33 @@ public class StylePackageImpl extends EPackageImpl implements StylePackage {
      * @generated
      */
     protected void createReturnTypeAnnotations() {
-        String source = "http://www.eclipse.org/sirius/interpreted/expression/returnType";
-        addAnnotation(getBorderedStyleDescription_BorderSizeComputationExpression(), source, new String[] { "returnType", "an integer." });
-        addAnnotation(getNodeStyleDescription_SizeComputationExpression(), source, new String[] { "returnType", "an integer." });
-        addAnnotation(getLozengeNodeDescription_WidthComputationExpression(), source, new String[] { "returnType", "an integer." });
-        addAnnotation(getLozengeNodeDescription_HeightComputationExpression(), source, new String[] { "returnType", "an integer." });
-        addAnnotation(getEllipseNodeDescription_HorizontalDiameterComputationExpression(), source, new String[] { "returnType", "an integer." });
-        addAnnotation(getEllipseNodeDescription_VerticalDiameterComputationExpression(), source, new String[] { "returnType", "an integer." });
-        addAnnotation(getDotDescription_StrokeSizeComputationExpression(), source, new String[] { "returnType", "an integer." });
-        addAnnotation(getGaugeSectionDescription_MinValueExpression(), source, new String[] { "returnType", "an integer." });
-        addAnnotation(getGaugeSectionDescription_MaxValueExpression(), source, new String[] { "returnType", "an integer." });
-        addAnnotation(getGaugeSectionDescription_ValueExpression(), source, new String[] { "returnType", "an integer." });
-        addAnnotation(getSizeComputationContainerStyleDescription_WidthComputationExpression(), source, new String[] { "returnType", "an integer." });
-        addAnnotation(getSizeComputationContainerStyleDescription_HeightComputationExpression(), source, new String[] { "returnType", "an integer." });
-        addAnnotation(getEdgeStyleDescription_SizeComputationExpression(), source, new String[] { "returnType", "an integer." });
+        String source = "http://www.eclipse.org/sirius/interpreted/expression/returnType"; //$NON-NLS-1$
+        addAnnotation(getBorderedStyleDescription_BorderSizeComputationExpression(), source, new String[] { "returnType", "an integer." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getNodeStyleDescription_SizeComputationExpression(), source, new String[] { "returnType", "an integer." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getLozengeNodeDescription_WidthComputationExpression(), source, new String[] { "returnType", "an integer." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getLozengeNodeDescription_HeightComputationExpression(), source, new String[] { "returnType", "an integer." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getEllipseNodeDescription_HorizontalDiameterComputationExpression(), source, new String[] { "returnType", "an integer." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getEllipseNodeDescription_VerticalDiameterComputationExpression(), source, new String[] { "returnType", "an integer." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getDotDescription_StrokeSizeComputationExpression(), source, new String[] { "returnType", "an integer." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getGaugeSectionDescription_MinValueExpression(), source, new String[] { "returnType", "an integer." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getGaugeSectionDescription_MaxValueExpression(), source, new String[] { "returnType", "an integer." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getGaugeSectionDescription_ValueExpression(), source, new String[] { "returnType", "an integer." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getSizeComputationContainerStyleDescription_WidthComputationExpression(), source, new String[] { "returnType", "an integer." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getSizeComputationContainerStyleDescription_HeightComputationExpression(), source, new String[] { "returnType", "an integer." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getEdgeStyleDescription_SizeComputationExpression(), source, new String[] { "returnType", "an integer." //$NON-NLS-1$ //$NON-NLS-2$
+        });
     }
 
     /**
@@ -1549,7 +1656,7 @@ public class StylePackageImpl extends EPackageImpl implements StylePackage {
      * @generated
      */
     protected void createVariablesAnnotations() {
-        String source = "http://www.eclipse.org/sirius/interpreted/expression/variables";
+        String source = "http://www.eclipse.org/sirius/interpreted/expression/variables"; //$NON-NLS-1$
         addAnnotation(getBorderedStyleDescription_BorderSizeComputationExpression(), source, new String[] {});
         addAnnotation(getNodeStyleDescription_SizeComputationExpression(), source, new String[] {});
         addAnnotation(getLozengeNodeDescription_WidthComputationExpression(), source, new String[] {});
@@ -1562,9 +1669,11 @@ public class StylePackageImpl extends EPackageImpl implements StylePackage {
         addAnnotation(getGaugeSectionDescription_ValueExpression(), source, new String[] {});
         addAnnotation(getSizeComputationContainerStyleDescription_WidthComputationExpression(), source, new String[] {});
         addAnnotation(getSizeComputationContainerStyleDescription_HeightComputationExpression(), source, new String[] {});
-        addAnnotation(getEdgeStyleDescription_SizeComputationExpression(), source, new String[] { "diagram", "diagram.DDiagram | the current DSemanticDiagram.", "view",
-            "diagram.DEdge | the current edge view for which the size is calculated.", "sourceView", "diagram.EdgeTarget | the source view of the current edge.", "targetView",
-        "diagram.EdgeTarget | the target view of the current edge." });
+        addAnnotation(getEdgeStyleDescription_SizeComputationExpression(), source, new String[] { "diagram", "diagram.DDiagram | the current DSemanticDiagram.", //$NON-NLS-1$ //$NON-NLS-2$
+            "view", "diagram.DEdge | the current edge view for which the size is calculated.", //$NON-NLS-1$ //$NON-NLS-2$
+            "sourceView", "diagram.EdgeTarget | the source view of the current edge.", //$NON-NLS-1$ //$NON-NLS-2$
+            "targetView", "diagram.EdgeTarget | the target view of the current edge." //$NON-NLS-1$ //$NON-NLS-2$
+        });
     }
 
     /**
@@ -1574,7 +1683,7 @@ public class StylePackageImpl extends EPackageImpl implements StylePackage {
      * @generated
      */
     protected void createTagValuesAnnotations() {
-        String source = "TagValues";
+        String source = "TagValues"; //$NON-NLS-1$
         addAnnotation(getDotDescription_StrokeSizeComputationExpression(), source, new String[] {});
     }
 
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/impl/WorkspaceImageDescriptionImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/impl/WorkspaceImageDescriptionImpl.java
index fd635ecdc4..9ee0d5ddb9 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/impl/WorkspaceImageDescriptionImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/impl/WorkspaceImageDescriptionImpl.java
@@ -398,13 +398,13 @@ public class WorkspaceImageDescriptionImpl extends NodeStyleDescriptionImpl impl
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (arcWidth: ");
+        result.append(" (arcWidth: "); //$NON-NLS-1$
         result.append(arcWidth);
-        result.append(", arcHeight: ");
+        result.append(", arcHeight: "); //$NON-NLS-1$
         result.append(arcHeight);
-        result.append(", roundedCorner: ");
+        result.append(", roundedCorner: "); //$NON-NLS-1$
         result.append(roundedCorner);
-        result.append(", workspacePath: ");
+        result.append(", workspacePath: "); //$NON-NLS-1$
         result.append(workspacePath);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/BehaviorToolImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/BehaviorToolImpl.java
index 08cbee0ffe..33e82e29fe 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/BehaviorToolImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/BehaviorToolImpl.java
@@ -289,7 +289,7 @@ public class BehaviorToolImpl extends AbstractToolDescriptionImpl implements Beh
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (domainClass: ");
+        result.append(" (domainClass: "); //$NON-NLS-1$
         result.append(domainClass);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/ContainerCreationDescriptionImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/ContainerCreationDescriptionImpl.java
index 4e464ad4b3..4a87a971ba 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/ContainerCreationDescriptionImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/ContainerCreationDescriptionImpl.java
@@ -589,7 +589,7 @@ public class ContainerCreationDescriptionImpl extends MappingBasedToolDescriptio
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (iconPath: ");
+        result.append(" (iconPath: "); //$NON-NLS-1$
         result.append(iconPath);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/ContainerDropDescriptionImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/ContainerDropDescriptionImpl.java
index ecea343ee5..fcad32e182 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/ContainerDropDescriptionImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/ContainerDropDescriptionImpl.java
@@ -851,9 +851,9 @@ public class ContainerDropDescriptionImpl extends MappingBasedToolDescriptionImp
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (dragSource: ");
+        result.append(" (dragSource: "); //$NON-NLS-1$
         result.append(dragSource);
-        result.append(", moveEdges: ");
+        result.append(", moveEdges: "); //$NON-NLS-1$
         result.append(moveEdges);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/CreateEdgeViewImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/CreateEdgeViewImpl.java
index 590b130933..746d5aa6bd 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/CreateEdgeViewImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/CreateEdgeViewImpl.java
@@ -226,9 +226,9 @@ public class CreateEdgeViewImpl extends CreateViewImpl implements CreateEdgeView
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (sourceExpression: ");
+        result.append(" (sourceExpression: "); //$NON-NLS-1$
         result.append(sourceExpression);
-        result.append(", targetExpression: ");
+        result.append(", targetExpression: "); //$NON-NLS-1$
         result.append(targetExpression);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/CreateViewImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/CreateViewImpl.java
index 4799f9df1c..a11c9a82cc 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/CreateViewImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/CreateViewImpl.java
@@ -297,9 +297,9 @@ public class CreateViewImpl extends ContainerModelOperationImpl implements Creat
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (containerViewExpression: ");
+        result.append(" (containerViewExpression: "); //$NON-NLS-1$
         result.append(containerViewExpression);
-        result.append(", variableName: ");
+        result.append(", variableName: "); //$NON-NLS-1$
         result.append(variableName);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/DeleteHookImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/DeleteHookImpl.java
index d58e580eb5..9aec06a63b 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/DeleteHookImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/DeleteHookImpl.java
@@ -226,7 +226,7 @@ public class DeleteHookImpl extends MinimalEObjectImpl.Container implements Dele
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (id: ");
+        result.append(" (id: "); //$NON-NLS-1$
         result.append(id);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/DeleteHookParameterImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/DeleteHookParameterImpl.java
index 3b012f3993..f024b3b101 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/DeleteHookParameterImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/DeleteHookParameterImpl.java
@@ -223,9 +223,9 @@ public class DeleteHookParameterImpl extends MinimalEObjectImpl.Container implem
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (name: ");
+        result.append(" (name: "); //$NON-NLS-1$
         result.append(name);
-        result.append(", value: ");
+        result.append(", value: "); //$NON-NLS-1$
         result.append(value);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/DirectEditLabelImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/DirectEditLabelImpl.java
index 803d460641..ade02e7e69 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/DirectEditLabelImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/DirectEditLabelImpl.java
@@ -413,7 +413,7 @@ public class DirectEditLabelImpl extends MappingBasedToolDescriptionImpl impleme
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (inputLabelExpression: ");
+        result.append(" (inputLabelExpression: "); //$NON-NLS-1$
         result.append(inputLabelExpression);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/EdgeCreationDescriptionImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/EdgeCreationDescriptionImpl.java
index f06394af4e..67e92ed524 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/EdgeCreationDescriptionImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/EdgeCreationDescriptionImpl.java
@@ -920,9 +920,9 @@ public class EdgeCreationDescriptionImpl extends MappingBasedToolDescriptionImpl
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (iconPath: ");
+        result.append(" (iconPath: "); //$NON-NLS-1$
         result.append(iconPath);
-        result.append(", connectionStartPrecondition: ");
+        result.append(", connectionStartPrecondition: "); //$NON-NLS-1$
         result.append(connectionStartPrecondition);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/NavigationImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/NavigationImpl.java
index 23162a4de7..2601521da1 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/NavigationImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/NavigationImpl.java
@@ -239,7 +239,7 @@ public class NavigationImpl extends ContainerModelOperationImpl implements Navig
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (createIfNotExistent: ");
+        result.append(" (createIfNotExistent: "); //$NON-NLS-1$
         result.append(createIfNotExistent);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/NodeCreationDescriptionImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/NodeCreationDescriptionImpl.java
index e2d6101fc5..ad00581d46 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/NodeCreationDescriptionImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/NodeCreationDescriptionImpl.java
@@ -589,7 +589,7 @@ public class NodeCreationDescriptionImpl extends MappingBasedToolDescriptionImpl
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (iconPath: ");
+        result.append(" (iconPath: "); //$NON-NLS-1$
         result.append(iconPath);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/ReconnectEdgeDescriptionImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/ReconnectEdgeDescriptionImpl.java
index e26d1fbc38..0ca6fa57ef 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/ReconnectEdgeDescriptionImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/ReconnectEdgeDescriptionImpl.java
@@ -953,7 +953,7 @@ public class ReconnectEdgeDescriptionImpl extends MappingBasedToolDescriptionImp
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (reconnectionKind: ");
+        result.append(" (reconnectionKind: "); //$NON-NLS-1$
         result.append(reconnectionKind);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/RequestDescriptionImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/RequestDescriptionImpl.java
index f928d0cd0e..1650a5b015 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/RequestDescriptionImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/RequestDescriptionImpl.java
@@ -166,7 +166,7 @@ public class RequestDescriptionImpl extends AbstractToolDescriptionImpl implemen
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (type: ");
+        result.append(" (type: "); //$NON-NLS-1$
         result.append(type);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/ToolFactoryImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/ToolFactoryImpl.java
index 46a25981d5..145ef273cb 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/ToolFactoryImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/ToolFactoryImpl.java
@@ -162,7 +162,7 @@ public class ToolFactoryImpl extends EFactoryImpl implements ToolFactory {
         case ToolPackage.CONTAINER_DROP_DESCRIPTION:
             return createContainerDropDescription();
         default:
-            throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+            throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
         }
     }
 
@@ -177,7 +177,7 @@ public class ToolFactoryImpl extends EFactoryImpl implements ToolFactory {
         case ToolPackage.RECONNECTION_KIND:
             return createReconnectionKindFromString(eDataType, initialValue);
         default:
-            throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+            throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
         }
     }
 
@@ -192,7 +192,7 @@ public class ToolFactoryImpl extends EFactoryImpl implements ToolFactory {
         case ToolPackage.RECONNECTION_KIND:
             return convertReconnectionKindToString(eDataType, instanceValue);
         default:
-            throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+            throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
         }
     }
 
@@ -606,7 +606,7 @@ public class ToolFactoryImpl extends EFactoryImpl implements ToolFactory {
     public ReconnectionKind createReconnectionKindFromString(EDataType eDataType, String initialValue) {
         ReconnectionKind result = ReconnectionKind.get(initialValue);
         if (result == null) {
-            throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+            throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
         }
         return result;
     }
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/ToolGroupImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/ToolGroupImpl.java
index ad95d410ae..9c7dc5d170 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/ToolGroupImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/ToolGroupImpl.java
@@ -325,9 +325,9 @@ public class ToolGroupImpl extends DocumentedElementImpl implements ToolGroup {
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (name: ");
+        result.append(" (name: "); //$NON-NLS-1$
         result.append(name);
-        result.append(", label: ");
+        result.append(", label: "); //$NON-NLS-1$
         result.append(label);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/ToolPackageImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/ToolPackageImpl.java
index a4d3df3a98..927685e18c 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/ToolPackageImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/ToolPackageImpl.java
@@ -1600,302 +1600,449 @@ public class ToolPackageImpl extends EPackageImpl implements ToolPackage {
         containerDropDescriptionEClass.getESuperTypes().add(theToolPackage_1.getMappingBasedToolDescription());
 
         // Initialize classes and features; add operations and parameters
-        initEClass(toolSectionEClass, ToolSection.class, "ToolSection", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getToolSection_Icon(), theDescriptionPackage_1.getImagePath(), "icon", null, 0, 1, ToolSection.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getToolSection_OwnedTools(), theToolPackage_1.getToolEntry(), null, "ownedTools", null, 0, -1, ToolSection.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
+        initEClass(toolSectionEClass, ToolSection.class, "ToolSection", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getToolSection_Icon(),
+                theDescriptionPackage_1.getImagePath(),
+                "icon", null, 0, 1, ToolSection.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getToolSection_OwnedTools(),
+                theToolPackage_1.getToolEntry(),
+                null,
+                "ownedTools", null, 0, -1, ToolSection.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
         getToolSection_OwnedTools().getEKeys().add(theDescriptionPackage_1.getIdentifiedElement_Name());
-        initEReference(getToolSection_SubSections(), this.getToolSection(), null, "subSections", null, 0, -1, ToolSection.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
+        initEReference(
+                getToolSection_SubSections(),
+                this.getToolSection(),
+                null,
+                "subSections", null, 0, -1, ToolSection.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
         getToolSection_SubSections().getEKeys().add(theDescriptionPackage_1.getIdentifiedElement_Name());
-        initEReference(getToolSection_PopupMenus(), theToolPackage_1.getPopupMenu(), null, "popupMenus", null, 0, -1, ToolSection.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE,
-                !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getToolSection_ReusedTools(), theToolPackage_1.getToolEntry(), null, "reusedTools", null, 0, -1, ToolSection.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getToolSection_GroupExtensions(), this.getToolGroupExtension(), null, "groupExtensions", null, 0, -1, ToolSection.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-
-        initEClass(toolGroupEClass, ToolGroup.class, "ToolGroup", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getToolGroup_Tools(), theToolPackage_1.getAbstractToolDescription(), null, "tools", null, 0, -1, ToolGroup.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-
-        initEClass(toolGroupExtensionEClass, ToolGroupExtension.class, "ToolGroupExtension", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getToolGroupExtension_Group(), this.getToolGroup(), null, "group", null, 1, 1, ToolGroupExtension.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getToolGroupExtension_Tools(), theToolPackage_1.getAbstractToolDescription(), null, "tools", null, 0, -1, ToolGroupExtension.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(nodeCreationDescriptionEClass, NodeCreationDescription.class, "NodeCreationDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getNodeCreationDescription_NodeMappings(), theDescriptionPackage.getNodeMapping(), null, "nodeMappings", null, 1, -1, NodeCreationDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getNodeCreationDescription_Variable(), this.getNodeCreationVariable(), null, "variable", null, 1, 1, NodeCreationDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getNodeCreationDescription_ViewVariable(), theToolPackage_1.getContainerViewVariable(), null, "viewVariable", null, 1, 1, NodeCreationDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getNodeCreationDescription_InitialOperation(), theToolPackage_1.getInitialNodeCreationOperation(), null, "initialOperation", null, 1, 1, NodeCreationDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getNodeCreationDescription_IconPath(), theDescriptionPackage_1.getImagePath(), "iconPath", "", 0, 1, NodeCreationDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getNodeCreationDescription_ExtraMappings(), theDescriptionPackage.getAbstractNodeMapping(), null, "extraMappings", null, 0, -1, NodeCreationDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(edgeCreationDescriptionEClass, EdgeCreationDescription.class, "EdgeCreationDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getEdgeCreationDescription_EdgeMappings(), theDescriptionPackage.getEdgeMapping(), null, "edgeMappings", null, 1, -1, EdgeCreationDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getEdgeCreationDescription_SourceVariable(), this.getSourceEdgeCreationVariable(), null, "sourceVariable", null, 1, 1, EdgeCreationDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getEdgeCreationDescription_TargetVariable(), this.getTargetEdgeCreationVariable(), null, "targetVariable", null, 1, 1, EdgeCreationDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getEdgeCreationDescription_SourceViewVariable(), this.getSourceEdgeViewCreationVariable(), null, "sourceViewVariable", null, 1, 1, EdgeCreationDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getEdgeCreationDescription_TargetViewVariable(), this.getTargetEdgeViewCreationVariable(), null, "targetViewVariable", null, 1, 1, EdgeCreationDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getEdgeCreationDescription_InitialOperation(), theToolPackage_1.getInitEdgeCreationOperation(), null, "initialOperation", null, 1, 1, EdgeCreationDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getEdgeCreationDescription_IconPath(), theDescriptionPackage_1.getImagePath(), "iconPath", "", 0, 1, EdgeCreationDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getEdgeCreationDescription_ExtraSourceMappings(), theDescriptionPackage.getDiagramElementMapping(), null, "extraSourceMappings", null, 0, -1, EdgeCreationDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getEdgeCreationDescription_ExtraTargetMappings(), theDescriptionPackage.getDiagramElementMapping(), null, "extraTargetMappings", null, 0, -1, EdgeCreationDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getEdgeCreationDescription_ConnectionStartPrecondition(), theDescriptionPackage_1.getInterpretedExpression(), "connectionStartPrecondition", null, 0, 1,
-                EdgeCreationDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        EOperation op = addEOperation(edgeCreationDescriptionEClass, theDescriptionPackage.getEdgeMapping(), "getBestMapping", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-        addEParameter(op, theDiagramPackage.getEdgeTarget(), "source", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-        addEParameter(op, theDiagramPackage.getEdgeTarget(), "target", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-        addEParameter(op, theEcorePackage.getEObject(), "createdElements", 0, -1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-
-        initEClass(containerCreationDescriptionEClass, ContainerCreationDescription.class, "ContainerCreationDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getContainerCreationDescription_ContainerMappings(), theDescriptionPackage.getContainerMapping(), null, "containerMappings", null, 1, -1, ContainerCreationDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getContainerCreationDescription_Variable(), this.getNodeCreationVariable(), null, "variable", null, 1, 1, ContainerCreationDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getContainerCreationDescription_ViewVariable(), theToolPackage_1.getContainerViewVariable(), null, "viewVariable", null, 1, 1, ContainerCreationDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getContainerCreationDescription_InitialOperation(), theToolPackage_1.getInitialNodeCreationOperation(), null, "initialOperation", null, 1, 1,
-                ContainerCreationDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES,
-                !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getContainerCreationDescription_IconPath(), theDescriptionPackage_1.getImagePath(), "iconPath", "", 0, 1, ContainerCreationDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getContainerCreationDescription_ExtraMappings(), theDescriptionPackage.getAbstractNodeMapping(), null, "extraMappings", null, 0, -1, ContainerCreationDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(deleteElementDescriptionEClass, DeleteElementDescription.class, "DeleteElementDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getDeleteElementDescription_Element(), theToolPackage_1.getElementDeleteVariable(), null, "element", null, 1, 1, DeleteElementDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getDeleteElementDescription_ElementView(), theToolPackage_1.getElementDeleteVariable(), null, "elementView", null, 0, 1, DeleteElementDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getDeleteElementDescription_ContainerView(), theToolPackage_1.getContainerViewVariable(), null, "containerView", null, 1, 1, DeleteElementDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getDeleteElementDescription_InitialOperation(), theToolPackage_1.getInitialOperation(), null, "initialOperation", null, 1, 1, DeleteElementDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getDeleteElementDescription_Hook(), this.getDeleteHook(), null, "hook", null, 0, 1, DeleteElementDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-
-        addEOperation(deleteElementDescriptionEClass, theDescriptionPackage.getDiagramElementMapping(), "getMappings", 1, -1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-
-        initEClass(doubleClickDescriptionEClass, DoubleClickDescription.class, "DoubleClickDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getDoubleClickDescription_Mappings(), theDescriptionPackage.getDiagramElementMapping(), theDescriptionPackage.getDiagramElementMapping_DoubleClickDescription(), "mappings",
-                null, 1, -1, DoubleClickDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE,
-                EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getDoubleClickDescription_Element(), this.getElementDoubleClickVariable(), null, "element", null, 1, 1, DoubleClickDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getDoubleClickDescription_ElementView(), this.getElementDoubleClickVariable(), null, "elementView", null, 0, 1, DoubleClickDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getDoubleClickDescription_InitialOperation(), theToolPackage_1.getInitialOperation(), null, "initialOperation", null, 1, 1, DoubleClickDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(deleteHookEClass, DeleteHook.class, "DeleteHook", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getDeleteHook_Id(), theEcorePackage.getEString(), "id", null, 1, 1, DeleteHook.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE,
-                !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getDeleteHook_Parameters(), this.getDeleteHookParameter(), null, "parameters", null, 0, -1, DeleteHook.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-
-        initEClass(deleteHookParameterEClass, DeleteHookParameter.class, "DeleteHookParameter", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getDeleteHookParameter_Name(), theEcorePackage.getEString(), "name", null, 1, 1, DeleteHookParameter.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getDeleteHookParameter_Value(), theDescriptionPackage_1.getInterpretedExpression(), "value", null, 0, 1, DeleteHookParameter.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(reconnectEdgeDescriptionEClass, ReconnectEdgeDescription.class, "ReconnectEdgeDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getReconnectEdgeDescription_ReconnectionKind(), this.getReconnectionKind(), "reconnectionKind", "RECONNECT_TARGET", 1, 1, ReconnectEdgeDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getReconnectEdgeDescription_Source(), this.getSourceEdgeCreationVariable(), null, "source", null, 1, 1, ReconnectEdgeDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getReconnectEdgeDescription_Target(), this.getTargetEdgeCreationVariable(), null, "target", null, 1, 1, ReconnectEdgeDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getReconnectEdgeDescription_SourceView(), this.getSourceEdgeViewCreationVariable(), null, "sourceView", null, 1, 1, ReconnectEdgeDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getReconnectEdgeDescription_TargetView(), this.getTargetEdgeViewCreationVariable(), null, "targetView", null, 1, 1, ReconnectEdgeDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getReconnectEdgeDescription_Element(), theToolPackage_1.getElementSelectVariable(), null, "element", null, 1, 1, ReconnectEdgeDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getReconnectEdgeDescription_InitialOperation(), theToolPackage_1.getInitialOperation(), null, "initialOperation", null, 1, 1, ReconnectEdgeDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getReconnectEdgeDescription_EdgeView(), theToolPackage_1.getElementSelectVariable(), null, "edgeView", null, 1, 1, ReconnectEdgeDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        addEOperation(reconnectEdgeDescriptionEClass, theDescriptionPackage.getEdgeMapping(), "getMappings", 1, -1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-
-        initEClass(requestDescriptionEClass, RequestDescription.class, "RequestDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getRequestDescription_Type(), theEcorePackage.getEString(), "type", null, 1, 1, RequestDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(directEditLabelEClass, DirectEditLabel.class, "DirectEditLabel", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getDirectEditLabel_Mask(), theToolPackage_1.getEditMaskVariables(), null, "mask", null, 1, 1, DirectEditLabel.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getDirectEditLabel_InitialOperation(), theToolPackage_1.getInitialOperation(), null, "initialOperation", null, 1, 1, DirectEditLabel.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getDirectEditLabel_InputLabelExpression(), theDescriptionPackage_1.getInterpretedExpression(), "inputLabelExpression", null, 0, 1, DirectEditLabel.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-
-        addEOperation(directEditLabelEClass, theDescriptionPackage.getDiagramElementMapping(), "getMapping", 1, -1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-
-        initEClass(behaviorToolEClass, BehaviorTool.class, "BehaviorTool", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getBehaviorTool_DomainClass(), theDescriptionPackage_1.getTypeName(), "domainClass", "EObject", 1, 1, BehaviorTool.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getBehaviorTool_InitialOperation(), theToolPackage_1.getInitialOperation(), null, "initialOperation", null, 1, 1, BehaviorTool.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(sourceEdgeCreationVariableEClass, SourceEdgeCreationVariable.class, "SourceEdgeCreationVariable", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(sourceEdgeViewCreationVariableEClass, SourceEdgeViewCreationVariable.class, "SourceEdgeViewCreationVariable", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(targetEdgeCreationVariableEClass, TargetEdgeCreationVariable.class, "TargetEdgeCreationVariable", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(targetEdgeViewCreationVariableEClass, TargetEdgeViewCreationVariable.class, "TargetEdgeViewCreationVariable", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(elementDoubleClickVariableEClass, ElementDoubleClickVariable.class, "ElementDoubleClickVariable", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(nodeCreationVariableEClass, NodeCreationVariable.class, "NodeCreationVariable", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(createViewEClass, CreateView.class, "CreateView", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getCreateView_Mapping(), theDescriptionPackage.getDiagramElementMapping(), null, "mapping", null, 1, 1, CreateView.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEAttribute(getCreateView_ContainerViewExpression(), theDescriptionPackage_1.getInterpretedExpression(), "containerViewExpression", "", 1, 1, CreateView.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getCreateView_VariableName(), theEcorePackage.getEString(), "variableName", "createdView", 0, 1, CreateView.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(createEdgeViewEClass, CreateEdgeView.class, "CreateEdgeView", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getCreateEdgeView_SourceExpression(), theDescriptionPackage_1.getInterpretedExpression(), "sourceExpression", null, 1, 1, CreateEdgeView.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getCreateEdgeView_TargetExpression(), theDescriptionPackage_1.getInterpretedExpression(), "targetExpression", null, 1, 1, CreateEdgeView.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(navigationEClass, Navigation.class, "Navigation", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getNavigation_CreateIfNotExistent(), theEcorePackage.getEBoolean(), "createIfNotExistent", null, 0, 1, Navigation.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getNavigation_DiagramDescription(), theDescriptionPackage.getDiagramDescription(), null, "diagramDescription", null, 1, 1, Navigation.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(diagramCreationDescriptionEClass, DiagramCreationDescription.class, "DiagramCreationDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getDiagramCreationDescription_DiagramDescription(), theDescriptionPackage.getDiagramDescription(), null, "diagramDescription", null, 1, 1, DiagramCreationDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(diagramNavigationDescriptionEClass, DiagramNavigationDescription.class, "DiagramNavigationDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getDiagramNavigationDescription_DiagramDescription(), theDescriptionPackage.getDiagramDescription(), null, "diagramDescription", null, 1, 1, DiagramNavigationDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(containerDropDescriptionEClass, ContainerDropDescription.class, "ContainerDropDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getContainerDropDescription_Mappings(), theDescriptionPackage.getDiagramElementMapping(), null, "mappings", null, 0, -1, ContainerDropDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getContainerDropDescription_OldContainer(), theToolPackage_1.getDropContainerVariable(), null, "oldContainer", null, 1, 1, ContainerDropDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getContainerDropDescription_NewContainer(), theToolPackage_1.getDropContainerVariable(), null, "newContainer", null, 1, 1, ContainerDropDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getContainerDropDescription_Element(), theToolPackage_1.getElementDropVariable(), null, "element", null, 1, 1, ContainerDropDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getContainerDropDescription_NewViewContainer(), theToolPackage_1.getContainerViewVariable(), null, "newViewContainer", null, 1, 1, ContainerDropDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getContainerDropDescription_InitialOperation(), theToolPackage_1.getInitialContainerDropOperation(), null, "initialOperation", null, 1, 1, ContainerDropDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getContainerDropDescription_DragSource(), theToolPackage_1.getDragSource(), "dragSource", null, 1, 1, ContainerDropDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getContainerDropDescription_MoveEdges(), theEcorePackage.getEBoolean(), "moveEdges", null, 1, 1, ContainerDropDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        op = addEOperation(containerDropDescriptionEClass, theDescriptionPackage.getDiagramElementMapping(), "getBestMapping", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-        addEParameter(op, theDiagramPackage.getDragAndDropTarget(), "targetContainer", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-        addEParameter(op, theEcorePackage.getEObject(), "droppedElement", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-
-        addEOperation(containerDropDescriptionEClass, theDescriptionPackage.getDragAndDropTargetDescription(), "getContainers", 1, -1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
+        initEReference(
+                getToolSection_PopupMenus(),
+                theToolPackage_1.getPopupMenu(),
+                null,
+                "popupMenus", null, 0, -1, ToolSection.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE, !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getToolSection_ReusedTools(),
+                theToolPackage_1.getToolEntry(),
+                null,
+                "reusedTools", null, 0, -1, ToolSection.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getToolSection_GroupExtensions(),
+                this.getToolGroupExtension(),
+                null,
+                "groupExtensions", null, 0, -1, ToolSection.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(toolGroupEClass, ToolGroup.class, "ToolGroup", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getToolGroup_Tools(),
+                theToolPackage_1.getAbstractToolDescription(),
+                null,
+                "tools", null, 0, -1, ToolGroup.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(toolGroupExtensionEClass, ToolGroupExtension.class, "ToolGroupExtension", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getToolGroupExtension_Group(),
+                this.getToolGroup(),
+                null,
+                "group", null, 1, 1, ToolGroupExtension.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getToolGroupExtension_Tools(),
+                theToolPackage_1.getAbstractToolDescription(),
+                null,
+                "tools", null, 0, -1, ToolGroupExtension.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(nodeCreationDescriptionEClass, NodeCreationDescription.class,
+                "NodeCreationDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getNodeCreationDescription_NodeMappings(),
+                theDescriptionPackage.getNodeMapping(),
+                null,
+                "nodeMappings", null, 1, -1, NodeCreationDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getNodeCreationDescription_Variable(),
+                this.getNodeCreationVariable(),
+                null,
+                "variable", null, 1, 1, NodeCreationDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getNodeCreationDescription_ViewVariable(),
+                theToolPackage_1.getContainerViewVariable(),
+                null,
+                "viewVariable", null, 1, 1, NodeCreationDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getNodeCreationDescription_InitialOperation(),
+                theToolPackage_1.getInitialNodeCreationOperation(),
+                null,
+                "initialOperation", null, 1, 1, NodeCreationDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getNodeCreationDescription_IconPath(),
+                theDescriptionPackage_1.getImagePath(),
+                "iconPath", "", 0, 1, NodeCreationDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEReference(
+                getNodeCreationDescription_ExtraMappings(),
+                theDescriptionPackage.getAbstractNodeMapping(),
+                null,
+                "extraMappings", null, 0, -1, NodeCreationDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(edgeCreationDescriptionEClass, EdgeCreationDescription.class,
+                "EdgeCreationDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getEdgeCreationDescription_EdgeMappings(),
+                theDescriptionPackage.getEdgeMapping(),
+                null,
+                "edgeMappings", null, 1, -1, EdgeCreationDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getEdgeCreationDescription_SourceVariable(),
+                this.getSourceEdgeCreationVariable(),
+                null,
+                "sourceVariable", null, 1, 1, EdgeCreationDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getEdgeCreationDescription_TargetVariable(),
+                this.getTargetEdgeCreationVariable(),
+                null,
+                "targetVariable", null, 1, 1, EdgeCreationDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getEdgeCreationDescription_SourceViewVariable(),
+                this.getSourceEdgeViewCreationVariable(),
+                null,
+                "sourceViewVariable", null, 1, 1, EdgeCreationDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getEdgeCreationDescription_TargetViewVariable(),
+                this.getTargetEdgeViewCreationVariable(),
+                null,
+                "targetViewVariable", null, 1, 1, EdgeCreationDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getEdgeCreationDescription_InitialOperation(),
+                theToolPackage_1.getInitEdgeCreationOperation(),
+                null,
+                "initialOperation", null, 1, 1, EdgeCreationDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getEdgeCreationDescription_IconPath(),
+                theDescriptionPackage_1.getImagePath(),
+                "iconPath", "", 0, 1, EdgeCreationDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEReference(
+                getEdgeCreationDescription_ExtraSourceMappings(),
+                theDescriptionPackage.getDiagramElementMapping(),
+                null,
+                "extraSourceMappings", null, 0, -1, EdgeCreationDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getEdgeCreationDescription_ExtraTargetMappings(),
+                theDescriptionPackage.getDiagramElementMapping(),
+                null,
+                "extraTargetMappings", null, 0, -1, EdgeCreationDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getEdgeCreationDescription_ConnectionStartPrecondition(),
+                theDescriptionPackage_1.getInterpretedExpression(),
+                "connectionStartPrecondition", null, 0, 1, EdgeCreationDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        EOperation op = addEOperation(edgeCreationDescriptionEClass, theDescriptionPackage.getEdgeMapping(), "getBestMapping", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        addEParameter(op, theDiagramPackage.getEdgeTarget(), "source", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        addEParameter(op, theDiagramPackage.getEdgeTarget(), "target", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        addEParameter(op, theEcorePackage.getEObject(), "createdElements", 0, -1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(containerCreationDescriptionEClass, ContainerCreationDescription.class,
+                "ContainerCreationDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getContainerCreationDescription_ContainerMappings(),
+                theDescriptionPackage.getContainerMapping(),
+                null,
+                "containerMappings", null, 1, -1, ContainerCreationDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getContainerCreationDescription_Variable(),
+                this.getNodeCreationVariable(),
+                null,
+                "variable", null, 1, 1, ContainerCreationDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getContainerCreationDescription_ViewVariable(),
+                theToolPackage_1.getContainerViewVariable(),
+                null,
+                "viewVariable", null, 1, 1, ContainerCreationDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getContainerCreationDescription_InitialOperation(),
+                theToolPackage_1.getInitialNodeCreationOperation(),
+                null,
+                "initialOperation", null, 1, 1, ContainerCreationDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getContainerCreationDescription_IconPath(),
+                theDescriptionPackage_1.getImagePath(),
+                "iconPath", "", 0, 1, ContainerCreationDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEReference(
+                getContainerCreationDescription_ExtraMappings(),
+                theDescriptionPackage.getAbstractNodeMapping(),
+                null,
+                "extraMappings", null, 0, -1, ContainerCreationDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(deleteElementDescriptionEClass, DeleteElementDescription.class,
+                "DeleteElementDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getDeleteElementDescription_Element(),
+                theToolPackage_1.getElementDeleteVariable(),
+                null,
+                "element", null, 1, 1, DeleteElementDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDeleteElementDescription_ElementView(),
+                theToolPackage_1.getElementDeleteVariable(),
+                null,
+                "elementView", null, 0, 1, DeleteElementDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDeleteElementDescription_ContainerView(),
+                theToolPackage_1.getContainerViewVariable(),
+                null,
+                "containerView", null, 1, 1, DeleteElementDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDeleteElementDescription_InitialOperation(),
+                theToolPackage_1.getInitialOperation(),
+                null,
+                "initialOperation", null, 1, 1, DeleteElementDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDeleteElementDescription_Hook(),
+                this.getDeleteHook(),
+                null,
+                "hook", null, 0, 1, DeleteElementDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        addEOperation(deleteElementDescriptionEClass, theDescriptionPackage.getDiagramElementMapping(), "getMappings", 1, -1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(doubleClickDescriptionEClass, DoubleClickDescription.class,
+                "DoubleClickDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getDoubleClickDescription_Mappings(),
+                theDescriptionPackage.getDiagramElementMapping(),
+                theDescriptionPackage.getDiagramElementMapping_DoubleClickDescription(),
+                "mappings", null, 1, -1, DoubleClickDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDoubleClickDescription_Element(),
+                this.getElementDoubleClickVariable(),
+                null,
+                "element", null, 1, 1, DoubleClickDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDoubleClickDescription_ElementView(),
+                this.getElementDoubleClickVariable(),
+                null,
+                "elementView", null, 0, 1, DoubleClickDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDoubleClickDescription_InitialOperation(),
+                theToolPackage_1.getInitialOperation(),
+                null,
+                "initialOperation", null, 1, 1, DoubleClickDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(deleteHookEClass, DeleteHook.class, "DeleteHook", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getDeleteHook_Id(),
+                theEcorePackage.getEString(),
+                "id", null, 1, 1, DeleteHook.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDeleteHook_Parameters(),
+                this.getDeleteHookParameter(),
+                null,
+                "parameters", null, 0, -1, DeleteHook.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(deleteHookParameterEClass, DeleteHookParameter.class, "DeleteHookParameter", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getDeleteHookParameter_Name(),
+                theEcorePackage.getEString(),
+                "name", null, 1, 1, DeleteHookParameter.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getDeleteHookParameter_Value(),
+                theDescriptionPackage_1.getInterpretedExpression(),
+                "value", null, 0, 1, DeleteHookParameter.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(reconnectEdgeDescriptionEClass, ReconnectEdgeDescription.class,
+                "ReconnectEdgeDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getReconnectEdgeDescription_ReconnectionKind(),
+                this.getReconnectionKind(),
+                "reconnectionKind", "RECONNECT_TARGET", 1, 1, ReconnectEdgeDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEReference(
+                getReconnectEdgeDescription_Source(),
+                this.getSourceEdgeCreationVariable(),
+                null,
+                "source", null, 1, 1, ReconnectEdgeDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getReconnectEdgeDescription_Target(),
+                this.getTargetEdgeCreationVariable(),
+                null,
+                "target", null, 1, 1, ReconnectEdgeDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getReconnectEdgeDescription_SourceView(),
+                this.getSourceEdgeViewCreationVariable(),
+                null,
+                "sourceView", null, 1, 1, ReconnectEdgeDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getReconnectEdgeDescription_TargetView(),
+                this.getTargetEdgeViewCreationVariable(),
+                null,
+                "targetView", null, 1, 1, ReconnectEdgeDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getReconnectEdgeDescription_Element(),
+                theToolPackage_1.getElementSelectVariable(),
+                null,
+                "element", null, 1, 1, ReconnectEdgeDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getReconnectEdgeDescription_InitialOperation(),
+                theToolPackage_1.getInitialOperation(),
+                null,
+                "initialOperation", null, 1, 1, ReconnectEdgeDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getReconnectEdgeDescription_EdgeView(),
+                theToolPackage_1.getElementSelectVariable(),
+                null,
+                "edgeView", null, 1, 1, ReconnectEdgeDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        addEOperation(reconnectEdgeDescriptionEClass, theDescriptionPackage.getEdgeMapping(), "getMappings", 1, -1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(requestDescriptionEClass, RequestDescription.class, "RequestDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getRequestDescription_Type(),
+                theEcorePackage.getEString(),
+                "type", null, 1, 1, RequestDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(directEditLabelEClass, DirectEditLabel.class, "DirectEditLabel", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getDirectEditLabel_Mask(),
+                theToolPackage_1.getEditMaskVariables(),
+                null,
+                "mask", null, 1, 1, DirectEditLabel.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDirectEditLabel_InitialOperation(),
+                theToolPackage_1.getInitialOperation(),
+                null,
+                "initialOperation", null, 1, 1, DirectEditLabel.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getDirectEditLabel_InputLabelExpression(),
+                theDescriptionPackage_1.getInterpretedExpression(),
+                "inputLabelExpression", null, 0, 1, DirectEditLabel.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        addEOperation(directEditLabelEClass, theDescriptionPackage.getDiagramElementMapping(), "getMapping", 1, -1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(behaviorToolEClass, BehaviorTool.class, "BehaviorTool", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getBehaviorTool_DomainClass(),
+                theDescriptionPackage_1.getTypeName(),
+                "domainClass", "EObject", 1, 1, BehaviorTool.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEReference(
+                getBehaviorTool_InitialOperation(),
+                theToolPackage_1.getInitialOperation(),
+                null,
+                "initialOperation", null, 1, 1, BehaviorTool.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(sourceEdgeCreationVariableEClass, SourceEdgeCreationVariable.class,
+                "SourceEdgeCreationVariable", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(sourceEdgeViewCreationVariableEClass, SourceEdgeViewCreationVariable.class,
+                "SourceEdgeViewCreationVariable", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(targetEdgeCreationVariableEClass, TargetEdgeCreationVariable.class,
+                "TargetEdgeCreationVariable", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(targetEdgeViewCreationVariableEClass, TargetEdgeViewCreationVariable.class,
+                "TargetEdgeViewCreationVariable", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(elementDoubleClickVariableEClass, ElementDoubleClickVariable.class,
+                "ElementDoubleClickVariable", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(nodeCreationVariableEClass, NodeCreationVariable.class, "NodeCreationVariable", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(createViewEClass, CreateView.class, "CreateView", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getCreateView_Mapping(),
+                theDescriptionPackage.getDiagramElementMapping(),
+                null,
+                "mapping", null, 1, 1, CreateView.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getCreateView_ContainerViewExpression(),
+                theDescriptionPackage_1.getInterpretedExpression(),
+                "containerViewExpression", "", 1, 1, CreateView.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(
+                getCreateView_VariableName(),
+                theEcorePackage.getEString(),
+                "variableName", "createdView", 0, 1, CreateView.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+
+        initEClass(createEdgeViewEClass, CreateEdgeView.class, "CreateEdgeView", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getCreateEdgeView_SourceExpression(),
+                theDescriptionPackage_1.getInterpretedExpression(),
+                "sourceExpression", null, 1, 1, CreateEdgeView.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getCreateEdgeView_TargetExpression(),
+                theDescriptionPackage_1.getInterpretedExpression(),
+                "targetExpression", null, 1, 1, CreateEdgeView.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(navigationEClass, Navigation.class, "Navigation", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getNavigation_CreateIfNotExistent(),
+                theEcorePackage.getEBoolean(),
+                "createIfNotExistent", null, 0, 1, Navigation.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getNavigation_DiagramDescription(),
+                theDescriptionPackage.getDiagramDescription(),
+                null,
+                "diagramDescription", null, 1, 1, Navigation.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(diagramCreationDescriptionEClass, DiagramCreationDescription.class,
+                "DiagramCreationDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getDiagramCreationDescription_DiagramDescription(),
+                theDescriptionPackage.getDiagramDescription(),
+                null,
+                "diagramDescription", null, 1, 1, DiagramCreationDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(diagramNavigationDescriptionEClass, DiagramNavigationDescription.class,
+                "DiagramNavigationDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getDiagramNavigationDescription_DiagramDescription(),
+                theDescriptionPackage.getDiagramDescription(),
+                null,
+                "diagramDescription", null, 1, 1, DiagramNavigationDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(containerDropDescriptionEClass, ContainerDropDescription.class,
+                "ContainerDropDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getContainerDropDescription_Mappings(),
+                theDescriptionPackage.getDiagramElementMapping(),
+                null,
+                "mappings", null, 0, -1, ContainerDropDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getContainerDropDescription_OldContainer(),
+                theToolPackage_1.getDropContainerVariable(),
+                null,
+                "oldContainer", null, 1, 1, ContainerDropDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getContainerDropDescription_NewContainer(),
+                theToolPackage_1.getDropContainerVariable(),
+                null,
+                "newContainer", null, 1, 1, ContainerDropDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getContainerDropDescription_Element(),
+                theToolPackage_1.getElementDropVariable(),
+                null,
+                "element", null, 1, 1, ContainerDropDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getContainerDropDescription_NewViewContainer(),
+                theToolPackage_1.getContainerViewVariable(),
+                null,
+                "newViewContainer", null, 1, 1, ContainerDropDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getContainerDropDescription_InitialOperation(),
+                theToolPackage_1.getInitialContainerDropOperation(),
+                null,
+                "initialOperation", null, 1, 1, ContainerDropDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getContainerDropDescription_DragSource(),
+                theToolPackage_1.getDragSource(),
+                "dragSource", null, 1, 1, ContainerDropDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getContainerDropDescription_MoveEdges(),
+                theEcorePackage.getEBoolean(),
+                "moveEdges", null, 1, 1, ContainerDropDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        op = addEOperation(containerDropDescriptionEClass, theDescriptionPackage.getDiagramElementMapping(), "getBestMapping", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        addEParameter(op, theDiagramPackage.getDragAndDropTarget(), "targetContainer", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        addEParameter(op, theEcorePackage.getEObject(), "droppedElement", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        addEOperation(containerDropDescriptionEClass, theDescriptionPackage.getDragAndDropTargetDescription(), "getContainers", 1, -1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
 
         // Initialize enums and add enum literals
-        initEEnum(reconnectionKindEEnum, ReconnectionKind.class, "ReconnectionKind");
+        initEEnum(reconnectionKindEEnum, ReconnectionKind.class, "ReconnectionKind"); //$NON-NLS-1$
         addEEnumLiteral(reconnectionKindEEnum, ReconnectionKind.RECONNECT_TARGET_LITERAL);
         addEEnumLiteral(reconnectionKindEEnum, ReconnectionKind.RECONNECT_SOURCE_LITERAL);
         addEEnumLiteral(reconnectionKindEEnum, ReconnectionKind.RECONNECT_BOTH_LITERAL);
@@ -1915,15 +2062,20 @@ public class ToolPackageImpl extends EPackageImpl implements ToolPackage {
      * @generated
      */
     protected void createVariablesAnnotations() {
-        String source = "http://www.eclipse.org/sirius/interpreted/expression/variables";
-        addAnnotation(getNodeCreationDescription_Variable(), source, new String[] { "type", "ecore.EObject" });
-        addAnnotation(getNodeCreationDescription_ViewVariable(), source, new String[] { "type", "diagram.DDiagramElementContainer" });
-        addAnnotation(getEdgeCreationDescription_ConnectionStartPrecondition(), source, new String[] { "container", "ecore.EObject | the semantic element of diagram.", "preSourceView",
-            "diagram.EdgeTarget | (edge only) the source view of the current potential edge.", "preSource", "ecore.EObject | (edge only) the semantic element of $preSourceView.", "diagram",
-        "diagram.DDiagram | the diagram of the current potential edge" });
+        String source = "http://www.eclipse.org/sirius/interpreted/expression/variables"; //$NON-NLS-1$
+        addAnnotation(getNodeCreationDescription_Variable(), source, new String[] { "type", "ecore.EObject" //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getNodeCreationDescription_ViewVariable(), source, new String[] { "type", "diagram.DDiagramElementContainer" //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getEdgeCreationDescription_ConnectionStartPrecondition(), source, new String[] { "container", "ecore.EObject | the semantic element of diagram.", //$NON-NLS-1$ //$NON-NLS-2$
+            "preSourceView", "diagram.EdgeTarget | (edge only) the source view of the current potential edge.", //$NON-NLS-1$ //$NON-NLS-2$
+            "preSource", "ecore.EObject | (edge only) the semantic element of $preSourceView.", //$NON-NLS-1$ //$NON-NLS-2$
+            "diagram", "diagram.DDiagram | the diagram of the current potential edge" //$NON-NLS-1$ //$NON-NLS-2$
+        });
         addAnnotation(getDeleteHookParameter_Value(), source, new String[] {});
-        addAnnotation(getDirectEditLabel_InputLabelExpression(), source, new String[] { "diagram", "diagram.DDiagram | the current DSemanticDiagram.", "view",
-        "diagram.DDiagramElement | the current view for which the label is calculated." });
+        addAnnotation(getDirectEditLabel_InputLabelExpression(), source, new String[] { "diagram", "diagram.DDiagram | the current DSemanticDiagram.", //$NON-NLS-1$ //$NON-NLS-2$
+            "view", "diagram.DDiagramElement | the current view for which the label is calculated." //$NON-NLS-1$ //$NON-NLS-2$
+        });
         addAnnotation(getCreateView_ContainerViewExpression(), source, new String[] {});
         addAnnotation(getCreateEdgeView_SourceExpression(), source, new String[] {});
         addAnnotation(getCreateEdgeView_TargetExpression(), source, new String[] {});
@@ -1937,13 +2089,19 @@ public class ToolPackageImpl extends EPackageImpl implements ToolPackage {
      * @generated
      */
     protected void createReturnTypeAnnotations() {
-        String source = "http://www.eclipse.org/sirius/interpreted/expression/returnType";
-        addAnnotation(getEdgeCreationDescription_ConnectionStartPrecondition(), source, new String[] { "returnType", "a boolean." });
-        addAnnotation(getDeleteHookParameter_Value(), source, new String[] { "returnType", "a Collection<EObject> or an EObject." });
-        addAnnotation(getDirectEditLabel_InputLabelExpression(), source, new String[] { "returnType", "a string." });
-        addAnnotation(getCreateView_ContainerViewExpression(), source, new String[] { "returnType", "a view (DNode, DEdge, DDiagram -> any DSemanticDecorator)." });
-        addAnnotation(getCreateEdgeView_SourceExpression(), source, new String[] { "returnType", "an EObject." });
-        addAnnotation(getCreateEdgeView_TargetExpression(), source, new String[] { "returnType", "an EObject." });
+        String source = "http://www.eclipse.org/sirius/interpreted/expression/returnType"; //$NON-NLS-1$
+        addAnnotation(getEdgeCreationDescription_ConnectionStartPrecondition(), source, new String[] { "returnType", "a boolean." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getDeleteHookParameter_Value(), source, new String[] { "returnType", "a Collection<EObject> or an EObject." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getDirectEditLabel_InputLabelExpression(), source, new String[] { "returnType", "a string." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getCreateView_ContainerViewExpression(), source, new String[] { "returnType", "a view (DNode, DEdge, DDiagram -> any DSemanticDecorator)." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getCreateEdgeView_SourceExpression(), source, new String[] { "returnType", "an EObject." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getCreateEdgeView_TargetExpression(), source, new String[] { "returnType", "an EObject." //$NON-NLS-1$ //$NON-NLS-2$
+        });
     }
 
 } // ToolPackageImpl
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/ToolSectionImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/ToolSectionImpl.java
index e45315fb47..4f5be2136b 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/ToolSectionImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/ToolSectionImpl.java
@@ -526,11 +526,11 @@ public class ToolSectionImpl extends DocumentedElementImpl implements ToolSectio
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (name: ");
+        result.append(" (name: "); //$NON-NLS-1$
         result.append(name);
-        result.append(", label: ");
+        result.append(", label: "); //$NON-NLS-1$
         result.append(label);
-        result.append(", icon: ");
+        result.append(", icon: "); //$NON-NLS-1$
         result.append(icon);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/AbsoluteBoundsFilterImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/AbsoluteBoundsFilterImpl.java
index a525e68f40..acdd4a4f41 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/AbsoluteBoundsFilterImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/AbsoluteBoundsFilterImpl.java
@@ -334,13 +334,13 @@ public class AbsoluteBoundsFilterImpl extends MinimalEObjectImpl.Container imple
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (x: ");
+        result.append(" (x: "); //$NON-NLS-1$
         result.append(x);
-        result.append(", y: ");
+        result.append(", y: "); //$NON-NLS-1$
         result.append(y);
-        result.append(", height: ");
+        result.append(", height: "); //$NON-NLS-1$
         result.append(height);
-        result.append(", width: ");
+        result.append(", width: "); //$NON-NLS-1$
         result.append(width);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/BorderedStyleImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/BorderedStyleImpl.java
index 9c5744f96b..3f3cc1d602 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/BorderedStyleImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/BorderedStyleImpl.java
@@ -345,13 +345,13 @@ public class BorderedStyleImpl extends StyleImpl implements BorderedStyle {
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (borderSize: ");
+        result.append(" (borderSize: "); //$NON-NLS-1$
         result.append(borderSize);
-        result.append(", borderSizeComputationExpression: ");
+        result.append(", borderSizeComputationExpression: "); //$NON-NLS-1$
         result.append(borderSizeComputationExpression);
-        result.append(", borderColor: ");
+        result.append(", borderColor: "); //$NON-NLS-1$
         result.append(borderColor);
-        result.append(", borderLineStyle: ");
+        result.append(", borderLineStyle: "); //$NON-NLS-1$
         result.append(borderLineStyle);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/BundledImageImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/BundledImageImpl.java
index 8c3ff3887a..d19b0f7aaf 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/BundledImageImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/BundledImageImpl.java
@@ -224,9 +224,9 @@ public class BundledImageImpl extends NodeStyleImpl implements BundledImage {
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (shape: ");
+        result.append(" (shape: "); //$NON-NLS-1$
         result.append(shape);
-        result.append(", color: ");
+        result.append(", color: "); //$NON-NLS-1$
         result.append(color);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/CollapseFilterImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/CollapseFilterImpl.java
index c72aef7d2f..8c6e7690bc 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/CollapseFilterImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/CollapseFilterImpl.java
@@ -221,9 +221,9 @@ public class CollapseFilterImpl extends MinimalEObjectImpl.Container implements
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (width: ");
+        result.append(" (width: "); //$NON-NLS-1$
         result.append(width);
-        result.append(", height: ");
+        result.append(", height: "); //$NON-NLS-1$
         result.append(height);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/ContainerStyleImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/ContainerStyleImpl.java
index 15fc3bb4e9..627f6a5af5 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/ContainerStyleImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/ContainerStyleImpl.java
@@ -581,15 +581,15 @@ public abstract class ContainerStyleImpl extends LabelStyleImpl implements Conta
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (borderSize: ");
+        result.append(" (borderSize: "); //$NON-NLS-1$
         result.append(borderSize);
-        result.append(", borderSizeComputationExpression: ");
+        result.append(", borderSizeComputationExpression: "); //$NON-NLS-1$
         result.append(borderSizeComputationExpression);
-        result.append(", borderColor: ");
+        result.append(", borderColor: "); //$NON-NLS-1$
         result.append(borderColor);
-        result.append(", borderLineStyle: ");
+        result.append(", borderLineStyle: "); //$NON-NLS-1$
         result.append(borderLineStyle);
-        result.append(", hideLabelByDefault: ");
+        result.append(", hideLabelByDefault: "); //$NON-NLS-1$
         result.append(hideLabelByDefault);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/CustomStyleImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/CustomStyleImpl.java
index ac36b00749..68fcaa0fb8 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/CustomStyleImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/CustomStyleImpl.java
@@ -164,7 +164,7 @@ public class CustomStyleImpl extends NodeStyleImpl implements CustomStyle {
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (id: ");
+        result.append(" (id: "); //$NON-NLS-1$
         result.append(id);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/DDiagramElementContainerImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/DDiagramElementContainerImpl.java
index 32422e0a54..0476604369 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/DDiagramElementContainerImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/DDiagramElementContainerImpl.java
@@ -874,11 +874,11 @@ public abstract class DDiagramElementContainerImpl extends DDiagramElementImpl i
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (arrangeConstraints: ");
+        result.append(" (arrangeConstraints: "); //$NON-NLS-1$
         result.append(arrangeConstraints);
-        result.append(", width: ");
+        result.append(", width: "); //$NON-NLS-1$
         result.append(width);
-        result.append(", height: ");
+        result.append(", height: "); //$NON-NLS-1$
         result.append(height);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/DDiagramElementImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/DDiagramElementImpl.java
index ddb6c9ca10..1e1c3877be 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/DDiagramElementImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/DDiagramElementImpl.java
@@ -411,9 +411,9 @@ public abstract class DDiagramElementImpl extends DRepresentationElementImpl imp
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (visible: ");
+        result.append(" (visible: "); //$NON-NLS-1$
         result.append(visible);
-        result.append(", tooltipText: ");
+        result.append(", tooltipText: "); //$NON-NLS-1$
         result.append(tooltipText);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/DDiagramImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/DDiagramImpl.java
index 89dac12fd1..806176af23 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/DDiagramImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/DDiagramImpl.java
@@ -975,11 +975,11 @@ public class DDiagramImpl extends DRepresentationImpl implements DDiagram {
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (synchronized: ");
+        result.append(" (synchronized: "); //$NON-NLS-1$
         result.append(synchronized_);
-        result.append(", isInLayoutingMode: ");
+        result.append(", isInLayoutingMode: "); //$NON-NLS-1$
         result.append(isInLayoutingMode);
-        result.append(", headerHeight: ");
+        result.append(", headerHeight: "); //$NON-NLS-1$
         result.append(headerHeight);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/DEdgeImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/DEdgeImpl.java
index 3e18857b78..479e8b3b65 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/DEdgeImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/DEdgeImpl.java
@@ -1146,19 +1146,19 @@ public class DEdgeImpl extends DDiagramElementImpl implements DEdge {
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (size: ");
+        result.append(" (size: "); //$NON-NLS-1$
         result.append(size);
-        result.append(", routingStyle: ");
+        result.append(", routingStyle: "); //$NON-NLS-1$
         result.append(routingStyle);
-        result.append(", isFold: ");
+        result.append(", isFold: "); //$NON-NLS-1$
         result.append(isFold);
-        result.append(", isMockEdge: ");
+        result.append(", isMockEdge: "); //$NON-NLS-1$
         result.append(isMockEdge);
-        result.append(", arrangeConstraints: ");
+        result.append(", arrangeConstraints: "); //$NON-NLS-1$
         result.append(arrangeConstraints);
-        result.append(", beginLabel: ");
+        result.append(", beginLabel: "); //$NON-NLS-1$
         result.append(beginLabel);
-        result.append(", endLabel: ");
+        result.append(", endLabel: "); //$NON-NLS-1$
         result.append(endLabel);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/DNodeContainerImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/DNodeContainerImpl.java
index f87c9ec39d..f4011a1314 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/DNodeContainerImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/DNodeContainerImpl.java
@@ -229,7 +229,7 @@ public class DNodeContainerImpl extends DDiagramElementContainerImpl implements
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (childrenPresentation: ");
+        result.append(" (childrenPresentation: "); //$NON-NLS-1$
         result.append(childrenPresentation);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/DNodeImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/DNodeImpl.java
index 581a04c79e..acc057cfd5 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/DNodeImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/DNodeImpl.java
@@ -882,15 +882,15 @@ public class DNodeImpl extends DDiagramElementImpl implements DNode {
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (arrangeConstraints: ");
+        result.append(" (arrangeConstraints: "); //$NON-NLS-1$
         result.append(arrangeConstraints);
-        result.append(", width: ");
+        result.append(", width: "); //$NON-NLS-1$
         result.append(width);
-        result.append(", height: ");
+        result.append(", height: "); //$NON-NLS-1$
         result.append(height);
-        result.append(", labelPosition: ");
+        result.append(", labelPosition: "); //$NON-NLS-1$
         result.append(labelPosition);
-        result.append(", resizeKind: ");
+        result.append(", resizeKind: "); //$NON-NLS-1$
         result.append(resizeKind);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/DNodeListElementImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/DNodeListElementImpl.java
index e40757df17..d8e20ad867 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/DNodeListElementImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/DNodeListElementImpl.java
@@ -496,7 +496,7 @@ public class DNodeListElementImpl extends DDiagramElementImpl implements DNodeLi
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (arrangeConstraints: ");
+        result.append(" (arrangeConstraints: "); //$NON-NLS-1$
         result.append(arrangeConstraints);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/DiagramFactoryImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/DiagramFactoryImpl.java
index 7af0af46fc..799b5fa12e 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/DiagramFactoryImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/DiagramFactoryImpl.java
@@ -205,7 +205,7 @@ public class DiagramFactoryImpl extends EFactoryImpl implements DiagramFactory {
         case DiagramPackage.DRAG_AND_DROP_TARGET:
             return createDragAndDropTarget();
         default:
-            throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+            throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
         }
     }
 
@@ -240,7 +240,7 @@ public class DiagramFactoryImpl extends EFactoryImpl implements DiagramFactory {
         case DiagramPackage.ARRANGE_CONSTRAINT:
             return createArrangeConstraintFromString(eDataType, initialValue);
         default:
-            throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+            throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
         }
     }
 
@@ -275,7 +275,7 @@ public class DiagramFactoryImpl extends EFactoryImpl implements DiagramFactory {
         case DiagramPackage.ARRANGE_CONSTRAINT:
             return convertArrangeConstraintToString(eDataType, instanceValue);
         default:
-            throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+            throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
         }
     }
 
@@ -694,7 +694,7 @@ public class DiagramFactoryImpl extends EFactoryImpl implements DiagramFactory {
     public ContainerLayout createContainerLayoutFromString(EDataType eDataType, String initialValue) {
         ContainerLayout result = ContainerLayout.get(initialValue);
         if (result == null) {
-            throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+            throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
         }
         return result;
     }
@@ -716,7 +716,7 @@ public class DiagramFactoryImpl extends EFactoryImpl implements DiagramFactory {
     public LabelPosition createLabelPositionFromString(EDataType eDataType, String initialValue) {
         LabelPosition result = LabelPosition.get(initialValue);
         if (result == null) {
-            throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+            throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
         }
         return result;
     }
@@ -738,7 +738,7 @@ public class DiagramFactoryImpl extends EFactoryImpl implements DiagramFactory {
     public ContainerShape createContainerShapeFromString(EDataType eDataType, String initialValue) {
         ContainerShape result = ContainerShape.get(initialValue);
         if (result == null) {
-            throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+            throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
         }
         return result;
     }
@@ -760,7 +760,7 @@ public class DiagramFactoryImpl extends EFactoryImpl implements DiagramFactory {
     public BackgroundStyle createBackgroundStyleFromString(EDataType eDataType, String initialValue) {
         BackgroundStyle result = BackgroundStyle.get(initialValue);
         if (result == null) {
-            throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+            throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
         }
         return result;
     }
@@ -782,7 +782,7 @@ public class DiagramFactoryImpl extends EFactoryImpl implements DiagramFactory {
     public BundledImageShape createBundledImageShapeFromString(EDataType eDataType, String initialValue) {
         BundledImageShape result = BundledImageShape.get(initialValue);
         if (result == null) {
-            throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+            throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
         }
         return result;
     }
@@ -804,7 +804,7 @@ public class DiagramFactoryImpl extends EFactoryImpl implements DiagramFactory {
     public LineStyle createLineStyleFromString(EDataType eDataType, String initialValue) {
         LineStyle result = LineStyle.get(initialValue);
         if (result == null) {
-            throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+            throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
         }
         return result;
     }
@@ -826,7 +826,7 @@ public class DiagramFactoryImpl extends EFactoryImpl implements DiagramFactory {
     public EdgeArrows createEdgeArrowsFromString(EDataType eDataType, String initialValue) {
         EdgeArrows result = EdgeArrows.get(initialValue);
         if (result == null) {
-            throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+            throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
         }
         return result;
     }
@@ -848,7 +848,7 @@ public class DiagramFactoryImpl extends EFactoryImpl implements DiagramFactory {
     public EdgeRouting createEdgeRoutingFromString(EDataType eDataType, String initialValue) {
         EdgeRouting result = EdgeRouting.get(initialValue);
         if (result == null) {
-            throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+            throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
         }
         return result;
     }
@@ -870,7 +870,7 @@ public class DiagramFactoryImpl extends EFactoryImpl implements DiagramFactory {
     public AlignmentKind createAlignmentKindFromString(EDataType eDataType, String initialValue) {
         AlignmentKind result = AlignmentKind.get(initialValue);
         if (result == null) {
-            throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+            throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
         }
         return result;
     }
@@ -892,7 +892,7 @@ public class DiagramFactoryImpl extends EFactoryImpl implements DiagramFactory {
     public ResizeKind createResizeKindFromString(EDataType eDataType, String initialValue) {
         ResizeKind result = ResizeKind.get(initialValue);
         if (result == null) {
-            throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+            throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
         }
         return result;
     }
@@ -914,7 +914,7 @@ public class DiagramFactoryImpl extends EFactoryImpl implements DiagramFactory {
     public ArrangeConstraint createArrangeConstraintFromString(EDataType eDataType, String initialValue) {
         ArrangeConstraint result = ArrangeConstraint.get(initialValue);
         if (result == null) {
-            throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+            throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
         }
         return result;
     }
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/DiagramPackageImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/DiagramPackageImpl.java
index d2be72cc0a..cfe3e7942e 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/DiagramPackageImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/DiagramPackageImpl.java
@@ -2718,465 +2718,712 @@ public class DiagramPackageImpl extends EPackageImpl implements DiagramPackage {
         bracketEdgeStyleEClass.getESuperTypes().add(this.getEdgeStyle());
 
         // Initialize classes and features; add operations and parameters
-        initEClass(dDiagramEClass, DDiagram.class, "DDiagram", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getDDiagram_OwnedDiagramElements(), this.getDDiagramElement(), null, "ownedDiagramElements", null, 0, -1, DDiagram.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getDDiagram_DiagramElements(), this.getDDiagramElement(), null, "diagramElements", null, 0, -1, DDiagram.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE,
-                !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getDDiagram_Description(), theDescriptionPackage.getDiagramDescription(), null, "description", null, 0, 1, DDiagram.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getDDiagram_Edges(), this.getDEdge(), null, "edges", null, 0, -1, DDiagram.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE, !EPackageImpl.IS_CHANGEABLE,
-                !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getDDiagram_Nodes(), this.getDNode(), null, "nodes", null, 0, -1, DDiagram.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE, !EPackageImpl.IS_CHANGEABLE,
-                !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getDDiagram_NodeListElements(), this.getDNodeListElement(), null, "nodeListElements", null, 0, -1, DDiagram.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE,
-                !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getDDiagram_Containers(), this.getDDiagramElementContainer(), null, "containers", null, 0, -1, DDiagram.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE,
-                !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getDDiagram_CurrentConcern(), theConcernPackage.getConcernDescription(), null, "currentConcern", null, 0, 1, DDiagram.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getDDiagram_ActivatedFilters(), theFilterPackage.getFilterDescription(), null, "activatedFilters", null, 0, -1, DDiagram.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getDDiagram_AllFilters(), theFilterPackage.getFilterDescription(), null, "allFilters", null, 0, -1, DDiagram.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE,
-                !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getDDiagram_ActivatedRules(), theValidationPackage.getValidationRule(), null, "activatedRules", null, 0, -1, DDiagram.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getDDiagram_ActivateBehaviors(), theToolPackage.getBehaviorTool(), null, "activateBehaviors", null, 0, -1, DDiagram.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getDDiagram_FilterVariableHistory(), this.getFilterVariableHistory(), null, "filterVariableHistory", null, 1, 1, DDiagram.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getDDiagram_ActivatedLayers(), theDescriptionPackage.getLayer(), null, "activatedLayers", null, 0, -1, DDiagram.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEAttribute(getDDiagram_Synchronized(), theEcorePackage.getEBoolean(), "synchronized", "true", 0, 1, DDiagram.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getDDiagram_HiddenElements(), this.getDDiagramElement(), null, "hiddenElements", null, 0, -1, DDiagram.class, EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEAttribute(getDDiagram_IsInLayoutingMode(), theEcorePackage.getEBoolean(), "isInLayoutingMode", null, 0, 1, DDiagram.class, EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getDDiagram_HeaderHeight(), theEcorePackage.getEInt(), "headerHeight", "1", 0, 1, DDiagram.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        EOperation op = addEOperation(dDiagramEClass, this.getDNode(), "getNodesFromMapping", 0, -1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-        addEParameter(op, theDescriptionPackage.getNodeMapping(), "mapping", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-
-        op = addEOperation(dDiagramEClass, this.getDEdge(), "getEdgesFromMapping", 0, -1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-        addEParameter(op, theDescriptionPackage.getEdgeMapping(), "mapping", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-
-        op = addEOperation(dDiagramEClass, this.getDDiagramElementContainer(), "getContainersFromMapping", 0, -1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-        addEParameter(op, theDescriptionPackage.getContainerMapping(), "mapping", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-
-        initEClass(dSemanticDiagramEClass, DSemanticDiagram.class, "DSemanticDiagram", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(dDiagramElementEClass, DDiagramElement.class, "DDiagramElement", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getDDiagramElement_Visible(), theEcorePackage.getEBoolean(), "visible", "true", 0, 1, DDiagramElement.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getDDiagramElement_TooltipText(), theEcorePackage.getEString(), "tooltipText", null, 0, 1, DDiagramElement.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getDDiagramElement_ParentLayers(), theDescriptionPackage.getLayer(), null, "parentLayers", null, 0, -1, DDiagramElement.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getDDiagramElement_Decorations(), theViewpointPackage.getDecoration(), null, "decorations", null, 0, -1, DDiagramElement.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getDDiagramElement_DiagramElementMapping(), theDescriptionPackage.getDiagramElementMapping(), null, "diagramElementMapping", null, 0, 1, DDiagramElement.class,
-                EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE, !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getDDiagramElement_GraphicalFilters(), this.getGraphicalFilter(), null, "graphicalFilters", null, 0, -1, DDiagramElement.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        addEOperation(dDiagramElementEClass, this.getDDiagram(), "getParentDiagram", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-
-        initEClass(graphicalFilterEClass, GraphicalFilter.class, "GraphicalFilter", EPackageImpl.IS_ABSTRACT, EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(hideFilterEClass, HideFilter.class, "HideFilter", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(hideLabelFilterEClass, HideLabelFilter.class, "HideLabelFilter", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(foldingPointFilterEClass, FoldingPointFilter.class, "FoldingPointFilter", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(foldingFilterEClass, FoldingFilter.class, "FoldingFilter", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(appliedCompositeFiltersEClass, AppliedCompositeFilters.class, "AppliedCompositeFilters", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getAppliedCompositeFilters_CompositeFilterDescriptions(), theFilterPackage.getCompositeFilterDescription(), null, "compositeFilterDescriptions", null, 0, -1,
-                AppliedCompositeFilters.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES,
-                !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(absoluteBoundsFilterEClass, AbsoluteBoundsFilter.class, "AbsoluteBoundsFilter", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getAbsoluteBoundsFilter_X(), theEcorePackage.getEIntegerObject(), "x", null, 0, 1, AbsoluteBoundsFilter.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getAbsoluteBoundsFilter_Y(), theEcorePackage.getEIntegerObject(), "y", null, 0, 1, AbsoluteBoundsFilter.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getAbsoluteBoundsFilter_Height(), theEcorePackage.getEIntegerObject(), "height", null, 0, 1, AbsoluteBoundsFilter.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getAbsoluteBoundsFilter_Width(), theEcorePackage.getEIntegerObject(), "width", null, 0, 1, AbsoluteBoundsFilter.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(abstractDNodeEClass, AbstractDNode.class, "AbstractDNode", EPackageImpl.IS_ABSTRACT, EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getAbstractDNode_OwnedBorderedNodes(), this.getDNode(), null, "ownedBorderedNodes", null, 0, -1, AbstractDNode.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEAttribute(getAbstractDNode_ArrangeConstraints(), this.getArrangeConstraint(), "arrangeConstraints", "KEEP_LOCATION", 0, -1, AbstractDNode.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(dNodeEClass, DNode.class, "DNode", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getDNode_Width(), theEcorePackage.getEIntegerObject(), "width", null, 0, 1, DNode.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE,
-                !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getDNode_Height(), theEcorePackage.getEIntegerObject(), "height", null, 0, 1, DNode.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE,
-                !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getDNode_OwnedStyle(), this.getNodeStyle(), null, "ownedStyle", null, 0, 1, DNode.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE,
-                EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getDNode_LabelPosition(), this.getLabelPosition(), "labelPosition", null, 0, 1, DNode.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE,
-                !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getDNode_ResizeKind(), this.getResizeKind(), "resizeKind", "NONE", 0, 1, DNode.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE,
-                !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getDNode_OriginalStyle(), theViewpointPackage.getStyle(), null, "originalStyle", null, 0, 1, DNode.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getDNode_ActualMapping(), theDescriptionPackage.getNodeMapping(), null, "actualMapping", null, 1, 1, DNode.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getDNode_CandidatesMapping(), theDescriptionPackage.getNodeMapping(), null, "candidatesMapping", null, 0, -1, DNode.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(dDiagramElementContainerEClass, DDiagramElementContainer.class, "DDiagramElementContainer", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getDDiagramElementContainer_Nodes(), this.getDNode(), null, "nodes", null, 0, -1, DDiagramElementContainer.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE,
-                !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getDDiagramElementContainer_Containers(), this.getDDiagramElementContainer(), null, "containers", null, 0, -1, DDiagramElementContainer.class, EPackageImpl.IS_TRANSIENT,
-                EPackageImpl.IS_VOLATILE, !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getDDiagramElementContainer_Elements(), this.getDDiagramElement(), null, "elements", null, 0, -1, DDiagramElementContainer.class, EPackageImpl.IS_TRANSIENT,
-                EPackageImpl.IS_VOLATILE, !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getDDiagramElementContainer_OwnedStyle(), this.getContainerStyle(), null, "ownedStyle", null, 0, 1, DDiagramElementContainer.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getDDiagramElementContainer_OriginalStyle(), theViewpointPackage.getStyle(), null, "originalStyle", null, 0, 1, DDiagramElementContainer.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getDDiagramElementContainer_ActualMapping(), theDescriptionPackage.getContainerMapping(), null, "actualMapping", null, 1, 1, DDiagramElementContainer.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getDDiagramElementContainer_CandidatesMapping(), theDescriptionPackage.getContainerMapping(), null, "candidatesMapping", null, 0, -1, DDiagramElementContainer.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getDDiagramElementContainer_Width(), theEcorePackage.getEIntegerObject(), "width", null, 0, 1, DDiagramElementContainer.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getDDiagramElementContainer_Height(), theEcorePackage.getEIntegerObject(), "height", null, 0, 1, DDiagramElementContainer.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        op = addEOperation(dDiagramElementContainerEClass, this.getDNode(), "getNodesFromMapping", 0, -1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-        addEParameter(op, theDescriptionPackage.getNodeMapping(), "mapping", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-
-        op = addEOperation(dDiagramElementContainerEClass, this.getDDiagramElementContainer(), "getContainersFromMapping", 0, -1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-        addEParameter(op, theDescriptionPackage.getContainerMapping(), "mapping", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-
-        initEClass(dNodeContainerEClass, DNodeContainer.class, "DNodeContainer", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getDNodeContainer_OwnedDiagramElements(), this.getDDiagramElement(), null, "ownedDiagramElements", null, 0, -1, DNodeContainer.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getDNodeContainer_ChildrenPresentation(), this.getContainerLayout(), "childrenPresentation", "FreeForm", 1, 1, DNodeContainer.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(dNodeListEClass, DNodeList.class, "DNodeList", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getDNodeList_OwnedElements(), this.getDNodeListElement(), null, "ownedElements", null, 0, -1, DNodeList.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-
-        initEClass(dNodeListElementEClass, DNodeListElement.class, "DNodeListElement", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getDNodeListElement_OwnedStyle(), this.getNodeStyle(), null, "ownedStyle", null, 0, 1, DNodeListElement.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getDNodeListElement_OriginalStyle(), theViewpointPackage.getStyle(), null, "originalStyle", null, 0, 1, DNodeListElement.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getDNodeListElement_ActualMapping(), theDescriptionPackage.getNodeMapping(), null, "actualMapping", null, 1, 1, DNodeListElement.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getDNodeListElement_CandidatesMapping(), theDescriptionPackage.getNodeMapping(), null, "candidatesMapping", null, 0, -1, DNodeListElement.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(dEdgeEClass, DEdge.class, "DEdge", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getDEdge_OwnedStyle(), this.getEdgeStyle(), null, "ownedStyle", null, 0, 1, DEdge.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE,
-                EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getDEdge_Size(), theEcorePackage.getEIntegerObject(), "size", "1", 0, 1, DEdge.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE,
-                !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getDEdge_SourceNode(), this.getEdgeTarget(), this.getEdgeTarget_OutgoingEdges(), "sourceNode", null, 1, 1, DEdge.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getDEdge_TargetNode(), this.getEdgeTarget(), this.getEdgeTarget_IncomingEdges(), "targetNode", null, 1, 1, DEdge.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getDEdge_ActualMapping(), theDescriptionPackage.getIEdgeMapping(), null, "actualMapping", null, 1, 1, DEdge.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEAttribute(getDEdge_RoutingStyle(), this.getEdgeRouting(), "routingStyle", "straight", 1, 1, DEdge.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getDEdge_IsFold(), theEcorePackage.getEBoolean(), "isFold", null, 0, 1, DEdge.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE,
-                !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getDEdge_IsMockEdge(), theEcorePackage.getEBoolean(), "isMockEdge", null, 0, 1, DEdge.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE,
-                !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getDEdge_OriginalStyle(), theViewpointPackage.getStyle(), null, "originalStyle", null, 0, 1, DEdge.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getDEdge_Path(), this.getEdgeTarget(), null, "path", null, 0, -1, DEdge.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE,
-                !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getDEdge_ArrangeConstraints(), this.getArrangeConstraint(), "arrangeConstraints", "KEEP_LOCATION", 0, -1, DEdge.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getDEdge_BeginLabel(), theEcorePackage.getEString(), "beginLabel", "", 0, 1, DEdge.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE,
-                !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getDEdge_EndLabel(), theEcorePackage.getEString(), "endLabel", "", 0, 1, DEdge.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE,
-                !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        addEOperation(dEdgeEClass, theEcorePackage.getEBoolean(), "isRootFolding", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-
-        initEClass(nodeStyleEClass, NodeStyle.class, "NodeStyle", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getNodeStyle_LabelPosition(), this.getLabelPosition(), "labelPosition", null, 0, 1, NodeStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(dotEClass, Dot.class, "Dot", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getDot_StrokeSizeComputationExpression(), theDescriptionPackage_1.getInterpretedExpression(), "strokeSizeComputationExpression", "2", 0, 1, Dot.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEAttribute(getDot_BackgroundColor(), theViewpointPackage.getRGBValues(), "backgroundColor", "136,136,136", 0, 1, Dot.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(gaugeSectionEClass, GaugeSection.class, "GaugeSection", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getGaugeSection_Min(), theEcorePackage.getEIntegerObject(), "min", null, 0, 1, GaugeSection.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getGaugeSection_Max(), theEcorePackage.getEIntegerObject(), "max", null, 0, 1, GaugeSection.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getGaugeSection_Value(), theEcorePackage.getEIntegerObject(), "value", null, 0, 1, GaugeSection.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getGaugeSection_Label(), theEcorePackage.getEString(), "label", null, 0, 1, GaugeSection.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getGaugeSection_BackgroundColor(), theViewpointPackage.getRGBValues(), "backgroundColor", "0,0,0", 0, 1, GaugeSection.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getGaugeSection_ForegroundColor(), theViewpointPackage.getRGBValues(), "foregroundColor", "138,226,52", 0, 1, GaugeSection.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(containerStyleEClass, ContainerStyle.class, "ContainerStyle", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(flatContainerStyleEClass, FlatContainerStyle.class, "FlatContainerStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getFlatContainerStyle_BackgroundStyle(), this.getBackgroundStyle(), "backgroundStyle", null, 1, 1, FlatContainerStyle.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getFlatContainerStyle_BackgroundColor(), theViewpointPackage.getRGBValues(), "backgroundColor", "255,255,255", 0, 1, FlatContainerStyle.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getFlatContainerStyle_ForegroundColor(), theViewpointPackage.getRGBValues(), "foregroundColor", "209,209,209", 0, 1, FlatContainerStyle.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(shapeContainerStyleEClass, ShapeContainerStyle.class, "ShapeContainerStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getShapeContainerStyle_Shape(), this.getContainerShape(), "shape", null, 1, 1, ShapeContainerStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getShapeContainerStyle_BackgroundColor(), theViewpointPackage.getRGBValues(), "backgroundColor", "209,209,209", 0, 1, ShapeContainerStyle.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(squareEClass, Square.class, "Square", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getSquare_Width(), theEcorePackage.getEIntegerObject(), "width", "0", 0, 1, Square.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE,
-                !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getSquare_Height(), theEcorePackage.getEIntegerObject(), "height", "0", 0, 1, Square.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE,
-                !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getSquare_Color(), theViewpointPackage.getRGBValues(), "color", "136,136,136", 0, 1, Square.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(ellipseEClass, Ellipse.class, "Ellipse", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getEllipse_HorizontalDiameter(), theEcorePackage.getEIntegerObject(), "horizontalDiameter", "0", 0, 1, Ellipse.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getEllipse_VerticalDiameter(), theEcorePackage.getEIntegerObject(), "verticalDiameter", "0", 0, 1, Ellipse.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getEllipse_Color(), theViewpointPackage.getRGBValues(), "color", "136,136,136", 0, 1, Ellipse.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(lozengeEClass, Lozenge.class, "Lozenge", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getLozenge_Width(), theEcorePackage.getEIntegerObject(), "width", "0", 0, 1, Lozenge.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE,
-                !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getLozenge_Height(), theEcorePackage.getEIntegerObject(), "height", "0", 0, 1, Lozenge.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE,
-                !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getLozenge_Color(), theViewpointPackage.getRGBValues(), "color", "136,136,136", 0, 1, Lozenge.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(bundledImageEClass, BundledImage.class, "BundledImage", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getBundledImage_Shape(), this.getBundledImageShape(), "shape", null, 1, 1, BundledImage.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getBundledImage_Color(), theViewpointPackage.getRGBValues(), "color", "0,0,0", 0, 1, BundledImage.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(workspaceImageEClass, WorkspaceImage.class, "WorkspaceImage", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getWorkspaceImage_WorkspacePath(), theEcorePackage.getEString(), "workspacePath", null, 1, 1, WorkspaceImage.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(customStyleEClass, CustomStyle.class, "CustomStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getCustomStyle_Id(), theEcorePackage.getEString(), "id", null, 0, 1, CustomStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE,
-                !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(edgeTargetEClass, EdgeTarget.class, "EdgeTarget", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getEdgeTarget_OutgoingEdges(), this.getDEdge(), this.getDEdge_SourceNode(), "outgoingEdges", null, 0, -1, EdgeTarget.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getEdgeTarget_IncomingEdges(), this.getDEdge(), this.getDEdge_TargetNode(), "incomingEdges", null, 0, -1, EdgeTarget.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(edgeStyleEClass, EdgeStyle.class, "EdgeStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getEdgeStyle_LineStyle(), this.getLineStyle(), "lineStyle", null, 0, 1, EdgeStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE,
-                !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getEdgeStyle_SourceArrow(), this.getEdgeArrows(), "sourceArrow", "NoDecoration", 1, 1, EdgeStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getEdgeStyle_TargetArrow(), this.getEdgeArrows(), "targetArrow", "InputArrow", 1, 1, EdgeStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getEdgeStyle_FoldingStyle(), theDescriptionPackage.getFoldingStyle(), "foldingStyle", "NONE", 1, 1, EdgeStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getEdgeStyle_Size(), theEcorePackage.getEIntegerObject(), "size", "1", 0, 1, EdgeStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE,
-                !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getEdgeStyle_RoutingStyle(), this.getEdgeRouting(), "routingStyle", "straight", 1, 1, EdgeStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getEdgeStyle_BeginLabelStyle(), this.getBeginLabelStyle(), null, "beginLabelStyle", null, 0, 1, EdgeStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getEdgeStyle_CenterLabelStyle(), this.getCenterLabelStyle(), null, "centerLabelStyle", null, 0, 1, EdgeStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getEdgeStyle_EndLabelStyle(), this.getEndLabelStyle(), null, "endLabelStyle", null, 0, 1, EdgeStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEAttribute(getEdgeStyle_Centered(), theDescriptionPackage.getCenteringStyle(), "centered", "None", 1, 1, EdgeStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getEdgeStyle_StrokeColor(), theViewpointPackage.getRGBValues(), "strokeColor", "136,136,136", 0, 1, EdgeStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(gaugeCompositeStyleEClass, GaugeCompositeStyle.class, "GaugeCompositeStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getGaugeCompositeStyle_Alignment(), this.getAlignmentKind(), "alignment", "SQUARE", 0, 1, GaugeCompositeStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getGaugeCompositeStyle_Sections(), this.getGaugeSection(), null, "sections", null, 0, -1, GaugeCompositeStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-
-        initEClass(borderedStyleEClass, BorderedStyle.class, "BorderedStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getBorderedStyle_BorderSize(), theEcorePackage.getEIntegerObject(), "borderSize", "0", 1, 1, BorderedStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getBorderedStyle_BorderSizeComputationExpression(), theDescriptionPackage_1.getInterpretedExpression(), "borderSizeComputationExpression", "0", 0, 1, BorderedStyle.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEAttribute(getBorderedStyle_BorderColor(), theViewpointPackage.getRGBValues(), "borderColor", "0,0,0", 0, 1, BorderedStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getBorderedStyle_BorderLineStyle(), this.getLineStyle(), "borderLineStyle", null, 0, 1, BorderedStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(noteEClass, Note.class, "Note", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getNote_Color(), theViewpointPackage.getRGBValues(), "color", "252,233,79", 0, 1, Note.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE,
-                !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(filterVariableHistoryEClass, FilterVariableHistory.class, "FilterVariableHistory", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getFilterVariableHistory_OwnedValues(), this.getFilterVariableValue(), null, "ownedValues", null, 0, -1, FilterVariableHistory.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(filterVariableValueEClass, FilterVariableValue.class, "FilterVariableValue", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getFilterVariableValue_VariableDefinition(), theFilterPackage.getFilterVariable(), null, "variableDefinition", null, 1, 1, FilterVariableValue.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getFilterVariableValue_ModelElement(), theEcorePackage.getEObject(), null, "modelElement", null, 1, 1, FilterVariableValue.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(collapseFilterEClass, CollapseFilter.class, "CollapseFilter", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getCollapseFilter_Width(), theEcorePackage.getEInt(), "width", null, 0, 1, CollapseFilter.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getCollapseFilter_Height(), theEcorePackage.getEInt(), "height", null, 0, 1, CollapseFilter.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(indirectlyCollapseFilterEClass, IndirectlyCollapseFilter.class, "IndirectlyCollapseFilter", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(beginLabelStyleEClass, BeginLabelStyle.class, "BeginLabelStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        addEOperation(beginLabelStyleEClass, theStylePackage_1.getBasicLabelStyleDescription(), "getDescription", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-
-        op = addEOperation(beginLabelStyleEClass, null, "setDescription", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-        addEParameter(op, theStylePackage_1.getBasicLabelStyleDescription(), "description", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-
-        initEClass(centerLabelStyleEClass, CenterLabelStyle.class, "CenterLabelStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        addEOperation(centerLabelStyleEClass, theStylePackage_1.getBasicLabelStyleDescription(), "getDescription", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-
-        op = addEOperation(centerLabelStyleEClass, null, "setDescription", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-        addEParameter(op, theStylePackage_1.getBasicLabelStyleDescription(), "description", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-
-        initEClass(endLabelStyleEClass, EndLabelStyle.class, "EndLabelStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        addEOperation(endLabelStyleEClass, theStylePackage_1.getBasicLabelStyleDescription(), "getDescription", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-
-        op = addEOperation(endLabelStyleEClass, null, "setDescription", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-        addEParameter(op, theStylePackage_1.getBasicLabelStyleDescription(), "description", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-
-        initEClass(bracketEdgeStyleEClass, BracketEdgeStyle.class, "BracketEdgeStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(computedStyleDescriptionRegistryEClass, ComputedStyleDescriptionRegistry.class, "ComputedStyleDescriptionRegistry", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getComputedStyleDescriptionRegistry_ComputedStyleDescriptions(), theStylePackage_1.getStyleDescription(), null, "computedStyleDescriptions", null, 0, -1,
-                ComputedStyleDescriptionRegistry.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES,
-                !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(dragAndDropTargetEClass, DragAndDropTarget.class, "DragAndDropTarget", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        addEOperation(dragAndDropTargetEClass, theDescriptionPackage.getDragAndDropTargetDescription(), "getDragAndDropDescription", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-
-        initEClass(hideLabelCapabilityStyleEClass, HideLabelCapabilityStyle.class, "HideLabelCapabilityStyle", EPackageImpl.IS_ABSTRACT, EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getHideLabelCapabilityStyle_HideLabelByDefault(), ecorePackage.getEBoolean(), "hideLabelByDefault", "false", 0, 1, HideLabelCapabilityStyle.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEClass(dDiagramEClass, DDiagram.class, "DDiagram", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getDDiagram_OwnedDiagramElements(),
+                this.getDDiagramElement(),
+                null,
+                "ownedDiagramElements", null, 0, -1, DDiagram.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDDiagram_DiagramElements(),
+                this.getDDiagramElement(),
+                null,
+                "diagramElements", null, 0, -1, DDiagram.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE, !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDDiagram_Description(),
+                theDescriptionPackage.getDiagramDescription(),
+                null,
+                "description", null, 0, 1, DDiagram.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDDiagram_Edges(),
+                this.getDEdge(),
+                null,
+                "edges", null, 0, -1, DDiagram.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE, !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDDiagram_Nodes(),
+                this.getDNode(),
+                null,
+                "nodes", null, 0, -1, DDiagram.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE, !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDDiagram_NodeListElements(),
+                this.getDNodeListElement(),
+                null,
+                "nodeListElements", null, 0, -1, DDiagram.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE, !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDDiagram_Containers(),
+                this.getDDiagramElementContainer(),
+                null,
+                "containers", null, 0, -1, DDiagram.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE, !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDDiagram_CurrentConcern(),
+                theConcernPackage.getConcernDescription(),
+                null,
+                "currentConcern", null, 0, 1, DDiagram.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDDiagram_ActivatedFilters(),
+                theFilterPackage.getFilterDescription(),
+                null,
+                "activatedFilters", null, 0, -1, DDiagram.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDDiagram_AllFilters(),
+                theFilterPackage.getFilterDescription(),
+                null,
+                "allFilters", null, 0, -1, DDiagram.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE, !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDDiagram_ActivatedRules(),
+                theValidationPackage.getValidationRule(),
+                null,
+                "activatedRules", null, 0, -1, DDiagram.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDDiagram_ActivateBehaviors(),
+                theToolPackage.getBehaviorTool(),
+                null,
+                "activateBehaviors", null, 0, -1, DDiagram.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDDiagram_FilterVariableHistory(),
+                this.getFilterVariableHistory(),
+                null,
+                "filterVariableHistory", null, 1, 1, DDiagram.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDDiagram_ActivatedLayers(),
+                theDescriptionPackage.getLayer(),
+                null,
+                "activatedLayers", null, 0, -1, DDiagram.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getDDiagram_Synchronized(),
+                theEcorePackage.getEBoolean(),
+                "synchronized", "true", 0, 1, DDiagram.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEReference(
+                getDDiagram_HiddenElements(),
+                this.getDDiagramElement(),
+                null,
+                "hiddenElements", null, 0, -1, DDiagram.class, EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getDDiagram_IsInLayoutingMode(),
+                theEcorePackage.getEBoolean(),
+                "isInLayoutingMode", null, 0, 1, DDiagram.class, EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getDDiagram_HeaderHeight(),
+                theEcorePackage.getEInt(),
+                "headerHeight", "1", 0, 1, DDiagram.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+
+        EOperation op = addEOperation(dDiagramEClass, this.getDNode(), "getNodesFromMapping", 0, -1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        addEParameter(op, theDescriptionPackage.getNodeMapping(), "mapping", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        op = addEOperation(dDiagramEClass, this.getDEdge(), "getEdgesFromMapping", 0, -1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        addEParameter(op, theDescriptionPackage.getEdgeMapping(), "mapping", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        op = addEOperation(dDiagramEClass, this.getDDiagramElementContainer(), "getContainersFromMapping", 0, -1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        addEParameter(op, theDescriptionPackage.getContainerMapping(), "mapping", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(dSemanticDiagramEClass, DSemanticDiagram.class, "DSemanticDiagram", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(dDiagramElementEClass, DDiagramElement.class, "DDiagramElement", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getDDiagramElement_Visible(),
+                theEcorePackage.getEBoolean(),
+                "visible", "true", 0, 1, DDiagramElement.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(
+                getDDiagramElement_TooltipText(),
+                theEcorePackage.getEString(),
+                "tooltipText", null, 0, 1, DDiagramElement.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDDiagramElement_ParentLayers(),
+                theDescriptionPackage.getLayer(),
+                null,
+                "parentLayers", null, 0, -1, DDiagramElement.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDDiagramElement_Decorations(),
+                theViewpointPackage.getDecoration(),
+                null,
+                "decorations", null, 0, -1, DDiagramElement.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDDiagramElement_DiagramElementMapping(),
+                theDescriptionPackage.getDiagramElementMapping(),
+                null,
+                "diagramElementMapping", null, 0, 1, DDiagramElement.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE, !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDDiagramElement_GraphicalFilters(),
+                this.getGraphicalFilter(),
+                null,
+                "graphicalFilters", null, 0, -1, DDiagramElement.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        addEOperation(dDiagramElementEClass, this.getDDiagram(), "getParentDiagram", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(graphicalFilterEClass, GraphicalFilter.class, "GraphicalFilter", EPackageImpl.IS_ABSTRACT, EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(hideFilterEClass, HideFilter.class, "HideFilter", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(hideLabelFilterEClass, HideLabelFilter.class, "HideLabelFilter", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(foldingPointFilterEClass, FoldingPointFilter.class, "FoldingPointFilter", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(foldingFilterEClass, FoldingFilter.class, "FoldingFilter", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(appliedCompositeFiltersEClass, AppliedCompositeFilters.class,
+                "AppliedCompositeFilters", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getAppliedCompositeFilters_CompositeFilterDescriptions(),
+                theFilterPackage.getCompositeFilterDescription(),
+                null,
+                "compositeFilterDescriptions", null, 0, -1, AppliedCompositeFilters.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(absoluteBoundsFilterEClass, AbsoluteBoundsFilter.class, "AbsoluteBoundsFilter", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getAbsoluteBoundsFilter_X(),
+                theEcorePackage.getEIntegerObject(),
+                "x", null, 0, 1, AbsoluteBoundsFilter.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getAbsoluteBoundsFilter_Y(),
+                theEcorePackage.getEIntegerObject(),
+                "y", null, 0, 1, AbsoluteBoundsFilter.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getAbsoluteBoundsFilter_Height(),
+                theEcorePackage.getEIntegerObject(),
+                "height", null, 0, 1, AbsoluteBoundsFilter.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getAbsoluteBoundsFilter_Width(),
+                theEcorePackage.getEIntegerObject(),
+                "width", null, 0, 1, AbsoluteBoundsFilter.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(abstractDNodeEClass, AbstractDNode.class, "AbstractDNode", EPackageImpl.IS_ABSTRACT, EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getAbstractDNode_OwnedBorderedNodes(),
+                this.getDNode(),
+                null,
+                "ownedBorderedNodes", null, 0, -1, AbstractDNode.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getAbstractDNode_ArrangeConstraints(),
+                this.getArrangeConstraint(),
+                "arrangeConstraints", "KEEP_LOCATION", 0, -1, AbstractDNode.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+
+        initEClass(dNodeEClass, DNode.class, "DNode", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getDNode_Width(),
+                theEcorePackage.getEIntegerObject(),
+                "width", null, 0, 1, DNode.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getDNode_Height(),
+                theEcorePackage.getEIntegerObject(),
+                "height", null, 0, 1, DNode.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDNode_OwnedStyle(),
+                this.getNodeStyle(),
+                null,
+                "ownedStyle", null, 0, 1, DNode.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getDNode_LabelPosition(),
+                this.getLabelPosition(),
+                "labelPosition", null, 0, 1, DNode.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getDNode_ResizeKind(),
+                this.getResizeKind(),
+                "resizeKind", "NONE", 0, 1, DNode.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEReference(
+                getDNode_OriginalStyle(),
+                theViewpointPackage.getStyle(),
+                null,
+                "originalStyle", null, 0, 1, DNode.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDNode_ActualMapping(),
+                theDescriptionPackage.getNodeMapping(),
+                null,
+                "actualMapping", null, 1, 1, DNode.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDNode_CandidatesMapping(),
+                theDescriptionPackage.getNodeMapping(),
+                null,
+                "candidatesMapping", null, 0, -1, DNode.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(dDiagramElementContainerEClass, DDiagramElementContainer.class,
+                "DDiagramElementContainer", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getDDiagramElementContainer_Nodes(),
+                this.getDNode(),
+                null,
+                "nodes", null, 0, -1, DDiagramElementContainer.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE, !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDDiagramElementContainer_Containers(),
+                this.getDDiagramElementContainer(),
+                null,
+                "containers", null, 0, -1, DDiagramElementContainer.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE, !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDDiagramElementContainer_Elements(),
+                this.getDDiagramElement(),
+                null,
+                "elements", null, 0, -1, DDiagramElementContainer.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE, !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDDiagramElementContainer_OwnedStyle(),
+                this.getContainerStyle(),
+                null,
+                "ownedStyle", null, 0, 1, DDiagramElementContainer.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDDiagramElementContainer_OriginalStyle(),
+                theViewpointPackage.getStyle(),
+                null,
+                "originalStyle", null, 0, 1, DDiagramElementContainer.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDDiagramElementContainer_ActualMapping(),
+                theDescriptionPackage.getContainerMapping(),
+                null,
+                "actualMapping", null, 1, 1, DDiagramElementContainer.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDDiagramElementContainer_CandidatesMapping(),
+                theDescriptionPackage.getContainerMapping(),
+                null,
+                "candidatesMapping", null, 0, -1, DDiagramElementContainer.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getDDiagramElementContainer_Width(),
+                theEcorePackage.getEIntegerObject(),
+                "width", null, 0, 1, DDiagramElementContainer.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getDDiagramElementContainer_Height(),
+                theEcorePackage.getEIntegerObject(),
+                "height", null, 0, 1, DDiagramElementContainer.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        op = addEOperation(dDiagramElementContainerEClass, this.getDNode(), "getNodesFromMapping", 0, -1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        addEParameter(op, theDescriptionPackage.getNodeMapping(), "mapping", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        op = addEOperation(dDiagramElementContainerEClass, this.getDDiagramElementContainer(), "getContainersFromMapping", 0, -1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        addEParameter(op, theDescriptionPackage.getContainerMapping(), "mapping", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(dNodeContainerEClass, DNodeContainer.class, "DNodeContainer", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getDNodeContainer_OwnedDiagramElements(),
+                this.getDDiagramElement(),
+                null,
+                "ownedDiagramElements", null, 0, -1, DNodeContainer.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getDNodeContainer_ChildrenPresentation(),
+                this.getContainerLayout(),
+                "childrenPresentation", "FreeForm", 1, 1, DNodeContainer.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+
+        initEClass(dNodeListEClass, DNodeList.class, "DNodeList", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getDNodeList_OwnedElements(),
+                this.getDNodeListElement(),
+                null,
+                "ownedElements", null, 0, -1, DNodeList.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(dNodeListElementEClass, DNodeListElement.class, "DNodeListElement", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getDNodeListElement_OwnedStyle(),
+                this.getNodeStyle(),
+                null,
+                "ownedStyle", null, 0, 1, DNodeListElement.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDNodeListElement_OriginalStyle(),
+                theViewpointPackage.getStyle(),
+                null,
+                "originalStyle", null, 0, 1, DNodeListElement.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDNodeListElement_ActualMapping(),
+                theDescriptionPackage.getNodeMapping(),
+                null,
+                "actualMapping", null, 1, 1, DNodeListElement.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDNodeListElement_CandidatesMapping(),
+                theDescriptionPackage.getNodeMapping(),
+                null,
+                "candidatesMapping", null, 0, -1, DNodeListElement.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(dEdgeEClass, DEdge.class, "DEdge", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getDEdge_OwnedStyle(),
+                this.getEdgeStyle(),
+                null,
+                "ownedStyle", null, 0, 1, DEdge.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getDEdge_Size(),
+                theEcorePackage.getEIntegerObject(),
+                "size", "1", 0, 1, DEdge.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEReference(
+                getDEdge_SourceNode(),
+                this.getEdgeTarget(),
+                this.getEdgeTarget_OutgoingEdges(),
+                "sourceNode", null, 1, 1, DEdge.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDEdge_TargetNode(),
+                this.getEdgeTarget(),
+                this.getEdgeTarget_IncomingEdges(),
+                "targetNode", null, 1, 1, DEdge.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDEdge_ActualMapping(),
+                theDescriptionPackage.getIEdgeMapping(),
+                null,
+                "actualMapping", null, 1, 1, DEdge.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getDEdge_RoutingStyle(),
+                this.getEdgeRouting(),
+                "routingStyle", "straight", 1, 1, DEdge.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(
+                getDEdge_IsFold(),
+                theEcorePackage.getEBoolean(),
+                "isFold", null, 0, 1, DEdge.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getDEdge_IsMockEdge(),
+                theEcorePackage.getEBoolean(),
+                "isMockEdge", null, 0, 1, DEdge.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDEdge_OriginalStyle(),
+                theViewpointPackage.getStyle(),
+                null,
+                "originalStyle", null, 0, 1, DEdge.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDEdge_Path(),
+                this.getEdgeTarget(),
+                null,
+                "path", null, 0, -1, DEdge.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getDEdge_ArrangeConstraints(),
+                this.getArrangeConstraint(),
+                "arrangeConstraints", "KEEP_LOCATION", 0, -1, DEdge.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(
+                getDEdge_BeginLabel(),
+                theEcorePackage.getEString(),
+                "beginLabel", "", 0, 1, DEdge.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(
+                getDEdge_EndLabel(),
+                theEcorePackage.getEString(),
+                "endLabel", "", 0, 1, DEdge.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+
+        addEOperation(dEdgeEClass, theEcorePackage.getEBoolean(), "isRootFolding", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(nodeStyleEClass, NodeStyle.class, "NodeStyle", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getNodeStyle_LabelPosition(),
+                this.getLabelPosition(),
+                "labelPosition", null, 0, 1, NodeStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(dotEClass, Dot.class, "Dot", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getDot_StrokeSizeComputationExpression(),
+                theDescriptionPackage_1.getInterpretedExpression(),
+                "strokeSizeComputationExpression", "2", 0, 1, Dot.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(
+                getDot_BackgroundColor(),
+                theViewpointPackage.getRGBValues(),
+                "backgroundColor", "136,136,136", 0, 1, Dot.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+
+        initEClass(gaugeSectionEClass, GaugeSection.class, "GaugeSection", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getGaugeSection_Min(),
+                theEcorePackage.getEIntegerObject(),
+                "min", null, 0, 1, GaugeSection.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getGaugeSection_Max(),
+                theEcorePackage.getEIntegerObject(),
+                "max", null, 0, 1, GaugeSection.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getGaugeSection_Value(),
+                theEcorePackage.getEIntegerObject(),
+                "value", null, 0, 1, GaugeSection.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getGaugeSection_Label(),
+                theEcorePackage.getEString(),
+                "label", null, 0, 1, GaugeSection.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getGaugeSection_BackgroundColor(),
+                theViewpointPackage.getRGBValues(),
+                "backgroundColor", "0,0,0", 0, 1, GaugeSection.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(
+                getGaugeSection_ForegroundColor(),
+                theViewpointPackage.getRGBValues(),
+                "foregroundColor", "138,226,52", 0, 1, GaugeSection.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+
+        initEClass(containerStyleEClass, ContainerStyle.class, "ContainerStyle", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(flatContainerStyleEClass, FlatContainerStyle.class, "FlatContainerStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getFlatContainerStyle_BackgroundStyle(),
+                this.getBackgroundStyle(),
+                "backgroundStyle", null, 1, 1, FlatContainerStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getFlatContainerStyle_BackgroundColor(),
+                theViewpointPackage.getRGBValues(),
+                "backgroundColor", "255,255,255", 0, 1, FlatContainerStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(
+                getFlatContainerStyle_ForegroundColor(),
+                theViewpointPackage.getRGBValues(),
+                "foregroundColor", "209,209,209", 0, 1, FlatContainerStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+
+        initEClass(shapeContainerStyleEClass, ShapeContainerStyle.class, "ShapeContainerStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getShapeContainerStyle_Shape(),
+                this.getContainerShape(),
+                "shape", null, 1, 1, ShapeContainerStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getShapeContainerStyle_BackgroundColor(),
+                theViewpointPackage.getRGBValues(),
+                "backgroundColor", "209,209,209", 0, 1, ShapeContainerStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+
+        initEClass(squareEClass, Square.class, "Square", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getSquare_Width(),
+                theEcorePackage.getEIntegerObject(),
+                "width", "0", 0, 1, Square.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(
+                getSquare_Height(),
+                theEcorePackage.getEIntegerObject(),
+                "height", "0", 0, 1, Square.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(
+                getSquare_Color(),
+                theViewpointPackage.getRGBValues(),
+                "color", "136,136,136", 0, 1, Square.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+
+        initEClass(ellipseEClass, Ellipse.class, "Ellipse", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getEllipse_HorizontalDiameter(),
+                theEcorePackage.getEIntegerObject(),
+                "horizontalDiameter", "0", 0, 1, Ellipse.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(
+                getEllipse_VerticalDiameter(),
+                theEcorePackage.getEIntegerObject(),
+                "verticalDiameter", "0", 0, 1, Ellipse.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(
+                getEllipse_Color(),
+                theViewpointPackage.getRGBValues(),
+                "color", "136,136,136", 0, 1, Ellipse.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+
+        initEClass(lozengeEClass, Lozenge.class, "Lozenge", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getLozenge_Width(),
+                theEcorePackage.getEIntegerObject(),
+                "width", "0", 0, 1, Lozenge.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(
+                getLozenge_Height(),
+                theEcorePackage.getEIntegerObject(),
+                "height", "0", 0, 1, Lozenge.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(
+                getLozenge_Color(),
+                theViewpointPackage.getRGBValues(),
+                "color", "136,136,136", 0, 1, Lozenge.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+
+        initEClass(bundledImageEClass, BundledImage.class, "BundledImage", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getBundledImage_Shape(),
+                this.getBundledImageShape(),
+                "shape", null, 1, 1, BundledImage.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getBundledImage_Color(),
+                theViewpointPackage.getRGBValues(),
+                "color", "0,0,0", 0, 1, BundledImage.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+
+        initEClass(workspaceImageEClass, WorkspaceImage.class, "WorkspaceImage", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getWorkspaceImage_WorkspacePath(),
+                theEcorePackage.getEString(),
+                "workspacePath", null, 1, 1, WorkspaceImage.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(customStyleEClass, CustomStyle.class, "CustomStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getCustomStyle_Id(),
+                theEcorePackage.getEString(),
+                "id", null, 0, 1, CustomStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(edgeTargetEClass, EdgeTarget.class, "EdgeTarget", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getEdgeTarget_OutgoingEdges(),
+                this.getDEdge(),
+                this.getDEdge_SourceNode(),
+                "outgoingEdges", null, 0, -1, EdgeTarget.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getEdgeTarget_IncomingEdges(),
+                this.getDEdge(),
+                this.getDEdge_TargetNode(),
+                "incomingEdges", null, 0, -1, EdgeTarget.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(edgeStyleEClass, EdgeStyle.class, "EdgeStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getEdgeStyle_LineStyle(),
+                this.getLineStyle(),
+                "lineStyle", null, 0, 1, EdgeStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getEdgeStyle_SourceArrow(),
+                this.getEdgeArrows(),
+                "sourceArrow", "NoDecoration", 1, 1, EdgeStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(
+                getEdgeStyle_TargetArrow(),
+                this.getEdgeArrows(),
+                "targetArrow", "InputArrow", 1, 1, EdgeStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(
+                getEdgeStyle_FoldingStyle(),
+                theDescriptionPackage.getFoldingStyle(),
+                "foldingStyle", "NONE", 1, 1, EdgeStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(
+                getEdgeStyle_Size(),
+                theEcorePackage.getEIntegerObject(),
+                "size", "1", 0, 1, EdgeStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(
+                getEdgeStyle_RoutingStyle(),
+                this.getEdgeRouting(),
+                "routingStyle", "straight", 1, 1, EdgeStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEReference(
+                getEdgeStyle_BeginLabelStyle(),
+                this.getBeginLabelStyle(),
+                null,
+                "beginLabelStyle", null, 0, 1, EdgeStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getEdgeStyle_CenterLabelStyle(),
+                this.getCenterLabelStyle(),
+                null,
+                "centerLabelStyle", null, 0, 1, EdgeStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getEdgeStyle_EndLabelStyle(),
+                this.getEndLabelStyle(),
+                null,
+                "endLabelStyle", null, 0, 1, EdgeStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getEdgeStyle_Centered(),
+                theDescriptionPackage.getCenteringStyle(),
+                "centered", "None", 1, 1, EdgeStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(
+                getEdgeStyle_StrokeColor(),
+                theViewpointPackage.getRGBValues(),
+                "strokeColor", "136,136,136", 0, 1, EdgeStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+
+        initEClass(gaugeCompositeStyleEClass, GaugeCompositeStyle.class, "GaugeCompositeStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getGaugeCompositeStyle_Alignment(),
+                this.getAlignmentKind(),
+                "alignment", "SQUARE", 0, 1, GaugeCompositeStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEReference(
+                getGaugeCompositeStyle_Sections(),
+                this.getGaugeSection(),
+                null,
+                "sections", null, 0, -1, GaugeCompositeStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(borderedStyleEClass, BorderedStyle.class, "BorderedStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getBorderedStyle_BorderSize(),
+                theEcorePackage.getEIntegerObject(),
+                "borderSize", "0", 1, 1, BorderedStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(
+                getBorderedStyle_BorderSizeComputationExpression(),
+                theDescriptionPackage_1.getInterpretedExpression(),
+                "borderSizeComputationExpression", "0", 0, 1, BorderedStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(
+                getBorderedStyle_BorderColor(),
+                theViewpointPackage.getRGBValues(),
+                "borderColor", "0,0,0", 0, 1, BorderedStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(
+                getBorderedStyle_BorderLineStyle(),
+                this.getLineStyle(),
+                "borderLineStyle", null, 0, 1, BorderedStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(noteEClass, Note.class, "Note", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getNote_Color(),
+                theViewpointPackage.getRGBValues(),
+                "color", "252,233,79", 0, 1, Note.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+
+        initEClass(filterVariableHistoryEClass, FilterVariableHistory.class, "FilterVariableHistory", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getFilterVariableHistory_OwnedValues(),
+                this.getFilterVariableValue(),
+                null,
+                "ownedValues", null, 0, -1, FilterVariableHistory.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(filterVariableValueEClass, FilterVariableValue.class, "FilterVariableValue", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getFilterVariableValue_VariableDefinition(),
+                theFilterPackage.getFilterVariable(),
+                null,
+                "variableDefinition", null, 1, 1, FilterVariableValue.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getFilterVariableValue_ModelElement(),
+                theEcorePackage.getEObject(),
+                null,
+                "modelElement", null, 1, 1, FilterVariableValue.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(collapseFilterEClass, CollapseFilter.class, "CollapseFilter", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getCollapseFilter_Width(),
+                theEcorePackage.getEInt(),
+                "width", null, 0, 1, CollapseFilter.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getCollapseFilter_Height(),
+                theEcorePackage.getEInt(),
+                "height", null, 0, 1, CollapseFilter.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(indirectlyCollapseFilterEClass, IndirectlyCollapseFilter.class,
+                "IndirectlyCollapseFilter", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(beginLabelStyleEClass, BeginLabelStyle.class, "BeginLabelStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        addEOperation(beginLabelStyleEClass, theStylePackage_1.getBasicLabelStyleDescription(), "getDescription", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        op = addEOperation(beginLabelStyleEClass, null, "setDescription", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        addEParameter(op, theStylePackage_1.getBasicLabelStyleDescription(), "description", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(centerLabelStyleEClass, CenterLabelStyle.class, "CenterLabelStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        addEOperation(centerLabelStyleEClass, theStylePackage_1.getBasicLabelStyleDescription(), "getDescription", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        op = addEOperation(centerLabelStyleEClass, null, "setDescription", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        addEParameter(op, theStylePackage_1.getBasicLabelStyleDescription(), "description", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(endLabelStyleEClass, EndLabelStyle.class, "EndLabelStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        addEOperation(endLabelStyleEClass, theStylePackage_1.getBasicLabelStyleDescription(), "getDescription", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        op = addEOperation(endLabelStyleEClass, null, "setDescription", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        addEParameter(op, theStylePackage_1.getBasicLabelStyleDescription(), "description", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(bracketEdgeStyleEClass, BracketEdgeStyle.class, "BracketEdgeStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(computedStyleDescriptionRegistryEClass, ComputedStyleDescriptionRegistry.class,
+                "ComputedStyleDescriptionRegistry", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getComputedStyleDescriptionRegistry_ComputedStyleDescriptions(),
+                theStylePackage_1.getStyleDescription(),
+                null,
+                "computedStyleDescriptions", null, 0, -1, ComputedStyleDescriptionRegistry.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(dragAndDropTargetEClass, DragAndDropTarget.class, "DragAndDropTarget", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        addEOperation(dragAndDropTargetEClass, theDescriptionPackage.getDragAndDropTargetDescription(), "getDragAndDropDescription", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(hideLabelCapabilityStyleEClass, HideLabelCapabilityStyle.class,
+                "HideLabelCapabilityStyle", EPackageImpl.IS_ABSTRACT, EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getHideLabelCapabilityStyle_HideLabelByDefault(),
+                ecorePackage.getEBoolean(),
+                "hideLabelByDefault", "false", 0, 1, HideLabelCapabilityStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
 
         // Initialize enums and add enum literals
-        initEEnum(containerLayoutEEnum, ContainerLayout.class, "ContainerLayout");
+        initEEnum(containerLayoutEEnum, ContainerLayout.class, "ContainerLayout"); //$NON-NLS-1$
         addEEnumLiteral(containerLayoutEEnum, ContainerLayout.FREE_FORM);
         addEEnumLiteral(containerLayoutEEnum, ContainerLayout.LIST);
         addEEnumLiteral(containerLayoutEEnum, ContainerLayout.HORIZONTAL_STACK);
         addEEnumLiteral(containerLayoutEEnum, ContainerLayout.VERTICAL_STACK);
 
-        initEEnum(labelPositionEEnum, LabelPosition.class, "LabelPosition");
+        initEEnum(labelPositionEEnum, LabelPosition.class, "LabelPosition"); //$NON-NLS-1$
         addEEnumLiteral(labelPositionEEnum, LabelPosition.BORDER_LITERAL);
         addEEnumLiteral(labelPositionEEnum, LabelPosition.NODE_LITERAL);
 
-        initEEnum(containerShapeEEnum, ContainerShape.class, "ContainerShape");
+        initEEnum(containerShapeEEnum, ContainerShape.class, "ContainerShape"); //$NON-NLS-1$
         addEEnumLiteral(containerShapeEEnum, ContainerShape.PARALLELOGRAM_LITERAL);
 
-        initEEnum(backgroundStyleEEnum, BackgroundStyle.class, "BackgroundStyle");
+        initEEnum(backgroundStyleEEnum, BackgroundStyle.class, "BackgroundStyle"); //$NON-NLS-1$
         addEEnumLiteral(backgroundStyleEEnum, BackgroundStyle.GRADIENT_LEFT_TO_RIGHT_LITERAL);
         addEEnumLiteral(backgroundStyleEEnum, BackgroundStyle.LIQUID_LITERAL);
         addEEnumLiteral(backgroundStyleEEnum, BackgroundStyle.GRADIENT_TOP_TO_BOTTOM_LITERAL);
 
-        initEEnum(bundledImageShapeEEnum, BundledImageShape.class, "BundledImageShape");
+        initEEnum(bundledImageShapeEEnum, BundledImageShape.class, "BundledImageShape"); //$NON-NLS-1$
         addEEnumLiteral(bundledImageShapeEEnum, BundledImageShape.SQUARE_LITERAL);
         addEEnumLiteral(bundledImageShapeEEnum, BundledImageShape.STROKE_LITERAL);
         addEEnumLiteral(bundledImageShapeEEnum, BundledImageShape.TRIANGLE_LITERAL);
         addEEnumLiteral(bundledImageShapeEEnum, BundledImageShape.DOT_LITERAL);
         addEEnumLiteral(bundledImageShapeEEnum, BundledImageShape.RING_LITERAL);
 
-        initEEnum(lineStyleEEnum, LineStyle.class, "LineStyle");
+        initEEnum(lineStyleEEnum, LineStyle.class, "LineStyle"); //$NON-NLS-1$
         addEEnumLiteral(lineStyleEEnum, LineStyle.SOLID_LITERAL);
         addEEnumLiteral(lineStyleEEnum, LineStyle.DASH_LITERAL);
         addEEnumLiteral(lineStyleEEnum, LineStyle.DOT_LITERAL);
         addEEnumLiteral(lineStyleEEnum, LineStyle.DASH_DOT_LITERAL);
 
-        initEEnum(edgeArrowsEEnum, EdgeArrows.class, "EdgeArrows");
+        initEEnum(edgeArrowsEEnum, EdgeArrows.class, "EdgeArrows"); //$NON-NLS-1$
         addEEnumLiteral(edgeArrowsEEnum, EdgeArrows.NO_DECORATION_LITERAL);
         addEEnumLiteral(edgeArrowsEEnum, EdgeArrows.OUTPUT_ARROW_LITERAL);
         addEEnumLiteral(edgeArrowsEEnum, EdgeArrows.INPUT_ARROW_LITERAL);
@@ -3189,23 +3436,23 @@ public class DiagramPackageImpl extends EPackageImpl implements DiagramPackage {
         addEEnumLiteral(edgeArrowsEEnum, EdgeArrows.INPUT_ARROW_WITH_DIAMOND_LITERAL);
         addEEnumLiteral(edgeArrowsEEnum, EdgeArrows.INPUT_ARROW_WITH_FILL_DIAMOND_LITERAL);
 
-        initEEnum(edgeRoutingEEnum, EdgeRouting.class, "EdgeRouting");
+        initEEnum(edgeRoutingEEnum, EdgeRouting.class, "EdgeRouting"); //$NON-NLS-1$
         addEEnumLiteral(edgeRoutingEEnum, EdgeRouting.STRAIGHT_LITERAL);
         addEEnumLiteral(edgeRoutingEEnum, EdgeRouting.MANHATTAN_LITERAL);
         addEEnumLiteral(edgeRoutingEEnum, EdgeRouting.TREE_LITERAL);
 
-        initEEnum(alignmentKindEEnum, AlignmentKind.class, "AlignmentKind");
+        initEEnum(alignmentKindEEnum, AlignmentKind.class, "AlignmentKind"); //$NON-NLS-1$
         addEEnumLiteral(alignmentKindEEnum, AlignmentKind.VERTICAL_LITERAL);
         addEEnumLiteral(alignmentKindEEnum, AlignmentKind.HORIZONTAL_LITERAL);
         addEEnumLiteral(alignmentKindEEnum, AlignmentKind.SQUARE_LITERAL);
 
-        initEEnum(resizeKindEEnum, ResizeKind.class, "ResizeKind");
+        initEEnum(resizeKindEEnum, ResizeKind.class, "ResizeKind"); //$NON-NLS-1$
         addEEnumLiteral(resizeKindEEnum, ResizeKind.NONE_LITERAL);
         addEEnumLiteral(resizeKindEEnum, ResizeKind.NSEW_LITERAL);
         addEEnumLiteral(resizeKindEEnum, ResizeKind.NORTH_SOUTH_LITERAL);
         addEEnumLiteral(resizeKindEEnum, ResizeKind.EAST_WEST_LITERAL);
 
-        initEEnum(arrangeConstraintEEnum, ArrangeConstraint.class, "ArrangeConstraint");
+        initEEnum(arrangeConstraintEEnum, ArrangeConstraint.class, "ArrangeConstraint"); //$NON-NLS-1$
         addEEnumLiteral(arrangeConstraintEEnum, ArrangeConstraint.KEEP_LOCATION);
         addEEnumLiteral(arrangeConstraintEEnum, ArrangeConstraint.KEEP_SIZE);
         addEEnumLiteral(arrangeConstraintEEnum, ArrangeConstraint.KEEP_RATIO);
@@ -3230,9 +3477,11 @@ public class DiagramPackageImpl extends EPackageImpl implements DiagramPackage {
      * @generated
      */
     protected void createReturnTypeAnnotations() {
-        String source = "http://www.eclipse.org/sirius/interpreted/expression/returnType";
-        addAnnotation(getDot_StrokeSizeComputationExpression(), source, new String[] { "returnType", "an integer." });
-        addAnnotation(getBorderedStyle_BorderSizeComputationExpression(), source, new String[] { "returnType", "an integer." });
+        String source = "http://www.eclipse.org/sirius/interpreted/expression/returnType"; //$NON-NLS-1$
+        addAnnotation(getDot_StrokeSizeComputationExpression(), source, new String[] { "returnType", "an integer." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getBorderedStyle_BorderSizeComputationExpression(), source, new String[] { "returnType", "an integer." //$NON-NLS-1$ //$NON-NLS-2$
+        });
     }
 
     /**
@@ -3243,7 +3492,7 @@ public class DiagramPackageImpl extends EPackageImpl implements DiagramPackage {
      * @generated
      */
     protected void createVariablesAnnotations() {
-        String source = "http://www.eclipse.org/sirius/interpreted/expression/variables";
+        String source = "http://www.eclipse.org/sirius/interpreted/expression/variables"; //$NON-NLS-1$
         addAnnotation(getDot_StrokeSizeComputationExpression(), source, new String[] {});
         addAnnotation(getBorderedStyle_BorderSizeComputationExpression(), source, new String[] {});
     }
@@ -3255,18 +3504,29 @@ public class DiagramPackageImpl extends EPackageImpl implements DiagramPackage {
      * @generated
      */
     protected void createSiriusAnnotations() {
-        String source = "Sirius";
-        addAnnotation(edgeArrowsEEnum.getELiterals().get(0), source, new String[] { "imagePath", "icons/full/decorator/noDecoration.gif" });
-        addAnnotation(edgeArrowsEEnum.getELiterals().get(1), source, new String[] { "imagePath", "icons/full/decorator/outputArrow.gif" });
-        addAnnotation(edgeArrowsEEnum.getELiterals().get(2), source, new String[] { "imagePath", "icons/full/decorator/inputArrow.gif" });
-        addAnnotation(edgeArrowsEEnum.getELiterals().get(3), source, new String[] { "imagePath", "icons/full/decorator/outputClosedArrow.gif" });
-        addAnnotation(edgeArrowsEEnum.getELiterals().get(4), source, new String[] { "imagePath", "icons/full/decorator/inputClosedArrow.gif" });
-        addAnnotation(edgeArrowsEEnum.getELiterals().get(5), source, new String[] { "imagePath", "icons/full/decorator/outputFillClosedArrow.gif" });
-        addAnnotation(edgeArrowsEEnum.getELiterals().get(6), source, new String[] { "imagePath", "icons/full/decorator/inputFillClosedArrow.gif" });
-        addAnnotation(edgeArrowsEEnum.getELiterals().get(7), source, new String[] { "imagePath", "icons/full/decorator/diamond.gif" });
-        addAnnotation(edgeArrowsEEnum.getELiterals().get(8), source, new String[] { "imagePath", "icons/full/decorator/fillDiamond.gif" });
-        addAnnotation(edgeArrowsEEnum.getELiterals().get(9), source, new String[] { "imagePath", "icons/full/decorator/inputArrowWithDiamond.gif" });
-        addAnnotation(edgeArrowsEEnum.getELiterals().get(10), source, new String[] { "imagePath", "icons/full/decorator/inputArrowWithFillDiamond.gif" });
+        String source = "Sirius"; //$NON-NLS-1$
+        addAnnotation(edgeArrowsEEnum.getELiterals().get(0), source, new String[] { "imagePath", "icons/full/decorator/noDecoration.gif" //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(edgeArrowsEEnum.getELiterals().get(1), source, new String[] { "imagePath", "icons/full/decorator/outputArrow.gif" //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(edgeArrowsEEnum.getELiterals().get(2), source, new String[] { "imagePath", "icons/full/decorator/inputArrow.gif" //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(edgeArrowsEEnum.getELiterals().get(3), source, new String[] { "imagePath", "icons/full/decorator/outputClosedArrow.gif" //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(edgeArrowsEEnum.getELiterals().get(4), source, new String[] { "imagePath", "icons/full/decorator/inputClosedArrow.gif" //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(edgeArrowsEEnum.getELiterals().get(5), source, new String[] { "imagePath", "icons/full/decorator/outputFillClosedArrow.gif" //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(edgeArrowsEEnum.getELiterals().get(6), source, new String[] { "imagePath", "icons/full/decorator/inputFillClosedArrow.gif" //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(edgeArrowsEEnum.getELiterals().get(7), source, new String[] { "imagePath", "icons/full/decorator/diamond.gif" //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(edgeArrowsEEnum.getELiterals().get(8), source, new String[] { "imagePath", "icons/full/decorator/fillDiamond.gif" //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(edgeArrowsEEnum.getELiterals().get(9), source, new String[] { "imagePath", "icons/full/decorator/inputArrowWithDiamond.gif" //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(edgeArrowsEEnum.getELiterals().get(10), source, new String[] { "imagePath", "icons/full/decorator/inputArrowWithFillDiamond.gif" //$NON-NLS-1$ //$NON-NLS-2$
+        });
     }
 
 } // DiagramPackageImpl
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/DotImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/DotImpl.java
index f4ec4ae63f..7812692469 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/DotImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/DotImpl.java
@@ -229,9 +229,9 @@ public class DotImpl extends NodeStyleImpl implements Dot {
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (strokeSizeComputationExpression: ");
+        result.append(" (strokeSizeComputationExpression: "); //$NON-NLS-1$
         result.append(strokeSizeComputationExpression);
-        result.append(", backgroundColor: ");
+        result.append(", backgroundColor: "); //$NON-NLS-1$
         result.append(backgroundColor);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/EdgeStyleImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/EdgeStyleImpl.java
index 7099c37509..c87af9cfd4 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/EdgeStyleImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/EdgeStyleImpl.java
@@ -907,21 +907,21 @@ public class EdgeStyleImpl extends StyleImpl implements EdgeStyle {
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (lineStyle: ");
+        result.append(" (lineStyle: "); //$NON-NLS-1$
         result.append(lineStyle);
-        result.append(", sourceArrow: ");
+        result.append(", sourceArrow: "); //$NON-NLS-1$
         result.append(sourceArrow);
-        result.append(", targetArrow: ");
+        result.append(", targetArrow: "); //$NON-NLS-1$
         result.append(targetArrow);
-        result.append(", foldingStyle: ");
+        result.append(", foldingStyle: "); //$NON-NLS-1$
         result.append(foldingStyle);
-        result.append(", size: ");
+        result.append(", size: "); //$NON-NLS-1$
         result.append(size);
-        result.append(", routingStyle: ");
+        result.append(", routingStyle: "); //$NON-NLS-1$
         result.append(routingStyle);
-        result.append(", centered: ");
+        result.append(", centered: "); //$NON-NLS-1$
         result.append(centered);
-        result.append(", strokeColor: ");
+        result.append(", strokeColor: "); //$NON-NLS-1$
         result.append(strokeColor);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/EllipseImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/EllipseImpl.java
index 4b6c77e85d..25974e788d 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/EllipseImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/EllipseImpl.java
@@ -283,11 +283,11 @@ public class EllipseImpl extends NodeStyleImpl implements Ellipse {
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (horizontalDiameter: ");
+        result.append(" (horizontalDiameter: "); //$NON-NLS-1$
         result.append(horizontalDiameter);
-        result.append(", verticalDiameter: ");
+        result.append(", verticalDiameter: "); //$NON-NLS-1$
         result.append(verticalDiameter);
-        result.append(", color: ");
+        result.append(", color: "); //$NON-NLS-1$
         result.append(color);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/FlatContainerStyleImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/FlatContainerStyleImpl.java
index 76aef81eda..8c525d97d8 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/FlatContainerStyleImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/FlatContainerStyleImpl.java
@@ -289,11 +289,11 @@ public class FlatContainerStyleImpl extends ContainerStyleImpl implements FlatCo
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (backgroundStyle: ");
+        result.append(" (backgroundStyle: "); //$NON-NLS-1$
         result.append(backgroundStyle);
-        result.append(", backgroundColor: ");
+        result.append(", backgroundColor: "); //$NON-NLS-1$
         result.append(backgroundColor);
-        result.append(", foregroundColor: ");
+        result.append(", foregroundColor: "); //$NON-NLS-1$
         result.append(foregroundColor);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/GaugeCompositeStyleImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/GaugeCompositeStyleImpl.java
index 085c4ae224..b3adb5969b 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/GaugeCompositeStyleImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/GaugeCompositeStyleImpl.java
@@ -226,7 +226,7 @@ public class GaugeCompositeStyleImpl extends NodeStyleImpl implements GaugeCompo
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (alignment: ");
+        result.append(" (alignment: "); //$NON-NLS-1$
         result.append(alignment);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/GaugeSectionImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/GaugeSectionImpl.java
index e2c4682509..7782b86e80 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/GaugeSectionImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/GaugeSectionImpl.java
@@ -454,17 +454,17 @@ public class GaugeSectionImpl extends CustomizableImpl implements GaugeSection {
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (min: ");
+        result.append(" (min: "); //$NON-NLS-1$
         result.append(min);
-        result.append(", max: ");
+        result.append(", max: "); //$NON-NLS-1$
         result.append(max);
-        result.append(", value: ");
+        result.append(", value: "); //$NON-NLS-1$
         result.append(value);
-        result.append(", label: ");
+        result.append(", label: "); //$NON-NLS-1$
         result.append(label);
-        result.append(", backgroundColor: ");
+        result.append(", backgroundColor: "); //$NON-NLS-1$
         result.append(backgroundColor);
-        result.append(", foregroundColor: ");
+        result.append(", foregroundColor: "); //$NON-NLS-1$
         result.append(foregroundColor);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/LozengeImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/LozengeImpl.java
index 63526d3448..e6be677c79 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/LozengeImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/LozengeImpl.java
@@ -279,11 +279,11 @@ public class LozengeImpl extends NodeStyleImpl implements Lozenge {
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (width: ");
+        result.append(" (width: "); //$NON-NLS-1$
         result.append(width);
-        result.append(", height: ");
+        result.append(", height: "); //$NON-NLS-1$
         result.append(height);
-        result.append(", color: ");
+        result.append(", color: "); //$NON-NLS-1$
         result.append(color);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/NodeStyleImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/NodeStyleImpl.java
index 19ec5f1172..8763b96b25 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/NodeStyleImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/NodeStyleImpl.java
@@ -638,17 +638,17 @@ public abstract class NodeStyleImpl extends LabelStyleImpl implements NodeStyle
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (borderSize: ");
+        result.append(" (borderSize: "); //$NON-NLS-1$
         result.append(borderSize);
-        result.append(", borderSizeComputationExpression: ");
+        result.append(", borderSizeComputationExpression: "); //$NON-NLS-1$
         result.append(borderSizeComputationExpression);
-        result.append(", borderColor: ");
+        result.append(", borderColor: "); //$NON-NLS-1$
         result.append(borderColor);
-        result.append(", borderLineStyle: ");
+        result.append(", borderLineStyle: "); //$NON-NLS-1$
         result.append(borderLineStyle);
-        result.append(", hideLabelByDefault: ");
+        result.append(", hideLabelByDefault: "); //$NON-NLS-1$
         result.append(hideLabelByDefault);
-        result.append(", labelPosition: ");
+        result.append(", labelPosition: "); //$NON-NLS-1$
         result.append(labelPosition);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/NoteImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/NoteImpl.java
index 69a45b4ad0..4527b08397 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/NoteImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/NoteImpl.java
@@ -166,7 +166,7 @@ public class NoteImpl extends NodeStyleImpl implements Note {
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (color: ");
+        result.append(" (color: "); //$NON-NLS-1$
         result.append(color);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/ShapeContainerStyleImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/ShapeContainerStyleImpl.java
index b532717953..2de9b0e3d3 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/ShapeContainerStyleImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/ShapeContainerStyleImpl.java
@@ -227,9 +227,9 @@ public class ShapeContainerStyleImpl extends ContainerStyleImpl implements Shape
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (shape: ");
+        result.append(" (shape: "); //$NON-NLS-1$
         result.append(shape);
-        result.append(", backgroundColor: ");
+        result.append(", backgroundColor: "); //$NON-NLS-1$
         result.append(backgroundColor);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/SquareImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/SquareImpl.java
index dab6f66b08..62a059b034 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/SquareImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/SquareImpl.java
@@ -279,11 +279,11 @@ public class SquareImpl extends NodeStyleImpl implements Square {
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (width: ");
+        result.append(" (width: "); //$NON-NLS-1$
         result.append(width);
-        result.append(", height: ");
+        result.append(", height: "); //$NON-NLS-1$
         result.append(height);
-        result.append(", color: ");
+        result.append(", color: "); //$NON-NLS-1$
         result.append(color);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/WorkspaceImageImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/WorkspaceImageImpl.java
index 64c88f3796..9f22307e32 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/WorkspaceImageImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/WorkspaceImageImpl.java
@@ -167,7 +167,7 @@ public class WorkspaceImageImpl extends NodeStyleImpl implements WorkspaceImage
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (workspacePath: ");
+        result.append(" (workspacePath: "); //$NON-NLS-1$
         result.append(workspacePath);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/BackgroundConditionalStyleItemProvider.java b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/BackgroundConditionalStyleItemProvider.java
index ed214cdd71..2e1da8abac 100644
--- a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/BackgroundConditionalStyleItemProvider.java
+++ b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/BackgroundConditionalStyleItemProvider.java
@@ -74,11 +74,13 @@ IItemPropertySource {
      * @generated
      */
     protected void addPredicateExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_BackgroundConditionalStyle_predicateExpression_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_BackgroundConditionalStyle_predicateExpression_feature", "_UI_BackgroundConditionalStyle_type"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_BackgroundConditionalStyle_predicateExpression_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_BackgroundConditionalStyle_predicateExpression_feature", "_UI_BackgroundConditionalStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DescriptionPackage.Literals.BACKGROUND_CONDITIONAL_STYLE__PREDICATE_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -122,7 +124,7 @@ IItemPropertySource {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/BackgroundConditionalStyle"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/BackgroundConditionalStyle")); //$NON-NLS-1$
     }
 
     /**
@@ -134,7 +136,8 @@ IItemPropertySource {
     @Override
     public String getText(Object object) {
         String label = ((BackgroundConditionalStyle) object).getPredicateExpression();
-        return label == null || label.length() == 0 ? getString("_UI_BackgroundConditionalStyle_type") : getString("_UI_BackgroundConditionalStyle_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_BackgroundConditionalStyle_type") : //$NON-NLS-1$
+            getString("_UI_BackgroundConditionalStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/BackgroundStyleDescriptionItemProvider.java b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/BackgroundStyleDescriptionItemProvider.java
index 320b2ad8c4..12e3c3bb42 100644
--- a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/BackgroundStyleDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/BackgroundStyleDescriptionItemProvider.java
@@ -72,9 +72,10 @@ IItemPropertySource {
      */
     protected void addBackgroundColorPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_BackgroundStyleDescription_backgroundColor_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_BackgroundStyleDescription_backgroundColor_feature", "_UI_BackgroundStyleDescription_type"),
-                DescriptionPackage.Literals.BACKGROUND_STYLE_DESCRIPTION__BACKGROUND_COLOR, true, false, false, null, getString("_UI_ColorPropertyCategory"), null));
+                getString("_UI_BackgroundStyleDescription_backgroundColor_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_BackgroundStyleDescription_backgroundColor_feature", "_UI_BackgroundStyleDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DescriptionPackage.Literals.BACKGROUND_STYLE_DESCRIPTION__BACKGROUND_COLOR, true, false, false, null, getString("_UI_ColorPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -85,7 +86,7 @@ IItemPropertySource {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/BackgroundStyleDescription"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/BackgroundStyleDescription")); //$NON-NLS-1$
     }
 
     /**
@@ -96,7 +97,7 @@ IItemPropertySource {
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_BackgroundStyleDescription_type");
+        return getString("_UI_BackgroundStyleDescription_type"); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/CellUpdaterItemProvider.java b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/CellUpdaterItemProvider.java
index 19dad90c77..df855420e4 100644
--- a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/CellUpdaterItemProvider.java
+++ b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/CellUpdaterItemProvider.java
@@ -75,8 +75,10 @@ IItemPropertySource {
      */
     protected void addCanEditPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_CellUpdater_canEdit_feature"), getString("_UI_PropertyDescriptor_description", "_UI_CellUpdater_canEdit_feature", "_UI_CellUpdater_type"),
-                DescriptionPackage.Literals.CELL_UPDATER__CAN_EDIT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_BehaviorPropertyCategory"), null));
+                getString("_UI_CellUpdater_canEdit_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_CellUpdater_canEdit_feature", "_UI_CellUpdater_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DescriptionPackage.Literals.CELL_UPDATER__CAN_EDIT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_BehaviorPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -120,7 +122,7 @@ IItemPropertySource {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/CellUpdater"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/CellUpdater")); //$NON-NLS-1$
     }
 
     /**
@@ -132,7 +134,8 @@ IItemPropertySource {
     @Override
     public String getText(Object object) {
         String label = ((CellUpdater) object).getCanEdit();
-        return label == null || label.length() == 0 ? getString("_UI_CellUpdater_type") : getString("_UI_CellUpdater_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_CellUpdater_type") : //$NON-NLS-1$
+            getString("_UI_CellUpdater_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/ColumnMappingItemProvider.java b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/ColumnMappingItemProvider.java
index 34fc3eedeb..34bb2c880c 100644
--- a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/ColumnMappingItemProvider.java
+++ b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/ColumnMappingItemProvider.java
@@ -67,9 +67,10 @@ public class ColumnMappingItemProvider extends TableMappingItemProvider {
      */
     protected void addHeaderLabelExpressionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_ColumnMapping_headerLabelExpression_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_ColumnMapping_headerLabelExpression_feature", "_UI_ColumnMapping_type"),
-                DescriptionPackage.Literals.COLUMN_MAPPING__HEADER_LABEL_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_LabelPropertyCategory"), null));
+                getString("_UI_ColumnMapping_headerLabelExpression_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_ColumnMapping_headerLabelExpression_feature", "_UI_ColumnMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DescriptionPackage.Literals.COLUMN_MAPPING__HEADER_LABEL_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_LabelPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -80,8 +81,10 @@ public class ColumnMappingItemProvider extends TableMappingItemProvider {
      */
     protected void addInitialWidthPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_ColumnMapping_initialWidth_feature"), getString("_UI_ColumnMapping_initialWidth_description"), DescriptionPackage.Literals.COLUMN_MAPPING__INITIAL_WIDTH, true, false,
-                false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, getString("_UI_AdvancedPropertyCategory"), null));
+                getString("_UI_ColumnMapping_initialWidth_feature"), //$NON-NLS-1$
+                getString("_UI_ColumnMapping_initialWidth_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.COLUMN_MAPPING__INITIAL_WIDTH, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, getString("_UI_AdvancedPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -92,7 +95,7 @@ public class ColumnMappingItemProvider extends TableMappingItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ColumnMapping"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/ColumnMapping")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/CreateCellToolItemProvider.java b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/CreateCellToolItemProvider.java
index 7b2df4b1c4..59bf3afad7 100644
--- a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/CreateCellToolItemProvider.java
+++ b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/CreateCellToolItemProvider.java
@@ -75,8 +75,10 @@ public class CreateCellToolItemProvider extends TableToolItemProvider {
      */
     protected void addDocumentationPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DocumentedElement_documentation_feature"), getString("_UI_DocumentedElement_documentation_description"), DescriptionPackage.Literals.DOCUMENTED_ELEMENT__DOCUMENTATION,
-                true, true, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_DocumentationPropertyCategory"), null));
+                getString("_UI_DocumentedElement_documentation_feature"), //$NON-NLS-1$
+                getString("_UI_DocumentedElement_documentation_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.DOCUMENTED_ELEMENT__DOCUMENTATION, true, true, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_DocumentationPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -87,8 +89,10 @@ public class CreateCellToolItemProvider extends TableToolItemProvider {
      */
     protected void addNamePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_IdentifiedElement_name_feature"), getString("_UI_IdentifiedElement_name_description"), DescriptionPackage.Literals.IDENTIFIED_ELEMENT__NAME, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_IdentifiedElement_name_feature"), //$NON-NLS-1$
+                getString("_UI_IdentifiedElement_name_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.IDENTIFIED_ELEMENT__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -99,8 +103,10 @@ public class CreateCellToolItemProvider extends TableToolItemProvider {
      */
     protected void addLabelPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_IdentifiedElement_label_feature"), getString("_UI_IdentifiedElement_label_description"), DescriptionPackage.Literals.IDENTIFIED_ELEMENT__LABEL, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_IdentifiedElement_label_feature"), //$NON-NLS-1$
+                getString("_UI_IdentifiedElement_label_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.IDENTIFIED_ELEMENT__LABEL, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -111,9 +117,10 @@ public class CreateCellToolItemProvider extends TableToolItemProvider {
      */
     protected void addPreconditionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_AbstractToolDescription_precondition_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_AbstractToolDescription_precondition_feature", "_UI_AbstractToolDescription_type"),
-                ToolPackage.Literals.ABSTRACT_TOOL_DESCRIPTION__PRECONDITION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_AbstractToolDescription_precondition_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_AbstractToolDescription_precondition_feature", "_UI_AbstractToolDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                ToolPackage.Literals.ABSTRACT_TOOL_DESCRIPTION__PRECONDITION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -124,21 +131,22 @@ public class CreateCellToolItemProvider extends TableToolItemProvider {
      */
     protected void addForceRefreshPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_AbstractToolDescription_forceRefresh_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_AbstractToolDescription_forceRefresh_feature", "_UI_AbstractToolDescription_type"),
-                ToolPackage.Literals.ABSTRACT_TOOL_DESCRIPTION__FORCE_REFRESH, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_AbstractToolDescription_forceRefresh_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_AbstractToolDescription_forceRefresh_feature", "_UI_AbstractToolDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                ToolPackage.Literals.ABSTRACT_TOOL_DESCRIPTION__FORCE_REFRESH, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
      * This adds a property descriptor for the Elements To Select feature. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected void addElementsToSelectPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_AbstractToolDescription_elementsToSelect_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_AbstractToolDescription_elementsToSelect_feature", "_UI_AbstractToolDescription_type"),
+                getString("_UI_AbstractToolDescription_elementsToSelect_feature"), //$NON-NLS-1$
+                getString("_UI_AbstractToolDescription_elementsToSelect_description"), //$NON-NLS-1$
                 ToolPackage.Literals.ABSTRACT_TOOL_DESCRIPTION__ELEMENTS_TO_SELECT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -150,8 +158,8 @@ public class CreateCellToolItemProvider extends TableToolItemProvider {
      */
     protected void addInverseSelectionOrderPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_AbstractToolDescription_inverseSelectionOrder_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_AbstractToolDescription_inverseSelectionOrder_feature", "_UI_AbstractToolDescription_type"),
+                getString("_UI_AbstractToolDescription_inverseSelectionOrder_feature"), //$NON-NLS-1$
+                getString("_UI_AbstractToolDescription_inverseSelectionOrder_description"), //$NON-NLS-1$
                 ToolPackage.Literals.ABSTRACT_TOOL_DESCRIPTION__INVERSE_SELECTION_ORDER, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
     }
 
@@ -197,7 +205,7 @@ public class CreateCellToolItemProvider extends TableToolItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/CreateCellTool"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/CreateCellTool")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/CreateColumnToolItemProvider.java b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/CreateColumnToolItemProvider.java
index 97de569b76..b6826ecf74 100644
--- a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/CreateColumnToolItemProvider.java
+++ b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/CreateColumnToolItemProvider.java
@@ -61,7 +61,7 @@ public class CreateColumnToolItemProvider extends CreateToolItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/CreateColumnTool"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/CreateColumnTool")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/CreateCrossColumnToolItemProvider.java b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/CreateCrossColumnToolItemProvider.java
index bb3e02a1de..d3956ac2da 100644
--- a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/CreateCrossColumnToolItemProvider.java
+++ b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/CreateCrossColumnToolItemProvider.java
@@ -64,8 +64,10 @@ public class CreateCrossColumnToolItemProvider extends CreateToolItemProvider {
      */
     protected void addMappingPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_CreateCrossColumnTool_mapping_feature"), getString("_UI_PropertyDescriptor_description", "_UI_CreateCrossColumnTool_mapping_feature", "_UI_CreateCrossColumnTool_type"),
-                DescriptionPackage.Literals.CREATE_CROSS_COLUMN_TOOL__MAPPING, true, false, true, null, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_CreateCrossColumnTool_mapping_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_CreateCrossColumnTool_mapping_feature", "_UI_CreateCrossColumnTool_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DescriptionPackage.Literals.CREATE_CROSS_COLUMN_TOOL__MAPPING, true, false, true, null, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -76,7 +78,7 @@ public class CreateCrossColumnToolItemProvider extends CreateToolItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/CreateCrossColumnTool"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/CreateCrossColumnTool")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/CreateLineToolItemProvider.java b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/CreateLineToolItemProvider.java
index fd07d9b2ec..6aa73fbc4e 100644
--- a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/CreateLineToolItemProvider.java
+++ b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/CreateLineToolItemProvider.java
@@ -64,8 +64,10 @@ public class CreateLineToolItemProvider extends CreateToolItemProvider {
      */
     protected void addMappingPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_CreateLineTool_mapping_feature"), getString("_UI_PropertyDescriptor_description", "_UI_CreateLineTool_mapping_feature", "_UI_CreateLineTool_type"),
-                DescriptionPackage.Literals.CREATE_LINE_TOOL__MAPPING, true, false, true, null, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_CreateLineTool_mapping_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_CreateLineTool_mapping_feature", "_UI_CreateLineTool_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DescriptionPackage.Literals.CREATE_LINE_TOOL__MAPPING, true, false, true, null, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -76,7 +78,7 @@ public class CreateLineToolItemProvider extends CreateToolItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/CreateLineTool"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/CreateLineTool")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/CreateToolItemProvider.java b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/CreateToolItemProvider.java
index f70107a099..d40d069779 100644
--- a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/CreateToolItemProvider.java
+++ b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/CreateToolItemProvider.java
@@ -110,7 +110,7 @@ public class CreateToolItemProvider extends AbstractToolDescriptionItemProvider
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/CreateTool"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/CreateTool")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/CrossTableDescriptionItemProvider.java b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/CrossTableDescriptionItemProvider.java
index 3616343272..cf8c87b273 100644
--- a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/CrossTableDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/CrossTableDescriptionItemProvider.java
@@ -102,7 +102,7 @@ public class CrossTableDescriptionItemProvider extends TableDescriptionItemProvi
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/CrossTableDescription"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/CrossTableDescription")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/DeleteColumnToolItemProvider.java b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/DeleteColumnToolItemProvider.java
index 2248bc781d..b5f07178be 100644
--- a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/DeleteColumnToolItemProvider.java
+++ b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/DeleteColumnToolItemProvider.java
@@ -61,7 +61,7 @@ public class DeleteColumnToolItemProvider extends DeleteToolItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/DeleteColumnTool"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/DeleteColumnTool")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/DeleteLineToolItemProvider.java b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/DeleteLineToolItemProvider.java
index dd14ea0e74..dc71c0742d 100644
--- a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/DeleteLineToolItemProvider.java
+++ b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/DeleteLineToolItemProvider.java
@@ -61,7 +61,7 @@ public class DeleteLineToolItemProvider extends DeleteToolItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/DeleteLineTool"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/DeleteLineTool")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/DeleteToolItemProvider.java b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/DeleteToolItemProvider.java
index 964482d178..31251c6c76 100644
--- a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/DeleteToolItemProvider.java
+++ b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/DeleteToolItemProvider.java
@@ -110,7 +110,7 @@ public class DeleteToolItemProvider extends AbstractToolDescriptionItemProvider
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/DeleteTool"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/DeleteTool")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/EditionTableDescriptionItemProvider.java b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/EditionTableDescriptionItemProvider.java
index 50ca3b7435..fc16eac229 100644
--- a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/EditionTableDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/EditionTableDescriptionItemProvider.java
@@ -100,7 +100,7 @@ public class EditionTableDescriptionItemProvider extends TableDescriptionItemPro
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/EditionTableDescription"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/EditionTableDescription")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/ElementColumnMappingItemProvider.java b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/ElementColumnMappingItemProvider.java
index 6a8100d610..7d9c2a82d8 100644
--- a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/ElementColumnMappingItemProvider.java
+++ b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/ElementColumnMappingItemProvider.java
@@ -73,8 +73,10 @@ public class ElementColumnMappingItemProvider extends ColumnMappingItemProvider
      */
     protected void addDomainClassPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_ElementColumnMapping_domainClass_feature"), getString("_UI_ElementColumnMapping_domainClass_description"),
-                DescriptionPackage.Literals.ELEMENT_COLUMN_MAPPING__DOMAIN_CLASS, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_ElementColumnMapping_domainClass_feature"), //$NON-NLS-1$
+                getString("_UI_ElementColumnMapping_domainClass_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.ELEMENT_COLUMN_MAPPING__DOMAIN_CLASS, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -84,10 +86,13 @@ public class ElementColumnMappingItemProvider extends ColumnMappingItemProvider
      * @generated
      */
     protected void addSemanticCandidatesExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_ElementColumnMapping_semanticCandidatesExpression_feature"), getString("_UI_ElementColumnMapping_semanticCandidatesExpression_description"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_ElementColumnMapping_semanticCandidatesExpression_feature"), //$NON-NLS-1$
+                getString("_UI_ElementColumnMapping_semanticCandidatesExpression_description"), //$NON-NLS-1$
                 DescriptionPackage.Literals.ELEMENT_COLUMN_MAPPING__SEMANTIC_CANDIDATES_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -136,7 +141,7 @@ public class ElementColumnMappingItemProvider extends ColumnMappingItemProvider
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ElementColumnMapping"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/ElementColumnMapping")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/FeatureColumnMappingItemProvider.java b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/FeatureColumnMappingItemProvider.java
index 03070c9e42..a880d86194 100644
--- a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/FeatureColumnMappingItemProvider.java
+++ b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/FeatureColumnMappingItemProvider.java
@@ -79,8 +79,10 @@ public class FeatureColumnMappingItemProvider extends ColumnMappingItemProvider
      */
     protected void addCanEditPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_CellUpdater_canEdit_feature"), getString("_UI_PropertyDescriptor_description", "_UI_CellUpdater_canEdit_feature", "_UI_CellUpdater_type"),
-                DescriptionPackage.Literals.CELL_UPDATER__CAN_EDIT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_BehaviorPropertyCategory"), null));
+                getString("_UI_CellUpdater_canEdit_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_CellUpdater_canEdit_feature", "_UI_CellUpdater_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DescriptionPackage.Literals.CELL_UPDATER__CAN_EDIT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_BehaviorPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -91,8 +93,10 @@ public class FeatureColumnMappingItemProvider extends ColumnMappingItemProvider
      */
     protected void addFeatureNamePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_FeatureColumnMapping_featureName_feature"), getString("_UI_FeatureColumnMapping_featureName_description"),
-                DescriptionPackage.Literals.FEATURE_COLUMN_MAPPING__FEATURE_NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_FeatureColumnMapping_featureName_feature"), //$NON-NLS-1$
+                getString("_UI_FeatureColumnMapping_featureName_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.FEATURE_COLUMN_MAPPING__FEATURE_NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -103,8 +107,10 @@ public class FeatureColumnMappingItemProvider extends ColumnMappingItemProvider
      */
     protected void addLabelExpressionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_FeatureColumnMapping_labelExpression_feature"), getString("_UI_FeatureColumnMapping_labelExpression_description"),
-                DescriptionPackage.Literals.FEATURE_COLUMN_MAPPING__LABEL_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_LabelPropertyCategory"), null));
+                getString("_UI_FeatureColumnMapping_labelExpression_feature"), //$NON-NLS-1$
+                getString("_UI_FeatureColumnMapping_labelExpression_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.FEATURE_COLUMN_MAPPING__LABEL_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_LabelPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -114,10 +120,13 @@ public class FeatureColumnMappingItemProvider extends ColumnMappingItemProvider
      * @generated
      */
     protected void addFeatureParentExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_FeatureColumnMapping_featureParentExpression_feature"), getString("_UI_FeatureColumnMapping_featureParentExpression_description"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_FeatureColumnMapping_featureParentExpression_feature"), //$NON-NLS-1$
+                getString("_UI_FeatureColumnMapping_featureParentExpression_description"), //$NON-NLS-1$
                 DescriptionPackage.Literals.FEATURE_COLUMN_MAPPING__FEATURE_PARENT_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_AdvancedPropertyCategory"), null));
+                getString("_UI_AdvancedPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -165,7 +174,7 @@ public class FeatureColumnMappingItemProvider extends ColumnMappingItemProvider
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/FeatureColumnMapping"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/FeatureColumnMapping")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/ForegroundConditionalStyleItemProvider.java b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/ForegroundConditionalStyleItemProvider.java
index d56179d95a..86adcca677 100644
--- a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/ForegroundConditionalStyleItemProvider.java
+++ b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/ForegroundConditionalStyleItemProvider.java
@@ -74,11 +74,13 @@ IItemPropertySource {
      * @generated
      */
     protected void addPredicateExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_ForegroundConditionalStyle_predicateExpression_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_ForegroundConditionalStyle_predicateExpression_feature", "_UI_ForegroundConditionalStyle_type"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_ForegroundConditionalStyle_predicateExpression_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_ForegroundConditionalStyle_predicateExpression_feature", "_UI_ForegroundConditionalStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DescriptionPackage.Literals.FOREGROUND_CONDITIONAL_STYLE__PREDICATE_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -122,7 +124,7 @@ IItemPropertySource {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ForegroundConditionalStyle"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/ForegroundConditionalStyle")); //$NON-NLS-1$
     }
 
     /**
@@ -134,7 +136,8 @@ IItemPropertySource {
     @Override
     public String getText(Object object) {
         String label = ((ForegroundConditionalStyle) object).getPredicateExpression();
-        return label == null || label.length() == 0 ? getString("_UI_ForegroundConditionalStyle_type") : getString("_UI_ForegroundConditionalStyle_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_ForegroundConditionalStyle_type") : //$NON-NLS-1$
+            getString("_UI_ForegroundConditionalStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/ForegroundStyleDescriptionItemProvider.java b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/ForegroundStyleDescriptionItemProvider.java
index aa5d3ff63c..a61d49a77b 100644
--- a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/ForegroundStyleDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/ForegroundStyleDescriptionItemProvider.java
@@ -75,9 +75,10 @@ IItemPropertySource {
      */
     protected void addLabelSizePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_ForegroundStyleDescription_labelSize_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_ForegroundStyleDescription_labelSize_feature", "_UI_ForegroundStyleDescription_type"),
-                DescriptionPackage.Literals.FOREGROUND_STYLE_DESCRIPTION__LABEL_SIZE, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, getString("_UI_LabelPropertyCategory"), null));
+                getString("_UI_ForegroundStyleDescription_labelSize_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_ForegroundStyleDescription_labelSize_feature", "_UI_ForegroundStyleDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DescriptionPackage.Literals.FOREGROUND_STYLE_DESCRIPTION__LABEL_SIZE, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, getString("_UI_LabelPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -88,9 +89,10 @@ IItemPropertySource {
      */
     protected void addLabelFormatPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_ForegroundStyleDescription_labelFormat_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_ForegroundStyleDescription_labelFormat_feature", "_UI_ForegroundStyleDescription_type"),
-                DescriptionPackage.Literals.FOREGROUND_STYLE_DESCRIPTION__LABEL_FORMAT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_LabelPropertyCategory"), null));
+                getString("_UI_ForegroundStyleDescription_labelFormat_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_ForegroundStyleDescription_labelFormat_feature", "_UI_ForegroundStyleDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DescriptionPackage.Literals.FOREGROUND_STYLE_DESCRIPTION__LABEL_FORMAT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_LabelPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -101,9 +103,10 @@ IItemPropertySource {
      */
     protected void addForeGroundColorPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_ForegroundStyleDescription_foreGroundColor_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_ForegroundStyleDescription_foreGroundColor_feature", "_UI_ForegroundStyleDescription_type"),
-                DescriptionPackage.Literals.FOREGROUND_STYLE_DESCRIPTION__FORE_GROUND_COLOR, true, false, false, null, getString("_UI_ColorPropertyCategory"), null));
+                getString("_UI_ForegroundStyleDescription_foreGroundColor_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_ForegroundStyleDescription_foreGroundColor_feature", "_UI_ForegroundStyleDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DescriptionPackage.Literals.FOREGROUND_STYLE_DESCRIPTION__FORE_GROUND_COLOR, true, false, false, null, getString("_UI_ColorPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -114,7 +117,7 @@ IItemPropertySource {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ForegroundStyleDescription"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/ForegroundStyleDescription")); //$NON-NLS-1$
     }
 
     /**
@@ -126,7 +129,7 @@ IItemPropertySource {
     @Override
     public String getText(Object object) {
         ForegroundStyleDescription foregroundStyleDescription = (ForegroundStyleDescription) object;
-        return getString("_UI_ForegroundStyleDescription_type") + " " + foregroundStyleDescription.getLabelSize();
+        return getString("_UI_ForegroundStyleDescription_type") + " " + foregroundStyleDescription.getLabelSize(); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/IntersectionMappingItemProvider.java b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/IntersectionMappingItemProvider.java
index 2c6a6e6952..3f5f8c174f 100644
--- a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/IntersectionMappingItemProvider.java
+++ b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/IntersectionMappingItemProvider.java
@@ -88,8 +88,10 @@ public class IntersectionMappingItemProvider extends TableMappingItemProvider {
      */
     protected void addCanEditPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_CellUpdater_canEdit_feature"), getString("_UI_PropertyDescriptor_description", "_UI_CellUpdater_canEdit_feature", "_UI_CellUpdater_type"),
-                DescriptionPackage.Literals.CELL_UPDATER__CAN_EDIT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_BehaviorPropertyCategory"), null));
+                getString("_UI_CellUpdater_canEdit_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_CellUpdater_canEdit_feature", "_UI_CellUpdater_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DescriptionPackage.Literals.CELL_UPDATER__CAN_EDIT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_BehaviorPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -100,8 +102,10 @@ public class IntersectionMappingItemProvider extends TableMappingItemProvider {
      */
     protected void addLineMappingPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_IntersectionMapping_lineMapping_feature"), getString("_UI_IntersectionMapping_lineMapping_description"), DescriptionPackage.Literals.INTERSECTION_MAPPING__LINE_MAPPING,
-                true, false, true, null, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_IntersectionMapping_lineMapping_feature"), //$NON-NLS-1$
+                getString("_UI_IntersectionMapping_lineMapping_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.INTERSECTION_MAPPING__LINE_MAPPING, true, false, true, null, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -112,8 +116,10 @@ public class IntersectionMappingItemProvider extends TableMappingItemProvider {
      */
     protected void addColumnMappingPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_IntersectionMapping_columnMapping_feature"), getString("_UI_IntersectionMapping_columnMapping_description"),
-                DescriptionPackage.Literals.INTERSECTION_MAPPING__COLUMN_MAPPING, true, false, true, null, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_IntersectionMapping_columnMapping_feature"), //$NON-NLS-1$
+                getString("_UI_IntersectionMapping_columnMapping_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.INTERSECTION_MAPPING__COLUMN_MAPPING, true, false, true, null, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -124,8 +130,10 @@ public class IntersectionMappingItemProvider extends TableMappingItemProvider {
      */
     protected void addLabelExpressionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_IntersectionMapping_labelExpression_feature"), getString("_UI_IntersectionMapping_labelExpression_description"),
-                DescriptionPackage.Literals.INTERSECTION_MAPPING__LABEL_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_LabelPropertyCategory"), null));
+                getString("_UI_IntersectionMapping_labelExpression_feature"), //$NON-NLS-1$
+                getString("_UI_IntersectionMapping_labelExpression_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.INTERSECTION_MAPPING__LABEL_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_LabelPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -135,12 +143,11 @@ public class IntersectionMappingItemProvider extends TableMappingItemProvider {
      * @generated
      */
     protected void addUseDomainClassPropertyDescriptor(Object object) {
-        itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_IntersectionMapping_useDomainClass_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_IntersectionMapping_useDomainClass_feature", "_UI_IntersectionMapping_type"),
-                DescriptionPackage.Literals.INTERSECTION_MAPPING__USE_DOMAIN_CLASS, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-                getString("_UI_DomainBasedPropertyCategory"), null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+                getString("_UI_IntersectionMapping_useDomainClass_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_IntersectionMapping_useDomainClass_feature", "_UI_IntersectionMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DescriptionPackage.Literals.INTERSECTION_MAPPING__USE_DOMAIN_CLASS, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, getString("_UI_DomainBasedPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -151,9 +158,9 @@ public class IntersectionMappingItemProvider extends TableMappingItemProvider {
      */
     protected void addColumnFinderExpressionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_IntersectionMapping_columnFinderExpression_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_IntersectionMapping_columnFinderExpression_feature", "_UI_IntersectionMapping_type"),
-                DescriptionPackage.Literals.INTERSECTION_MAPPING__COLUMN_FINDER_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"),
+                getString("_UI_IntersectionMapping_columnFinderExpression_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_IntersectionMapping_columnFinderExpression_feature", "_UI_IntersectionMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DescriptionPackage.Literals.INTERSECTION_MAPPING__COLUMN_FINDER_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
                 null));
     }
 
@@ -165,9 +172,9 @@ public class IntersectionMappingItemProvider extends TableMappingItemProvider {
      */
     protected void addLineFinderExpressionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_IntersectionMapping_lineFinderExpression_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_IntersectionMapping_lineFinderExpression_feature", "_UI_IntersectionMapping_type"),
-                DescriptionPackage.Literals.INTERSECTION_MAPPING__LINE_FINDER_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_DomainBasedPropertyCategory"),
+                getString("_UI_IntersectionMapping_lineFinderExpression_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_IntersectionMapping_lineFinderExpression_feature", "_UI_IntersectionMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DescriptionPackage.Literals.INTERSECTION_MAPPING__LINE_FINDER_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_DomainBasedPropertyCategory"), //$NON-NLS-1$
                 null));
     }
 
@@ -178,10 +185,13 @@ public class IntersectionMappingItemProvider extends TableMappingItemProvider {
      * @generated
      */
     protected void addSemanticCandidatesExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_IntersectionMapping_semanticCandidatesExpression_feature"), getString("_UI_IntersectionMapping_semanticCandidatesExpression_description"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_IntersectionMapping_semanticCandidatesExpression_feature"), //$NON-NLS-1$
+                getString("_UI_IntersectionMapping_semanticCandidatesExpression_description"), //$NON-NLS-1$
                 DescriptionPackage.Literals.INTERSECTION_MAPPING__SEMANTIC_CANDIDATES_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_DomainBasedPropertyCategory"), null));
+                getString("_UI_DomainBasedPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -192,8 +202,10 @@ public class IntersectionMappingItemProvider extends TableMappingItemProvider {
      */
     protected void addDomainClassPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_IntersectionMapping_domainClass_feature"), getString("_UI_IntersectionMapping_domainClass_description"), DescriptionPackage.Literals.INTERSECTION_MAPPING__DOMAIN_CLASS,
-                true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_DomainBasedPropertyCategory"), null));
+                getString("_UI_IntersectionMapping_domainClass_feature"), //$NON-NLS-1$
+                getString("_UI_IntersectionMapping_domainClass_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.INTERSECTION_MAPPING__DOMAIN_CLASS, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_DomainBasedPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -204,8 +216,9 @@ public class IntersectionMappingItemProvider extends TableMappingItemProvider {
      */
     protected void addPreconditionExpressionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_IntersectionMapping_preconditionExpression_feature"), getString("_UI_IntersectionMapping_preconditionExpression_description"),
-                DescriptionPackage.Literals.INTERSECTION_MAPPING__PRECONDITION_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_AdvancedPropertyCategory"),
+                getString("_UI_IntersectionMapping_preconditionExpression_feature"), //$NON-NLS-1$
+                getString("_UI_IntersectionMapping_preconditionExpression_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.INTERSECTION_MAPPING__PRECONDITION_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_AdvancedPropertyCategory"), //$NON-NLS-1$
                 null));
     }
 
@@ -217,7 +230,8 @@ public class IntersectionMappingItemProvider extends TableMappingItemProvider {
      */
     protected void addCreatePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_IntersectionMapping_create_feature"), getString("_UI_PropertyDescriptor_description", "_UI_IntersectionMapping_create_feature", "_UI_IntersectionMapping_type"),
+                getString("_UI_IntersectionMapping_create_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_IntersectionMapping_create_feature", "_UI_IntersectionMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DescriptionPackage.Literals.INTERSECTION_MAPPING__CREATE, true, false, true, null, null, null));
     }
 
@@ -267,7 +281,7 @@ public class IntersectionMappingItemProvider extends TableMappingItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/IntersectionMapping"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/IntersectionMapping")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/LabelEditToolItemProvider.java b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/LabelEditToolItemProvider.java
index 2e0bd43c0c..5cd25a44c3 100644
--- a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/LabelEditToolItemProvider.java
+++ b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/LabelEditToolItemProvider.java
@@ -96,7 +96,7 @@ public class LabelEditToolItemProvider extends TableToolItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/LabelEditTool"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/LabelEditTool")); //$NON-NLS-1$
     }
 
     /**
@@ -107,7 +107,7 @@ public class LabelEditToolItemProvider extends TableToolItemProvider {
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_LabelEditTool_type");
+        return getString("_UI_LabelEditTool_type"); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/LineMappingItemProvider.java b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/LineMappingItemProvider.java
index 7c11e3453a..c994ff1e5e 100644
--- a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/LineMappingItemProvider.java
+++ b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/LineMappingItemProvider.java
@@ -76,7 +76,8 @@ public class LineMappingItemProvider extends TableMappingItemProvider {
      */
     protected void addReusedSubLinesPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_LineMapping_reusedSubLines_feature"), getString("_UI_PropertyDescriptor_description", "_UI_LineMapping_reusedSubLines_feature", "_UI_LineMapping_type"),
+                getString("_UI_LineMapping_reusedSubLines_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_LineMapping_reusedSubLines_feature", "_UI_LineMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DescriptionPackage.Literals.LINE_MAPPING__REUSED_SUB_LINES, true, false, true, null, null, null));
     }
 
@@ -88,8 +89,10 @@ public class LineMappingItemProvider extends TableMappingItemProvider {
      */
     protected void addDomainClassPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_LineMapping_domainClass_feature"), getString("_UI_LineMapping_domainClass_description"), DescriptionPackage.Literals.LINE_MAPPING__DOMAIN_CLASS, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_LineMapping_domainClass_feature"), //$NON-NLS-1$
+                getString("_UI_LineMapping_domainClass_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.LINE_MAPPING__DOMAIN_CLASS, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -100,8 +103,9 @@ public class LineMappingItemProvider extends TableMappingItemProvider {
      */
     protected void addSemanticCandidatesExpressionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_LineMapping_semanticCandidatesExpression_feature"), getString("_UI_LineMapping_semanticCandidatesExpression_description"),
-                DescriptionPackage.Literals.LINE_MAPPING__SEMANTIC_CANDIDATES_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"),
+                getString("_UI_LineMapping_semanticCandidatesExpression_feature"), //$NON-NLS-1$
+                getString("_UI_LineMapping_semanticCandidatesExpression_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.LINE_MAPPING__SEMANTIC_CANDIDATES_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
                 null));
     }
 
@@ -113,8 +117,10 @@ public class LineMappingItemProvider extends TableMappingItemProvider {
      */
     protected void addHeaderLabelExpressionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_LineMapping_headerLabelExpression_feature"), getString("_UI_PropertyDescriptor_description", "_UI_LineMapping_headerLabelExpression_feature", "_UI_LineMapping_type"),
-                DescriptionPackage.Literals.LINE_MAPPING__HEADER_LABEL_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_LabelPropertyCategory"), null));
+                getString("_UI_LineMapping_headerLabelExpression_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_LineMapping_headerLabelExpression_feature", "_UI_LineMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DescriptionPackage.Literals.LINE_MAPPING__HEADER_LABEL_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_LabelPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -125,8 +131,10 @@ public class LineMappingItemProvider extends TableMappingItemProvider {
      */
     protected void addReusedInMappingsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_LineMapping_reusedInMappings_feature"), getString("_UI_LineMapping_reusedInMappings_description"), DescriptionPackage.Literals.LINE_MAPPING__REUSED_IN_MAPPINGS, true,
-                false, true, null, getString("_UI_ImportPropertyCategory"), null));
+                getString("_UI_LineMapping_reusedInMappings_feature"), //$NON-NLS-1$
+                getString("_UI_LineMapping_reusedInMappings_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.LINE_MAPPING__REUSED_IN_MAPPINGS, true, false, true, null, getString("_UI_ImportPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -176,7 +184,7 @@ public class LineMappingItemProvider extends TableMappingItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/LineMapping"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/LineMapping")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/StyleUpdaterItemProvider.java b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/StyleUpdaterItemProvider.java
index de627db5ce..53112e1fab 100644
--- a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/StyleUpdaterItemProvider.java
+++ b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/StyleUpdaterItemProvider.java
@@ -108,7 +108,7 @@ IItemPropertySource {
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_StyleUpdater_type");
+        return getString("_UI_StyleUpdater_type"); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/TableCreationDescriptionItemProvider.java b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/TableCreationDescriptionItemProvider.java
index 41c79afef9..7b3e5a6731 100644
--- a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/TableCreationDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/TableCreationDescriptionItemProvider.java
@@ -67,9 +67,10 @@ public class TableCreationDescriptionItemProvider extends RepresentationCreation
      */
     protected void addTableDescriptionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_TableCreationDescription_tableDescription_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_TableCreationDescription_tableDescription_feature", "_UI_TableCreationDescription_type"),
-                DescriptionPackage.Literals.TABLE_CREATION_DESCRIPTION__TABLE_DESCRIPTION, true, false, true, null, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_TableCreationDescription_tableDescription_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_TableCreationDescription_tableDescription_feature", "_UI_TableCreationDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DescriptionPackage.Literals.TABLE_CREATION_DESCRIPTION__TABLE_DESCRIPTION, true, false, true, null, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -80,7 +81,7 @@ public class TableCreationDescriptionItemProvider extends RepresentationCreation
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/TableCreationDescription"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/TableCreationDescription")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/TableDescriptionItemProvider.java b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/TableDescriptionItemProvider.java
index f4b17117c0..47436dbb80 100644
--- a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/TableDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/TableDescriptionItemProvider.java
@@ -82,8 +82,10 @@ public class TableDescriptionItemProvider extends DocumentedElementItemProvider
      */
     protected void addNamePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_IdentifiedElement_name_feature"), getString("_UI_IdentifiedElement_name_description"), DescriptionPackage.Literals.IDENTIFIED_ELEMENT__NAME, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_IdentifiedElement_name_feature"), //$NON-NLS-1$
+                getString("_UI_IdentifiedElement_name_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.IDENTIFIED_ELEMENT__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -94,8 +96,10 @@ public class TableDescriptionItemProvider extends DocumentedElementItemProvider
      */
     protected void addLabelPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_IdentifiedElement_label_feature"), getString("_UI_IdentifiedElement_label_description"), DescriptionPackage.Literals.IDENTIFIED_ELEMENT__LABEL, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_IdentifiedElement_label_feature"), //$NON-NLS-1$
+                getString("_UI_IdentifiedElement_label_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.IDENTIFIED_ELEMENT__LABEL, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -106,8 +110,9 @@ public class TableDescriptionItemProvider extends DocumentedElementItemProvider
      */
     protected void addTitleExpressionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_RepresentationDescription_titleExpression_feature"), getString("_UI_RepresentationDescription_titleExpression_description"),
-                DescriptionPackage.Literals.REPRESENTATION_DESCRIPTION__TITLE_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_AdvancedPropertyCategory"),
+                getString("_UI_RepresentationDescription_titleExpression_feature"), //$NON-NLS-1$
+                getString("_UI_RepresentationDescription_titleExpression_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.REPRESENTATION_DESCRIPTION__TITLE_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_AdvancedPropertyCategory"), //$NON-NLS-1$
                 null));
     }
 
@@ -118,11 +123,11 @@ public class TableDescriptionItemProvider extends DocumentedElementItemProvider
      * @generated
      */
     protected void addInitialisationPropertyDescriptor(Object object) {
-        itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_RepresentationDescription_initialisation_feature"), getString("_UI_RepresentationDescription_initialisation_description"),
-                DescriptionPackage.Literals.REPRESENTATION_DESCRIPTION__INITIALISATION, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-                getString("_UI_GeneralPropertyCategory"), null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+                getString("_UI_RepresentationDescription_initialisation_feature"), //$NON-NLS-1$
+                getString("_UI_RepresentationDescription_initialisation_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.REPRESENTATION_DESCRIPTION__INITIALISATION, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -133,8 +138,10 @@ public class TableDescriptionItemProvider extends DocumentedElementItemProvider
      */
     protected void addMetamodelPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_RepresentationDescription_metamodel_feature"), getString("_UI_RepresentationDescription_metamodel_description"),
-                DescriptionPackage.Literals.REPRESENTATION_DESCRIPTION__METAMODEL, true, false, true, null, getString("_UI_MetamodelsPropertyCategory"), null));
+                getString("_UI_RepresentationDescription_metamodel_feature"), //$NON-NLS-1$
+                getString("_UI_RepresentationDescription_metamodel_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.REPRESENTATION_DESCRIPTION__METAMODEL, true, false, true, null, getString("_UI_MetamodelsPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -145,11 +152,11 @@ public class TableDescriptionItemProvider extends DocumentedElementItemProvider
      * @generated
      */
     protected void addShowOnStartupPropertyDescriptor(Object object) {
-        itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_RepresentationDescription_showOnStartup_feature"), getString("_UI_RepresentationDescription_showOnStartup_description"),
-                DescriptionPackage.Literals.REPRESENTATION_DESCRIPTION__SHOW_ON_STARTUP, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-                getString("_UI_GeneralPropertyCategory"), null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+                getString("_UI_RepresentationDescription_showOnStartup_feature"), //$NON-NLS-1$
+                getString("_UI_RepresentationDescription_showOnStartup_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.REPRESENTATION_DESCRIPTION__SHOW_ON_STARTUP, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -159,10 +166,13 @@ public class TableDescriptionItemProvider extends DocumentedElementItemProvider
      * @generated
      */
     protected void addEndUserDocumentationPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_EndUserDocumentedElement_endUserDocumentation_feature"), getString("_UI_EndUserDocumentedElement_endUserDocumentation_description"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_EndUserDocumentedElement_endUserDocumentation_feature"), //$NON-NLS-1$
+                getString("_UI_EndUserDocumentedElement_endUserDocumentation_description"), //$NON-NLS-1$
                 DescriptionPackage.Literals.END_USER_DOCUMENTED_ELEMENT__END_USER_DOCUMENTATION, true, true, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_DocumentationPropertyCategory"), null));
+                getString("_UI_DocumentationPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -172,10 +182,13 @@ public class TableDescriptionItemProvider extends DocumentedElementItemProvider
      * @generated
      */
     protected void addPreconditionExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_TableDescription_preconditionExpression_feature"), getString("_UI_TableDescription_preconditionExpression_description"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_TableDescription_preconditionExpression_feature"), //$NON-NLS-1$
+                getString("_UI_TableDescription_preconditionExpression_description"), //$NON-NLS-1$
                 org.eclipse.sirius.table.metamodel.table.description.DescriptionPackage.Literals.TABLE_DESCRIPTION__PRECONDITION_EXPRESSION, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_AdvancedPropertyCategory"), null));
+                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_AdvancedPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -185,10 +198,13 @@ public class TableDescriptionItemProvider extends DocumentedElementItemProvider
      * @generated
      */
     protected void addDomainClassPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_TableDescription_domainClass_feature"), getString("_UI_TableDescription_domainClass_description"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_TableDescription_domainClass_feature"), //$NON-NLS-1$
+                getString("_UI_TableDescription_domainClass_description"), //$NON-NLS-1$
                 org.eclipse.sirius.table.metamodel.table.description.DescriptionPackage.Literals.TABLE_DESCRIPTION__DOMAIN_CLASS, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -198,10 +214,13 @@ public class TableDescriptionItemProvider extends DocumentedElementItemProvider
      * @generated
      */
     protected void addInitialHeaderColumnWidthPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_TableDescription_initialHeaderColumnWidth_feature"), getString("_UI_TableDescription_initialHeaderColumnWidth_description"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_TableDescription_initialHeaderColumnWidth_feature"), //$NON-NLS-1$
+                getString("_UI_TableDescription_initialHeaderColumnWidth_description"), //$NON-NLS-1$
                 org.eclipse.sirius.table.metamodel.table.description.DescriptionPackage.Literals.TABLE_DESCRIPTION__INITIAL_HEADER_COLUMN_WIDTH, true, false, false,
-                ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, getString("_UI_AdvancedPropertyCategory"), null));
+                ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, getString("_UI_AdvancedPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -248,7 +267,7 @@ public class TableDescriptionItemProvider extends DocumentedElementItemProvider
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/TableDescription"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/TableDescription")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/TableMappingItemProvider.java b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/TableMappingItemProvider.java
index f637da9be8..cecb40b733 100644
--- a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/TableMappingItemProvider.java
+++ b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/TableMappingItemProvider.java
@@ -69,8 +69,10 @@ public class TableMappingItemProvider extends RepresentationElementMappingItemPr
      */
     protected void addSemanticElementsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_TableMapping_semanticElements_feature"), getString("_UI_TableMapping_semanticElements_description"), DescriptionPackage.Literals.TABLE_MAPPING__SEMANTIC_ELEMENTS, true,
-                false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_AdvancedPropertyCategory"), null));
+                getString("_UI_TableMapping_semanticElements_feature"), //$NON-NLS-1$
+                getString("_UI_TableMapping_semanticElements_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.TABLE_MAPPING__SEMANTIC_ELEMENTS, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_AdvancedPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -81,7 +83,7 @@ public class TableMappingItemProvider extends RepresentationElementMappingItemPr
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/TableMapping"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/TableMapping")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/TableNavigationDescriptionItemProvider.java b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/TableNavigationDescriptionItemProvider.java
index b60ebff79a..3c4f7a8c13 100644
--- a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/TableNavigationDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/TableNavigationDescriptionItemProvider.java
@@ -67,9 +67,10 @@ public class TableNavigationDescriptionItemProvider extends RepresentationNaviga
      */
     protected void addTableDescriptionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_TableNavigationDescription_tableDescription_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_TableNavigationDescription_tableDescription_feature", "_UI_TableNavigationDescription_type"),
-                DescriptionPackage.Literals.TABLE_NAVIGATION_DESCRIPTION__TABLE_DESCRIPTION, true, false, true, null, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_TableNavigationDescription_tableDescription_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_TableNavigationDescription_tableDescription_feature", "_UI_TableNavigationDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DescriptionPackage.Literals.TABLE_NAVIGATION_DESCRIPTION__TABLE_DESCRIPTION, true, false, true, null, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -80,7 +81,7 @@ public class TableNavigationDescriptionItemProvider extends RepresentationNaviga
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/TableNavigationDescription"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/TableNavigationDescription")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/TableToolItemProvider.java b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/TableToolItemProvider.java
index 0a5aa4e412..aedc48d351 100644
--- a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/TableToolItemProvider.java
+++ b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/TableToolItemProvider.java
@@ -111,7 +111,7 @@ public class TableToolItemProvider extends ItemProviderAdapter implements IEditi
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/TableTool"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/TableTool")); //$NON-NLS-1$
     }
 
     /**
@@ -122,7 +122,7 @@ public class TableToolItemProvider extends ItemProviderAdapter implements IEditi
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_TableTool_type");
+        return getString("_UI_TableTool_type"); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/TableVariableItemProvider.java b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/TableVariableItemProvider.java
index aba64ab134..e6d5ca4177 100644
--- a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/TableVariableItemProvider.java
+++ b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/TableVariableItemProvider.java
@@ -70,8 +70,10 @@ public class TableVariableItemProvider extends AbstractVariableItemProvider {
      */
     protected void addDocumentationPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_TableVariable_documentation_feature"), getString("_UI_PropertyDescriptor_description", "_UI_TableVariable_documentation_feature", "_UI_TableVariable_type"),
-                DescriptionPackage.Literals.TABLE_VARIABLE__DOCUMENTATION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_DocumentationPropertyCategory"), null));
+                getString("_UI_TableVariable_documentation_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_TableVariable_documentation_feature", "_UI_TableVariable_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DescriptionPackage.Literals.TABLE_VARIABLE__DOCUMENTATION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_DocumentationPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -115,7 +117,7 @@ public class TableVariableItemProvider extends AbstractVariableItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/TableVariable"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/TableVariable")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/provider/DCellItemProvider.java b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/provider/DCellItemProvider.java
index 7ee081f691..0c24443d77 100644
--- a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/provider/DCellItemProvider.java
+++ b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/provider/DCellItemProvider.java
@@ -75,7 +75,8 @@ public class DCellItemProvider extends DSemanticDecoratorItemProvider {
      */
     protected void addNamePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DRepresentationElement_name_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DRepresentationElement_name_feature", "_UI_DRepresentationElement_type"),
+                getString("_UI_DRepresentationElement_name_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DRepresentationElement_name_feature", "_UI_DRepresentationElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 ViewpointPackage.Literals.DREPRESENTATION_ELEMENT__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -86,9 +87,9 @@ public class DCellItemProvider extends DSemanticDecoratorItemProvider {
      * @generated
      */
     protected void addLabelPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DCell_label_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_DCell_label_feature", "_UI_DCell_type"), TablePackage.Literals.DCELL__LABEL, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DCell_label_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DCell_label_feature", "_UI_DCell_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                TablePackage.Literals.DCELL__LABEL, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
     /**
@@ -99,8 +100,8 @@ public class DCellItemProvider extends DSemanticDecoratorItemProvider {
      */
     protected void addSemanticElementsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DRepresentationElement_semanticElements_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_DRepresentationElement_semanticElements_feature", "_UI_DRepresentationElement_type"),
+                getString("_UI_DRepresentationElement_semanticElements_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DRepresentationElement_semanticElements_feature", "_UI_DRepresentationElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 ViewpointPackage.Literals.DREPRESENTATION_ELEMENT__SEMANTIC_ELEMENTS, true, false, true, null, null, null));
     }
 
@@ -112,7 +113,8 @@ public class DCellItemProvider extends DSemanticDecoratorItemProvider {
      */
     protected void addTableElementMappingPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DTableElement_tableElementMapping_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DTableElement_tableElementMapping_feature", "_UI_DTableElement_type"),
+                getString("_UI_DTableElement_tableElementMapping_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DTableElement_tableElementMapping_feature", "_UI_DTableElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 TablePackage.Literals.DTABLE_ELEMENT__TABLE_ELEMENT_MAPPING, false, false, false, null, null, null));
     }
 
@@ -123,8 +125,9 @@ public class DCellItemProvider extends DSemanticDecoratorItemProvider {
      * @generated
      */
     protected void addColumnPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DCell_column_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_DCell_column_feature", "_UI_DCell_type"), TablePackage.Literals.DCELL__COLUMN, true, false, true, null, null, null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DCell_column_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DCell_column_feature", "_UI_DCell_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                TablePackage.Literals.DCELL__COLUMN, true, false, true, null, null, null));
     }
 
     /**
@@ -134,8 +137,9 @@ public class DCellItemProvider extends DSemanticDecoratorItemProvider {
      * @generated
      */
     protected void addUpdaterPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DCell_updater_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_DCell_updater_feature", "_UI_DCell_type"), TablePackage.Literals.DCELL__UPDATER, false, false, false, null, null, null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DCell_updater_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DCell_updater_feature", "_UI_DCell_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                TablePackage.Literals.DCELL__UPDATER, false, false, false, null, null, null));
     }
 
     /**
@@ -146,7 +150,8 @@ public class DCellItemProvider extends DSemanticDecoratorItemProvider {
      */
     protected void addIntersectionMappingPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DCell_intersectionMapping_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DCell_intersectionMapping_feature", "_UI_DCell_type"),
+                getString("_UI_DCell_intersectionMapping_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DCell_intersectionMapping_feature", "_UI_DCell_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 TablePackage.Literals.DCELL__INTERSECTION_MAPPING, true, false, true, null, null, null));
     }
 
@@ -190,7 +195,7 @@ public class DCellItemProvider extends DSemanticDecoratorItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/DCell"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/DCell")); //$NON-NLS-1$
     }
 
     /**
@@ -202,7 +207,8 @@ public class DCellItemProvider extends DSemanticDecoratorItemProvider {
     @Override
     public String getText(Object object) {
         String label = ((DCell) object).getName();
-        return label == null || label.length() == 0 ? getString("_UI_DCell_type") : getString("_UI_DCell_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_DCell_type") : //$NON-NLS-1$
+            getString("_UI_DCell_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/provider/DCellStyleItemProvider.java b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/provider/DCellStyleItemProvider.java
index a1ca4abcc8..e2fab73a37 100644
--- a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/provider/DCellStyleItemProvider.java
+++ b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/provider/DCellStyleItemProvider.java
@@ -63,7 +63,8 @@ public class DCellStyleItemProvider extends DTableElementStyleItemProvider {
      */
     protected void addForegroundStyleOriginPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DCellStyle_foregroundStyleOrigin_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DCellStyle_foregroundStyleOrigin_feature", "_UI_DCellStyle_type"),
+                getString("_UI_DCellStyle_foregroundStyleOrigin_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DCellStyle_foregroundStyleOrigin_feature", "_UI_DCellStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 TablePackage.Literals.DCELL_STYLE__FOREGROUND_STYLE_ORIGIN, true, false, true, null, null, null));
     }
 
@@ -75,7 +76,8 @@ public class DCellStyleItemProvider extends DTableElementStyleItemProvider {
      */
     protected void addBackgroundStyleOriginPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DCellStyle_backgroundStyleOrigin_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DCellStyle_backgroundStyleOrigin_feature", "_UI_DCellStyle_type"),
+                getString("_UI_DCellStyle_backgroundStyleOrigin_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DCellStyle_backgroundStyleOrigin_feature", "_UI_DCellStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 TablePackage.Literals.DCELL_STYLE__BACKGROUND_STYLE_ORIGIN, true, false, true, null, null, null));
     }
 
@@ -87,7 +89,7 @@ public class DCellStyleItemProvider extends DTableElementStyleItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/DCellStyle"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/DCellStyle")); //$NON-NLS-1$
     }
 
     /**
@@ -99,7 +101,7 @@ public class DCellStyleItemProvider extends DTableElementStyleItemProvider {
     @Override
     public String getText(Object object) {
         DCellStyle dCellStyle = (DCellStyle) object;
-        return getString("_UI_DCellStyle_type") + " " + dCellStyle.getLabelSize();
+        return getString("_UI_DCellStyle_type") + " " + dCellStyle.getLabelSize(); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/provider/DColumnItemProvider.java b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/provider/DColumnItemProvider.java
index 77837d3d31..a904ce302a 100644
--- a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/provider/DColumnItemProvider.java
+++ b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/provider/DColumnItemProvider.java
@@ -70,9 +70,9 @@ public class DColumnItemProvider extends DTableElementItemProvider {
      * @generated
      */
     protected void addLabelPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DColumn_label_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_DColumn_label_feature", "_UI_DColumn_type"), TablePackage.Literals.DCOLUMN__LABEL, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DColumn_label_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DColumn_label_feature", "_UI_DColumn_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                TablePackage.Literals.DCOLUMN__LABEL, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
     /**
@@ -82,8 +82,9 @@ public class DColumnItemProvider extends DTableElementItemProvider {
      * @generated
      */
     protected void addCellsPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DColumn_cells_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_DColumn_cells_feature", "_UI_DColumn_type"), TablePackage.Literals.DCOLUMN__CELLS, true, false, true, null, null, null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DColumn_cells_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DColumn_cells_feature", "_UI_DColumn_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                TablePackage.Literals.DCOLUMN__CELLS, true, false, true, null, null, null));
     }
 
     /**
@@ -94,7 +95,8 @@ public class DColumnItemProvider extends DTableElementItemProvider {
      */
     protected void addOriginMappingPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DColumn_originMapping_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DColumn_originMapping_feature", "_UI_DColumn_type"),
+                getString("_UI_DColumn_originMapping_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DColumn_originMapping_feature", "_UI_DColumn_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 TablePackage.Literals.DCOLUMN__ORIGIN_MAPPING, true, false, true, null, null, null));
     }
 
@@ -106,7 +108,8 @@ public class DColumnItemProvider extends DTableElementItemProvider {
      */
     protected void addOrderedCellsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DColumn_orderedCells_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DColumn_orderedCells_feature", "_UI_DColumn_type"),
+                getString("_UI_DColumn_orderedCells_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DColumn_orderedCells_feature", "_UI_DColumn_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 TablePackage.Literals.DCOLUMN__ORDERED_CELLS, false, false, false, null, null, null));
     }
 
@@ -117,9 +120,9 @@ public class DColumnItemProvider extends DTableElementItemProvider {
      * @generated
      */
     protected void addVisiblePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DColumn_visible_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_DColumn_visible_feature", "_UI_DColumn_type"), TablePackage.Literals.DCOLUMN__VISIBLE, true, false, false,
-                ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DColumn_visible_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DColumn_visible_feature", "_UI_DColumn_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                TablePackage.Literals.DCOLUMN__VISIBLE, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
     }
 
     /**
@@ -129,9 +132,9 @@ public class DColumnItemProvider extends DTableElementItemProvider {
      * @generated
      */
     protected void addWidthPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DColumn_width_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_DColumn_width_feature", "_UI_DColumn_type"), TablePackage.Literals.DCOLUMN__WIDTH, true, false, false,
-                ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DColumn_width_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DColumn_width_feature", "_UI_DColumn_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                TablePackage.Literals.DCOLUMN__WIDTH, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
     }
 
     /**
@@ -174,7 +177,7 @@ public class DColumnItemProvider extends DTableElementItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/DColumn"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/DColumn")); //$NON-NLS-1$
     }
 
     /**
@@ -186,7 +189,8 @@ public class DColumnItemProvider extends DTableElementItemProvider {
     @Override
     public String getText(Object object) {
         String label = ((DColumn) object).getName();
-        return label == null || label.length() == 0 ? getString("_UI_DColumn_type") : getString("_UI_DColumn_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_DColumn_type") : //$NON-NLS-1$
+            getString("_UI_DColumn_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/provider/DFeatureColumnItemProvider.java b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/provider/DFeatureColumnItemProvider.java
index 1ec794a688..f8440466c7 100644
--- a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/provider/DFeatureColumnItemProvider.java
+++ b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/provider/DFeatureColumnItemProvider.java
@@ -64,7 +64,8 @@ public class DFeatureColumnItemProvider extends DColumnItemProvider {
      */
     protected void addFeatureNamePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DFeatureColumn_featureName_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DFeatureColumn_featureName_feature", "_UI_DFeatureColumn_type"),
+                getString("_UI_DFeatureColumn_featureName_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DFeatureColumn_featureName_feature", "_UI_DFeatureColumn_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 TablePackage.Literals.DFEATURE_COLUMN__FEATURE_NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -76,7 +77,7 @@ public class DFeatureColumnItemProvider extends DColumnItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/DFeatureColumn"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/DFeatureColumn")); //$NON-NLS-1$
     }
 
     /**
@@ -88,7 +89,8 @@ public class DFeatureColumnItemProvider extends DColumnItemProvider {
     @Override
     public String getText(Object object) {
         String label = ((DFeatureColumn) object).getName();
-        return label == null || label.length() == 0 ? getString("_UI_DFeatureColumn_type") : getString("_UI_DFeatureColumn_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_DFeatureColumn_type") : //$NON-NLS-1$
+            getString("_UI_DFeatureColumn_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/provider/DLineItemProvider.java b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/provider/DLineItemProvider.java
index 983b78ccdf..303990caae 100644
--- a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/provider/DLineItemProvider.java
+++ b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/provider/DLineItemProvider.java
@@ -74,7 +74,8 @@ public class DLineItemProvider extends LineContainerItemProvider {
      */
     protected void addNamePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DRepresentationElement_name_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DRepresentationElement_name_feature", "_UI_DRepresentationElement_type"),
+                getString("_UI_DRepresentationElement_name_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DRepresentationElement_name_feature", "_UI_DRepresentationElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 ViewpointPackage.Literals.DREPRESENTATION_ELEMENT__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -86,8 +87,8 @@ public class DLineItemProvider extends LineContainerItemProvider {
      */
     protected void addSemanticElementsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DRepresentationElement_semanticElements_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_DRepresentationElement_semanticElements_feature", "_UI_DRepresentationElement_type"),
+                getString("_UI_DRepresentationElement_semanticElements_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DRepresentationElement_semanticElements_feature", "_UI_DRepresentationElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 ViewpointPackage.Literals.DREPRESENTATION_ELEMENT__SEMANTIC_ELEMENTS, true, false, true, null, null, null));
     }
 
@@ -99,7 +100,8 @@ public class DLineItemProvider extends LineContainerItemProvider {
      */
     protected void addTableElementMappingPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DTableElement_tableElementMapping_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DTableElement_tableElementMapping_feature", "_UI_DTableElement_type"),
+                getString("_UI_DTableElement_tableElementMapping_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DTableElement_tableElementMapping_feature", "_UI_DTableElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 TablePackage.Literals.DTABLE_ELEMENT__TABLE_ELEMENT_MAPPING, false, false, false, null, null, null));
     }
 
@@ -110,9 +112,9 @@ public class DLineItemProvider extends LineContainerItemProvider {
      * @generated
      */
     protected void addLabelPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DLine_label_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_DLine_label_feature", "_UI_DLine_type"), TablePackage.Literals.DLINE__LABEL, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DLine_label_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DLine_label_feature", "_UI_DLine_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                TablePackage.Literals.DLINE__LABEL, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
     /**
@@ -123,7 +125,8 @@ public class DLineItemProvider extends LineContainerItemProvider {
      */
     protected void addOriginMappingPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DLine_originMapping_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DLine_originMapping_feature", "_UI_DLine_type"),
+                getString("_UI_DLine_originMapping_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DLine_originMapping_feature", "_UI_DLine_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 TablePackage.Literals.DLINE__ORIGIN_MAPPING, true, false, true, null, null, null));
     }
 
@@ -134,9 +137,9 @@ public class DLineItemProvider extends LineContainerItemProvider {
      * @generated
      */
     protected void addVisiblePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DLine_visible_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_DLine_visible_feature", "_UI_DLine_type"), TablePackage.Literals.DLINE__VISIBLE, true, false, false,
-                ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DLine_visible_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DLine_visible_feature", "_UI_DLine_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                TablePackage.Literals.DLINE__VISIBLE, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
     }
 
     /**
@@ -146,9 +149,9 @@ public class DLineItemProvider extends LineContainerItemProvider {
      * @generated
      */
     protected void addCollapsedPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DLine_collapsed_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_DLine_collapsed_feature", "_UI_DLine_type"), TablePackage.Literals.DLINE__COLLAPSED, true, false, false,
-                ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DLine_collapsed_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DLine_collapsed_feature", "_UI_DLine_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                TablePackage.Literals.DLINE__COLLAPSED, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
     }
 
     /**
@@ -159,7 +162,8 @@ public class DLineItemProvider extends LineContainerItemProvider {
      */
     protected void addOrderedCellsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DLine_orderedCells_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DLine_orderedCells_feature", "_UI_DLine_type"),
+                getString("_UI_DLine_orderedCells_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DLine_orderedCells_feature", "_UI_DLine_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 TablePackage.Literals.DLINE__ORDERED_CELLS, false, false, false, null, null, null));
     }
 
@@ -204,7 +208,7 @@ public class DLineItemProvider extends LineContainerItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/DLine"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/DLine")); //$NON-NLS-1$
     }
 
     /**
@@ -216,7 +220,8 @@ public class DLineItemProvider extends LineContainerItemProvider {
     @Override
     public String getText(Object object) {
         String label = ((DLine) object).getName();
-        return label == null || label.length() == 0 ? getString("_UI_DLine_type") : getString("_UI_DLine_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_DLine_type") : //$NON-NLS-1$
+            getString("_UI_DLine_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/provider/DTableElementItemProvider.java b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/provider/DTableElementItemProvider.java
index 81e40bcc0b..7c70b30058 100644
--- a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/provider/DTableElementItemProvider.java
+++ b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/provider/DTableElementItemProvider.java
@@ -64,7 +64,8 @@ public class DTableElementItemProvider extends DRepresentationElementItemProvide
      */
     protected void addTableElementMappingPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DTableElement_tableElementMapping_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DTableElement_tableElementMapping_feature", "_UI_DTableElement_type"),
+                getString("_UI_DTableElement_tableElementMapping_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DTableElement_tableElementMapping_feature", "_UI_DTableElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 TablePackage.Literals.DTABLE_ELEMENT__TABLE_ELEMENT_MAPPING, false, false, false, null, null, null));
     }
 
@@ -77,7 +78,8 @@ public class DTableElementItemProvider extends DRepresentationElementItemProvide
     @Override
     public String getText(Object object) {
         String label = ((DTableElement) object).getName();
-        return label == null || label.length() == 0 ? getString("_UI_DTableElement_type") : getString("_UI_DTableElement_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_DTableElement_type") : //$NON-NLS-1$
+            getString("_UI_DTableElement_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/provider/DTableElementStyleItemProvider.java b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/provider/DTableElementStyleItemProvider.java
index c5a118d87f..a61d38ccf6 100644
--- a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/provider/DTableElementStyleItemProvider.java
+++ b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/provider/DTableElementStyleItemProvider.java
@@ -77,7 +77,8 @@ IItemPropertySource {
      */
     protected void addLabelSizePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DTableElementStyle_labelSize_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DTableElementStyle_labelSize_feature", "_UI_DTableElementStyle_type"),
+                getString("_UI_DTableElementStyle_labelSize_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DTableElementStyle_labelSize_feature", "_UI_DTableElementStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 TablePackage.Literals.DTABLE_ELEMENT_STYLE__LABEL_SIZE, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
     }
 
@@ -89,7 +90,8 @@ IItemPropertySource {
      */
     protected void addLabelFormatPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DTableElementStyle_labelFormat_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DTableElementStyle_labelFormat_feature", "_UI_DTableElementStyle_type"),
+                getString("_UI_DTableElementStyle_labelFormat_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DTableElementStyle_labelFormat_feature", "_UI_DTableElementStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 TablePackage.Literals.DTABLE_ELEMENT_STYLE__LABEL_FORMAT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -101,8 +103,8 @@ IItemPropertySource {
      */
     protected void addDefaultForegroundStylePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DTableElementStyle_defaultForegroundStyle_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_DTableElementStyle_defaultForegroundStyle_feature", "_UI_DTableElementStyle_type"),
+                getString("_UI_DTableElementStyle_defaultForegroundStyle_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DTableElementStyle_defaultForegroundStyle_feature", "_UI_DTableElementStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 TablePackage.Literals.DTABLE_ELEMENT_STYLE__DEFAULT_FOREGROUND_STYLE, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
     }
 
@@ -114,8 +116,8 @@ IItemPropertySource {
      */
     protected void addDefaultBackgroundStylePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DTableElementStyle_defaultBackgroundStyle_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_DTableElementStyle_defaultBackgroundStyle_feature", "_UI_DTableElementStyle_type"),
+                getString("_UI_DTableElementStyle_defaultBackgroundStyle_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DTableElementStyle_defaultBackgroundStyle_feature", "_UI_DTableElementStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 TablePackage.Literals.DTABLE_ELEMENT_STYLE__DEFAULT_BACKGROUND_STYLE, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
     }
 
@@ -127,8 +129,8 @@ IItemPropertySource {
      */
     protected void addForegroundColorPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DTableElementStyle_foregroundColor_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_DTableElementStyle_foregroundColor_feature", "_UI_DTableElementStyle_type"),
+                getString("_UI_DTableElementStyle_foregroundColor_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DTableElementStyle_foregroundColor_feature", "_UI_DTableElementStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 TablePackage.Literals.DTABLE_ELEMENT_STYLE__FOREGROUND_COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -140,8 +142,8 @@ IItemPropertySource {
      */
     protected void addBackgroundColorPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DTableElementStyle_backgroundColor_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_DTableElementStyle_backgroundColor_feature", "_UI_DTableElementStyle_type"),
+                getString("_UI_DTableElementStyle_backgroundColor_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DTableElementStyle_backgroundColor_feature", "_UI_DTableElementStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 TablePackage.Literals.DTABLE_ELEMENT_STYLE__BACKGROUND_COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -153,7 +155,7 @@ IItemPropertySource {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/DTableElementStyle"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/DTableElementStyle")); //$NON-NLS-1$
     }
 
     /**
@@ -165,7 +167,7 @@ IItemPropertySource {
     @Override
     public String getText(Object object) {
         DTableElementStyle dTableElementStyle = (DTableElementStyle) object;
-        return getString("_UI_DTableElementStyle_type") + " " + dTableElementStyle.getLabelSize();
+        return getString("_UI_DTableElementStyle_type") + " " + dTableElementStyle.getLabelSize(); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/provider/DTableElementSynchronizerItemProvider.java b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/provider/DTableElementSynchronizerItemProvider.java
index 9b4224f68e..bd99a81b73 100644
--- a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/provider/DTableElementSynchronizerItemProvider.java
+++ b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/provider/DTableElementSynchronizerItemProvider.java
@@ -66,7 +66,7 @@ IItemPropertySource {
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_DTableElementSynchronizer_type");
+        return getString("_UI_DTableElementSynchronizer_type"); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/provider/DTableItemProvider.java b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/provider/DTableItemProvider.java
index 0116c7faa6..e88f106d6f 100644
--- a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/provider/DTableItemProvider.java
+++ b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/provider/DTableItemProvider.java
@@ -72,7 +72,8 @@ public class DTableItemProvider extends DRepresentationItemProvider {
      */
     protected void addTargetPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DSemanticDecorator_target_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DSemanticDecorator_target_feature", "_UI_DSemanticDecorator_type"),
+                getString("_UI_DSemanticDecorator_target_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DSemanticDecorator_target_feature", "_UI_DSemanticDecorator_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 ViewpointPackage.Literals.DSEMANTIC_DECORATOR__TARGET, true, false, true, null, null, null));
     }
 
@@ -84,7 +85,8 @@ public class DTableItemProvider extends DRepresentationItemProvider {
      */
     protected void addDescriptionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DTable_description_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DTable_description_feature", "_UI_DTable_type"),
+                getString("_UI_DTable_description_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DTable_description_feature", "_UI_DTable_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 TablePackage.Literals.DTABLE__DESCRIPTION, true, false, true, null, null, null));
     }
 
@@ -96,7 +98,8 @@ public class DTableItemProvider extends DRepresentationItemProvider {
      */
     protected void addHeaderColumnWidthPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DTable_headerColumnWidth_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DTable_headerColumnWidth_feature", "_UI_DTable_type"),
+                getString("_UI_DTable_headerColumnWidth_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DTable_headerColumnWidth_feature", "_UI_DTable_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 TablePackage.Literals.DTABLE__HEADER_COLUMN_WIDTH, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
     }
 
diff --git a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/provider/DTargetColumnItemProvider.java b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/provider/DTargetColumnItemProvider.java
index 717d09fa08..c41e09e3c1 100644
--- a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/provider/DTargetColumnItemProvider.java
+++ b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/provider/DTargetColumnItemProvider.java
@@ -77,7 +77,8 @@ public class DTargetColumnItemProvider extends DSemanticDecoratorItemProvider {
      */
     protected void addNamePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DRepresentationElement_name_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DRepresentationElement_name_feature", "_UI_DRepresentationElement_type"),
+                getString("_UI_DRepresentationElement_name_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DRepresentationElement_name_feature", "_UI_DRepresentationElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 ViewpointPackage.Literals.DREPRESENTATION_ELEMENT__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -89,8 +90,8 @@ public class DTargetColumnItemProvider extends DSemanticDecoratorItemProvider {
      */
     protected void addSemanticElementsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DRepresentationElement_semanticElements_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_DRepresentationElement_semanticElements_feature", "_UI_DRepresentationElement_type"),
+                getString("_UI_DRepresentationElement_semanticElements_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DRepresentationElement_semanticElements_feature", "_UI_DRepresentationElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 ViewpointPackage.Literals.DREPRESENTATION_ELEMENT__SEMANTIC_ELEMENTS, true, false, true, null, null, null));
     }
 
@@ -102,7 +103,8 @@ public class DTargetColumnItemProvider extends DSemanticDecoratorItemProvider {
      */
     protected void addTableElementMappingPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DTableElement_tableElementMapping_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DTableElement_tableElementMapping_feature", "_UI_DTableElement_type"),
+                getString("_UI_DTableElement_tableElementMapping_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DTableElement_tableElementMapping_feature", "_UI_DTableElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 TablePackage.Literals.DTABLE_ELEMENT__TABLE_ELEMENT_MAPPING, false, false, false, null, null, null));
     }
 
@@ -113,9 +115,9 @@ public class DTargetColumnItemProvider extends DSemanticDecoratorItemProvider {
      * @generated
      */
     protected void addLabelPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DColumn_label_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_DColumn_label_feature", "_UI_DColumn_type"), TablePackage.Literals.DCOLUMN__LABEL, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DColumn_label_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DColumn_label_feature", "_UI_DColumn_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                TablePackage.Literals.DCOLUMN__LABEL, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
     /**
@@ -125,8 +127,9 @@ public class DTargetColumnItemProvider extends DSemanticDecoratorItemProvider {
      * @generated
      */
     protected void addCellsPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DColumn_cells_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_DColumn_cells_feature", "_UI_DColumn_type"), TablePackage.Literals.DCOLUMN__CELLS, true, false, true, null, null, null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DColumn_cells_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DColumn_cells_feature", "_UI_DColumn_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                TablePackage.Literals.DCOLUMN__CELLS, true, false, true, null, null, null));
     }
 
     /**
@@ -137,7 +140,8 @@ public class DTargetColumnItemProvider extends DSemanticDecoratorItemProvider {
      */
     protected void addOriginMappingPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DColumn_originMapping_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DColumn_originMapping_feature", "_UI_DColumn_type"),
+                getString("_UI_DColumn_originMapping_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DColumn_originMapping_feature", "_UI_DColumn_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 TablePackage.Literals.DCOLUMN__ORIGIN_MAPPING, true, false, true, null, null, null));
     }
 
@@ -149,7 +153,8 @@ public class DTargetColumnItemProvider extends DSemanticDecoratorItemProvider {
      */
     protected void addOrderedCellsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DColumn_orderedCells_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DColumn_orderedCells_feature", "_UI_DColumn_type"),
+                getString("_UI_DColumn_orderedCells_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DColumn_orderedCells_feature", "_UI_DColumn_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 TablePackage.Literals.DCOLUMN__ORDERED_CELLS, false, false, false, null, null, null));
     }
 
@@ -160,9 +165,9 @@ public class DTargetColumnItemProvider extends DSemanticDecoratorItemProvider {
      * @generated
      */
     protected void addVisiblePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DColumn_visible_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_DColumn_visible_feature", "_UI_DColumn_type"), TablePackage.Literals.DCOLUMN__VISIBLE, true, false, false,
-                ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DColumn_visible_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DColumn_visible_feature", "_UI_DColumn_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                TablePackage.Literals.DCOLUMN__VISIBLE, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
     }
 
     /**
@@ -172,9 +177,9 @@ public class DTargetColumnItemProvider extends DSemanticDecoratorItemProvider {
      * @generated
      */
     protected void addWidthPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DColumn_width_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_DColumn_width_feature", "_UI_DColumn_type"), TablePackage.Literals.DCOLUMN__WIDTH, true, false, false,
-                ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DColumn_width_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DColumn_width_feature", "_UI_DColumn_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                TablePackage.Literals.DCOLUMN__WIDTH, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
     }
 
     /**
@@ -218,7 +223,7 @@ public class DTargetColumnItemProvider extends DSemanticDecoratorItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/DTargetColumn"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/DTargetColumn")); //$NON-NLS-1$
     }
 
     /**
@@ -230,7 +235,8 @@ public class DTargetColumnItemProvider extends DSemanticDecoratorItemProvider {
     @Override
     public String getText(Object object) {
         String label = ((DTargetColumn) object).getName();
-        return label == null || label.length() == 0 ? getString("_UI_DTargetColumn_type") : getString("_UI_DTargetColumn_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_DTargetColumn_type") : //$NON-NLS-1$
+            getString("_UI_DTargetColumn_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/provider/LineContainerItemProvider.java b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/provider/LineContainerItemProvider.java
index c59762781a..cec79f860a 100644
--- a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/provider/LineContainerItemProvider.java
+++ b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/provider/LineContainerItemProvider.java
@@ -98,7 +98,7 @@ public class LineContainerItemProvider extends DSemanticDecoratorItemProvider {
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_LineContainer_type");
+        return getString("_UI_LineContainer_type"); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/BackgroundConditionalStyleImpl.java b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/BackgroundConditionalStyleImpl.java
index 03b1f1ab1c..2bf0bbd362 100644
--- a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/BackgroundConditionalStyleImpl.java
+++ b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/BackgroundConditionalStyleImpl.java
@@ -261,7 +261,7 @@ public class BackgroundConditionalStyleImpl extends MinimalEObjectImpl.Container
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (predicateExpression: ");
+        result.append(" (predicateExpression: "); //$NON-NLS-1$
         result.append(predicateExpression);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/CellUpdaterImpl.java b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/CellUpdaterImpl.java
index 15b73ee92b..726e1f7522 100644
--- a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/CellUpdaterImpl.java
+++ b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/CellUpdaterImpl.java
@@ -283,7 +283,7 @@ public class CellUpdaterImpl extends MinimalEObjectImpl.Container implements Cel
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (canEdit: ");
+        result.append(" (canEdit: "); //$NON-NLS-1$
         result.append(canEdit);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/ColumnMappingImpl.java b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/ColumnMappingImpl.java
index a929f48d89..cf0e7f48e6 100644
--- a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/ColumnMappingImpl.java
+++ b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/ColumnMappingImpl.java
@@ -225,9 +225,9 @@ public class ColumnMappingImpl extends TableMappingImpl implements ColumnMapping
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (headerLabelExpression: ");
+        result.append(" (headerLabelExpression: "); //$NON-NLS-1$
         result.append(headerLabelExpression);
-        result.append(", initialWidth: ");
+        result.append(", initialWidth: "); //$NON-NLS-1$
         result.append(initialWidth);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/CreateCellToolImpl.java b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/CreateCellToolImpl.java
index cea4a8e4a6..8adf2a6191 100644
--- a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/CreateCellToolImpl.java
+++ b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/CreateCellToolImpl.java
@@ -527,7 +527,7 @@ public class CreateCellToolImpl extends TableToolImpl implements CreateCellTool
     public void setMapping(IntersectionMapping newMapping) {
         if (newMapping != eInternalContainer() || (eContainerFeatureID() != DescriptionPackage.CREATE_CELL_TOOL__MAPPING && newMapping != null)) {
             if (EcoreUtil.isAncestor(this, newMapping)) {
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+                throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); //$NON-NLS-1$
             }
             NotificationChain msgs = null;
             if (eInternalContainer() != null) {
@@ -856,19 +856,19 @@ public class CreateCellToolImpl extends TableToolImpl implements CreateCellTool
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (documentation: ");
+        result.append(" (documentation: "); //$NON-NLS-1$
         result.append(documentation);
-        result.append(", name: ");
+        result.append(", name: "); //$NON-NLS-1$
         result.append(name);
-        result.append(", label: ");
+        result.append(", label: "); //$NON-NLS-1$
         result.append(label);
-        result.append(", precondition: ");
+        result.append(", precondition: "); //$NON-NLS-1$
         result.append(precondition);
-        result.append(", forceRefresh: ");
+        result.append(", forceRefresh: "); //$NON-NLS-1$
         result.append(forceRefresh);
-        result.append(", elementsToSelect: ");
+        result.append(", elementsToSelect: "); //$NON-NLS-1$
         result.append(elementsToSelect);
-        result.append(", inverseSelectionOrder: ");
+        result.append(", inverseSelectionOrder: "); //$NON-NLS-1$
         result.append(inverseSelectionOrder);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/CreateColumnToolImpl.java b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/CreateColumnToolImpl.java
index 54edb8b640..6653b1f806 100644
--- a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/CreateColumnToolImpl.java
+++ b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/CreateColumnToolImpl.java
@@ -86,7 +86,7 @@ public class CreateColumnToolImpl extends CreateToolImpl implements CreateColumn
     public void setMapping(ElementColumnMapping newMapping) {
         if (newMapping != eInternalContainer() || (eContainerFeatureID() != DescriptionPackage.CREATE_COLUMN_TOOL__MAPPING && newMapping != null)) {
             if (EcoreUtil.isAncestor(this, newMapping)) {
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+                throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); //$NON-NLS-1$
             }
             NotificationChain msgs = null;
             if (eInternalContainer() != null) {
diff --git a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/DeleteColumnToolImpl.java b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/DeleteColumnToolImpl.java
index 4142eb9608..d4088e3e7b 100644
--- a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/DeleteColumnToolImpl.java
+++ b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/DeleteColumnToolImpl.java
@@ -86,7 +86,7 @@ public class DeleteColumnToolImpl extends DeleteToolImpl implements DeleteColumn
     public void setMapping(ElementColumnMapping newMapping) {
         if (newMapping != eInternalContainer() || (eContainerFeatureID() != DescriptionPackage.DELETE_COLUMN_TOOL__MAPPING && newMapping != null)) {
             if (EcoreUtil.isAncestor(this, newMapping)) {
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+                throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); //$NON-NLS-1$
             }
             NotificationChain msgs = null;
             if (eInternalContainer() != null) {
diff --git a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/DeleteLineToolImpl.java b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/DeleteLineToolImpl.java
index 2483e19ba1..120866a7f3 100644
--- a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/DeleteLineToolImpl.java
+++ b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/DeleteLineToolImpl.java
@@ -86,7 +86,7 @@ public class DeleteLineToolImpl extends DeleteToolImpl implements DeleteLineTool
     public void setMapping(LineMapping newMapping) {
         if (newMapping != eInternalContainer() || (eContainerFeatureID() != DescriptionPackage.DELETE_LINE_TOOL__MAPPING && newMapping != null)) {
             if (EcoreUtil.isAncestor(this, newMapping)) {
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+                throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); //$NON-NLS-1$
             }
             NotificationChain msgs = null;
             if (eInternalContainer() != null) {
diff --git a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/DescriptionFactoryImpl.java b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/DescriptionFactoryImpl.java
index 475b551e1c..297eaaab1a 100644
--- a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/DescriptionFactoryImpl.java
+++ b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/DescriptionFactoryImpl.java
@@ -148,7 +148,7 @@ public class DescriptionFactoryImpl extends EFactoryImpl implements DescriptionF
         case DescriptionPackage.TABLE_NAVIGATION_DESCRIPTION:
             return createTableNavigationDescription();
         default:
-            throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+            throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
         }
     }
 
diff --git a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/DescriptionPackageImpl.java b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/DescriptionPackageImpl.java
index 8f4a90f3e2..05ddd45b29 100644
--- a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/DescriptionPackageImpl.java
+++ b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/DescriptionPackageImpl.java
@@ -1628,306 +1628,449 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
         tableNavigationDescriptionEClass.getESuperTypes().add(theToolPackage.getRepresentationNavigationDescription());
 
         // Initialize classes and features; add operations and parameters
-        initEClass(tableDescriptionEClass, TableDescription.class, "TableDescription", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getTableDescription_PreconditionExpression(), theDescriptionPackage_1.getInterpretedExpression(), "preconditionExpression", "", 0, 1, TableDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEAttribute(getTableDescription_DomainClass(), theDescriptionPackage_1.getTypeName(), "domainClass", null, 1, 1, TableDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getTableDescription_OwnedRepresentationCreationDescriptions(), theToolPackage.getRepresentationCreationDescription(), null, "ownedRepresentationCreationDescriptions", null, 0,
-                -1, TableDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES,
-                !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEClass(tableDescriptionEClass, TableDescription.class, "TableDescription", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getTableDescription_PreconditionExpression(),
+                theDescriptionPackage_1.getInterpretedExpression(),
+                "preconditionExpression", "", 0, 1, TableDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(
+                getTableDescription_DomainClass(),
+                theDescriptionPackage_1.getTypeName(),
+                "domainClass", null, 1, 1, TableDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getTableDescription_OwnedRepresentationCreationDescriptions(),
+                theToolPackage.getRepresentationCreationDescription(),
+                null,
+                "ownedRepresentationCreationDescriptions", null, 0, -1, TableDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
         getTableDescription_OwnedRepresentationCreationDescriptions().getEKeys().add(theDescriptionPackage_1.getIdentifiedElement_Name());
-        initEReference(getTableDescription_ReusedRepresentationCreationDescriptions(), theToolPackage.getRepresentationCreationDescription(), null, "reusedRepresentationCreationDescriptions", null,
-                0, -1, TableDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES,
-                !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEReference(
+                getTableDescription_ReusedRepresentationCreationDescriptions(),
+                theToolPackage.getRepresentationCreationDescription(),
+                null,
+                "reusedRepresentationCreationDescriptions", null, 0, -1, TableDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
         getTableDescription_ReusedRepresentationCreationDescriptions().getEKeys().add(theDescriptionPackage_1.getIdentifiedElement_Name());
-        initEReference(getTableDescription_AllRepresentationCreationDescriptions(), theToolPackage.getRepresentationCreationDescription(), null, "allRepresentationCreationDescriptions", null, 0, -1,
-                TableDescription.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE, !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES,
-                !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEReference(
+                getTableDescription_AllRepresentationCreationDescriptions(),
+                theToolPackage.getRepresentationCreationDescription(),
+                null,
+                "allRepresentationCreationDescriptions", null, 0, -1, TableDescription.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE, !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
         getTableDescription_AllRepresentationCreationDescriptions().getEKeys().add(theDescriptionPackage_1.getIdentifiedElement_Name());
-        initEReference(getTableDescription_OwnedRepresentationNavigationDescriptions(), theToolPackage.getRepresentationNavigationDescription(), null, "ownedRepresentationNavigationDescriptions",
-                null, 0, -1, TableDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES,
-                !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEReference(
+                getTableDescription_OwnedRepresentationNavigationDescriptions(),
+                theToolPackage.getRepresentationNavigationDescription(),
+                null,
+                "ownedRepresentationNavigationDescriptions", null, 0, -1, TableDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
         getTableDescription_OwnedRepresentationNavigationDescriptions().getEKeys().add(theDescriptionPackage_1.getIdentifiedElement_Name());
-        initEReference(getTableDescription_ReusedRepresentationNavigationDescriptions(), theToolPackage.getRepresentationNavigationDescription(), null, "reusedRepresentationNavigationDescriptions",
-                null, 0, -1, TableDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES,
-                !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEReference(
+                getTableDescription_ReusedRepresentationNavigationDescriptions(),
+                theToolPackage.getRepresentationNavigationDescription(),
+                null,
+                "reusedRepresentationNavigationDescriptions", null, 0, -1, TableDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
         getTableDescription_ReusedRepresentationNavigationDescriptions().getEKeys().add(theDescriptionPackage_1.getIdentifiedElement_Name());
-        initEReference(getTableDescription_AllRepresentationNavigationDescriptions(), theToolPackage.getRepresentationNavigationDescription(), null, "allRepresentationNavigationDescriptions", null,
-                0, -1, TableDescription.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE, !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES,
-                !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEReference(
+                getTableDescription_AllRepresentationNavigationDescriptions(),
+                theToolPackage.getRepresentationNavigationDescription(),
+                null,
+                "allRepresentationNavigationDescriptions", null, 0, -1, TableDescription.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE, !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
         getTableDescription_AllRepresentationNavigationDescriptions().getEKeys().add(theDescriptionPackage_1.getIdentifiedElement_Name());
-        initEReference(getTableDescription_OwnedLineMappings(), this.getLineMapping(), null, "ownedLineMappings", null, 1, -1, TableDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEReference(
+                getTableDescription_OwnedLineMappings(),
+                this.getLineMapping(),
+                null,
+                "ownedLineMappings", null, 1, -1, TableDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
         getTableDescription_OwnedLineMappings().getEKeys().add(theDescriptionPackage_1.getIdentifiedElement_Name());
-        initEReference(getTableDescription_ReusedLineMappings(), this.getLineMapping(), null, "reusedLineMappings", null, 0, -1, TableDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEReference(
+                getTableDescription_ReusedLineMappings(),
+                this.getLineMapping(),
+                null,
+                "reusedLineMappings", null, 0, -1, TableDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
         getTableDescription_ReusedLineMappings().getEKeys().add(theDescriptionPackage_1.getIdentifiedElement_Name());
-        initEReference(getTableDescription_AllLineMappings(), this.getLineMapping(), null, "allLineMappings", null, 1, -1, TableDescription.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE,
-                !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
+        initEReference(
+                getTableDescription_AllLineMappings(),
+                this.getLineMapping(),
+                null,
+                "allLineMappings", null, 1, -1, TableDescription.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE, !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
         getTableDescription_AllLineMappings().getEKeys().add(theDescriptionPackage_1.getIdentifiedElement_Name());
-        initEReference(getTableDescription_OwnedCreateLine(), this.getCreateLineTool(), null, "ownedCreateLine", null, 0, -1, TableDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getTableDescription_ReusedCreateLine(), this.getCreateLineTool(), null, "reusedCreateLine", null, 0, -1, TableDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getTableDescription_AllCreateLine(), this.getCreateLineTool(), null, "allCreateLine", null, 0, -1, TableDescription.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE,
-                !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEAttribute(getTableDescription_InitialHeaderColumnWidth(), theEcorePackage.getEInt(), "initialHeaderColumnWidth", null, 0, 1, TableDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getTableDescription_ImportedElements(), theEcorePackage.getEObject(), null, "importedElements", null, 0, -1, TableDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(editionTableDescriptionEClass, EditionTableDescription.class, "EditionTableDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getEditionTableDescription_OwnedColumnMappings(), this.getFeatureColumnMapping(), null, "ownedColumnMappings", null, 1, -1, EditionTableDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEReference(
+                getTableDescription_OwnedCreateLine(),
+                this.getCreateLineTool(),
+                null,
+                "ownedCreateLine", null, 0, -1, TableDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getTableDescription_ReusedCreateLine(),
+                this.getCreateLineTool(),
+                null,
+                "reusedCreateLine", null, 0, -1, TableDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getTableDescription_AllCreateLine(),
+                this.getCreateLineTool(),
+                null,
+                "allCreateLine", null, 0, -1, TableDescription.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE, !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getTableDescription_InitialHeaderColumnWidth(),
+                theEcorePackage.getEInt(),
+                "initialHeaderColumnWidth", null, 0, 1, TableDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getTableDescription_ImportedElements(),
+                theEcorePackage.getEObject(),
+                null,
+                "importedElements", null, 0, -1, TableDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(editionTableDescriptionEClass, EditionTableDescription.class,
+                "EditionTableDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getEditionTableDescription_OwnedColumnMappings(),
+                this.getFeatureColumnMapping(),
+                null,
+                "ownedColumnMappings", null, 1, -1, EditionTableDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
         getEditionTableDescription_OwnedColumnMappings().getEKeys().add(theDescriptionPackage_1.getIdentifiedElement_Name());
-        initEReference(getEditionTableDescription_ReusedColumnMappings(), this.getFeatureColumnMapping(), null, "reusedColumnMappings", null, 0, -1, EditionTableDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEReference(
+                getEditionTableDescription_ReusedColumnMappings(),
+                this.getFeatureColumnMapping(),
+                null,
+                "reusedColumnMappings", null, 0, -1, EditionTableDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
         getEditionTableDescription_ReusedColumnMappings().getEKeys().add(theDescriptionPackage_1.getIdentifiedElement_Name());
-        initEReference(getEditionTableDescription_AllColumnMappings(), this.getFeatureColumnMapping(), null, "allColumnMappings", null, 1, -1, EditionTableDescription.class,
-                EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE, !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEReference(
+                getEditionTableDescription_AllColumnMappings(),
+                this.getFeatureColumnMapping(),
+                null,
+                "allColumnMappings", null, 1, -1, EditionTableDescription.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE, !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
         getEditionTableDescription_AllColumnMappings().getEKeys().add(theDescriptionPackage_1.getIdentifiedElement_Name());
 
-        initEClass(crossTableDescriptionEClass, CrossTableDescription.class, "CrossTableDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getCrossTableDescription_OwnedColumnMappings(), this.getElementColumnMapping(), null, "ownedColumnMappings", null, 1, -1, CrossTableDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getCrossTableDescription_Intersection(), this.getIntersectionMapping(), null, "intersection", null, 0, -1, CrossTableDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getCrossTableDescription_CreateColumn(), this.getCreateCrossColumnTool(), null, "createColumn", null, 0, -1, CrossTableDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(tableMappingEClass, TableMapping.class, "TableMapping", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getTableMapping_SemanticElements(), theDescriptionPackage_1.getInterpretedExpression(), "semanticElements", null, 0, 1, TableMapping.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(lineMappingEClass, LineMapping.class, "LineMapping", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getLineMapping_OwnedSubLines(), this.getLineMapping(), null, "ownedSubLines", null, 0, -1, LineMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
+        initEClass(crossTableDescriptionEClass, CrossTableDescription.class, "CrossTableDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getCrossTableDescription_OwnedColumnMappings(),
+                this.getElementColumnMapping(),
+                null,
+                "ownedColumnMappings", null, 1, -1, CrossTableDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getCrossTableDescription_Intersection(),
+                this.getIntersectionMapping(),
+                null,
+                "intersection", null, 0, -1, CrossTableDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getCrossTableDescription_CreateColumn(),
+                this.getCreateCrossColumnTool(),
+                null,
+                "createColumn", null, 0, -1, CrossTableDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(tableMappingEClass, TableMapping.class, "TableMapping", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getTableMapping_SemanticElements(),
+                theDescriptionPackage_1.getInterpretedExpression(),
+                "semanticElements", null, 0, 1, TableMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(lineMappingEClass, LineMapping.class, "LineMapping", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getLineMapping_OwnedSubLines(),
+                this.getLineMapping(),
+                null,
+                "ownedSubLines", null, 0, -1, LineMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
         getLineMapping_OwnedSubLines().getEKeys().add(theDescriptionPackage_1.getIdentifiedElement_Name());
-        initEReference(getLineMapping_ReusedSubLines(), this.getLineMapping(), this.getLineMapping_ReusedInMappings(), "reusedSubLines", null, 0, -1, LineMapping.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getLineMapping_AllSubLines(), this.getLineMapping(), null, "allSubLines", null, 0, -1, LineMapping.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE,
-                !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getLineMapping_ReusedInMappings(), this.getLineMapping(), this.getLineMapping_ReusedSubLines(), "reusedInMappings", null, 0, -1, LineMapping.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getLineMapping_DomainClass(), theDescriptionPackage_1.getTypeName(), "domainClass", null, 1, 1, LineMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getLineMapping_Create(), this.getCreateLineTool(), null, "create", null, 0, -1, LineMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getLineMapping_Delete(), this.getDeleteLineTool(), this.getDeleteLineTool_Mapping(), "delete", null, 0, 1, LineMapping.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getLineMapping_SemanticCandidatesExpression(), theDescriptionPackage_1.getInterpretedExpression(), "semanticCandidatesExpression", null, 0, 1, LineMapping.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEAttribute(getLineMapping_HeaderLabelExpression(), theDescriptionPackage_1.getInterpretedExpression(), "headerLabelExpression", null, 0, 1, LineMapping.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(columnMappingEClass, ColumnMapping.class, "ColumnMapping", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getColumnMapping_HeaderLabelExpression(), theDescriptionPackage_1.getInterpretedExpression(), "headerLabelExpression", null, 0, 1, ColumnMapping.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEAttribute(getColumnMapping_InitialWidth(), theEcorePackage.getEInt(), "initialWidth", null, 0, 1, ColumnMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(elementColumnMappingEClass, ElementColumnMapping.class, "ElementColumnMapping", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getElementColumnMapping_DomainClass(), theDescriptionPackage_1.getTypeName(), "domainClass", null, 1, 1, ElementColumnMapping.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getElementColumnMapping_SemanticCandidatesExpression(), theDescriptionPackage_1.getInterpretedExpression(), "semanticCandidatesExpression", null, 0, 1,
-                ElementColumnMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getElementColumnMapping_Create(), this.getCreateColumnTool(), this.getCreateColumnTool_Mapping(), "create", null, 0, -1, ElementColumnMapping.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getElementColumnMapping_Delete(), this.getDeleteColumnTool(), this.getDeleteColumnTool_Mapping(), "delete", null, 0, 1, ElementColumnMapping.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(featureColumnMappingEClass, FeatureColumnMapping.class, "FeatureColumnMapping", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getFeatureColumnMapping_FeatureName(), theEcorePackage.getEString(), "featureName", null, 1, 1, FeatureColumnMapping.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getFeatureColumnMapping_LabelExpression(), theDescriptionPackage_1.getInterpretedExpression(), "labelExpression", null, 0, 1, FeatureColumnMapping.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEAttribute(getFeatureColumnMapping_FeatureParentExpression(), theDescriptionPackage_1.getInterpretedExpression(), "featureParentExpression", null, 0, 1, FeatureColumnMapping.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-
-        initEClass(cellUpdaterEClass, CellUpdater.class, "CellUpdater", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getCellUpdater_DirectEdit(), this.getLabelEditTool(), null, "directEdit", null, 0, 1, CellUpdater.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEAttribute(getCellUpdater_CanEdit(), theDescriptionPackage_1.getInterpretedExpression(), "canEdit", null, 0, 1, CellUpdater.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        addEOperation(cellUpdaterEClass, theDescriptionPackage_1.getInterpretedExpression(), "getLabelComputationExpression", 1, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-
-        addEOperation(cellUpdaterEClass, this.getCreateCellTool(), "getCreateCell", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-
-        initEClass(styleUpdaterEClass, StyleUpdater.class, "StyleUpdater", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getStyleUpdater_DefaultForeground(), this.getForegroundStyleDescription(), null, "defaultForeground", null, 0, 1, StyleUpdater.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getStyleUpdater_ForegroundConditionalStyle(), this.getForegroundConditionalStyle(), null, "foregroundConditionalStyle", null, 0, -1, StyleUpdater.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getStyleUpdater_DefaultBackground(), this.getBackgroundStyleDescription(), null, "defaultBackground", null, 0, 1, StyleUpdater.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getStyleUpdater_BackgroundConditionalStyle(), this.getBackgroundConditionalStyle(), null, "backgroundConditionalStyle", null, 0, -1, StyleUpdater.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(intersectionMappingEClass, IntersectionMapping.class, "IntersectionMapping", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getIntersectionMapping_LineMapping(), this.getLineMapping(), null, "lineMapping", null, 1, -1, IntersectionMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
+        initEReference(
+                getLineMapping_ReusedSubLines(),
+                this.getLineMapping(),
+                this.getLineMapping_ReusedInMappings(),
+                "reusedSubLines", null, 0, -1, LineMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getLineMapping_AllSubLines(),
+                this.getLineMapping(),
+                null,
+                "allSubLines", null, 0, -1, LineMapping.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE, !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getLineMapping_ReusedInMappings(),
+                this.getLineMapping(),
+                this.getLineMapping_ReusedSubLines(),
+                "reusedInMappings", null, 0, -1, LineMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getLineMapping_DomainClass(),
+                theDescriptionPackage_1.getTypeName(),
+                "domainClass", null, 1, 1, LineMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getLineMapping_Create(),
+                this.getCreateLineTool(),
+                null,
+                "create", null, 0, -1, LineMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getLineMapping_Delete(),
+                this.getDeleteLineTool(),
+                this.getDeleteLineTool_Mapping(),
+                "delete", null, 0, 1, LineMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getLineMapping_SemanticCandidatesExpression(),
+                theDescriptionPackage_1.getInterpretedExpression(),
+                "semanticCandidatesExpression", null, 0, 1, LineMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getLineMapping_HeaderLabelExpression(),
+                theDescriptionPackage_1.getInterpretedExpression(),
+                "headerLabelExpression", null, 0, 1, LineMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(columnMappingEClass, ColumnMapping.class, "ColumnMapping", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getColumnMapping_HeaderLabelExpression(),
+                theDescriptionPackage_1.getInterpretedExpression(),
+                "headerLabelExpression", null, 0, 1, ColumnMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getColumnMapping_InitialWidth(),
+                theEcorePackage.getEInt(),
+                "initialWidth", null, 0, 1, ColumnMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(elementColumnMappingEClass, ElementColumnMapping.class, "ElementColumnMapping", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getElementColumnMapping_DomainClass(),
+                theDescriptionPackage_1.getTypeName(),
+                "domainClass", null, 1, 1, ElementColumnMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getElementColumnMapping_SemanticCandidatesExpression(),
+                theDescriptionPackage_1.getInterpretedExpression(),
+                "semanticCandidatesExpression", null, 0, 1, ElementColumnMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getElementColumnMapping_Create(),
+                this.getCreateColumnTool(),
+                this.getCreateColumnTool_Mapping(),
+                "create", null, 0, -1, ElementColumnMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getElementColumnMapping_Delete(),
+                this.getDeleteColumnTool(),
+                this.getDeleteColumnTool_Mapping(),
+                "delete", null, 0, 1, ElementColumnMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(featureColumnMappingEClass, FeatureColumnMapping.class, "FeatureColumnMapping", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getFeatureColumnMapping_FeatureName(),
+                theEcorePackage.getEString(),
+                "featureName", null, 1, 1, FeatureColumnMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getFeatureColumnMapping_LabelExpression(),
+                theDescriptionPackage_1.getInterpretedExpression(),
+                "labelExpression", null, 0, 1, FeatureColumnMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getFeatureColumnMapping_FeatureParentExpression(),
+                theDescriptionPackage_1.getInterpretedExpression(),
+                "featureParentExpression", null, 0, 1, FeatureColumnMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(cellUpdaterEClass, CellUpdater.class, "CellUpdater", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getCellUpdater_DirectEdit(),
+                this.getLabelEditTool(),
+                null,
+                "directEdit", null, 0, 1, CellUpdater.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getCellUpdater_CanEdit(),
+                theDescriptionPackage_1.getInterpretedExpression(),
+                "canEdit", null, 0, 1, CellUpdater.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        addEOperation(cellUpdaterEClass, theDescriptionPackage_1.getInterpretedExpression(), "getLabelComputationExpression", 1, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        addEOperation(cellUpdaterEClass, this.getCreateCellTool(), "getCreateCell", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(styleUpdaterEClass, StyleUpdater.class, "StyleUpdater", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getStyleUpdater_DefaultForeground(),
+                this.getForegroundStyleDescription(),
+                null,
+                "defaultForeground", null, 0, 1, StyleUpdater.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getStyleUpdater_ForegroundConditionalStyle(),
+                this.getForegroundConditionalStyle(),
+                null,
+                "foregroundConditionalStyle", null, 0, -1, StyleUpdater.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getStyleUpdater_DefaultBackground(),
+                this.getBackgroundStyleDescription(),
+                null,
+                "defaultBackground", null, 0, 1, StyleUpdater.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getStyleUpdater_BackgroundConditionalStyle(),
+                this.getBackgroundConditionalStyle(),
+                null,
+                "backgroundConditionalStyle", null, 0, -1, StyleUpdater.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(intersectionMappingEClass, IntersectionMapping.class, "IntersectionMapping", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getIntersectionMapping_LineMapping(),
+                this.getLineMapping(),
+                null,
+                "lineMapping", null, 1, -1, IntersectionMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
         getIntersectionMapping_LineMapping().getEKeys().add(theDescriptionPackage_1.getIdentifiedElement_Name());
-        initEReference(getIntersectionMapping_ColumnMapping(), this.getColumnMapping(), null, "columnMapping", null, 1, 1, IntersectionMapping.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getIntersectionMapping_LabelExpression(), theDescriptionPackage_1.getInterpretedExpression(), "labelExpression", null, 0, 1, IntersectionMapping.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEAttribute(getIntersectionMapping_UseDomainClass(), theEcorePackage.getEBoolean(), "useDomainClass", "false", 1, 1, IntersectionMapping.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getIntersectionMapping_ColumnFinderExpression(), theDescriptionPackage_1.getInterpretedExpression(), "columnFinderExpression", null, 1, 1, IntersectionMapping.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEAttribute(getIntersectionMapping_LineFinderExpression(), theDescriptionPackage_1.getInterpretedExpression(), "lineFinderExpression", null, 0, 1, IntersectionMapping.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEAttribute(getIntersectionMapping_SemanticCandidatesExpression(), theDescriptionPackage_1.getInterpretedExpression(), "semanticCandidatesExpression", null, 0, 1,
-                IntersectionMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getIntersectionMapping_DomainClass(), theDescriptionPackage_1.getTypeName(), "domainClass", null, 0, 1, IntersectionMapping.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getIntersectionMapping_PreconditionExpression(), theDescriptionPackage_1.getInterpretedExpression(), "preconditionExpression", null, 0, 1, IntersectionMapping.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getIntersectionMapping_Create(), this.getCreateCellTool(), this.getCreateCellTool_Mapping(), "create", null, 0, 1, IntersectionMapping.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(tableToolEClass, TableTool.class, "TableTool", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getTableTool_Variables(), this.getTableVariable(), null, "variables", null, 0, -1, TableTool.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getTableTool_FirstModelOperation(), theToolPackage.getModelOperation(), null, "firstModelOperation", null, 1, 1, TableTool.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(labelEditToolEClass, LabelEditTool.class, "LabelEditTool", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getLabelEditTool_Mask(), theToolPackage.getEditMaskVariables(), null, "mask", null, 1, 1, LabelEditTool.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-
-        initEClass(createToolEClass, CreateTool.class, "CreateTool", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(createColumnToolEClass, CreateColumnTool.class, "CreateColumnTool", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getCreateColumnTool_Mapping(), this.getElementColumnMapping(), this.getElementColumnMapping_Create(), "mapping", null, 1, 1, CreateColumnTool.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(createCrossColumnToolEClass, CreateCrossColumnTool.class, "CreateCrossColumnTool", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getCreateCrossColumnTool_Mapping(), this.getElementColumnMapping(), null, "mapping", null, 1, 1, CreateCrossColumnTool.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(createLineToolEClass, CreateLineTool.class, "CreateLineTool", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getCreateLineTool_Mapping(), this.getLineMapping(), null, "mapping", null, 0, 1, CreateLineTool.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-
-        initEClass(createCellToolEClass, CreateCellTool.class, "CreateCellTool", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getCreateCellTool_Mask(), theToolPackage.getEditMaskVariables(), null, "mask", null, 1, 1, CreateCellTool.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getCreateCellTool_Mapping(), this.getIntersectionMapping(), this.getIntersectionMapping_Create(), "mapping", null, 1, 1, CreateCellTool.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(deleteToolEClass, DeleteTool.class, "DeleteTool", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(deleteColumnToolEClass, DeleteColumnTool.class, "DeleteColumnTool", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getDeleteColumnTool_Mapping(), this.getElementColumnMapping(), this.getElementColumnMapping_Delete(), "mapping", null, 1, 1, DeleteColumnTool.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(deleteLineToolEClass, DeleteLineTool.class, "DeleteLineTool", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getDeleteLineTool_Mapping(), this.getLineMapping(), this.getLineMapping_Delete(), "mapping", null, 1, 1, DeleteLineTool.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(foregroundStyleDescriptionEClass, ForegroundStyleDescription.class, "ForegroundStyleDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getForegroundStyleDescription_LabelSize(), theEcorePackage.getEInt(), "labelSize", "12", 0, 1, ForegroundStyleDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getForegroundStyleDescription_LabelFormat(), theViewpointPackage.getFontFormat(), "labelFormat", null, 0, 4, ForegroundStyleDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getForegroundStyleDescription_ForeGroundColor(), theDescriptionPackage_1.getColorDescription(), null, "foreGroundColor", null, 1, 1, ForegroundStyleDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(backgroundStyleDescriptionEClass, BackgroundStyleDescription.class, "BackgroundStyleDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getBackgroundStyleDescription_BackgroundColor(), theDescriptionPackage_1.getColorDescription(), null, "backgroundColor", null, 1, 1, BackgroundStyleDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(foregroundConditionalStyleEClass, ForegroundConditionalStyle.class, "ForegroundConditionalStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getForegroundConditionalStyle_PredicateExpression(), theDescriptionPackage_1.getInterpretedExpression(), "predicateExpression", null, 1, 1, ForegroundConditionalStyle.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getForegroundConditionalStyle_Style(), this.getForegroundStyleDescription(), null, "style", null, 0, 1, ForegroundConditionalStyle.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(backgroundConditionalStyleEClass, BackgroundConditionalStyle.class, "BackgroundConditionalStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getBackgroundConditionalStyle_PredicateExpression(), theDescriptionPackage_1.getInterpretedExpression(), "predicateExpression", null, 1, 1, BackgroundConditionalStyle.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getBackgroundConditionalStyle_Style(), this.getBackgroundStyleDescription(), null, "style", null, 0, 1, BackgroundConditionalStyle.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(tableVariableEClass, TableVariable.class, "TableVariable", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getTableVariable_Documentation(), theEcorePackage.getEString(), "documentation", null, 0, 1, TableVariable.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(tableCreationDescriptionEClass, TableCreationDescription.class, "TableCreationDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getTableCreationDescription_TableDescription(), this.getTableDescription(), null, "tableDescription", null, 1, 1, TableCreationDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(tableNavigationDescriptionEClass, TableNavigationDescription.class, "TableNavigationDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getTableNavigationDescription_TableDescription(), this.getTableDescription(), null, "tableDescription", null, 1, 1, TableNavigationDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEReference(
+                getIntersectionMapping_ColumnMapping(),
+                this.getColumnMapping(),
+                null,
+                "columnMapping", null, 1, 1, IntersectionMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getIntersectionMapping_LabelExpression(),
+                theDescriptionPackage_1.getInterpretedExpression(),
+                "labelExpression", null, 0, 1, IntersectionMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getIntersectionMapping_UseDomainClass(),
+                theEcorePackage.getEBoolean(),
+                "useDomainClass", "false", 1, 1, IntersectionMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(
+                getIntersectionMapping_ColumnFinderExpression(),
+                theDescriptionPackage_1.getInterpretedExpression(),
+                "columnFinderExpression", null, 1, 1, IntersectionMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getIntersectionMapping_LineFinderExpression(),
+                theDescriptionPackage_1.getInterpretedExpression(),
+                "lineFinderExpression", null, 0, 1, IntersectionMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getIntersectionMapping_SemanticCandidatesExpression(),
+                theDescriptionPackage_1.getInterpretedExpression(),
+                "semanticCandidatesExpression", null, 0, 1, IntersectionMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getIntersectionMapping_DomainClass(),
+                theDescriptionPackage_1.getTypeName(),
+                "domainClass", null, 0, 1, IntersectionMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getIntersectionMapping_PreconditionExpression(),
+                theDescriptionPackage_1.getInterpretedExpression(),
+                "preconditionExpression", null, 0, 1, IntersectionMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getIntersectionMapping_Create(),
+                this.getCreateCellTool(),
+                this.getCreateCellTool_Mapping(),
+                "create", null, 0, 1, IntersectionMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(tableToolEClass, TableTool.class, "TableTool", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getTableTool_Variables(),
+                this.getTableVariable(),
+                null,
+                "variables", null, 0, -1, TableTool.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getTableTool_FirstModelOperation(),
+                theToolPackage.getModelOperation(),
+                null,
+                "firstModelOperation", null, 1, 1, TableTool.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(labelEditToolEClass, LabelEditTool.class, "LabelEditTool", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getLabelEditTool_Mask(),
+                theToolPackage.getEditMaskVariables(),
+                null,
+                "mask", null, 1, 1, LabelEditTool.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(createToolEClass, CreateTool.class, "CreateTool", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(createColumnToolEClass, CreateColumnTool.class, "CreateColumnTool", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getCreateColumnTool_Mapping(),
+                this.getElementColumnMapping(),
+                this.getElementColumnMapping_Create(),
+                "mapping", null, 1, 1, CreateColumnTool.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(createCrossColumnToolEClass, CreateCrossColumnTool.class, "CreateCrossColumnTool", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getCreateCrossColumnTool_Mapping(),
+                this.getElementColumnMapping(),
+                null,
+                "mapping", null, 1, 1, CreateCrossColumnTool.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(createLineToolEClass, CreateLineTool.class, "CreateLineTool", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getCreateLineTool_Mapping(),
+                this.getLineMapping(),
+                null,
+                "mapping", null, 0, 1, CreateLineTool.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(createCellToolEClass, CreateCellTool.class, "CreateCellTool", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getCreateCellTool_Mask(),
+                theToolPackage.getEditMaskVariables(),
+                null,
+                "mask", null, 1, 1, CreateCellTool.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getCreateCellTool_Mapping(),
+                this.getIntersectionMapping(),
+                this.getIntersectionMapping_Create(),
+                "mapping", null, 1, 1, CreateCellTool.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(deleteToolEClass, DeleteTool.class, "DeleteTool", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(deleteColumnToolEClass, DeleteColumnTool.class, "DeleteColumnTool", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getDeleteColumnTool_Mapping(),
+                this.getElementColumnMapping(),
+                this.getElementColumnMapping_Delete(),
+                "mapping", null, 1, 1, DeleteColumnTool.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(deleteLineToolEClass, DeleteLineTool.class, "DeleteLineTool", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getDeleteLineTool_Mapping(),
+                this.getLineMapping(),
+                this.getLineMapping_Delete(),
+                "mapping", null, 1, 1, DeleteLineTool.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(foregroundStyleDescriptionEClass, ForegroundStyleDescription.class,
+                "ForegroundStyleDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getForegroundStyleDescription_LabelSize(),
+                theEcorePackage.getEInt(),
+                "labelSize", "12", 0, 1, ForegroundStyleDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(
+                getForegroundStyleDescription_LabelFormat(),
+                theViewpointPackage.getFontFormat(),
+                "labelFormat", null, 0, 4, ForegroundStyleDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getForegroundStyleDescription_ForeGroundColor(),
+                theDescriptionPackage_1.getColorDescription(),
+                null,
+                "foreGroundColor", null, 1, 1, ForegroundStyleDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(backgroundStyleDescriptionEClass, BackgroundStyleDescription.class,
+                "BackgroundStyleDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getBackgroundStyleDescription_BackgroundColor(),
+                theDescriptionPackage_1.getColorDescription(),
+                null,
+                "backgroundColor", null, 1, 1, BackgroundStyleDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(foregroundConditionalStyleEClass, ForegroundConditionalStyle.class,
+                "ForegroundConditionalStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getForegroundConditionalStyle_PredicateExpression(),
+                theDescriptionPackage_1.getInterpretedExpression(),
+                "predicateExpression", null, 1, 1, ForegroundConditionalStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getForegroundConditionalStyle_Style(),
+                this.getForegroundStyleDescription(),
+                null,
+                "style", null, 0, 1, ForegroundConditionalStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(backgroundConditionalStyleEClass, BackgroundConditionalStyle.class,
+                "BackgroundConditionalStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getBackgroundConditionalStyle_PredicateExpression(),
+                theDescriptionPackage_1.getInterpretedExpression(),
+                "predicateExpression", null, 1, 1, BackgroundConditionalStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getBackgroundConditionalStyle_Style(),
+                this.getBackgroundStyleDescription(),
+                null,
+                "style", null, 0, 1, BackgroundConditionalStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(tableVariableEClass, TableVariable.class, "TableVariable", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getTableVariable_Documentation(),
+                theEcorePackage.getEString(),
+                "documentation", null, 0, 1, TableVariable.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(tableCreationDescriptionEClass, TableCreationDescription.class,
+                "TableCreationDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getTableCreationDescription_TableDescription(),
+                this.getTableDescription(),
+                null,
+                "tableDescription", null, 1, 1, TableCreationDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(tableNavigationDescriptionEClass, TableNavigationDescription.class,
+                "TableNavigationDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getTableNavigationDescription_TableDescription(),
+                this.getTableDescription(),
+                null,
+                "tableDescription", null, 1, 1, TableNavigationDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
 
         // Create annotations
         // http://www.eclipse.org/sirius/interpreted/expression/returnType
@@ -1944,23 +2087,39 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
      * @generated
      */
     protected void createReturnTypeAnnotations() {
-        String source = "http://www.eclipse.org/sirius/interpreted/expression/returnType";
-        addAnnotation(getTableDescription_PreconditionExpression(), source, new String[] { "returnType", "boolean" });
-        addAnnotation(getTableMapping_SemanticElements(), source, new String[] { "returnType", "a Collection<EObject> or an EObject." });
-        addAnnotation(getLineMapping_SemanticCandidatesExpression(), source, new String[] { "returnType", "a Collection<EObject> or an EObject." });
-        addAnnotation(getLineMapping_HeaderLabelExpression(), source, new String[] { "returnType", "a string." });
-        addAnnotation(getColumnMapping_HeaderLabelExpression(), source, new String[] { "returnType", "a string." });
-        addAnnotation(getElementColumnMapping_SemanticCandidatesExpression(), source, new String[] { "returnType", "a Collection<EObject> or an EObject." });
-        addAnnotation(getFeatureColumnMapping_LabelExpression(), source, new String[] { "returnType", "a string." });
-        addAnnotation(getFeatureColumnMapping_FeatureParentExpression(), source, new String[] { "returnType", "a Collection<EObject> or an EObject." });
-        addAnnotation(getCellUpdater_CanEdit(), source, new String[] { "returnType", "a boolean." });
-        addAnnotation(getIntersectionMapping_LabelExpression(), source, new String[] { "returnType", "a string." });
-        addAnnotation(getIntersectionMapping_ColumnFinderExpression(), source, new String[] { "returnType", "a Collection<EObject> or an EObject." });
-        addAnnotation(getIntersectionMapping_LineFinderExpression(), source, new String[] { "returnType", "a Collection<EObject> or an EObject." });
-        addAnnotation(getIntersectionMapping_SemanticCandidatesExpression(), source, new String[] { "returnType", "a Collection<EObject> or an EObject." });
-        addAnnotation(getIntersectionMapping_PreconditionExpression(), source, new String[] { "returnType", "a boolean." });
-        addAnnotation(getForegroundConditionalStyle_PredicateExpression(), source, new String[] { "returnType", "a boolean." });
-        addAnnotation(getBackgroundConditionalStyle_PredicateExpression(), source, new String[] { "returnType", "a boolean." });
+        String source = "http://www.eclipse.org/sirius/interpreted/expression/returnType"; //$NON-NLS-1$
+        addAnnotation(getTableDescription_PreconditionExpression(), source, new String[] { "returnType", "boolean" //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getTableMapping_SemanticElements(), source, new String[] { "returnType", "a Collection<EObject> or an EObject." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getLineMapping_SemanticCandidatesExpression(), source, new String[] { "returnType", "a Collection<EObject> or an EObject." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getLineMapping_HeaderLabelExpression(), source, new String[] { "returnType", "a string." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getColumnMapping_HeaderLabelExpression(), source, new String[] { "returnType", "a string." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getElementColumnMapping_SemanticCandidatesExpression(), source, new String[] { "returnType", "a Collection<EObject> or an EObject." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getFeatureColumnMapping_LabelExpression(), source, new String[] { "returnType", "a string." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getFeatureColumnMapping_FeatureParentExpression(), source, new String[] { "returnType", "a Collection<EObject> or an EObject." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getCellUpdater_CanEdit(), source, new String[] { "returnType", "a boolean." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getIntersectionMapping_LabelExpression(), source, new String[] { "returnType", "a string." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getIntersectionMapping_ColumnFinderExpression(), source, new String[] { "returnType", "a Collection<EObject> or an EObject." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getIntersectionMapping_LineFinderExpression(), source, new String[] { "returnType", "a Collection<EObject> or an EObject." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getIntersectionMapping_SemanticCandidatesExpression(), source, new String[] { "returnType", "a Collection<EObject> or an EObject." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getIntersectionMapping_PreconditionExpression(), source, new String[] { "returnType", "a boolean." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getForegroundConditionalStyle_PredicateExpression(), source, new String[] { "returnType", "a boolean." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getBackgroundConditionalStyle_PredicateExpression(), source, new String[] { "returnType", "a boolean." //$NON-NLS-1$ //$NON-NLS-2$
+        });
     }
 
     /**
@@ -1971,33 +2130,52 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
      * @generated
      */
     protected void createVariablesAnnotations() {
-        String source = "http://www.eclipse.org/sirius/interpreted/expression/variables";
+        String source = "http://www.eclipse.org/sirius/interpreted/expression/variables"; //$NON-NLS-1$
         addAnnotation(getTableDescription_PreconditionExpression(), source, new String[] {});
-        addAnnotation(getTableMapping_SemanticElements(), source, new String[] { "view", "table.DTableElement | current DTableElement (DCell, DColumn, DLine, ...).", "containerView",
-            "ecore.EObject | container of the current DTableElement (variable is available if container is not null).", "container",
-        "ecore.EObject | semantic target of containerView (if it is a DSemanticDecorator)." });
-        addAnnotation(getLineMapping_SemanticCandidatesExpression(), source, new String[] { "viewpoint", "table.DTable | (deprecated) current DTable.", "table", "table.DTable | current DTable.",
-            "root", "ecore.EObject | semantic target of $table.", "containerView", "table.LineContainer | current LineContainer (DLine or DTable).", "container",
-        "ecore.EObject | semantic target of $containerView (if it is a DSemanticDecorator)." });
+        addAnnotation(getTableMapping_SemanticElements(), source, new String[] { "view", "table.DTableElement | current DTableElement (DCell, DColumn, DLine, ...).", //$NON-NLS-1$ //$NON-NLS-2$
+            "containerView", "ecore.EObject | container of the current DTableElement (variable is available if container is not null).", //$NON-NLS-1$ //$NON-NLS-2$
+            "container", "ecore.EObject | semantic target of containerView (if it is a DSemanticDecorator)." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getLineMapping_SemanticCandidatesExpression(), source, new String[] { "viewpoint", "table.DTable | (deprecated) current DTable.", //$NON-NLS-1$ //$NON-NLS-2$
+            "table", "table.DTable | current DTable.", //$NON-NLS-1$ //$NON-NLS-2$
+            "root", "ecore.EObject | semantic target of $table.", //$NON-NLS-1$ //$NON-NLS-2$
+            "containerView", "table.LineContainer | current LineContainer (DLine or DTable).", //$NON-NLS-1$ //$NON-NLS-2$
+            "container", "ecore.EObject | semantic target of $containerView (if it is a DSemanticDecorator)." //$NON-NLS-1$ //$NON-NLS-2$
+        });
         addAnnotation(getLineMapping_HeaderLabelExpression(), source, new String[] {});
         addAnnotation(getColumnMapping_HeaderLabelExpression(), source, new String[] {});
-        addAnnotation(getElementColumnMapping_SemanticCandidatesExpression(), source, new String[] { "viewpoint", "table.DTable | (deprecated) current DTable.", "table",
-            "table.DTable | current DTable.", "containerView", "table.DTable | current DTable.", "container", "ecore.EObject | semantic element targeted by the current DTable." });
-        addAnnotation(getFeatureColumnMapping_LabelExpression(), source, new String[] { "root", "ecore.EObject | semantic target of the current DTable.", "line",
-            "table.DLine | DLine of the current DCell.", "lineSemantic", "ecore.EObject | semantic target of $line", "container", "ecore.EObject | semantic target of $line.", "column",
-            "table.DColumn | DColumn of the current DCell.", "columnSemantic", "ecore.EObject | semantic target of $column" });
-        addAnnotation(getFeatureColumnMapping_FeatureParentExpression(), source, new String[] { "root", "ecore.EObject | semantic target of the current DTable.", "container",
-        "ecore.EObject | semantic target of the current DLine." });
+        addAnnotation(getElementColumnMapping_SemanticCandidatesExpression(), source, new String[] { "viewpoint", "table.DTable | (deprecated) current DTable.", //$NON-NLS-1$ //$NON-NLS-2$
+            "table", "table.DTable | current DTable.", //$NON-NLS-1$ //$NON-NLS-2$
+            "containerView", "table.DTable | current DTable.", //$NON-NLS-1$ //$NON-NLS-2$
+            "container", "ecore.EObject | semantic element targeted by the current DTable." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getFeatureColumnMapping_LabelExpression(), source, new String[] { "root", "ecore.EObject | semantic target of the current DTable.", //$NON-NLS-1$ //$NON-NLS-2$
+            "line", "table.DLine | DLine of the current DCell.", //$NON-NLS-1$ //$NON-NLS-2$
+            "lineSemantic", "ecore.EObject | semantic target of $line", //$NON-NLS-1$ //$NON-NLS-2$
+            "container", "ecore.EObject | semantic target of $line.", //$NON-NLS-1$ //$NON-NLS-2$
+            "column", "table.DColumn | DColumn of the current DCell.", //$NON-NLS-1$ //$NON-NLS-2$
+            "columnSemantic", "ecore.EObject | semantic target of $column" //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getFeatureColumnMapping_FeatureParentExpression(), source, new String[] { "root", "ecore.EObject | semantic target of the current DTable.", //$NON-NLS-1$ //$NON-NLS-2$
+            "container", "ecore.EObject | semantic target of the current DLine." //$NON-NLS-1$ //$NON-NLS-2$
+        });
         addAnnotation(getCellUpdater_CanEdit(), source, new String[] {});
-        addAnnotation(getIntersectionMapping_LabelExpression(), source, new String[] { "root", "ecore.EObject | semantic target of the current DTable.", "line",
-            "table.DLine | DLine of the current DCell.", "lineSemantic", "ecore.EObject | semantic target of $line", "container", "ecore.EObject | semantic target of $line.", "column",
-            "table.DColumn | DColumn of the current DCell.", "columnSemantic", "ecore.EObject | semantic target of $column" });
+        addAnnotation(getIntersectionMapping_LabelExpression(), source, new String[] { "root", "ecore.EObject | semantic target of the current DTable.", //$NON-NLS-1$ //$NON-NLS-2$
+            "line", "table.DLine | DLine of the current DCell.", //$NON-NLS-1$ //$NON-NLS-2$
+            "lineSemantic", "ecore.EObject | semantic target of $line", //$NON-NLS-1$ //$NON-NLS-2$
+            "container", "ecore.EObject | semantic target of $line.", //$NON-NLS-1$ //$NON-NLS-2$
+            "column", "table.DColumn | DColumn of the current DCell.", //$NON-NLS-1$ //$NON-NLS-2$
+            "columnSemantic", "ecore.EObject | semantic target of $column" //$NON-NLS-1$ //$NON-NLS-2$
+        });
         addAnnotation(getIntersectionMapping_ColumnFinderExpression(), source, new String[] {});
         addAnnotation(getIntersectionMapping_LineFinderExpression(), source, new String[] {});
         addAnnotation(getIntersectionMapping_SemanticCandidatesExpression(), source, new String[] {});
-        addAnnotation(getIntersectionMapping_PreconditionExpression(), source, new String[] { "line", "table.DLine | the source view of the current potential line.", "lineSemantic",
-            "ecore.EObject | the semantic element of $line.", "column", "table.DColumn | the source view of the current potential column.", "columnSemantic",
-            "ecore.EObject | the semantic element of $column.", "table", "table.DTable | the current DTable." });
+        addAnnotation(getIntersectionMapping_PreconditionExpression(), source, new String[] { "line", "table.DLine | the source view of the current potential line.", //$NON-NLS-1$ //$NON-NLS-2$
+            "lineSemantic", "ecore.EObject | the semantic element of $line.", //$NON-NLS-1$ //$NON-NLS-2$
+            "column", "table.DColumn | the source view of the current potential column.", //$NON-NLS-1$ //$NON-NLS-2$
+            "columnSemantic", "ecore.EObject | the semantic element of $column.", //$NON-NLS-1$ //$NON-NLS-2$
+            "table", "table.DTable | the current DTable." //$NON-NLS-1$ //$NON-NLS-2$
+        });
         addAnnotation(getForegroundConditionalStyle_PredicateExpression(), source, new String[] {});
         addAnnotation(getBackgroundConditionalStyle_PredicateExpression(), source, new String[] {});
     }
diff --git a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/ElementColumnMappingImpl.java b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/ElementColumnMappingImpl.java
index 82156837df..00ef17d5f8 100644
--- a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/ElementColumnMappingImpl.java
+++ b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/ElementColumnMappingImpl.java
@@ -679,9 +679,9 @@ public class ElementColumnMappingImpl extends ColumnMappingImpl implements Eleme
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (domainClass: ");
+        result.append(" (domainClass: "); //$NON-NLS-1$
         result.append(domainClass);
-        result.append(", semanticCandidatesExpression: ");
+        result.append(", semanticCandidatesExpression: "); //$NON-NLS-1$
         result.append(semanticCandidatesExpression);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/FeatureColumnMappingImpl.java b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/FeatureColumnMappingImpl.java
index d1a390b7ed..0d1432cb36 100644
--- a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/FeatureColumnMappingImpl.java
+++ b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/FeatureColumnMappingImpl.java
@@ -778,13 +778,13 @@ public class FeatureColumnMappingImpl extends ColumnMappingImpl implements Featu
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (canEdit: ");
+        result.append(" (canEdit: "); //$NON-NLS-1$
         result.append(canEdit);
-        result.append(", featureName: ");
+        result.append(", featureName: "); //$NON-NLS-1$
         result.append(featureName);
-        result.append(", labelExpression: ");
+        result.append(", labelExpression: "); //$NON-NLS-1$
         result.append(labelExpression);
-        result.append(", featureParentExpression: ");
+        result.append(", featureParentExpression: "); //$NON-NLS-1$
         result.append(featureParentExpression);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/ForegroundConditionalStyleImpl.java b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/ForegroundConditionalStyleImpl.java
index 7324f053df..868d8d91af 100644
--- a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/ForegroundConditionalStyleImpl.java
+++ b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/ForegroundConditionalStyleImpl.java
@@ -261,7 +261,7 @@ public class ForegroundConditionalStyleImpl extends MinimalEObjectImpl.Container
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (predicateExpression: ");
+        result.append(" (predicateExpression: "); //$NON-NLS-1$
         result.append(predicateExpression);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/ForegroundStyleDescriptionImpl.java b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/ForegroundStyleDescriptionImpl.java
index 3628235e36..7e36c5131d 100644
--- a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/ForegroundStyleDescriptionImpl.java
+++ b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/ForegroundStyleDescriptionImpl.java
@@ -280,9 +280,9 @@ public class ForegroundStyleDescriptionImpl extends MinimalEObjectImpl.Container
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (labelSize: ");
+        result.append(" (labelSize: "); //$NON-NLS-1$
         result.append(labelSize);
-        result.append(", labelFormat: ");
+        result.append(", labelFormat: "); //$NON-NLS-1$
         result.append(labelFormat);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/IntersectionMappingImpl.java b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/IntersectionMappingImpl.java
index 295ffc501a..da07e237f9 100644
--- a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/IntersectionMappingImpl.java
+++ b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/IntersectionMappingImpl.java
@@ -1222,21 +1222,21 @@ public class IntersectionMappingImpl extends TableMappingImpl implements Interse
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (canEdit: ");
+        result.append(" (canEdit: "); //$NON-NLS-1$
         result.append(canEdit);
-        result.append(", labelExpression: ");
+        result.append(", labelExpression: "); //$NON-NLS-1$
         result.append(labelExpression);
-        result.append(", useDomainClass: ");
+        result.append(", useDomainClass: "); //$NON-NLS-1$
         result.append(useDomainClass);
-        result.append(", columnFinderExpression: ");
+        result.append(", columnFinderExpression: "); //$NON-NLS-1$
         result.append(columnFinderExpression);
-        result.append(", lineFinderExpression: ");
+        result.append(", lineFinderExpression: "); //$NON-NLS-1$
         result.append(lineFinderExpression);
-        result.append(", semanticCandidatesExpression: ");
+        result.append(", semanticCandidatesExpression: "); //$NON-NLS-1$
         result.append(semanticCandidatesExpression);
-        result.append(", domainClass: ");
+        result.append(", domainClass: "); //$NON-NLS-1$
         result.append(domainClass);
-        result.append(", preconditionExpression: ");
+        result.append(", preconditionExpression: "); //$NON-NLS-1$
         result.append(preconditionExpression);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/LineMappingImpl.java b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/LineMappingImpl.java
index e38bfabe1b..139ad36000 100644
--- a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/LineMappingImpl.java
+++ b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/LineMappingImpl.java
@@ -883,11 +883,11 @@ public class LineMappingImpl extends TableMappingImpl implements LineMapping {
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (domainClass: ");
+        result.append(" (domainClass: "); //$NON-NLS-1$
         result.append(domainClass);
-        result.append(", semanticCandidatesExpression: ");
+        result.append(", semanticCandidatesExpression: "); //$NON-NLS-1$
         result.append(semanticCandidatesExpression);
-        result.append(", headerLabelExpression: ");
+        result.append(", headerLabelExpression: "); //$NON-NLS-1$
         result.append(headerLabelExpression);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/TableDescriptionImpl.java b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/TableDescriptionImpl.java
index 25a0a50a1f..d5f324776e 100644
--- a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/TableDescriptionImpl.java
+++ b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/TableDescriptionImpl.java
@@ -1216,23 +1216,23 @@ public abstract class TableDescriptionImpl extends DocumentedElementImpl impleme
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (endUserDocumentation: ");
+        result.append(" (endUserDocumentation: "); //$NON-NLS-1$
         result.append(endUserDocumentation);
-        result.append(", name: ");
+        result.append(", name: "); //$NON-NLS-1$
         result.append(name);
-        result.append(", label: ");
+        result.append(", label: "); //$NON-NLS-1$
         result.append(label);
-        result.append(", titleExpression: ");
+        result.append(", titleExpression: "); //$NON-NLS-1$
         result.append(titleExpression);
-        result.append(", initialisation: ");
+        result.append(", initialisation: "); //$NON-NLS-1$
         result.append(initialisation);
-        result.append(", showOnStartup: ");
+        result.append(", showOnStartup: "); //$NON-NLS-1$
         result.append(showOnStartup);
-        result.append(", preconditionExpression: ");
+        result.append(", preconditionExpression: "); //$NON-NLS-1$
         result.append(preconditionExpression);
-        result.append(", domainClass: ");
+        result.append(", domainClass: "); //$NON-NLS-1$
         result.append(domainClass);
-        result.append(", initialHeaderColumnWidth: ");
+        result.append(", initialHeaderColumnWidth: "); //$NON-NLS-1$
         result.append(initialHeaderColumnWidth);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/TableMappingImpl.java b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/TableMappingImpl.java
index c97dd68dfa..ed5db89d06 100644
--- a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/TableMappingImpl.java
+++ b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/TableMappingImpl.java
@@ -167,7 +167,7 @@ public class TableMappingImpl extends RepresentationElementMappingImpl implement
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (semanticElements: ");
+        result.append(" (semanticElements: "); //$NON-NLS-1$
         result.append(semanticElements);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/TableVariableImpl.java b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/TableVariableImpl.java
index 52d150d27a..0024c26f22 100644
--- a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/TableVariableImpl.java
+++ b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/TableVariableImpl.java
@@ -266,7 +266,7 @@ public class TableVariableImpl extends AbstractVariableImpl implements TableVari
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (documentation: ");
+        result.append(" (documentation: "); //$NON-NLS-1$
         result.append(documentation);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/impl/DCellImpl.java b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/impl/DCellImpl.java
index 9b1377862d..e16f2c31c7 100644
--- a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/impl/DCellImpl.java
+++ b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/impl/DCellImpl.java
@@ -293,7 +293,7 @@ public class DCellImpl extends DSemanticDecoratorImpl implements DCell {
     public void setLine(DLine newLine) {
         if (newLine != eInternalContainer() || (eContainerFeatureID() != TablePackage.DCELL__LINE && newLine != null)) {
             if (EcoreUtil.isAncestor(this, newLine)) {
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+                throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); //$NON-NLS-1$
             }
             NotificationChain msgs = null;
             if (eInternalContainer() != null) {
@@ -852,9 +852,9 @@ public class DCellImpl extends DSemanticDecoratorImpl implements DCell {
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (name: ");
+        result.append(" (name: "); //$NON-NLS-1$
         result.append(name);
-        result.append(", label: ");
+        result.append(", label: "); //$NON-NLS-1$
         result.append(label);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/impl/DColumnImpl.java b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/impl/DColumnImpl.java
index 80b9f65a0d..65aa390760 100644
--- a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/impl/DColumnImpl.java
+++ b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/impl/DColumnImpl.java
@@ -286,7 +286,7 @@ public abstract class DColumnImpl extends DTableElementImpl implements DColumn {
     public void setTable(DTable newTable) {
         if (newTable != eInternalContainer() || (eContainerFeatureID() != TablePackage.DCOLUMN__TABLE && newTable != null)) {
             if (EcoreUtil.isAncestor(this, newTable)) {
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+                throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); //$NON-NLS-1$
             }
             NotificationChain msgs = null;
             if (eInternalContainer() != null) {
@@ -614,11 +614,11 @@ public abstract class DColumnImpl extends DTableElementImpl implements DColumn {
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (label: ");
+        result.append(" (label: "); //$NON-NLS-1$
         result.append(label);
-        result.append(", visible: ");
+        result.append(", visible: "); //$NON-NLS-1$
         result.append(visible);
-        result.append(", width: ");
+        result.append(", width: "); //$NON-NLS-1$
         result.append(width);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/impl/DFeatureColumnImpl.java b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/impl/DFeatureColumnImpl.java
index efb7706198..8316131c1b 100644
--- a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/impl/DFeatureColumnImpl.java
+++ b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/impl/DFeatureColumnImpl.java
@@ -164,7 +164,7 @@ public class DFeatureColumnImpl extends DColumnImpl implements DFeatureColumn {
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (featureName: ");
+        result.append(" (featureName: "); //$NON-NLS-1$
         result.append(featureName);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/impl/DLineImpl.java b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/impl/DLineImpl.java
index ca2840aab9..7a540a54d7 100644
--- a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/impl/DLineImpl.java
+++ b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/impl/DLineImpl.java
@@ -438,7 +438,7 @@ public class DLineImpl extends LineContainerImpl implements DLine {
     public void setContainer(LineContainer newContainer) {
         if (newContainer != eInternalContainer() || (eContainerFeatureID() != TablePackage.DLINE__CONTAINER && newContainer != null)) {
             if (EcoreUtil.isAncestor(this, newContainer)) {
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+                throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); //$NON-NLS-1$
             }
             NotificationChain msgs = null;
             if (eInternalContainer() != null) {
@@ -874,13 +874,13 @@ public class DLineImpl extends LineContainerImpl implements DLine {
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (name: ");
+        result.append(" (name: "); //$NON-NLS-1$
         result.append(name);
-        result.append(", label: ");
+        result.append(", label: "); //$NON-NLS-1$
         result.append(label);
-        result.append(", visible: ");
+        result.append(", visible: "); //$NON-NLS-1$
         result.append(visible);
-        result.append(", collapsed: ");
+        result.append(", collapsed: "); //$NON-NLS-1$
         result.append(collapsed);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/impl/DTableElementStyleImpl.java b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/impl/DTableElementStyleImpl.java
index 15387c5ccb..dd2cb893b6 100644
--- a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/impl/DTableElementStyleImpl.java
+++ b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/impl/DTableElementStyleImpl.java
@@ -448,17 +448,17 @@ public class DTableElementStyleImpl extends MinimalEObjectImpl.Container impleme
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (labelSize: ");
+        result.append(" (labelSize: "); //$NON-NLS-1$
         result.append(labelSize);
-        result.append(", labelFormat: ");
+        result.append(", labelFormat: "); //$NON-NLS-1$
         result.append(labelFormat);
-        result.append(", defaultForegroundStyle: ");
+        result.append(", defaultForegroundStyle: "); //$NON-NLS-1$
         result.append(defaultForegroundStyle);
-        result.append(", defaultBackgroundStyle: ");
+        result.append(", defaultBackgroundStyle: "); //$NON-NLS-1$
         result.append(defaultBackgroundStyle);
-        result.append(", foregroundColor: ");
+        result.append(", foregroundColor: "); //$NON-NLS-1$
         result.append(foregroundColor);
-        result.append(", backgroundColor: ");
+        result.append(", backgroundColor: "); //$NON-NLS-1$
         result.append(backgroundColor);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/impl/DTableImpl.java b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/impl/DTableImpl.java
index 2a3ad257a6..261f20f53c 100644
--- a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/impl/DTableImpl.java
+++ b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/impl/DTableImpl.java
@@ -476,7 +476,7 @@ public class DTableImpl extends DRepresentationImpl implements DTable {
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (headerColumnWidth: ");
+        result.append(" (headerColumnWidth: "); //$NON-NLS-1$
         result.append(headerColumnWidth);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/impl/DTargetColumnImpl.java b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/impl/DTargetColumnImpl.java
index 89ecc71469..68bb833839 100644
--- a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/impl/DTargetColumnImpl.java
+++ b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/impl/DTargetColumnImpl.java
@@ -396,7 +396,7 @@ public class DTargetColumnImpl extends DSemanticDecoratorImpl implements DTarget
     public void setTable(DTable newTable) {
         if (newTable != eInternalContainer() || (eContainerFeatureID() != TablePackage.DTARGET_COLUMN__TABLE && newTable != null)) {
             if (EcoreUtil.isAncestor(this, newTable)) {
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+                throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); //$NON-NLS-1$
             }
             NotificationChain msgs = null;
             if (eInternalContainer() != null) {
@@ -924,13 +924,13 @@ public class DTargetColumnImpl extends DSemanticDecoratorImpl implements DTarget
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (name: ");
+        result.append(" (name: "); //$NON-NLS-1$
         result.append(name);
-        result.append(", label: ");
+        result.append(", label: "); //$NON-NLS-1$
         result.append(label);
-        result.append(", visible: ");
+        result.append(", visible: "); //$NON-NLS-1$
         result.append(visible);
-        result.append(", width: ");
+        result.append(", width: "); //$NON-NLS-1$
         result.append(width);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/impl/TableFactoryImpl.java b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/impl/TableFactoryImpl.java
index a1224c847a..d08e858fd3 100644
--- a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/impl/TableFactoryImpl.java
+++ b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/impl/TableFactoryImpl.java
@@ -88,7 +88,7 @@ public class TableFactoryImpl extends EFactoryImpl implements TableFactory {
         case TablePackage.DTABLE_ELEMENT_STYLE:
             return createDTableElementStyle();
         default:
-            throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+            throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
         }
     }
 
diff --git a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/impl/TablePackageImpl.java b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/impl/TablePackageImpl.java
index 35a1464b6d..62496ef6c0 100644
--- a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/impl/TablePackageImpl.java
+++ b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/impl/TablePackageImpl.java
@@ -807,125 +807,202 @@ public class TablePackageImpl extends EPackageImpl implements TablePackage {
         dFeatureColumnEClass.getESuperTypes().add(this.getDColumn());
 
         // Initialize classes and features; add operations and parameters
-        initEClass(dTableEClass, DTable.class, "DTable", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getDTable_Columns(), this.getDColumn(), this.getDColumn_Table(), "columns", null, 0, -1, DTable.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEAttribute(getDTable_HeaderColumnWidth(), theEcorePackage.getEInt(), "headerColumnWidth", null, 0, 1, DTable.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getDTable_Description(), theDescriptionPackage.getTableDescription(), null, "description", null, 0, 1, DTable.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-
-        initEClass(dTableElementEClass, DTableElement.class, "DTableElement", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getDTableElement_TableElementMapping(), theDescriptionPackage.getTableMapping(), null, "tableElementMapping", null, 0, 1, DTableElement.class, EPackageImpl.IS_TRANSIENT,
-                EPackageImpl.IS_VOLATILE, !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(lineContainerEClass, LineContainer.class, "LineContainer", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getLineContainer_Lines(), this.getDLine(), this.getDLine_Container(), "lines", null, 0, -1, LineContainer.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-
-        initEClass(dLineEClass, DLine.class, "DLine", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getDLine_Label(), theEcorePackage.getEString(), "label", null, 0, 1, DLine.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE,
-                !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getDLine_OriginMapping(), theDescriptionPackage.getLineMapping(), null, "originMapping", null, 1, 1, DLine.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEAttribute(getDLine_Visible(), theEcorePackage.getEBoolean(), "visible", "true", 1, 1, DLine.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE,
-                !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getDLine_Collapsed(), theEcorePackage.getEBoolean(), "collapsed", "false", 1, 1, DLine.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE,
-                !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getDLine_Cells(), this.getDCell(), this.getDCell_Line(), "cells", null, 0, -1, DLine.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE,
-                EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getDLine_Container(), this.getLineContainer(), this.getLineContainer_Lines(), "container", null, 0, 1, DLine.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getDLine_OrderedCells(), this.getDCell(), null, "orderedCells", null, 0, -1, DLine.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE, !EPackageImpl.IS_CHANGEABLE,
-                !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getDLine_CurrentStyle(), this.getDTableElementStyle(), null, "currentStyle", null, 0, 1, DLine.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-
-        initEClass(dCellEClass, DCell.class, "DCell", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getDCell_Label(), theEcorePackage.getEString(), "label", null, 0, 1, DCell.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE,
-                !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getDCell_Line(), this.getDLine(), this.getDLine_Cells(), "line", null, 0, 1, DCell.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE,
-                !EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getDCell_Column(), this.getDColumn(), this.getDColumn_Cells(), "column", null, 0, 1, DCell.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getDCell_CurrentStyle(), this.getDCellStyle(), null, "currentStyle", null, 0, 1, DCell.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE,
-                EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getDCell_Updater(), theDescriptionPackage.getCellUpdater(), null, "updater", null, 0, 1, DCell.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getDCell_IntersectionMapping(), theDescriptionPackage.getIntersectionMapping(), null, "intersectionMapping", null, 0, 1, DCell.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(dCellStyleEClass, DCellStyle.class, "DCellStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getDCellStyle_ForegroundStyleOrigin(), theDescriptionPackage.getTableMapping(), null, "foregroundStyleOrigin", null, 0, 1, DCellStyle.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getDCellStyle_BackgroundStyleOrigin(), theDescriptionPackage.getTableMapping(), null, "backgroundStyleOrigin", null, 0, 1, DCellStyle.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(dColumnEClass, DColumn.class, "DColumn", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getDColumn_Label(), theEcorePackage.getEString(), "label", null, 0, 1, DColumn.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE,
-                !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getDColumn_Cells(), this.getDCell(), this.getDCell_Column(), "cells", null, 0, -1, DColumn.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getDColumn_OriginMapping(), theDescriptionPackage.getColumnMapping(), null, "originMapping", null, 1, 1, DColumn.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getDColumn_Table(), this.getDTable(), this.getDTable_Columns(), "table", null, 0, 1, DColumn.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getDColumn_OrderedCells(), this.getDCell(), null, "orderedCells", null, 0, -1, DColumn.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE, !EPackageImpl.IS_CHANGEABLE,
-                !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getDColumn_Visible(), theEcorePackage.getEBoolean(), "visible", "true", 1, 1, DColumn.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE,
-                !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getDColumn_Width(), theEcorePackage.getEInt(), "width", null, 0, 1, DColumn.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE,
-                !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getDColumn_CurrentStyle(), this.getDTableElementStyle(), null, "currentStyle", null, 0, 1, DColumn.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-
-        initEClass(dTargetColumnEClass, DTargetColumn.class, "DTargetColumn", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(dFeatureColumnEClass, DFeatureColumn.class, "DFeatureColumn", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getDFeatureColumn_FeatureName(), theEcorePackage.getEString(), "featureName", null, 1, 1, DFeatureColumn.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(dTableElementSynchronizerEClass, DTableElementSynchronizer.class, "DTableElementSynchronizer", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        EOperation op = addEOperation(dTableElementSynchronizerEClass, null, "refresh", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-        addEParameter(op, this.getDCell(), "cell", 1, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-
-        op = addEOperation(dTableElementSynchronizerEClass, null, "refresh", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-        addEParameter(op, this.getDColumn(), "column", 1, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-
-        op = addEOperation(dTableElementSynchronizerEClass, null, "refresh", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-        addEParameter(op, this.getDLine(), "line", 1, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-
-        initEClass(dTableElementStyleEClass, DTableElementStyle.class, "DTableElementStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getDTableElementStyle_LabelSize(), theEcorePackage.getEInt(), "labelSize", "8", 0, 1, DTableElementStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getDTableElementStyle_LabelFormat(), theViewpointPackage.getFontFormat(), "labelFormat", null, 0, 4, DTableElementStyle.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getDTableElementStyle_DefaultForegroundStyle(), theEcorePackage.getEBoolean(), "defaultForegroundStyle", "false", 0, 1, DTableElementStyle.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getDTableElementStyle_DefaultBackgroundStyle(), theEcorePackage.getEBoolean(), "defaultBackgroundStyle", "false", 0, 1, DTableElementStyle.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getDTableElementStyle_ForegroundColor(), theViewpointPackage.getRGBValues(), "foregroundColor", "0,0,0", 0, 1, DTableElementStyle.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getDTableElementStyle_BackgroundColor(), theViewpointPackage.getRGBValues(), "backgroundColor", "255,255,255", 0, 1, DTableElementStyle.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEClass(dTableEClass, DTable.class, "DTable", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getDTable_Columns(),
+                this.getDColumn(),
+                this.getDColumn_Table(),
+                "columns", null, 0, -1, DTable.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getDTable_HeaderColumnWidth(),
+                theEcorePackage.getEInt(),
+                "headerColumnWidth", null, 0, 1, DTable.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDTable_Description(),
+                theDescriptionPackage.getTableDescription(),
+                null,
+                "description", null, 0, 1, DTable.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(dTableElementEClass, DTableElement.class, "DTableElement", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getDTableElement_TableElementMapping(),
+                theDescriptionPackage.getTableMapping(),
+                null,
+                "tableElementMapping", null, 0, 1, DTableElement.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE, !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(lineContainerEClass, LineContainer.class, "LineContainer", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getLineContainer_Lines(),
+                this.getDLine(),
+                this.getDLine_Container(),
+                "lines", null, 0, -1, LineContainer.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(dLineEClass, DLine.class, "DLine", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getDLine_Label(),
+                theEcorePackage.getEString(),
+                "label", null, 0, 1, DLine.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDLine_OriginMapping(),
+                theDescriptionPackage.getLineMapping(),
+                null,
+                "originMapping", null, 1, 1, DLine.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getDLine_Visible(),
+                theEcorePackage.getEBoolean(),
+                "visible", "true", 1, 1, DLine.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(
+                getDLine_Collapsed(),
+                theEcorePackage.getEBoolean(),
+                "collapsed", "false", 1, 1, DLine.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEReference(
+                getDLine_Cells(),
+                this.getDCell(),
+                this.getDCell_Line(),
+                "cells", null, 0, -1, DLine.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDLine_Container(),
+                this.getLineContainer(),
+                this.getLineContainer_Lines(),
+                "container", null, 0, 1, DLine.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDLine_OrderedCells(),
+                this.getDCell(),
+                null,
+                "orderedCells", null, 0, -1, DLine.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE, !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDLine_CurrentStyle(),
+                this.getDTableElementStyle(),
+                null,
+                "currentStyle", null, 0, 1, DLine.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(dCellEClass, DCell.class, "DCell", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getDCell_Label(),
+                theEcorePackage.getEString(),
+                "label", null, 0, 1, DCell.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDCell_Line(),
+                this.getDLine(),
+                this.getDLine_Cells(),
+                "line", null, 0, 1, DCell.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDCell_Column(),
+                this.getDColumn(),
+                this.getDColumn_Cells(),
+                "column", null, 0, 1, DCell.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDCell_CurrentStyle(),
+                this.getDCellStyle(),
+                null,
+                "currentStyle", null, 0, 1, DCell.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDCell_Updater(),
+                theDescriptionPackage.getCellUpdater(),
+                null,
+                "updater", null, 0, 1, DCell.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDCell_IntersectionMapping(),
+                theDescriptionPackage.getIntersectionMapping(),
+                null,
+                "intersectionMapping", null, 0, 1, DCell.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(dCellStyleEClass, DCellStyle.class, "DCellStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getDCellStyle_ForegroundStyleOrigin(),
+                theDescriptionPackage.getTableMapping(),
+                null,
+                "foregroundStyleOrigin", null, 0, 1, DCellStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDCellStyle_BackgroundStyleOrigin(),
+                theDescriptionPackage.getTableMapping(),
+                null,
+                "backgroundStyleOrigin", null, 0, 1, DCellStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(dColumnEClass, DColumn.class, "DColumn", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getDColumn_Label(),
+                theEcorePackage.getEString(),
+                "label", null, 0, 1, DColumn.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDColumn_Cells(),
+                this.getDCell(),
+                this.getDCell_Column(),
+                "cells", null, 0, -1, DColumn.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDColumn_OriginMapping(),
+                theDescriptionPackage.getColumnMapping(),
+                null,
+                "originMapping", null, 1, 1, DColumn.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDColumn_Table(),
+                this.getDTable(),
+                this.getDTable_Columns(),
+                "table", null, 0, 1, DColumn.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDColumn_OrderedCells(),
+                this.getDCell(),
+                null,
+                "orderedCells", null, 0, -1, DColumn.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE, !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getDColumn_Visible(),
+                theEcorePackage.getEBoolean(),
+                "visible", "true", 1, 1, DColumn.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(
+                getDColumn_Width(),
+                theEcorePackage.getEInt(),
+                "width", null, 0, 1, DColumn.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDColumn_CurrentStyle(),
+                this.getDTableElementStyle(),
+                null,
+                "currentStyle", null, 0, 1, DColumn.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(dTargetColumnEClass, DTargetColumn.class, "DTargetColumn", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(dFeatureColumnEClass, DFeatureColumn.class, "DFeatureColumn", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getDFeatureColumn_FeatureName(),
+                theEcorePackage.getEString(),
+                "featureName", null, 1, 1, DFeatureColumn.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(dTableElementSynchronizerEClass, DTableElementSynchronizer.class,
+                "DTableElementSynchronizer", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        EOperation op = addEOperation(dTableElementSynchronizerEClass, null, "refresh", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        addEParameter(op, this.getDCell(), "cell", 1, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        op = addEOperation(dTableElementSynchronizerEClass, null, "refresh", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        addEParameter(op, this.getDColumn(), "column", 1, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        op = addEOperation(dTableElementSynchronizerEClass, null, "refresh", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        addEParameter(op, this.getDLine(), "line", 1, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(dTableElementStyleEClass, DTableElementStyle.class, "DTableElementStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getDTableElementStyle_LabelSize(),
+                theEcorePackage.getEInt(),
+                "labelSize", "8", 0, 1, DTableElementStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(
+                getDTableElementStyle_LabelFormat(),
+                theViewpointPackage.getFontFormat(),
+                "labelFormat", null, 0, 4, DTableElementStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getDTableElementStyle_DefaultForegroundStyle(),
+                theEcorePackage.getEBoolean(),
+                "defaultForegroundStyle", "false", 0, 1, DTableElementStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(
+                getDTableElementStyle_DefaultBackgroundStyle(),
+                theEcorePackage.getEBoolean(),
+                "defaultBackgroundStyle", "false", 0, 1, DTableElementStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(
+                getDTableElementStyle_ForegroundColor(),
+                theViewpointPackage.getRGBValues(),
+                "foregroundColor", "0,0,0", 0, 1, DTableElementStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(
+                getDTableElementStyle_BackgroundColor(),
+                theViewpointPackage.getRGBValues(),
+                "backgroundColor", "255,255,255", 0, 1, DTableElementStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
 
         // Create resource
         createResource(TablePackage.eNS_URI);
diff --git a/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/ConditionalTreeItemStyleDescriptionItemProvider.java b/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/ConditionalTreeItemStyleDescriptionItemProvider.java
index fcf3ce28d2..9c02d63e89 100644
--- a/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/ConditionalTreeItemStyleDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/ConditionalTreeItemStyleDescriptionItemProvider.java
@@ -99,7 +99,7 @@ public class ConditionalTreeItemStyleDescriptionItemProvider extends Conditional
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ConditionalTreeItemStyleDescription"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/ConditionalTreeItemStyleDescription")); //$NON-NLS-1$
     }
 
     /**
@@ -111,7 +111,8 @@ public class ConditionalTreeItemStyleDescriptionItemProvider extends Conditional
     @Override
     public String getText(Object object) {
         String label = ((ConditionalTreeItemStyleDescription) object).getPredicateExpression();
-        return label == null || label.length() == 0 ? getString("_UI_ConditionalTreeItemStyleDescription_type") : getString("_UI_ConditionalTreeItemStyleDescription_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_ConditionalTreeItemStyleDescription_type") : //$NON-NLS-1$
+            getString("_UI_ConditionalTreeItemStyleDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/PrecedingSiblingsVariablesItemProvider.java b/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/PrecedingSiblingsVariablesItemProvider.java
index a408b4510a..45998de98f 100644
--- a/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/PrecedingSiblingsVariablesItemProvider.java
+++ b/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/PrecedingSiblingsVariablesItemProvider.java
@@ -59,7 +59,7 @@ public class PrecedingSiblingsVariablesItemProvider extends TreeVariableItemProv
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/PrecedingSiblingsVariables"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/PrecedingSiblingsVariables")); //$NON-NLS-1$
     }
 
     /**
@@ -71,7 +71,8 @@ public class PrecedingSiblingsVariablesItemProvider extends TreeVariableItemProv
     @Override
     public String getText(Object object) {
         String label = ((PrecedingSiblingsVariables) object).getName();
-        return label == null || label.length() == 0 ? getString("_UI_PrecedingSiblingsVariables_type") : getString("_UI_PrecedingSiblingsVariables_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_PrecedingSiblingsVariables_type") : //$NON-NLS-1$
+            getString("_UI_PrecedingSiblingsVariables_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/StyleUpdaterItemProvider.java b/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/StyleUpdaterItemProvider.java
index b36ecc34d4..e1776132a1 100644
--- a/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/StyleUpdaterItemProvider.java
+++ b/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/StyleUpdaterItemProvider.java
@@ -106,7 +106,7 @@ IItemPropertySource {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/StyleUpdater"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/StyleUpdater")); //$NON-NLS-1$
     }
 
     /**
@@ -117,7 +117,7 @@ IItemPropertySource {
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_StyleUpdater_type");
+        return getString("_UI_StyleUpdater_type"); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeCreationDescriptionItemProvider.java b/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeCreationDescriptionItemProvider.java
index aafc3651e1..b177a89bbe 100644
--- a/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeCreationDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeCreationDescriptionItemProvider.java
@@ -67,9 +67,10 @@ public class TreeCreationDescriptionItemProvider extends RepresentationCreationD
      */
     protected void addTreeDescriptionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_TreeCreationDescription_treeDescription_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_TreeCreationDescription_treeDescription_feature", "_UI_TreeCreationDescription_type"),
-                DescriptionPackage.Literals.TREE_CREATION_DESCRIPTION__TREE_DESCRIPTION, true, false, true, null, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_TreeCreationDescription_treeDescription_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_TreeCreationDescription_treeDescription_feature", "_UI_TreeCreationDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DescriptionPackage.Literals.TREE_CREATION_DESCRIPTION__TREE_DESCRIPTION, true, false, true, null, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -80,7 +81,7 @@ public class TreeCreationDescriptionItemProvider extends RepresentationCreationD
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/TreeCreationDescription"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/TreeCreationDescription")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeDescriptionItemProvider.java b/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeDescriptionItemProvider.java
index cf152e2887..efbc6413fd 100644
--- a/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeDescriptionItemProvider.java
@@ -83,10 +83,13 @@ public class TreeDescriptionItemProvider extends DocumentedElementItemProvider {
      * @generated
      */
     protected void addEndUserDocumentationPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_EndUserDocumentedElement_endUserDocumentation_feature"), getString("_UI_EndUserDocumentedElement_endUserDocumentation_description"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_EndUserDocumentedElement_endUserDocumentation_feature"), //$NON-NLS-1$
+                getString("_UI_EndUserDocumentedElement_endUserDocumentation_description"), //$NON-NLS-1$
                 DescriptionPackage.Literals.END_USER_DOCUMENTED_ELEMENT__END_USER_DOCUMENTATION, true, true, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_DocumentationPropertyCategory"), null));
+                getString("_UI_DocumentationPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -97,8 +100,10 @@ public class TreeDescriptionItemProvider extends DocumentedElementItemProvider {
      */
     protected void addNamePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_IdentifiedElement_name_feature"), getString("_UI_IdentifiedElement_name_description"), DescriptionPackage.Literals.IDENTIFIED_ELEMENT__NAME, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_IdentifiedElement_name_feature"), //$NON-NLS-1$
+                getString("_UI_IdentifiedElement_name_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.IDENTIFIED_ELEMENT__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -109,8 +114,10 @@ public class TreeDescriptionItemProvider extends DocumentedElementItemProvider {
      */
     protected void addLabelPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_IdentifiedElement_label_feature"), getString("_UI_IdentifiedElement_label_description"), DescriptionPackage.Literals.IDENTIFIED_ELEMENT__LABEL, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_IdentifiedElement_label_feature"), //$NON-NLS-1$
+                getString("_UI_IdentifiedElement_label_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.IDENTIFIED_ELEMENT__LABEL, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -121,8 +128,9 @@ public class TreeDescriptionItemProvider extends DocumentedElementItemProvider {
      */
     protected void addTitleExpressionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_RepresentationDescription_titleExpression_feature"), getString("_UI_RepresentationDescription_titleExpression_description"),
-                DescriptionPackage.Literals.REPRESENTATION_DESCRIPTION__TITLE_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_AdvancedPropertyCategory"),
+                getString("_UI_RepresentationDescription_titleExpression_feature"), //$NON-NLS-1$
+                getString("_UI_RepresentationDescription_titleExpression_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.REPRESENTATION_DESCRIPTION__TITLE_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_AdvancedPropertyCategory"), //$NON-NLS-1$
                 null));
     }
 
@@ -133,11 +141,11 @@ public class TreeDescriptionItemProvider extends DocumentedElementItemProvider {
      * @generated
      */
     protected void addInitialisationPropertyDescriptor(Object object) {
-        itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_RepresentationDescription_initialisation_feature"), getString("_UI_RepresentationDescription_initialisation_description"),
-                DescriptionPackage.Literals.REPRESENTATION_DESCRIPTION__INITIALISATION, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-                getString("_UI_GeneralPropertyCategory"), null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+                getString("_UI_RepresentationDescription_initialisation_feature"), //$NON-NLS-1$
+                getString("_UI_RepresentationDescription_initialisation_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.REPRESENTATION_DESCRIPTION__INITIALISATION, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -148,8 +156,10 @@ public class TreeDescriptionItemProvider extends DocumentedElementItemProvider {
      */
     protected void addMetamodelPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_RepresentationDescription_metamodel_feature"), getString("_UI_RepresentationDescription_metamodel_description"),
-                DescriptionPackage.Literals.REPRESENTATION_DESCRIPTION__METAMODEL, true, false, true, null, getString("_UI_MetamodelsPropertyCategory"), null));
+                getString("_UI_RepresentationDescription_metamodel_feature"), //$NON-NLS-1$
+                getString("_UI_RepresentationDescription_metamodel_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.REPRESENTATION_DESCRIPTION__METAMODEL, true, false, true, null, getString("_UI_MetamodelsPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -159,11 +169,11 @@ public class TreeDescriptionItemProvider extends DocumentedElementItemProvider {
      * @generated
      */
     protected void addShowOnStartupPropertyDescriptor(Object object) {
-        itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_RepresentationDescription_showOnStartup_feature"), getString("_UI_RepresentationDescription_showOnStartup_description"),
-                DescriptionPackage.Literals.REPRESENTATION_DESCRIPTION__SHOW_ON_STARTUP, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-                getString("_UI_GeneralPropertyCategory"), null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+                getString("_UI_RepresentationDescription_showOnStartup_feature"), //$NON-NLS-1$
+                getString("_UI_RepresentationDescription_showOnStartup_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.REPRESENTATION_DESCRIPTION__SHOW_ON_STARTUP, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -173,10 +183,13 @@ public class TreeDescriptionItemProvider extends DocumentedElementItemProvider {
      * @generated
      */
     protected void addDomainClassPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_TreeDescription_domainClass_feature"), getString("_UI_TreeDescription_domainClass_description"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_TreeDescription_domainClass_feature"), //$NON-NLS-1$
+                getString("_UI_TreeDescription_domainClass_description"), //$NON-NLS-1$
                 org.eclipse.sirius.tree.description.DescriptionPackage.Literals.TREE_DESCRIPTION__DOMAIN_CLASS, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -186,10 +199,13 @@ public class TreeDescriptionItemProvider extends DocumentedElementItemProvider {
      * @generated
      */
     protected void addPreconditionExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_TreeDescription_preconditionExpression_feature"), getString("_UI_TreeDescription_preconditionExpression_description"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_TreeDescription_preconditionExpression_feature"), //$NON-NLS-1$
+                getString("_UI_TreeDescription_preconditionExpression_description"), //$NON-NLS-1$
                 org.eclipse.sirius.tree.description.DescriptionPackage.Literals.TREE_DESCRIPTION__PRECONDITION_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_AdvancedPropertyCategory"), null));
+                getString("_UI_AdvancedPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -237,7 +253,7 @@ public class TreeDescriptionItemProvider extends DocumentedElementItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/TreeDescription"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/TreeDescription")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeItemContainerDropToolItemProvider.java b/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeItemContainerDropToolItemProvider.java
index 6fe6b63db7..0a5aaff390 100644
--- a/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeItemContainerDropToolItemProvider.java
+++ b/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeItemContainerDropToolItemProvider.java
@@ -79,7 +79,8 @@ public class TreeItemContainerDropToolItemProvider extends MappingBasedToolDescr
      */
     protected void addDragSourcePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_TreeItemContainerDropTool_dragSource_feature"), getString("_UI_TreeItemContainerDropTool_dragSource_description"),
+                getString("_UI_TreeItemContainerDropTool_dragSource_feature"), //$NON-NLS-1$
+                getString("_UI_TreeItemContainerDropTool_dragSource_description"), //$NON-NLS-1$
                 DescriptionPackage.Literals.TREE_ITEM_CONTAINER_DROP_TOOL__DRAG_SOURCE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -130,7 +131,7 @@ public class TreeItemContainerDropToolItemProvider extends MappingBasedToolDescr
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/TreeItemContainerDropTool"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/TreeItemContainerDropTool")); //$NON-NLS-1$
     }
 
     /**
@@ -250,7 +251,8 @@ public class TreeItemContainerDropToolItemProvider extends MappingBasedToolDescr
                 || childFeature == DescriptionPackage.Literals.TREE_ITEM_CONTAINER_DROP_TOOL__NEW_CONTAINER;
 
         if (qualify) {
-            return getString("_UI_CreateChild_text2", new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+            return getString("_UI_CreateChild_text2", //$NON-NLS-1$
+                    new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
         }
         return super.getCreateChildText(owner, feature, child, selection);
     }
diff --git a/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeItemCreationToolItemProvider.java b/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeItemCreationToolItemProvider.java
index ef6a17cec5..f77f329f1e 100644
--- a/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeItemCreationToolItemProvider.java
+++ b/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeItemCreationToolItemProvider.java
@@ -64,8 +64,10 @@ public class TreeItemCreationToolItemProvider extends TreeItemToolItemProvider {
      */
     protected void addMappingPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_TreeItemCreationTool_mapping_feature"), getString("_UI_TreeItemCreationTool_mapping_description"), DescriptionPackage.Literals.TREE_ITEM_CREATION_TOOL__MAPPING, true,
-                false, true, null, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_TreeItemCreationTool_mapping_feature"), //$NON-NLS-1$
+                getString("_UI_TreeItemCreationTool_mapping_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.TREE_ITEM_CREATION_TOOL__MAPPING, true, false, true, null, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -76,7 +78,7 @@ public class TreeItemCreationToolItemProvider extends TreeItemToolItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/TreeItemCreationTool"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/TreeItemCreationTool")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeItemDeletionToolItemProvider.java b/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeItemDeletionToolItemProvider.java
index 79e7dd0f6c..d191988db6 100644
--- a/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeItemDeletionToolItemProvider.java
+++ b/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeItemDeletionToolItemProvider.java
@@ -61,7 +61,7 @@ public class TreeItemDeletionToolItemProvider extends TreeItemToolItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/TreeItemDeletionTool"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/TreeItemDeletionTool")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeItemDragToolItemProvider.java b/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeItemDragToolItemProvider.java
index 11debdb7e0..bb0cf3a189 100644
--- a/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeItemDragToolItemProvider.java
+++ b/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeItemDragToolItemProvider.java
@@ -80,8 +80,10 @@ public class TreeItemDragToolItemProvider extends MappingBasedToolDescriptionIte
      */
     protected void addContainersPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_TreeItemDragTool_containers_feature"), getString("_UI_TreeItemDragTool_containers_description"), DescriptionPackage.Literals.TREE_ITEM_DRAG_TOOL__CONTAINERS, true,
-                false, true, null, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_TreeItemDragTool_containers_feature"), //$NON-NLS-1$
+                getString("_UI_TreeItemDragTool_containers_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.TREE_ITEM_DRAG_TOOL__CONTAINERS, true, false, true, null, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -92,8 +94,10 @@ public class TreeItemDragToolItemProvider extends MappingBasedToolDescriptionIte
      */
     protected void addDragSourceTypePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_TreeItemDragTool_dragSourceType_feature"), getString("_UI_TreeItemDragTool_dragSourceType_description"),
-                DescriptionPackage.Literals.TREE_ITEM_DRAG_TOOL__DRAG_SOURCE_TYPE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_TreeItemDragTool_dragSourceType_feature"), //$NON-NLS-1$
+                getString("_UI_TreeItemDragTool_dragSourceType_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.TREE_ITEM_DRAG_TOOL__DRAG_SOURCE_TYPE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -143,7 +147,7 @@ public class TreeItemDragToolItemProvider extends MappingBasedToolDescriptionIte
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/TreeItemDragTool"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/TreeItemDragTool")); //$NON-NLS-1$
     }
 
     /**
@@ -262,7 +266,8 @@ public class TreeItemDragToolItemProvider extends MappingBasedToolDescriptionIte
         boolean qualify = childFeature == DescriptionPackage.Literals.TREE_ITEM_DRAG_TOOL__OLD_CONTAINER || childFeature == DescriptionPackage.Literals.TREE_ITEM_DRAG_TOOL__NEW_CONTAINER;
 
         if (qualify) {
-            return getString("_UI_CreateChild_text2", new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+            return getString("_UI_CreateChild_text2", //$NON-NLS-1$
+                    new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
         }
         return super.getCreateChildText(owner, feature, child, selection);
     }
diff --git a/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeItemEditionToolItemProvider.java b/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeItemEditionToolItemProvider.java
index f56911ba46..12d68eec3c 100644
--- a/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeItemEditionToolItemProvider.java
+++ b/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeItemEditionToolItemProvider.java
@@ -104,7 +104,7 @@ public class TreeItemEditionToolItemProvider extends TreeItemToolItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/TreeItemEditionTool"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/TreeItemEditionTool")); //$NON-NLS-1$
     }
 
     /**
@@ -174,7 +174,8 @@ public class TreeItemEditionToolItemProvider extends TreeItemToolItemProvider {
         boolean qualify = childFeature == DescriptionPackage.Literals.TREE_ITEM_EDITION_TOOL__ELEMENT || childFeature == DescriptionPackage.Literals.TREE_ITEM_EDITION_TOOL__ROOT;
 
         if (qualify) {
-            return getString("_UI_CreateChild_text2", new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+            return getString("_UI_CreateChild_text2", //$NON-NLS-1$
+                    new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
         }
         return super.getCreateChildText(owner, feature, child, selection);
     }
diff --git a/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeItemMappingItemProvider.java b/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeItemMappingItemProvider.java
index 5bc2ff8fb3..f6ba0ecc63 100644
--- a/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeItemMappingItemProvider.java
+++ b/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeItemMappingItemProvider.java
@@ -79,8 +79,10 @@ public class TreeItemMappingItemProvider extends TreeMappingItemProvider {
      */
     protected void addDomainClassPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_TreeItemMapping_domainClass_feature"), getString("_UI_TreeItemMapping_domainClass_description"), DescriptionPackage.Literals.TREE_ITEM_MAPPING__DOMAIN_CLASS, true,
-                false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_TreeItemMapping_domainClass_feature"), //$NON-NLS-1$
+                getString("_UI_TreeItemMapping_domainClass_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.TREE_ITEM_MAPPING__DOMAIN_CLASS, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -90,11 +92,11 @@ public class TreeItemMappingItemProvider extends TreeMappingItemProvider {
      * @generated
      */
     protected void addPreconditionExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_TreeItemMapping_preconditionExpression_feature"), getString("_UI_TreeItemMapping_preconditionExpression_description"),
-                DescriptionPackage.Literals.TREE_ITEM_MAPPING__PRECONDITION_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_AdvancedPropertyCategory"), null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+                getString("_UI_TreeItemMapping_preconditionExpression_feature"), //$NON-NLS-1$
+                getString("_UI_TreeItemMapping_preconditionExpression_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.TREE_ITEM_MAPPING__PRECONDITION_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_AdvancedPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -104,11 +106,13 @@ public class TreeItemMappingItemProvider extends TreeMappingItemProvider {
      * @generated
      */
     protected void addSemanticCandidatesExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_TreeItemMapping_semanticCandidatesExpression_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_TreeItemMapping_semanticCandidatesExpression_feature", "_UI_TreeItemMapping_type"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_TreeItemMapping_semanticCandidatesExpression_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_TreeItemMapping_semanticCandidatesExpression_feature", "_UI_TreeItemMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DescriptionPackage.Literals.TREE_ITEM_MAPPING__SEMANTIC_CANDIDATES_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -119,8 +123,10 @@ public class TreeItemMappingItemProvider extends TreeMappingItemProvider {
      */
     protected void addReusedTreeItemMappingsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_TreeItemMapping_reusedTreeItemMappings_feature"), getString("_UI_TreeItemMapping_reusedTreeItemMappings_description"),
-                DescriptionPackage.Literals.TREE_ITEM_MAPPING__REUSED_TREE_ITEM_MAPPINGS, true, false, true, null, getString("_UI_ImportPropertyCategory"), null));
+                getString("_UI_TreeItemMapping_reusedTreeItemMappings_feature"), //$NON-NLS-1$
+                getString("_UI_TreeItemMapping_reusedTreeItemMappings_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.TREE_ITEM_MAPPING__REUSED_TREE_ITEM_MAPPINGS, true, false, true, null, getString("_UI_ImportPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -131,8 +137,10 @@ public class TreeItemMappingItemProvider extends TreeMappingItemProvider {
      */
     protected void addSpecializePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_TreeItemMapping_specialize_feature"), getString("_UI_PropertyDescriptor_description", "_UI_TreeItemMapping_specialize_feature", "_UI_TreeItemMapping_type"),
-                DescriptionPackage.Literals.TREE_ITEM_MAPPING__SPECIALIZE, true, false, true, null, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_TreeItemMapping_specialize_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_TreeItemMapping_specialize_feature", "_UI_TreeItemMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DescriptionPackage.Literals.TREE_ITEM_MAPPING__SPECIALIZE, true, false, true, null, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -184,7 +192,7 @@ public class TreeItemMappingItemProvider extends TreeMappingItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/TreeItemMapping"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/TreeItemMapping")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeItemStyleDescriptionItemProvider.java b/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeItemStyleDescriptionItemProvider.java
index 1c64790c92..e705b4adb3 100644
--- a/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeItemStyleDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeItemStyleDescriptionItemProvider.java
@@ -82,9 +82,10 @@ IItemPropertySource {
      */
     protected void addLabelExpressionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_BasicLabelStyleDescription_labelExpression_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_BasicLabelStyleDescription_labelExpression_feature", "_UI_BasicLabelStyleDescription_type"),
-                StylePackage.Literals.BASIC_LABEL_STYLE_DESCRIPTION__LABEL_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_LabelPropertyCategory"), null));
+                getString("_UI_BasicLabelStyleDescription_labelExpression_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_BasicLabelStyleDescription_labelExpression_feature", "_UI_BasicLabelStyleDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                StylePackage.Literals.BASIC_LABEL_STYLE_DESCRIPTION__LABEL_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_LabelPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -95,8 +96,10 @@ IItemPropertySource {
      */
     protected void addLabelAlignmentPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_LabelStyleDescription_labelAlignment_feature"), getString("_UI_LabelStyleDescription_labelAlignment_description"),
-                StylePackage.Literals.LABEL_STYLE_DESCRIPTION__LABEL_ALIGNMENT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_LabelPropertyCategory"), null));
+                getString("_UI_LabelStyleDescription_labelAlignment_feature"), //$NON-NLS-1$
+                getString("_UI_LabelStyleDescription_labelAlignment_description"), //$NON-NLS-1$
+                StylePackage.Literals.LABEL_STYLE_DESCRIPTION__LABEL_ALIGNMENT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_LabelPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -107,9 +110,10 @@ IItemPropertySource {
      */
     protected void addLabelColorPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_BasicLabelStyleDescription_labelColor_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_BasicLabelStyleDescription_labelColor_feature", "_UI_BasicLabelStyleDescription_type"),
-                StylePackage.Literals.BASIC_LABEL_STYLE_DESCRIPTION__LABEL_COLOR, true, false, true, null, getString("_UI_ColorPropertyCategory"), null));
+                getString("_UI_BasicLabelStyleDescription_labelColor_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_BasicLabelStyleDescription_labelColor_feature", "_UI_BasicLabelStyleDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                StylePackage.Literals.BASIC_LABEL_STYLE_DESCRIPTION__LABEL_COLOR, true, false, true, null, getString("_UI_ColorPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -120,8 +124,10 @@ IItemPropertySource {
      */
     protected void addIconPathPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_BasicLabelStyleDescription_iconPath_feature"), getString("_UI_BasicLabelStyleDescription_iconPath_description"),
-                StylePackage.Literals.BASIC_LABEL_STYLE_DESCRIPTION__ICON_PATH, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_AdvancedPropertyCategory"), null));
+                getString("_UI_BasicLabelStyleDescription_iconPath_feature"), //$NON-NLS-1$
+                getString("_UI_BasicLabelStyleDescription_iconPath_description"), //$NON-NLS-1$
+                StylePackage.Literals.BASIC_LABEL_STYLE_DESCRIPTION__ICON_PATH, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_AdvancedPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -132,8 +138,10 @@ IItemPropertySource {
      */
     protected void addBackgroundColorPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_TreeItemStyleDescription_backgroundColor_feature"), getString("_UI_TreeItemStyleDescription_backgroundColor_description"),
-                DescriptionPackage.Literals.TREE_ITEM_STYLE_DESCRIPTION__BACKGROUND_COLOR, true, false, true, null, getString("_UI_ColorPropertyCategory"), null));
+                getString("_UI_TreeItemStyleDescription_backgroundColor_feature"), //$NON-NLS-1$
+                getString("_UI_TreeItemStyleDescription_backgroundColor_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.TREE_ITEM_STYLE_DESCRIPTION__BACKGROUND_COLOR, true, false, true, null, getString("_UI_ColorPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -144,9 +152,10 @@ IItemPropertySource {
      */
     protected void addLabelSizePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_BasicLabelStyleDescription_labelSize_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_BasicLabelStyleDescription_labelSize_feature", "_UI_BasicLabelStyleDescription_type"),
-                StylePackage.Literals.BASIC_LABEL_STYLE_DESCRIPTION__LABEL_SIZE, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, getString("_UI_LabelPropertyCategory"), null));
+                getString("_UI_BasicLabelStyleDescription_labelSize_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_BasicLabelStyleDescription_labelSize_feature", "_UI_BasicLabelStyleDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                StylePackage.Literals.BASIC_LABEL_STYLE_DESCRIPTION__LABEL_SIZE, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, getString("_UI_LabelPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -157,9 +166,10 @@ IItemPropertySource {
      */
     protected void addLabelFormatPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_BasicLabelStyleDescription_labelFormat_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_BasicLabelStyleDescription_labelFormat_feature", "_UI_BasicLabelStyleDescription_type"),
-                StylePackage.Literals.BASIC_LABEL_STYLE_DESCRIPTION__LABEL_FORMAT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_LabelPropertyCategory"), null));
+                getString("_UI_BasicLabelStyleDescription_labelFormat_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_BasicLabelStyleDescription_labelFormat_feature", "_UI_BasicLabelStyleDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                StylePackage.Literals.BASIC_LABEL_STYLE_DESCRIPTION__LABEL_FORMAT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_LabelPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -170,9 +180,10 @@ IItemPropertySource {
      */
     protected void addShowIconPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_BasicLabelStyleDescription_showIcon_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_BasicLabelStyleDescription_showIcon_feature", "_UI_BasicLabelStyleDescription_type"),
-                StylePackage.Literals.BASIC_LABEL_STYLE_DESCRIPTION__SHOW_ICON, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, getString("_UI_LabelPropertyCategory"), null));
+                getString("_UI_BasicLabelStyleDescription_showIcon_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_BasicLabelStyleDescription_showIcon_feature", "_UI_BasicLabelStyleDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                StylePackage.Literals.BASIC_LABEL_STYLE_DESCRIPTION__SHOW_ICON, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, getString("_UI_LabelPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -183,7 +194,7 @@ IItemPropertySource {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/TreeItemStyleDescription"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/TreeItemStyleDescription")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeItemUpdaterItemProvider.java b/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeItemUpdaterItemProvider.java
index ef3b9ab1b5..ebcfe37581 100644
--- a/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeItemUpdaterItemProvider.java
+++ b/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeItemUpdaterItemProvider.java
@@ -105,7 +105,7 @@ IItemPropertySource {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/TreeItemUpdater"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/TreeItemUpdater")); //$NON-NLS-1$
     }
 
     /**
@@ -116,7 +116,7 @@ IItemPropertySource {
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_TreeItemUpdater_type");
+        return getString("_UI_TreeItemUpdater_type"); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeMappingItemProvider.java b/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeMappingItemProvider.java
index 93d67df674..66fdbc4c71 100644
--- a/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeMappingItemProvider.java
+++ b/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeMappingItemProvider.java
@@ -69,8 +69,10 @@ public class TreeMappingItemProvider extends RepresentationElementMappingItemPro
      */
     protected void addSemanticElementsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_TreeMapping_semanticElements_feature"), getString("_UI_TreeMapping_semanticElements_description"), DescriptionPackage.Literals.TREE_MAPPING__SEMANTIC_ELEMENTS, true,
-                false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_AdvancedPropertyCategory"), null));
+                getString("_UI_TreeMapping_semanticElements_feature"), //$NON-NLS-1$
+                getString("_UI_TreeMapping_semanticElements_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.TREE_MAPPING__SEMANTIC_ELEMENTS, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_AdvancedPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -81,7 +83,7 @@ public class TreeMappingItemProvider extends RepresentationElementMappingItemPro
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/TreeMapping"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/TreeMapping")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeNavigationDescriptionItemProvider.java b/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeNavigationDescriptionItemProvider.java
index 5a20e8496c..7e14289956 100644
--- a/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeNavigationDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeNavigationDescriptionItemProvider.java
@@ -67,8 +67,10 @@ public class TreeNavigationDescriptionItemProvider extends RepresentationNavigat
      */
     protected void addTreeDescriptionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_TreeNavigationDescription_treeDescription_feature"), getString("_UI_TreeNavigationDescription_treeDescription_description"),
-                DescriptionPackage.Literals.TREE_NAVIGATION_DESCRIPTION__TREE_DESCRIPTION, true, false, true, null, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_TreeNavigationDescription_treeDescription_feature"), //$NON-NLS-1$
+                getString("_UI_TreeNavigationDescription_treeDescription_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.TREE_NAVIGATION_DESCRIPTION__TREE_DESCRIPTION, true, false, true, null, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -79,7 +81,7 @@ public class TreeNavigationDescriptionItemProvider extends RepresentationNavigat
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/TreeNavigationDescription"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/TreeNavigationDescription")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreePopupMenuItemProvider.java b/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreePopupMenuItemProvider.java
index 5a960d533e..97ab71de6b 100644
--- a/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreePopupMenuItemProvider.java
+++ b/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreePopupMenuItemProvider.java
@@ -101,7 +101,7 @@ public class TreePopupMenuItemProvider extends AbstractToolDescriptionItemProvid
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/TreePopupMenu"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/TreePopupMenu")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeVariableItemProvider.java b/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeVariableItemProvider.java
index 0d29d36f5d..0fd4308f4a 100644
--- a/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeVariableItemProvider.java
+++ b/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeVariableItemProvider.java
@@ -71,8 +71,10 @@ public class TreeVariableItemProvider extends AbstractVariableItemProvider {
      */
     protected void addDocumentationPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_TreeVariable_documentation_feature"), getString("_UI_PropertyDescriptor_description", "_UI_TreeVariable_documentation_feature", "_UI_TreeVariable_type"),
-                DescriptionPackage.Literals.TREE_VARIABLE__DOCUMENTATION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_TreeVariable_documentation_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_TreeVariable_documentation_feature", "_UI_TreeVariable_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DescriptionPackage.Literals.TREE_VARIABLE__DOCUMENTATION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -116,7 +118,7 @@ public class TreeVariableItemProvider extends AbstractVariableItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/TreeVariable"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/TreeVariable")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/provider/DTreeElementItemProvider.java b/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/provider/DTreeElementItemProvider.java
index c6094b5245..6ba78ae190 100644
--- a/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/provider/DTreeElementItemProvider.java
+++ b/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/provider/DTreeElementItemProvider.java
@@ -65,7 +65,8 @@ public class DTreeElementItemProvider extends DRepresentationElementItemProvider
      */
     protected void addTreeElementMappingPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DTreeElement_treeElementMapping_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DTreeElement_treeElementMapping_feature", "_UI_DTreeElement_type"),
+                getString("_UI_DTreeElement_treeElementMapping_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DTreeElement_treeElementMapping_feature", "_UI_DTreeElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 TreePackage.Literals.DTREE_ELEMENT__TREE_ELEMENT_MAPPING, false, false, false, null, null, null));
     }
 
@@ -77,7 +78,7 @@ public class DTreeElementItemProvider extends DRepresentationElementItemProvider
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/DTreeElement"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/DTreeElement")); //$NON-NLS-1$
     }
 
     /**
@@ -89,7 +90,8 @@ public class DTreeElementItemProvider extends DRepresentationElementItemProvider
     @Override
     public String getText(Object object) {
         String label = ((DTreeElement) object).getName();
-        return label == null || label.length() == 0 ? getString("_UI_DTreeElement_type") : getString("_UI_DTreeElement_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_DTreeElement_type") : //$NON-NLS-1$
+            getString("_UI_DTreeElement_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/provider/DTreeElementSynchronizerItemProvider.java b/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/provider/DTreeElementSynchronizerItemProvider.java
index 42fd85f527..56ce30d084 100644
--- a/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/provider/DTreeElementSynchronizerItemProvider.java
+++ b/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/provider/DTreeElementSynchronizerItemProvider.java
@@ -67,7 +67,7 @@ IItemPropertySource {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/DTreeElementSynchronizer"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/DTreeElementSynchronizer")); //$NON-NLS-1$
     }
 
     /**
@@ -78,7 +78,7 @@ IItemPropertySource {
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_DTreeElementSynchronizer_type");
+        return getString("_UI_DTreeElementSynchronizer_type"); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/provider/DTreeItemContainerItemProvider.java b/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/provider/DTreeItemContainerItemProvider.java
index ce28405ee6..c767fbae04 100644
--- a/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/provider/DTreeItemContainerItemProvider.java
+++ b/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/provider/DTreeItemContainerItemProvider.java
@@ -99,7 +99,7 @@ public class DTreeItemContainerItemProvider extends DSemanticDecoratorItemProvid
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_DTreeItemContainer_type");
+        return getString("_UI_DTreeItemContainer_type"); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/provider/DTreeItemItemProvider.java b/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/provider/DTreeItemItemProvider.java
index d926586e8a..fd0d4526d1 100644
--- a/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/provider/DTreeItemItemProvider.java
+++ b/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/provider/DTreeItemItemProvider.java
@@ -73,7 +73,8 @@ public class DTreeItemItemProvider extends DTreeItemContainerItemProvider {
      */
     protected void addNamePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DRepresentationElement_name_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DRepresentationElement_name_feature", "_UI_DRepresentationElement_type"),
+                getString("_UI_DRepresentationElement_name_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DRepresentationElement_name_feature", "_UI_DRepresentationElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 ViewpointPackage.Literals.DREPRESENTATION_ELEMENT__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -85,8 +86,8 @@ public class DTreeItemItemProvider extends DTreeItemContainerItemProvider {
      */
     protected void addSemanticElementsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DRepresentationElement_semanticElements_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_DRepresentationElement_semanticElements_feature", "_UI_DRepresentationElement_type"),
+                getString("_UI_DRepresentationElement_semanticElements_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DRepresentationElement_semanticElements_feature", "_UI_DRepresentationElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 ViewpointPackage.Literals.DREPRESENTATION_ELEMENT__SEMANTIC_ELEMENTS, true, false, true, null, null, null));
     }
 
@@ -98,7 +99,8 @@ public class DTreeItemItemProvider extends DTreeItemContainerItemProvider {
      */
     protected void addTreeElementMappingPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DTreeElement_treeElementMapping_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DTreeElement_treeElementMapping_feature", "_UI_DTreeElement_type"),
+                getString("_UI_DTreeElement_treeElementMapping_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DTreeElement_treeElementMapping_feature", "_UI_DTreeElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 TreePackage.Literals.DTREE_ELEMENT__TREE_ELEMENT_MAPPING, false, false, false, null, null, null));
     }
 
@@ -110,7 +112,8 @@ public class DTreeItemItemProvider extends DTreeItemContainerItemProvider {
      */
     protected void addExpandedPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DTreeItem_expanded_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DTreeItem_expanded_feature", "_UI_DTreeItem_type"),
+                getString("_UI_DTreeItem_expanded_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DTreeItem_expanded_feature", "_UI_DTreeItem_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 TreePackage.Literals.DTREE_ITEM__EXPANDED, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
     }
 
@@ -122,7 +125,8 @@ public class DTreeItemItemProvider extends DTreeItemContainerItemProvider {
      */
     protected void addActualMappingPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DTreeItem_actualMapping_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DTreeItem_actualMapping_feature", "_UI_DTreeItem_type"),
+                getString("_UI_DTreeItem_actualMapping_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DTreeItem_actualMapping_feature", "_UI_DTreeItem_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 TreePackage.Literals.DTREE_ITEM__ACTUAL_MAPPING, true, false, true, null, null, null));
     }
 
@@ -134,7 +138,8 @@ public class DTreeItemItemProvider extends DTreeItemContainerItemProvider {
      */
     protected void addStyleUpdaterPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DTreeItem_styleUpdater_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DTreeItem_styleUpdater_feature", "_UI_DTreeItem_type"),
+                getString("_UI_DTreeItem_styleUpdater_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DTreeItem_styleUpdater_feature", "_UI_DTreeItem_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 TreePackage.Literals.DTREE_ITEM__STYLE_UPDATER, false, false, false, null, null, null));
     }
 
@@ -146,7 +151,8 @@ public class DTreeItemItemProvider extends DTreeItemContainerItemProvider {
      */
     protected void addUpdaterPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DTreeItem_updater_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DTreeItem_updater_feature", "_UI_DTreeItem_type"),
+                getString("_UI_DTreeItem_updater_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DTreeItem_updater_feature", "_UI_DTreeItem_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 TreePackage.Literals.DTREE_ITEM__UPDATER, false, false, true, null, null, null));
     }
 
@@ -190,7 +196,7 @@ public class DTreeItemItemProvider extends DTreeItemContainerItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/DTreeItem"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/DTreeItem")); //$NON-NLS-1$
     }
 
     /**
@@ -202,7 +208,8 @@ public class DTreeItemItemProvider extends DTreeItemContainerItemProvider {
     @Override
     public String getText(Object object) {
         String label = ((DTreeItem) object).getName();
-        return label == null || label.length() == 0 ? getString("_UI_DTreeItem_type") : getString("_UI_DTreeItem_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_DTreeItem_type") : //$NON-NLS-1$
+            getString("_UI_DTreeItem_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/provider/DTreeItemProvider.java b/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/provider/DTreeItemProvider.java
index 98d3890540..0654b80d52 100644
--- a/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/provider/DTreeItemProvider.java
+++ b/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/provider/DTreeItemProvider.java
@@ -70,7 +70,8 @@ public class DTreeItemProvider extends DRepresentationItemProvider {
      */
     protected void addTargetPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DSemanticDecorator_target_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DSemanticDecorator_target_feature", "_UI_DSemanticDecorator_type"),
+                getString("_UI_DSemanticDecorator_target_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DSemanticDecorator_target_feature", "_UI_DSemanticDecorator_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 ViewpointPackage.Literals.DSEMANTIC_DECORATOR__TARGET, true, false, true, null, null, null));
     }
 
@@ -82,7 +83,8 @@ public class DTreeItemProvider extends DRepresentationItemProvider {
      */
     protected void addSemanticElementsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DTree_semanticElements_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DTree_semanticElements_feature", "_UI_DTree_type"),
+                getString("_UI_DTree_semanticElements_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DTree_semanticElements_feature", "_UI_DTree_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 TreePackage.Literals.DTREE__SEMANTIC_ELEMENTS, true, false, true, null, null, null));
     }
 
@@ -94,7 +96,8 @@ public class DTreeItemProvider extends DRepresentationItemProvider {
      */
     protected void addDescriptionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DTree_description_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DTree_description_feature", "_UI_DTree_type"),
+                getString("_UI_DTree_description_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DTree_description_feature", "_UI_DTree_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 TreePackage.Literals.DTREE__DESCRIPTION, true, false, true, null, null, null));
     }
 
@@ -138,7 +141,7 @@ public class DTreeItemProvider extends DRepresentationItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/DTree"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/DTree")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/provider/TreeItemStyleItemProvider.java b/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/provider/TreeItemStyleItemProvider.java
index 529dda6101..a7755f5cda 100644
--- a/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/provider/TreeItemStyleItemProvider.java
+++ b/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/provider/TreeItemStyleItemProvider.java
@@ -74,7 +74,8 @@ public class TreeItemStyleItemProvider extends StyleItemProvider {
      */
     protected void addLabelSizePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_BasicLabelStyle_labelSize_feature"), getString("_UI_PropertyDescriptor_description", "_UI_BasicLabelStyle_labelSize_feature", "_UI_BasicLabelStyle_type"),
+                getString("_UI_BasicLabelStyle_labelSize_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_BasicLabelStyle_labelSize_feature", "_UI_BasicLabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 ViewpointPackage.Literals.BASIC_LABEL_STYLE__LABEL_SIZE, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
     }
 
@@ -86,7 +87,8 @@ public class TreeItemStyleItemProvider extends StyleItemProvider {
      */
     protected void addLabelFormatPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_BasicLabelStyle_labelFormat_feature"), getString("_UI_PropertyDescriptor_description", "_UI_BasicLabelStyle_labelFormat_feature", "_UI_BasicLabelStyle_type"),
+                getString("_UI_BasicLabelStyle_labelFormat_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_BasicLabelStyle_labelFormat_feature", "_UI_BasicLabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 ViewpointPackage.Literals.BASIC_LABEL_STYLE__LABEL_FORMAT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -98,7 +100,8 @@ public class TreeItemStyleItemProvider extends StyleItemProvider {
      */
     protected void addShowIconPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_BasicLabelStyle_showIcon_feature"), getString("_UI_PropertyDescriptor_description", "_UI_BasicLabelStyle_showIcon_feature", "_UI_BasicLabelStyle_type"),
+                getString("_UI_BasicLabelStyle_showIcon_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_BasicLabelStyle_showIcon_feature", "_UI_BasicLabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 ViewpointPackage.Literals.BASIC_LABEL_STYLE__SHOW_ICON, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
     }
 
@@ -110,7 +113,8 @@ public class TreeItemStyleItemProvider extends StyleItemProvider {
      */
     protected void addIconPathPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_BasicLabelStyle_iconPath_feature"), getString("_UI_PropertyDescriptor_description", "_UI_BasicLabelStyle_iconPath_feature", "_UI_BasicLabelStyle_type"),
+                getString("_UI_BasicLabelStyle_iconPath_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_BasicLabelStyle_iconPath_feature", "_UI_BasicLabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 ViewpointPackage.Literals.BASIC_LABEL_STYLE__ICON_PATH, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -122,7 +126,8 @@ public class TreeItemStyleItemProvider extends StyleItemProvider {
      */
     protected void addLabelColorPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_BasicLabelStyle_labelColor_feature"), getString("_UI_PropertyDescriptor_description", "_UI_BasicLabelStyle_labelColor_feature", "_UI_BasicLabelStyle_type"),
+                getString("_UI_BasicLabelStyle_labelColor_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_BasicLabelStyle_labelColor_feature", "_UI_BasicLabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 ViewpointPackage.Literals.BASIC_LABEL_STYLE__LABEL_COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -134,7 +139,8 @@ public class TreeItemStyleItemProvider extends StyleItemProvider {
      */
     protected void addLabelAlignmentPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_LabelStyle_labelAlignment_feature"), getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_labelAlignment_feature", "_UI_LabelStyle_type"),
+                getString("_UI_LabelStyle_labelAlignment_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_labelAlignment_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 ViewpointPackage.Literals.LABEL_STYLE__LABEL_ALIGNMENT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -146,7 +152,8 @@ public class TreeItemStyleItemProvider extends StyleItemProvider {
      */
     protected void addBackgroundColorPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_TreeItemStyle_backgroundColor_feature"), getString("_UI_PropertyDescriptor_description", "_UI_TreeItemStyle_backgroundColor_feature", "_UI_TreeItemStyle_type"),
+                getString("_UI_TreeItemStyle_backgroundColor_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_TreeItemStyle_backgroundColor_feature", "_UI_TreeItemStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 TreePackage.Literals.TREE_ITEM_STYLE__BACKGROUND_COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -158,7 +165,7 @@ public class TreeItemStyleItemProvider extends StyleItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/TreeItemStyle"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/TreeItemStyle")); //$NON-NLS-1$
     }
 
     /**
@@ -170,7 +177,7 @@ public class TreeItemStyleItemProvider extends StyleItemProvider {
     @Override
     public String getText(Object object) {
         TreeItemStyle treeItemStyle = (TreeItemStyle) object;
-        return getString("_UI_TreeItemStyle_type") + " " + treeItemStyle.getLabelSize();
+        return getString("_UI_TreeItemStyle_type") + " " + treeItemStyle.getLabelSize(); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/description/impl/DescriptionFactoryImpl.java b/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/description/impl/DescriptionFactoryImpl.java
index db9405c8ec..8414fa73cf 100644
--- a/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/description/impl/DescriptionFactoryImpl.java
+++ b/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/description/impl/DescriptionFactoryImpl.java
@@ -120,7 +120,7 @@ public class DescriptionFactoryImpl extends EFactoryImpl implements DescriptionF
         case DescriptionPackage.TREE_POPUP_MENU:
             return createTreePopupMenu();
         default:
-            throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+            throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
         }
     }
 
@@ -135,7 +135,7 @@ public class DescriptionFactoryImpl extends EFactoryImpl implements DescriptionF
         case DescriptionPackage.TREE_DRAG_SOURCE:
             return createTreeDragSourceFromString(eDataType, initialValue);
         default:
-            throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+            throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
         }
     }
 
@@ -150,7 +150,7 @@ public class DescriptionFactoryImpl extends EFactoryImpl implements DescriptionF
         case DescriptionPackage.TREE_DRAG_SOURCE:
             return convertTreeDragSourceToString(eDataType, instanceValue);
         default:
-            throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+            throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
         }
     }
 
@@ -351,7 +351,7 @@ public class DescriptionFactoryImpl extends EFactoryImpl implements DescriptionF
     public TreeDragSource createTreeDragSourceFromString(EDataType eDataType, String initialValue) {
         TreeDragSource result = TreeDragSource.get(initialValue);
         if (result == null) {
-            throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+            throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
         }
         return result;
     }
diff --git a/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/description/impl/DescriptionPackageImpl.java b/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/description/impl/DescriptionPackageImpl.java
index fefc64ce71..906bae2089 100644
--- a/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/description/impl/DescriptionPackageImpl.java
+++ b/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/description/impl/DescriptionPackageImpl.java
@@ -1132,200 +1132,293 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
         treePopupMenuEClass.getESuperTypes().add(theToolPackage.getAbstractToolDescription());
 
         // Initialize classes and features; add operations and parameters
-        initEClass(treeDescriptionEClass, TreeDescription.class, "TreeDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getTreeDescription_DomainClass(), theDescriptionPackage_1.getTypeName(), "domainClass", null, 1, 1, TreeDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getTreeDescription_PreconditionExpression(), theDescriptionPackage_1.getInterpretedExpression(), "preconditionExpression", null, 0, 1, TreeDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getTreeDescription_CreateTreeItem(), this.getTreeItemCreationTool(), null, "createTreeItem", null, 0, -1, TreeDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getTreeDescription_OwnedRepresentationCreationDescriptions(), theToolPackage.getRepresentationCreationDescription(), null, "ownedRepresentationCreationDescriptions", null, 0,
-                -1, TreeDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES,
-                !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEClass(treeDescriptionEClass, TreeDescription.class, "TreeDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getTreeDescription_DomainClass(),
+                theDescriptionPackage_1.getTypeName(),
+                "domainClass", null, 1, 1, TreeDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getTreeDescription_PreconditionExpression(),
+                theDescriptionPackage_1.getInterpretedExpression(),
+                "preconditionExpression", null, 0, 1, TreeDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getTreeDescription_CreateTreeItem(),
+                this.getTreeItemCreationTool(),
+                null,
+                "createTreeItem", null, 0, -1, TreeDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getTreeDescription_OwnedRepresentationCreationDescriptions(),
+                theToolPackage.getRepresentationCreationDescription(),
+                null,
+                "ownedRepresentationCreationDescriptions", null, 0, -1, TreeDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
         getTreeDescription_OwnedRepresentationCreationDescriptions().getEKeys().add(theDescriptionPackage_1.getIdentifiedElement_Name());
-        initEReference(getTreeDescription_OwnedRepresentationNavigationDescriptions(), theToolPackage.getRepresentationNavigationDescription(), null, "ownedRepresentationNavigationDescriptions",
-                null, 0, -1, TreeDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES,
-                !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEReference(
+                getTreeDescription_OwnedRepresentationNavigationDescriptions(),
+                theToolPackage.getRepresentationNavigationDescription(),
+                null,
+                "ownedRepresentationNavigationDescriptions", null, 0, -1, TreeDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
         getTreeDescription_OwnedRepresentationNavigationDescriptions().getEKeys().add(theDescriptionPackage_1.getIdentifiedElement_Name());
 
-        initEClass(treeItemMappingEClass, TreeItemMapping.class, "TreeItemMapping", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getTreeItemMapping_DomainClass(), theDescriptionPackage_1.getTypeName(), "domainClass", null, 1, 1, TreeItemMapping.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getTreeItemMapping_PreconditionExpression(), theDescriptionPackage_1.getInterpretedExpression(), "preconditionExpression", null, 0, 1, TreeItemMapping.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEAttribute(getTreeItemMapping_SemanticCandidatesExpression(), theDescriptionPackage_1.getInterpretedExpression(), "semanticCandidatesExpression", null, 0, 1, TreeItemMapping.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getTreeItemMapping_ReusedTreeItemMappings(), this.getTreeItemMapping(), null, "reusedTreeItemMappings", null, 0, -1, TreeItemMapping.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getTreeItemMapping_AllSubMappings(), this.getTreeItemMapping(), null, "allSubMappings", null, 0, -1, TreeItemMapping.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE,
-                !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getTreeItemMapping_Specialize(), this.getTreeItemMapping(), null, "specialize", null, 0, 1, TreeItemMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getTreeItemMapping_Delete(), this.getTreeItemDeletionTool(), this.getTreeItemDeletionTool_Mapping(), "delete", null, 0, 1, TreeItemMapping.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getTreeItemMapping_Create(), this.getTreeItemCreationTool(), null, "create", null, 0, -1, TreeItemMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getTreeItemMapping_DndTools(), this.getTreeItemDragTool(), null, "dndTools", null, 0, -1, TreeItemMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getTreeItemMapping_PopupMenus(), this.getTreePopupMenu(), null, "popupMenus", null, 0, -1, TreeItemMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-
-        initEClass(treeItemStyleDescriptionEClass, TreeItemStyleDescription.class, "TreeItemStyleDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getTreeItemStyleDescription_BackgroundColor(), theDescriptionPackage_1.getColorDescription(), null, "backgroundColor", null, 1, 1, TreeItemStyleDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(conditionalTreeItemStyleDescriptionEClass, ConditionalTreeItemStyleDescription.class, "ConditionalTreeItemStyleDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getConditionalTreeItemStyleDescription_Style(), this.getTreeItemStyleDescription(), null, "style", null, 0, 1, ConditionalTreeItemStyleDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(treeItemToolEClass, TreeItemTool.class, "TreeItemTool", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getTreeItemTool_FirstModelOperation(), theToolPackage.getModelOperation(), null, "firstModelOperation", null, 0, 1, TreeItemTool.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getTreeItemTool_Variables(), this.getTreeVariable(), null, "variables", null, 0, -1, TreeItemTool.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-
-        initEClass(treeItemDragToolEClass, TreeItemDragTool.class, "TreeItemDragTool", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getTreeItemDragTool_OldContainer(), theToolPackage.getDropContainerVariable(), null, "oldContainer", null, 1, 1, TreeItemDragTool.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getTreeItemDragTool_NewContainer(), theToolPackage.getDropContainerVariable(), null, "newContainer", null, 1, 1, TreeItemDragTool.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getTreeItemDragTool_Element(), theToolPackage.getElementDropVariable(), null, "element", null, 1, 1, TreeItemDragTool.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getTreeItemDragTool_NewViewContainer(), theToolPackage.getContainerViewVariable(), null, "newViewContainer", null, 1, 1, TreeItemDragTool.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getTreeItemDragTool_Containers(), this.getTreeItemMappingContainer(), null, "containers", null, 1, -1, TreeItemDragTool.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getTreeItemDragTool_DragSourceType(), this.getTreeDragSource(), "dragSourceType", null, 1, 1, TreeItemDragTool.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getTreeItemDragTool_PrecedingSiblings(), this.getPrecedingSiblingsVariables(), null, "precedingSiblings", null, 1, 1, TreeItemDragTool.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        addEOperation(treeItemDragToolEClass, this.getTreeItemMapping(), "getBestTreeItemMapping", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-
-        initEClass(treeItemContainerDropToolEClass, TreeItemContainerDropTool.class, "TreeItemContainerDropTool", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getTreeItemContainerDropTool_OldContainer(), theToolPackage.getDropContainerVariable(), null, "oldContainer", null, 1, 1, TreeItemContainerDropTool.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getTreeItemContainerDropTool_NewContainer(), theToolPackage.getDropContainerVariable(), null, "newContainer", null, 1, 1, TreeItemContainerDropTool.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getTreeItemContainerDropTool_Element(), theToolPackage.getElementDropVariable(), null, "element", null, 1, 1, TreeItemContainerDropTool.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getTreeItemContainerDropTool_NewViewContainer(), theToolPackage.getContainerViewVariable(), null, "newViewContainer", null, 1, 1, TreeItemContainerDropTool.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getTreeItemContainerDropTool_PrecedingSiblings(), this.getPrecedingSiblingsVariables(), null, "precedingSiblings", null, 1, 1, TreeItemContainerDropTool.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getTreeItemContainerDropTool_DragSource(), this.getTreeDragSource(), "dragSource", null, 1, 1, TreeItemContainerDropTool.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(treeItemCreationToolEClass, TreeItemCreationTool.class, "TreeItemCreationTool", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getTreeItemCreationTool_Mapping(), this.getTreeItemMapping(), null, "mapping", null, 0, -1, TreeItemCreationTool.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-
-        initEClass(treeItemEditionToolEClass, TreeItemEditionTool.class, "TreeItemEditionTool", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getTreeItemEditionTool_Mask(), theToolPackage.getEditMaskVariables(), null, "mask", null, 1, 1, TreeItemEditionTool.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getTreeItemEditionTool_Mapping(), this.getTreeItemMapping(), null, "mapping", null, 0, -1, TreeItemEditionTool.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getTreeItemEditionTool_Element(), theToolPackage.getElementDropVariable(), null, "element", null, 1, 1, TreeItemEditionTool.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getTreeItemEditionTool_Root(), theToolPackage.getElementDropVariable(), null, "root", null, 1, 1, TreeItemEditionTool.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(treeItemDeletionToolEClass, TreeItemDeletionTool.class, "TreeItemDeletionTool", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getTreeItemDeletionTool_Mapping(), this.getTreeItemMapping(), this.getTreeItemMapping_Delete(), "mapping", null, 1, 1, TreeItemDeletionTool.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(treeCreationDescriptionEClass, TreeCreationDescription.class, "TreeCreationDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getTreeCreationDescription_TreeDescription(), this.getTreeDescription(), null, "treeDescription", null, 1, 1, TreeCreationDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(treeNavigationDescriptionEClass, TreeNavigationDescription.class, "TreeNavigationDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getTreeNavigationDescription_TreeDescription(), this.getTreeDescription(), null, "treeDescription", null, 1, 1, TreeNavigationDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(treeMappingEClass, TreeMapping.class, "TreeMapping", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getTreeMapping_SemanticElements(), theDescriptionPackage_1.getInterpretedExpression(), "semanticElements", null, 0, 1, TreeMapping.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(styleUpdaterEClass, StyleUpdater.class, "StyleUpdater", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getStyleUpdater_DefaultStyle(), this.getTreeItemStyleDescription(), null, "defaultStyle", null, 1, 1, StyleUpdater.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getStyleUpdater_ConditionalStyles(), this.getConditionalTreeItemStyleDescription(), null, "conditionalStyles", null, 0, -1, StyleUpdater.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(treeVariableEClass, TreeVariable.class, "TreeVariable", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getTreeVariable_Documentation(), theEcorePackage.getEString(), "documentation", null, 0, 1, TreeVariable.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(treeItemUpdaterEClass, TreeItemUpdater.class, "TreeItemUpdater", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getTreeItemUpdater_DirectEdit(), this.getTreeItemEditionTool(), null, "directEdit", null, 0, 1, TreeItemUpdater.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-
-        addEOperation(treeItemUpdaterEClass, theDescriptionPackage_1.getInterpretedExpression(), "getLabelComputationExpression", 1, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-
-        addEOperation(treeItemUpdaterEClass, this.getTreeItemCreationTool(), "getCreateTreeItem", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-
-        initEClass(precedingSiblingsVariablesEClass, PrecedingSiblingsVariables.class, "PrecedingSiblingsVariables", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(treeItemMappingContainerEClass, TreeItemMappingContainer.class, "TreeItemMappingContainer", EPackageImpl.IS_ABSTRACT, EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getTreeItemMappingContainer_SubItemMappings(), this.getTreeItemMapping(), null, "subItemMappings", null, 0, -1, TreeItemMappingContainer.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEClass(treeItemMappingEClass, TreeItemMapping.class, "TreeItemMapping", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getTreeItemMapping_DomainClass(),
+                theDescriptionPackage_1.getTypeName(),
+                "domainClass", null, 1, 1, TreeItemMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getTreeItemMapping_PreconditionExpression(),
+                theDescriptionPackage_1.getInterpretedExpression(),
+                "preconditionExpression", null, 0, 1, TreeItemMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getTreeItemMapping_SemanticCandidatesExpression(),
+                theDescriptionPackage_1.getInterpretedExpression(),
+                "semanticCandidatesExpression", null, 0, 1, TreeItemMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getTreeItemMapping_ReusedTreeItemMappings(),
+                this.getTreeItemMapping(),
+                null,
+                "reusedTreeItemMappings", null, 0, -1, TreeItemMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getTreeItemMapping_AllSubMappings(),
+                this.getTreeItemMapping(),
+                null,
+                "allSubMappings", null, 0, -1, TreeItemMapping.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE, !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getTreeItemMapping_Specialize(),
+                this.getTreeItemMapping(),
+                null,
+                "specialize", null, 0, 1, TreeItemMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getTreeItemMapping_Delete(),
+                this.getTreeItemDeletionTool(),
+                this.getTreeItemDeletionTool_Mapping(),
+                "delete", null, 0, 1, TreeItemMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getTreeItemMapping_Create(),
+                this.getTreeItemCreationTool(),
+                null,
+                "create", null, 0, -1, TreeItemMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getTreeItemMapping_DndTools(),
+                this.getTreeItemDragTool(),
+                null,
+                "dndTools", null, 0, -1, TreeItemMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getTreeItemMapping_PopupMenus(),
+                this.getTreePopupMenu(),
+                null,
+                "popupMenus", null, 0, -1, TreeItemMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(treeItemStyleDescriptionEClass, TreeItemStyleDescription.class,
+                "TreeItemStyleDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getTreeItemStyleDescription_BackgroundColor(),
+                theDescriptionPackage_1.getColorDescription(),
+                null,
+                "backgroundColor", null, 1, 1, TreeItemStyleDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(conditionalTreeItemStyleDescriptionEClass, ConditionalTreeItemStyleDescription.class,
+                "ConditionalTreeItemStyleDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getConditionalTreeItemStyleDescription_Style(),
+                this.getTreeItemStyleDescription(),
+                null,
+                "style", null, 0, 1, ConditionalTreeItemStyleDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(treeItemToolEClass, TreeItemTool.class, "TreeItemTool", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getTreeItemTool_FirstModelOperation(),
+                theToolPackage.getModelOperation(),
+                null,
+                "firstModelOperation", null, 0, 1, TreeItemTool.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getTreeItemTool_Variables(),
+                this.getTreeVariable(),
+                null,
+                "variables", null, 0, -1, TreeItemTool.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(treeItemDragToolEClass, TreeItemDragTool.class, "TreeItemDragTool", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getTreeItemDragTool_OldContainer(),
+                theToolPackage.getDropContainerVariable(),
+                null,
+                "oldContainer", null, 1, 1, TreeItemDragTool.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getTreeItemDragTool_NewContainer(),
+                theToolPackage.getDropContainerVariable(),
+                null,
+                "newContainer", null, 1, 1, TreeItemDragTool.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getTreeItemDragTool_Element(),
+                theToolPackage.getElementDropVariable(),
+                null,
+                "element", null, 1, 1, TreeItemDragTool.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getTreeItemDragTool_NewViewContainer(),
+                theToolPackage.getContainerViewVariable(),
+                null,
+                "newViewContainer", null, 1, 1, TreeItemDragTool.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getTreeItemDragTool_Containers(),
+                this.getTreeItemMappingContainer(),
+                null,
+                "containers", null, 1, -1, TreeItemDragTool.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getTreeItemDragTool_DragSourceType(),
+                this.getTreeDragSource(),
+                "dragSourceType", null, 1, 1, TreeItemDragTool.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getTreeItemDragTool_PrecedingSiblings(),
+                this.getPrecedingSiblingsVariables(),
+                null,
+                "precedingSiblings", null, 1, 1, TreeItemDragTool.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        addEOperation(treeItemDragToolEClass, this.getTreeItemMapping(), "getBestTreeItemMapping", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(treeItemContainerDropToolEClass, TreeItemContainerDropTool.class,
+                "TreeItemContainerDropTool", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getTreeItemContainerDropTool_OldContainer(),
+                theToolPackage.getDropContainerVariable(),
+                null,
+                "oldContainer", null, 1, 1, TreeItemContainerDropTool.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getTreeItemContainerDropTool_NewContainer(),
+                theToolPackage.getDropContainerVariable(),
+                null,
+                "newContainer", null, 1, 1, TreeItemContainerDropTool.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getTreeItemContainerDropTool_Element(),
+                theToolPackage.getElementDropVariable(),
+                null,
+                "element", null, 1, 1, TreeItemContainerDropTool.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getTreeItemContainerDropTool_NewViewContainer(),
+                theToolPackage.getContainerViewVariable(),
+                null,
+                "newViewContainer", null, 1, 1, TreeItemContainerDropTool.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getTreeItemContainerDropTool_PrecedingSiblings(),
+                this.getPrecedingSiblingsVariables(),
+                null,
+                "precedingSiblings", null, 1, 1, TreeItemContainerDropTool.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getTreeItemContainerDropTool_DragSource(),
+                this.getTreeDragSource(),
+                "dragSource", null, 1, 1, TreeItemContainerDropTool.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(treeItemCreationToolEClass, TreeItemCreationTool.class, "TreeItemCreationTool", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getTreeItemCreationTool_Mapping(),
+                this.getTreeItemMapping(),
+                null,
+                "mapping", null, 0, -1, TreeItemCreationTool.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(treeItemEditionToolEClass, TreeItemEditionTool.class, "TreeItemEditionTool", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getTreeItemEditionTool_Mask(),
+                theToolPackage.getEditMaskVariables(),
+                null,
+                "mask", null, 1, 1, TreeItemEditionTool.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getTreeItemEditionTool_Mapping(),
+                this.getTreeItemMapping(),
+                null,
+                "mapping", null, 0, -1, TreeItemEditionTool.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getTreeItemEditionTool_Element(),
+                theToolPackage.getElementDropVariable(),
+                null,
+                "element", null, 1, 1, TreeItemEditionTool.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getTreeItemEditionTool_Root(),
+                theToolPackage.getElementDropVariable(),
+                null,
+                "root", null, 1, 1, TreeItemEditionTool.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(treeItemDeletionToolEClass, TreeItemDeletionTool.class, "TreeItemDeletionTool", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getTreeItemDeletionTool_Mapping(),
+                this.getTreeItemMapping(),
+                this.getTreeItemMapping_Delete(),
+                "mapping", null, 1, 1, TreeItemDeletionTool.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(treeCreationDescriptionEClass, TreeCreationDescription.class,
+                "TreeCreationDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getTreeCreationDescription_TreeDescription(),
+                this.getTreeDescription(),
+                null,
+                "treeDescription", null, 1, 1, TreeCreationDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(treeNavigationDescriptionEClass, TreeNavigationDescription.class,
+                "TreeNavigationDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getTreeNavigationDescription_TreeDescription(),
+                this.getTreeDescription(),
+                null,
+                "treeDescription", null, 1, 1, TreeNavigationDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(treeMappingEClass, TreeMapping.class, "TreeMapping", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getTreeMapping_SemanticElements(),
+                theDescriptionPackage_1.getInterpretedExpression(),
+                "semanticElements", null, 0, 1, TreeMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(styleUpdaterEClass, StyleUpdater.class, "StyleUpdater", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getStyleUpdater_DefaultStyle(),
+                this.getTreeItemStyleDescription(),
+                null,
+                "defaultStyle", null, 1, 1, StyleUpdater.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getStyleUpdater_ConditionalStyles(),
+                this.getConditionalTreeItemStyleDescription(),
+                null,
+                "conditionalStyles", null, 0, -1, StyleUpdater.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(treeVariableEClass, TreeVariable.class, "TreeVariable", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getTreeVariable_Documentation(),
+                theEcorePackage.getEString(),
+                "documentation", null, 0, 1, TreeVariable.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(treeItemUpdaterEClass, TreeItemUpdater.class, "TreeItemUpdater", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getTreeItemUpdater_DirectEdit(),
+                this.getTreeItemEditionTool(),
+                null,
+                "directEdit", null, 0, 1, TreeItemUpdater.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        addEOperation(treeItemUpdaterEClass, theDescriptionPackage_1.getInterpretedExpression(), "getLabelComputationExpression", 1, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        addEOperation(treeItemUpdaterEClass, this.getTreeItemCreationTool(), "getCreateTreeItem", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(precedingSiblingsVariablesEClass, PrecedingSiblingsVariables.class,
+                "PrecedingSiblingsVariables", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(treeItemMappingContainerEClass, TreeItemMappingContainer.class,
+                "TreeItemMappingContainer", EPackageImpl.IS_ABSTRACT, EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getTreeItemMappingContainer_SubItemMappings(),
+                this.getTreeItemMapping(),
+                null,
+                "subItemMappings", null, 0, -1, TreeItemMappingContainer.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
         getTreeItemMappingContainer_SubItemMappings().getEKeys().add(theDescriptionPackage_1.getIdentifiedElement_Name());
-        initEReference(getTreeItemMappingContainer_DropTools(), this.getTreeItemContainerDropTool(), null, "dropTools", null, 0, -1, TreeItemMappingContainer.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(treePopupMenuEClass, TreePopupMenu.class, "TreePopupMenu", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getTreePopupMenu_MenuItemDescriptions(), theToolPackage.getMenuItemOrRef(), null, "menuItemDescriptions", null, 0, -1, TreePopupMenu.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEReference(
+                getTreeItemMappingContainer_DropTools(),
+                this.getTreeItemContainerDropTool(),
+                null,
+                "dropTools", null, 0, -1, TreeItemMappingContainer.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(treePopupMenuEClass, TreePopupMenu.class, "TreePopupMenu", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getTreePopupMenu_MenuItemDescriptions(),
+                theToolPackage.getMenuItemOrRef(),
+                null,
+                "menuItemDescriptions", null, 0, -1, TreePopupMenu.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
 
         // Initialize enums and add enum literals
-        initEEnum(treeDragSourceEEnum, TreeDragSource.class, "TreeDragSource");
+        initEEnum(treeDragSourceEEnum, TreeDragSource.class, "TreeDragSource"); //$NON-NLS-1$
         addEEnumLiteral(treeDragSourceEEnum, TreeDragSource.TREE);
         addEEnumLiteral(treeDragSourceEEnum, TreeDragSource.PROJECT_EXPLORER);
         addEEnumLiteral(treeDragSourceEEnum, TreeDragSource.BOTH);
@@ -1345,11 +1438,15 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
      * @generated
      */
     protected void createReturnTypeAnnotations() {
-        String source = "http://www.eclipse.org/sirius/interpreted/expression/returnType";
-        addAnnotation(getTreeDescription_PreconditionExpression(), source, new String[] { "returnType", "boolean" });
-        addAnnotation(getTreeItemMapping_PreconditionExpression(), source, new String[] { "returnType", "a Collection<EObject> or an EObject." });
-        addAnnotation(getTreeItemMapping_SemanticCandidatesExpression(), source, new String[] { "returnType", "a Collection<EObject> or an EObject." });
-        addAnnotation(getTreeMapping_SemanticElements(), source, new String[] { "returnType", "a Collection<EObject> or an EObject." });
+        String source = "http://www.eclipse.org/sirius/interpreted/expression/returnType"; //$NON-NLS-1$
+        addAnnotation(getTreeDescription_PreconditionExpression(), source, new String[] { "returnType", "boolean" //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getTreeItemMapping_PreconditionExpression(), source, new String[] { "returnType", "a Collection<EObject> or an EObject." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getTreeItemMapping_SemanticCandidatesExpression(), source, new String[] { "returnType", "a Collection<EObject> or an EObject." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getTreeMapping_SemanticElements(), source, new String[] { "returnType", "a Collection<EObject> or an EObject." //$NON-NLS-1$ //$NON-NLS-2$
+        });
     }
 
     /**
@@ -1360,17 +1457,20 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
      * @generated
      */
     protected void createVariablesAnnotations() {
-        String source = "http://www.eclipse.org/sirius/interpreted/expression/variables";
+        String source = "http://www.eclipse.org/sirius/interpreted/expression/variables"; //$NON-NLS-1$
         addAnnotation(getTreeDescription_PreconditionExpression(), source, new String[] {});
-        addAnnotation(getTreeItemMapping_PreconditionExpression(), source, new String[] { "tree", "tree.DTree | current DTree.", "containerView",
-            "ecore.EObject | container of the current DTreeElement (variable is available if container is not null).", "container",
-        "ecore.EObject | semantic target of $containerView (if it is a DSemanticDecorator)." });
-        addAnnotation(getTreeItemMapping_SemanticCandidatesExpression(), source, new String[] { "tree", "tree.DTree | current DTree.", "containerView",
-            "ecore.EObject | container of the current DTreeElement (variable is available if container is not null).", "container",
-        "ecore.EObject | semantic target of $containerView (if it is a DSemanticDecorator)." });
-        addAnnotation(getTreeMapping_SemanticElements(), source, new String[] { "view", "tree.DTreeElement | current DTreeElement.", "containerView",
-            "ecore.EObject | container of the current DTreeElement (variable is available if container is not null).", "container",
-        "ecore.EObject | semantic target of $containerView (if it is a DSemanticDecorator)." });
+        addAnnotation(getTreeItemMapping_PreconditionExpression(), source, new String[] { "tree", "tree.DTree | current DTree.", //$NON-NLS-1$ //$NON-NLS-2$
+            "containerView", "ecore.EObject | container of the current DTreeElement (variable is available if container is not null).", //$NON-NLS-1$ //$NON-NLS-2$
+            "container", "ecore.EObject | semantic target of $containerView (if it is a DSemanticDecorator)." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getTreeItemMapping_SemanticCandidatesExpression(), source, new String[] { "tree", "tree.DTree | current DTree.", //$NON-NLS-1$ //$NON-NLS-2$
+            "containerView", "ecore.EObject | container of the current DTreeElement (variable is available if container is not null).", //$NON-NLS-1$ //$NON-NLS-2$
+            "container", "ecore.EObject | semantic target of $containerView (if it is a DSemanticDecorator)." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getTreeMapping_SemanticElements(), source, new String[] { "view", "tree.DTreeElement | current DTreeElement.", //$NON-NLS-1$ //$NON-NLS-2$
+            "containerView", "ecore.EObject | container of the current DTreeElement (variable is available if container is not null).", //$NON-NLS-1$ //$NON-NLS-2$
+            "container", "ecore.EObject | semantic target of $containerView (if it is a DSemanticDecorator)." //$NON-NLS-1$ //$NON-NLS-2$
+        });
     }
 
 } // DescriptionPackageImpl
diff --git a/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/description/impl/TreeDescriptionImpl.java b/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/description/impl/TreeDescriptionImpl.java
index 9b374d0045..9c1f80c661 100644
--- a/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/description/impl/TreeDescriptionImpl.java
+++ b/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/description/impl/TreeDescriptionImpl.java
@@ -920,21 +920,21 @@ public class TreeDescriptionImpl extends DocumentedElementImpl implements TreeDe
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (endUserDocumentation: ");
+        result.append(" (endUserDocumentation: "); //$NON-NLS-1$
         result.append(endUserDocumentation);
-        result.append(", name: ");
+        result.append(", name: "); //$NON-NLS-1$
         result.append(name);
-        result.append(", label: ");
+        result.append(", label: "); //$NON-NLS-1$
         result.append(label);
-        result.append(", titleExpression: ");
+        result.append(", titleExpression: "); //$NON-NLS-1$
         result.append(titleExpression);
-        result.append(", initialisation: ");
+        result.append(", initialisation: "); //$NON-NLS-1$
         result.append(initialisation);
-        result.append(", showOnStartup: ");
+        result.append(", showOnStartup: "); //$NON-NLS-1$
         result.append(showOnStartup);
-        result.append(", domainClass: ");
+        result.append(", domainClass: "); //$NON-NLS-1$
         result.append(domainClass);
-        result.append(", preconditionExpression: ");
+        result.append(", preconditionExpression: "); //$NON-NLS-1$
         result.append(preconditionExpression);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/description/impl/TreeItemContainerDropToolImpl.java b/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/description/impl/TreeItemContainerDropToolImpl.java
index d9d7f25953..561b633090 100644
--- a/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/description/impl/TreeItemContainerDropToolImpl.java
+++ b/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/description/impl/TreeItemContainerDropToolImpl.java
@@ -754,7 +754,7 @@ public class TreeItemContainerDropToolImpl extends MappingBasedToolDescriptionIm
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (dragSource: ");
+        result.append(" (dragSource: "); //$NON-NLS-1$
         result.append(dragSource);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/description/impl/TreeItemDeletionToolImpl.java b/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/description/impl/TreeItemDeletionToolImpl.java
index c75ee6f3e0..cc869aeabf 100644
--- a/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/description/impl/TreeItemDeletionToolImpl.java
+++ b/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/description/impl/TreeItemDeletionToolImpl.java
@@ -86,7 +86,7 @@ public class TreeItemDeletionToolImpl extends TreeItemToolImpl implements TreeIt
     public void setMapping(TreeItemMapping newMapping) {
         if (newMapping != eInternalContainer() || (eContainerFeatureID() != DescriptionPackage.TREE_ITEM_DELETION_TOOL__MAPPING && newMapping != null)) {
             if (EcoreUtil.isAncestor(this, newMapping)) {
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+                throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); //$NON-NLS-1$
             }
             NotificationChain msgs = null;
             if (eInternalContainer() != null) {
diff --git a/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/description/impl/TreeItemDragToolImpl.java b/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/description/impl/TreeItemDragToolImpl.java
index cdf7a95ef6..a20bc3f051 100644
--- a/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/description/impl/TreeItemDragToolImpl.java
+++ b/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/description/impl/TreeItemDragToolImpl.java
@@ -801,7 +801,7 @@ public class TreeItemDragToolImpl extends MappingBasedToolDescriptionImpl implem
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (dragSourceType: ");
+        result.append(" (dragSourceType: "); //$NON-NLS-1$
         result.append(dragSourceType);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/description/impl/TreeItemMappingImpl.java b/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/description/impl/TreeItemMappingImpl.java
index 73138d30e2..b1d070db5a 100644
--- a/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/description/impl/TreeItemMappingImpl.java
+++ b/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/description/impl/TreeItemMappingImpl.java
@@ -1035,11 +1035,11 @@ public class TreeItemMappingImpl extends TreeMappingImpl implements TreeItemMapp
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (domainClass: ");
+        result.append(" (domainClass: "); //$NON-NLS-1$
         result.append(domainClass);
-        result.append(", preconditionExpression: ");
+        result.append(", preconditionExpression: "); //$NON-NLS-1$
         result.append(preconditionExpression);
-        result.append(", semanticCandidatesExpression: ");
+        result.append(", semanticCandidatesExpression: "); //$NON-NLS-1$
         result.append(semanticCandidatesExpression);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/description/impl/TreeItemStyleDescriptionImpl.java b/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/description/impl/TreeItemStyleDescriptionImpl.java
index e0f30e779c..71b73579c5 100644
--- a/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/description/impl/TreeItemStyleDescriptionImpl.java
+++ b/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/description/impl/TreeItemStyleDescriptionImpl.java
@@ -656,17 +656,17 @@ public class TreeItemStyleDescriptionImpl extends MinimalEObjectImpl.Container i
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (labelSize: ");
+        result.append(" (labelSize: "); //$NON-NLS-1$
         result.append(labelSize);
-        result.append(", labelFormat: ");
+        result.append(", labelFormat: "); //$NON-NLS-1$
         result.append(labelFormat);
-        result.append(", showIcon: ");
+        result.append(", showIcon: "); //$NON-NLS-1$
         result.append(showIcon);
-        result.append(", labelExpression: ");
+        result.append(", labelExpression: "); //$NON-NLS-1$
         result.append(labelExpression);
-        result.append(", iconPath: ");
+        result.append(", iconPath: "); //$NON-NLS-1$
         result.append(iconPath);
-        result.append(", labelAlignment: ");
+        result.append(", labelAlignment: "); //$NON-NLS-1$
         result.append(labelAlignment);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/description/impl/TreeMappingImpl.java b/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/description/impl/TreeMappingImpl.java
index 172a513be3..474ea4a21a 100644
--- a/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/description/impl/TreeMappingImpl.java
+++ b/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/description/impl/TreeMappingImpl.java
@@ -167,7 +167,7 @@ public class TreeMappingImpl extends RepresentationElementMappingImpl implements
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (semanticElements: ");
+        result.append(" (semanticElements: "); //$NON-NLS-1$
         result.append(semanticElements);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/description/impl/TreeVariableImpl.java b/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/description/impl/TreeVariableImpl.java
index 13452b3954..953f7daf55 100644
--- a/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/description/impl/TreeVariableImpl.java
+++ b/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/description/impl/TreeVariableImpl.java
@@ -266,7 +266,7 @@ public class TreeVariableImpl extends AbstractVariableImpl implements TreeVariab
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (documentation: ");
+        result.append(" (documentation: "); //$NON-NLS-1$
         result.append(documentation);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/impl/DTreeItemImpl.java b/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/impl/DTreeItemImpl.java
index 84ea55d6c5..1097428eee 100644
--- a/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/impl/DTreeItemImpl.java
+++ b/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/impl/DTreeItemImpl.java
@@ -370,7 +370,7 @@ public class DTreeItemImpl extends DTreeItemContainerImpl implements DTreeItem {
     public void setContainer(DTreeItemContainer newContainer) {
         if (newContainer != eInternalContainer() || (eContainerFeatureID() != TreePackage.DTREE_ITEM__CONTAINER && newContainer != null)) {
             if (EcoreUtil.isAncestor(this, newContainer)) {
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+                throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); //$NON-NLS-1$
             }
             NotificationChain msgs = null;
             if (eInternalContainer() != null) {
@@ -773,9 +773,9 @@ public class DTreeItemImpl extends DTreeItemContainerImpl implements DTreeItem {
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (name: ");
+        result.append(" (name: "); //$NON-NLS-1$
         result.append(name);
-        result.append(", expanded: ");
+        result.append(", expanded: "); //$NON-NLS-1$
         result.append(expanded);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/impl/TreeFactoryImpl.java b/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/impl/TreeFactoryImpl.java
index 87084317cb..566800387a 100644
--- a/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/impl/TreeFactoryImpl.java
+++ b/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/impl/TreeFactoryImpl.java
@@ -79,7 +79,7 @@ public class TreeFactoryImpl extends EFactoryImpl implements TreeFactory {
         case TreePackage.DTREE_ELEMENT_SYNCHRONIZER:
             return createDTreeElementSynchronizer();
         default:
-            throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+            throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
         }
     }
 
diff --git a/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/impl/TreeItemStyleImpl.java b/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/impl/TreeItemStyleImpl.java
index 72ef90b89c..412ce02598 100644
--- a/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/impl/TreeItemStyleImpl.java
+++ b/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/impl/TreeItemStyleImpl.java
@@ -565,19 +565,19 @@ public class TreeItemStyleImpl extends StyleImpl implements TreeItemStyle {
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (labelSize: ");
+        result.append(" (labelSize: "); //$NON-NLS-1$
         result.append(labelSize);
-        result.append(", labelFormat: ");
+        result.append(", labelFormat: "); //$NON-NLS-1$
         result.append(labelFormat);
-        result.append(", showIcon: ");
+        result.append(", showIcon: "); //$NON-NLS-1$
         result.append(showIcon);
-        result.append(", iconPath: ");
+        result.append(", iconPath: "); //$NON-NLS-1$
         result.append(iconPath);
-        result.append(", labelColor: ");
+        result.append(", labelColor: "); //$NON-NLS-1$
         result.append(labelColor);
-        result.append(", labelAlignment: ");
+        result.append(", labelAlignment: "); //$NON-NLS-1$
         result.append(labelAlignment);
-        result.append(", backgroundColor: ");
+        result.append(", backgroundColor: "); //$NON-NLS-1$
         result.append(backgroundColor);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/impl/TreePackageImpl.java b/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/impl/TreePackageImpl.java
index a1f7d3c149..a5d46a340e 100644
--- a/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/impl/TreePackageImpl.java
+++ b/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/impl/TreePackageImpl.java
@@ -426,52 +426,74 @@ public class TreePackageImpl extends EPackageImpl implements TreePackage {
         treeItemStyleEClass.getESuperTypes().add(theViewpointPackage.getLabelStyle());
 
         // Initialize classes and features; add operations and parameters
-        initEClass(dTreeEClass, DTree.class, "DTree", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getDTree_SemanticElements(), theEcorePackage.getEObject(), null, "semanticElements", null, 0, -1, DTree.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getDTree_Description(), theDescriptionPackage.getTreeDescription(), null, "description", null, 1, 1, DTree.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-
-        initEClass(dTreeElementEClass, DTreeElement.class, "DTreeElement", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getDTreeElement_TreeElementMapping(), theDescriptionPackage.getTreeMapping(), null, "treeElementMapping", null, 0, 1, DTreeElement.class, EPackageImpl.IS_TRANSIENT,
-                EPackageImpl.IS_VOLATILE, !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(dTreeItemContainerEClass, DTreeItemContainer.class, "DTreeItemContainer", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getDTreeItemContainer_OwnedTreeItems(), this.getDTreeItem(), this.getDTreeItem_Container(), "ownedTreeItems", null, 0, -1, DTreeItemContainer.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(dTreeItemEClass, DTreeItem.class, "DTreeItem", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getDTreeItem_Expanded(), theEcorePackage.getEBoolean(), "expanded", null, 1, 1, DTreeItem.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getDTreeItem_OwnedStyle(), this.getTreeItemStyle(), null, "ownedStyle", null, 1, 1, DTreeItem.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getDTreeItem_ActualMapping(), theDescriptionPackage.getTreeItemMapping(), null, "actualMapping", null, 1, 1, DTreeItem.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getDTreeItem_Container(), this.getDTreeItemContainer(), this.getDTreeItemContainer_OwnedTreeItems(), "container", null, 0, 1, DTreeItem.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getDTreeItem_StyleUpdater(), theDescriptionPackage.getStyleUpdater(), null, "styleUpdater", null, 0, 1, DTreeItem.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE,
-                !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getDTreeItem_Updater(), theDescriptionPackage.getTreeItemUpdater(), null, "updater", null, 0, 1, DTreeItem.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-
-        initEClass(treeItemStyleEClass, TreeItemStyle.class, "TreeItemStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getTreeItemStyle_BackgroundColor(), theViewpointPackage.getRGBValues(), "backgroundColor", "255,255,255", 0, 1, TreeItemStyle.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(dTreeElementSynchronizerEClass, DTreeElementSynchronizer.class, "DTreeElementSynchronizer", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        EOperation op = addEOperation(dTreeElementSynchronizerEClass, null, "refresh", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-        addEParameter(op, this.getDTreeItem(), "DTreeItem", 1, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
+        initEClass(dTreeEClass, DTree.class, "DTree", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getDTree_SemanticElements(),
+                theEcorePackage.getEObject(),
+                null,
+                "semanticElements", null, 0, -1, DTree.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDTree_Description(),
+                theDescriptionPackage.getTreeDescription(),
+                null,
+                "description", null, 1, 1, DTree.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(dTreeElementEClass, DTreeElement.class, "DTreeElement", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getDTreeElement_TreeElementMapping(),
+                theDescriptionPackage.getTreeMapping(),
+                null,
+                "treeElementMapping", null, 0, 1, DTreeElement.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE, !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(dTreeItemContainerEClass, DTreeItemContainer.class, "DTreeItemContainer", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getDTreeItemContainer_OwnedTreeItems(),
+                this.getDTreeItem(),
+                this.getDTreeItem_Container(),
+                "ownedTreeItems", null, 0, -1, DTreeItemContainer.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(dTreeItemEClass, DTreeItem.class, "DTreeItem", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getDTreeItem_Expanded(),
+                theEcorePackage.getEBoolean(),
+                "expanded", null, 1, 1, DTreeItem.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDTreeItem_OwnedStyle(),
+                this.getTreeItemStyle(),
+                null,
+                "ownedStyle", null, 1, 1, DTreeItem.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDTreeItem_ActualMapping(),
+                theDescriptionPackage.getTreeItemMapping(),
+                null,
+                "actualMapping", null, 1, 1, DTreeItem.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDTreeItem_Container(),
+                this.getDTreeItemContainer(),
+                this.getDTreeItemContainer_OwnedTreeItems(),
+                "container", null, 0, 1, DTreeItem.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDTreeItem_StyleUpdater(),
+                theDescriptionPackage.getStyleUpdater(),
+                null,
+                "styleUpdater", null, 0, 1, DTreeItem.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE, !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDTreeItem_Updater(),
+                theDescriptionPackage.getTreeItemUpdater(),
+                null,
+                "updater", null, 0, 1, DTreeItem.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(treeItemStyleEClass, TreeItemStyle.class, "TreeItemStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getTreeItemStyle_BackgroundColor(),
+                theViewpointPackage.getRGBValues(),
+                "backgroundColor", "255,255,255", 0, 1, TreeItemStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+
+        initEClass(dTreeElementSynchronizerEClass, DTreeElementSynchronizer.class,
+                "DTreeElementSynchronizer", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        EOperation op = addEOperation(dTreeElementSynchronizerEClass, null, "refresh", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        addEParameter(op, this.getDTreeItem(), "DTreeItem", 1, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
 
         // Create resource
         createResource(TreePackage.eNS_URI);
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/description/contribution/provider/AddFeatureContributionItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/description/contribution/provider/AddFeatureContributionItemProvider.java
index e9e8a7d0cf..2dfda0e2ac 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/description/contribution/provider/AddFeatureContributionItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/description/contribution/provider/AddFeatureContributionItemProvider.java
@@ -21,10 +21,8 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.sirius.description.contribution.AddFeatureContribution;
 
 /**
- * This is the item provider adapter for a
- * {@link org.eclipse.sirius.description.contribution.AddFeatureContribution}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
- * 
+ * This is the item provider adapter for a {@link org.eclipse.sirius.description.contribution.AddFeatureContribution} object.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
  * @generated
  */
 public class AddFeatureContributionItemProvider extends FeatureContributionItemProvider {
@@ -54,14 +52,14 @@ public class AddFeatureContributionItemProvider extends FeatureContributionItemP
     }
 
     /**
-     * This returns AddFeatureContribution.gif. <!-- begin-user-doc --> <!--
+     * This returns AddFeatureContribution.gif.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
      * @generated
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/AddFeatureContribution"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/AddFeatureContribution")); //$NON-NLS-1$
     }
 
     /**
@@ -89,11 +87,10 @@ public class AddFeatureContributionItemProvider extends FeatureContributionItemP
     }
 
     /**
-     * This handles model notifications by calling {@link #updateChildren} to
-     * update any cached children and by creating a viewer notification, which
-     * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
+     * This handles model notifications by calling {@link #updateChildren} to update any cached
+     * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
      * @generated
      */
     @Override
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/description/contribution/provider/ClearFeatureContributionItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/description/contribution/provider/ClearFeatureContributionItemProvider.java
index 67d7675b0a..1ae838d3bf 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/description/contribution/provider/ClearFeatureContributionItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/description/contribution/provider/ClearFeatureContributionItemProvider.java
@@ -21,10 +21,8 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.sirius.description.contribution.ClearFeatureContribution;
 
 /**
- * This is the item provider adapter for a
- * {@link org.eclipse.sirius.description.contribution.ClearFeatureContribution}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
- * 
+ * This is the item provider adapter for a {@link org.eclipse.sirius.description.contribution.ClearFeatureContribution} object.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
  * @generated
  */
 public class ClearFeatureContributionItemProvider extends FeatureContributionItemProvider {
@@ -54,14 +52,14 @@ public class ClearFeatureContributionItemProvider extends FeatureContributionIte
     }
 
     /**
-     * This returns ClearFeatureContribution.gif. <!-- begin-user-doc --> <!--
+     * This returns ClearFeatureContribution.gif.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
      * @generated
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ClearFeatureContribution"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/ClearFeatureContribution")); //$NON-NLS-1$
     }
 
     /**
@@ -89,11 +87,10 @@ public class ClearFeatureContributionItemProvider extends FeatureContributionIte
     }
 
     /**
-     * This handles model notifications by calling {@link #updateChildren} to
-     * update any cached children and by creating a viewer notification, which
-     * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
+     * This handles model notifications by calling {@link #updateChildren} to update any cached
+     * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
      * @generated
      */
     @Override
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/description/contribution/provider/ComputedEObjectReferenceItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/description/contribution/provider/ComputedEObjectReferenceItemProvider.java
index b1189b5709..faa7d81de4 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/description/contribution/provider/ComputedEObjectReferenceItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/description/contribution/provider/ComputedEObjectReferenceItemProvider.java
@@ -33,10 +33,8 @@ import org.eclipse.sirius.description.contribution.ContributionPackage;
 import org.eclipse.sirius.viewpoint.provider.SiriusEditPlugin;
 
 /**
- * This is the item provider adapter for a
- * {@link org.eclipse.sirius.description.contribution.ComputedEObjectReference}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
- * 
+ * This is the item provider adapter for a {@link org.eclipse.sirius.description.contribution.ComputedEObjectReference} object.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
  * @generated
  */
 public class ComputedEObjectReferenceItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
@@ -74,22 +72,30 @@ public class ComputedEObjectReferenceItemProvider extends ItemProviderAdapter im
      * @generated
      */
     protected void addValueExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_ComputedEObjectReference_valueExpression_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_ComputedEObjectReference_valueExpression_feature", "_UI_ComputedEObjectReference_type"),
-                ContributionPackage.Literals.COMPUTED_EOBJECT_REFERENCE__VALUE_EXPRESSION, true, false, true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"),
-                null));
+        itemPropertyDescriptors.add
+            (createItemPropertyDescriptor
+                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                 getResourceLocator(),
+                 getString("_UI_ComputedEObjectReference_valueExpression_feature"), //$NON-NLS-1$
+                 getString("_UI_PropertyDescriptor_description", "_UI_ComputedEObjectReference_valueExpression_feature", "_UI_ComputedEObjectReference_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                 ContributionPackage.Literals.COMPUTED_EOBJECT_REFERENCE__VALUE_EXPRESSION,
+                 true,
+                 false,
+                 true,
+                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                 getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                 null));
     }
 
     /**
-     * This returns ComputedEObjectReference.gif. <!-- begin-user-doc --> <!--
+     * This returns ComputedEObjectReference.gif.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
      * @generated
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ComputedEObjectReference"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/ComputedEObjectReference")); //$NON-NLS-1$
     }
 
     /**
@@ -116,11 +122,10 @@ public class ComputedEObjectReferenceItemProvider extends ItemProviderAdapter im
     }
 
     /**
-     * This handles model notifications by calling {@link #updateChildren} to
-     * update any cached children and by creating a viewer notification, which
-     * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
+     * This handles model notifications by calling {@link #updateChildren} to update any cached
+     * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
      * @generated
      */
     @Override
@@ -128,9 +133,9 @@ public class ComputedEObjectReferenceItemProvider extends ItemProviderAdapter im
         updateChildren(notification);
 
         switch (notification.getFeatureID(ComputedEObjectReference.class)) {
-        case ContributionPackage.COMPUTED_EOBJECT_REFERENCE__VALUE_EXPRESSION:
-            fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-            return;
+            case ContributionPackage.COMPUTED_EOBJECT_REFERENCE__VALUE_EXPRESSION:
+                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+                return;
         }
         super.notifyChanged(notification);
     }
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/description/contribution/provider/ContributionItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/description/contribution/provider/ContributionItemProvider.java
index 65a30f7488..f9cfeff7ef 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/description/contribution/provider/ContributionItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/description/contribution/provider/ContributionItemProvider.java
@@ -75,9 +75,19 @@ public class ContributionItemProvider extends ItemProviderAdapter implements IEd
      * @generated
      */
     protected void addDescriptionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_Contribution_description_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Contribution_description_feature", "_UI_Contribution_type"),
-                ContributionPackage.Literals.CONTRIBUTION__DESCRIPTION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+        itemPropertyDescriptors.add
+            (createItemPropertyDescriptor
+                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                 getResourceLocator(),
+                 getString("_UI_Contribution_description_feature"), //$NON-NLS-1$
+                 getString("_UI_PropertyDescriptor_description", "_UI_Contribution_description_feature", "_UI_Contribution_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                 ContributionPackage.Literals.CONTRIBUTION__DESCRIPTION,
+                 true,
+                 false,
+                 false,
+                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                 null,
+                 null));
     }
 
     @Override
@@ -86,13 +96,10 @@ public class ContributionItemProvider extends ItemProviderAdapter implements IEd
     }
 
     /**
-     * This specifies how to implement {@link #getChildren} and is used to
-     * deduce an appropriate feature for an
-     * {@link org.eclipse.emf.edit.command.AddCommand},
-     * {@link org.eclipse.emf.edit.command.RemoveCommand} or
-     * {@link org.eclipse.emf.edit.command.MoveCommand} in
-     * {@link #createCommand}. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+     * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+     * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -109,36 +116,35 @@ public class ContributionItemProvider extends ItemProviderAdapter implements IEd
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
      * @generated
      */
     @Override
     protected EStructuralFeature getChildFeature(Object object, Object child) {
-        // Check the type of the specified child object and return the proper
-        // feature to use for
+        // Check the type of the specified child object and return the proper feature to use for
         // adding (see {@link AddCommand}) it as a child.
 
         return super.getChildFeature(object, child);
     }
 
     /**
-     * This returns the label text for the adapted class. <!-- begin-user-doc
+     * This returns the label text for the adapted class.
+     * <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
      * @generated
      */
     @Override
     public String getText(Object object) {
-        String label = ((Contribution) object).getDescription();
-        return label == null || label.length() == 0 ? getString("_UI_Contribution_type") : getString("_UI_Contribution_type") + " " + label;
+        String label = ((Contribution)object).getDescription();
+        return label == null || label.length() == 0 ?
+            getString("_UI_Contribution_type") : //$NON-NLS-1$
+            getString("_UI_Contribution_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
-     * This handles model notifications by calling {@link #updateChildren} to
-     * update any cached children and by creating a viewer notification, which
-     * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
+     * This handles model notifications by calling {@link #updateChildren} to update any cached
+     * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
      * @generated
      */
     @Override
@@ -146,15 +152,15 @@ public class ContributionItemProvider extends ItemProviderAdapter implements IEd
         updateChildren(notification);
 
         switch (notification.getFeatureID(Contribution.class)) {
-        case ContributionPackage.CONTRIBUTION__DESCRIPTION:
-            fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-            return;
-        case ContributionPackage.CONTRIBUTION__SOURCE:
-        case ContributionPackage.CONTRIBUTION__TARGET:
-        case ContributionPackage.CONTRIBUTION__FEATURE_MASK:
-        case ContributionPackage.CONTRIBUTION__SUB_CONTRIBUTIONS:
-            fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-            return;
+            case ContributionPackage.CONTRIBUTION__DESCRIPTION:
+                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+                return;
+            case ContributionPackage.CONTRIBUTION__SOURCE:
+            case ContributionPackage.CONTRIBUTION__TARGET:
+            case ContributionPackage.CONTRIBUTION__FEATURE_MASK:
+            case ContributionPackage.CONTRIBUTION__SUB_CONTRIBUTIONS:
+                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+                return;
         }
         super.notifyChanged(notification);
     }
@@ -170,27 +176,60 @@ public class ContributionItemProvider extends ItemProviderAdapter implements IEd
     protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
         super.collectNewChildDescriptors(newChildDescriptors, object);
 
-        newChildDescriptors.add(createChildParameter(ContributionPackage.Literals.CONTRIBUTION__SOURCE, ContributionFactory.eINSTANCE.createDirectEObjectReference()));
+        newChildDescriptors.add
+            (createChildParameter
+                (ContributionPackage.Literals.CONTRIBUTION__SOURCE,
+                 ContributionFactory.eINSTANCE.createDirectEObjectReference()));
 
-        newChildDescriptors.add(createChildParameter(ContributionPackage.Literals.CONTRIBUTION__SOURCE, ContributionFactory.eINSTANCE.createComputedEObjectReference()));
+        newChildDescriptors.add
+            (createChildParameter
+                (ContributionPackage.Literals.CONTRIBUTION__SOURCE,
+                 ContributionFactory.eINSTANCE.createComputedEObjectReference()));
 
-        newChildDescriptors.add(createChildParameter(ContributionPackage.Literals.CONTRIBUTION__TARGET, ContributionFactory.eINSTANCE.createDirectEObjectReference()));
+        newChildDescriptors.add
+            (createChildParameter
+                (ContributionPackage.Literals.CONTRIBUTION__TARGET,
+                 ContributionFactory.eINSTANCE.createDirectEObjectReference()));
 
-        newChildDescriptors.add(createChildParameter(ContributionPackage.Literals.CONTRIBUTION__TARGET, ContributionFactory.eINSTANCE.createComputedEObjectReference()));
+        newChildDescriptors.add
+            (createChildParameter
+                (ContributionPackage.Literals.CONTRIBUTION__TARGET,
+                 ContributionFactory.eINSTANCE.createComputedEObjectReference()));
 
-        newChildDescriptors.add(createChildParameter(ContributionPackage.Literals.CONTRIBUTION__FEATURE_MASK, ContributionFactory.eINSTANCE.createIgnoreFeatureContribution()));
+        newChildDescriptors.add
+            (createChildParameter
+                (ContributionPackage.Literals.CONTRIBUTION__FEATURE_MASK,
+                 ContributionFactory.eINSTANCE.createIgnoreFeatureContribution()));
 
-        newChildDescriptors.add(createChildParameter(ContributionPackage.Literals.CONTRIBUTION__FEATURE_MASK, ContributionFactory.eINSTANCE.createSetFeatureContribution()));
+        newChildDescriptors.add
+            (createChildParameter
+                (ContributionPackage.Literals.CONTRIBUTION__FEATURE_MASK,
+                 ContributionFactory.eINSTANCE.createSetFeatureContribution()));
 
-        newChildDescriptors.add(createChildParameter(ContributionPackage.Literals.CONTRIBUTION__FEATURE_MASK, ContributionFactory.eINSTANCE.createAddFeatureContribution()));
+        newChildDescriptors.add
+            (createChildParameter
+                (ContributionPackage.Literals.CONTRIBUTION__FEATURE_MASK,
+                 ContributionFactory.eINSTANCE.createAddFeatureContribution()));
 
-        newChildDescriptors.add(createChildParameter(ContributionPackage.Literals.CONTRIBUTION__FEATURE_MASK, ContributionFactory.eINSTANCE.createRemoveFeatureContribution()));
+        newChildDescriptors.add
+            (createChildParameter
+                (ContributionPackage.Literals.CONTRIBUTION__FEATURE_MASK,
+                 ContributionFactory.eINSTANCE.createRemoveFeatureContribution()));
 
-        newChildDescriptors.add(createChildParameter(ContributionPackage.Literals.CONTRIBUTION__FEATURE_MASK, ContributionFactory.eINSTANCE.createClearFeatureContribution()));
+        newChildDescriptors.add
+            (createChildParameter
+                (ContributionPackage.Literals.CONTRIBUTION__FEATURE_MASK,
+                 ContributionFactory.eINSTANCE.createClearFeatureContribution()));
 
-        newChildDescriptors.add(createChildParameter(ContributionPackage.Literals.CONTRIBUTION__FEATURE_MASK, ContributionFactory.eINSTANCE.createResetFeatureContribution()));
+        newChildDescriptors.add
+            (createChildParameter
+                (ContributionPackage.Literals.CONTRIBUTION__FEATURE_MASK,
+                 ContributionFactory.eINSTANCE.createResetFeatureContribution()));
 
-        newChildDescriptors.add(createChildParameter(ContributionPackage.Literals.CONTRIBUTION__SUB_CONTRIBUTIONS, ContributionFactory.eINSTANCE.createContribution()));
+        newChildDescriptors.add
+            (createChildParameter
+                (ContributionPackage.Literals.CONTRIBUTION__SUB_CONTRIBUTIONS,
+                 ContributionFactory.eINSTANCE.createContribution()));
     }
 
     /**
@@ -205,10 +244,14 @@ public class ContributionItemProvider extends ItemProviderAdapter implements IEd
         Object childFeature = feature;
         Object childObject = child;
 
-        boolean qualify = childFeature == ContributionPackage.Literals.CONTRIBUTION__SOURCE || childFeature == ContributionPackage.Literals.CONTRIBUTION__TARGET;
+        boolean qualify =
+            childFeature == ContributionPackage.Literals.CONTRIBUTION__SOURCE ||
+            childFeature == ContributionPackage.Literals.CONTRIBUTION__TARGET;
 
         if (qualify) {
-            return getString("_UI_CreateChild_text2", new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+            return getString
+                ("_UI_CreateChild_text2", //$NON-NLS-1$
+                 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
         }
         return super.getCreateChildText(owner, feature, child, selection);
     }
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/description/contribution/provider/ContributionItemProviderAdapterFactory.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/description/contribution/provider/ContributionItemProviderAdapterFactory.java
index 930141951f..55afe2a725 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/description/contribution/provider/ContributionItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/description/contribution/provider/ContributionItemProviderAdapterFactory.java
@@ -31,20 +31,18 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.sirius.description.contribution.util.ContributionAdapterFactory;
 
 /**
- * This is the factory that is used to provide the interfaces needed to support
- * Viewers. The adapters generated by this factory convert EMF adapter
- * notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}. The
- * adapters also support Eclipse property sheets. Note that most of the adapters
- * are shared among multiple instances. <!-- begin-user-doc --> <!--
+ * This is the factory that is used to provide the interfaces needed to support Viewers.
+ * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.
+ * The adapters also support Eclipse property sheets.
+ * Note that most of the adapters are shared among multiple instances.
+ * <!-- begin-user-doc --> <!--
  * end-user-doc -->
- * 
  * @generated
  */
 public class ContributionItemProviderAdapterFactory extends ContributionAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
     /**
-     * This keeps track of the root adapter factory that delegates to this
-     * adapter factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * This keeps track of the root adapter factory that delegates to this adapter factory.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @generated
      */
     protected ComposedAdapterFactory parentAdapterFactory;
@@ -59,10 +57,9 @@ public class ContributionItemProviderAdapterFactory extends ContributionAdapterF
     protected IChangeNotifier changeNotifier = new ChangeNotifier();
 
     /**
-     * This keeps track of all the supported types checked by
-     * {@link #isFactoryForType isFactoryForType}. <!-- begin-user-doc --> <!--
+     * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
      * @generated
      */
     protected Collection<Object> supportedTypes = new ArrayList<Object>();
@@ -82,19 +79,15 @@ public class ContributionItemProviderAdapterFactory extends ContributionAdapterF
     }
 
     /**
-     * This keeps track of the one adapter used for all
-     * {@link org.eclipse.sirius.description.contribution.IgnoreFeatureContribution}
-     * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * This keeps track of the one adapter used for all {@link org.eclipse.sirius.description.contribution.IgnoreFeatureContribution} instances.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @generated
      */
     protected IgnoreFeatureContributionItemProvider ignoreFeatureContributionItemProvider;
 
     /**
-     * This creates an adapter for a
-     * {@link org.eclipse.sirius.description.contribution.IgnoreFeatureContribution}
-     * . <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * This creates an adapter for a {@link org.eclipse.sirius.description.contribution.IgnoreFeatureContribution}.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -107,19 +100,15 @@ public class ContributionItemProviderAdapterFactory extends ContributionAdapterF
     }
 
     /**
-     * This keeps track of the one adapter used for all
-     * {@link org.eclipse.sirius.description.contribution.SetFeatureContribution}
-     * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * This keeps track of the one adapter used for all {@link org.eclipse.sirius.description.contribution.SetFeatureContribution} instances.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @generated
      */
     protected SetFeatureContributionItemProvider setFeatureContributionItemProvider;
 
     /**
-     * This creates an adapter for a
-     * {@link org.eclipse.sirius.description.contribution.SetFeatureContribution}
-     * . <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * This creates an adapter for a {@link org.eclipse.sirius.description.contribution.SetFeatureContribution}.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -132,19 +121,15 @@ public class ContributionItemProviderAdapterFactory extends ContributionAdapterF
     }
 
     /**
-     * This keeps track of the one adapter used for all
-     * {@link org.eclipse.sirius.description.contribution.AddFeatureContribution}
-     * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * This keeps track of the one adapter used for all {@link org.eclipse.sirius.description.contribution.AddFeatureContribution} instances.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @generated
      */
     protected AddFeatureContributionItemProvider addFeatureContributionItemProvider;
 
     /**
-     * This creates an adapter for a
-     * {@link org.eclipse.sirius.description.contribution.AddFeatureContribution}
-     * . <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * This creates an adapter for a {@link org.eclipse.sirius.description.contribution.AddFeatureContribution}.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -157,19 +142,15 @@ public class ContributionItemProviderAdapterFactory extends ContributionAdapterF
     }
 
     /**
-     * This keeps track of the one adapter used for all
-     * {@link org.eclipse.sirius.description.contribution.RemoveFeatureContribution}
-     * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * This keeps track of the one adapter used for all {@link org.eclipse.sirius.description.contribution.RemoveFeatureContribution} instances.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @generated
      */
     protected RemoveFeatureContributionItemProvider removeFeatureContributionItemProvider;
 
     /**
-     * This creates an adapter for a
-     * {@link org.eclipse.sirius.description.contribution.RemoveFeatureContribution}
-     * . <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * This creates an adapter for a {@link org.eclipse.sirius.description.contribution.RemoveFeatureContribution}.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -182,19 +163,15 @@ public class ContributionItemProviderAdapterFactory extends ContributionAdapterF
     }
 
     /**
-     * This keeps track of the one adapter used for all
-     * {@link org.eclipse.sirius.description.contribution.ClearFeatureContribution}
-     * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * This keeps track of the one adapter used for all {@link org.eclipse.sirius.description.contribution.ClearFeatureContribution} instances.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @generated
      */
     protected ClearFeatureContributionItemProvider clearFeatureContributionItemProvider;
 
     /**
-     * This creates an adapter for a
-     * {@link org.eclipse.sirius.description.contribution.ClearFeatureContribution}
-     * . <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * This creates an adapter for a {@link org.eclipse.sirius.description.contribution.ClearFeatureContribution}.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -207,19 +184,15 @@ public class ContributionItemProviderAdapterFactory extends ContributionAdapterF
     }
 
     /**
-     * This keeps track of the one adapter used for all
-     * {@link org.eclipse.sirius.description.contribution.ResetFeatureContribution}
-     * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * This keeps track of the one adapter used for all {@link org.eclipse.sirius.description.contribution.ResetFeatureContribution} instances.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @generated
      */
     protected ResetFeatureContributionItemProvider resetFeatureContributionItemProvider;
 
     /**
-     * This creates an adapter for a
-     * {@link org.eclipse.sirius.description.contribution.ResetFeatureContribution}
-     * . <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * This creates an adapter for a {@link org.eclipse.sirius.description.contribution.ResetFeatureContribution}.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -232,19 +205,15 @@ public class ContributionItemProviderAdapterFactory extends ContributionAdapterF
     }
 
     /**
-     * This keeps track of the one adapter used for all
-     * {@link org.eclipse.sirius.description.contribution.DirectEObjectReference}
-     * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * This keeps track of the one adapter used for all {@link org.eclipse.sirius.description.contribution.DirectEObjectReference} instances.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @generated
      */
     protected DirectEObjectReferenceItemProvider directEObjectReferenceItemProvider;
 
     /**
-     * This creates an adapter for a
-     * {@link org.eclipse.sirius.description.contribution.DirectEObjectReference}
-     * . <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * This creates an adapter for a {@link org.eclipse.sirius.description.contribution.DirectEObjectReference}.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -257,19 +226,15 @@ public class ContributionItemProviderAdapterFactory extends ContributionAdapterF
     }
 
     /**
-     * This keeps track of the one adapter used for all
-     * {@link org.eclipse.sirius.description.contribution.ComputedEObjectReference}
-     * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * This keeps track of the one adapter used for all {@link org.eclipse.sirius.description.contribution.ComputedEObjectReference} instances.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @generated
      */
     protected ComputedEObjectReferenceItemProvider computedEObjectReferenceItemProvider;
 
     /**
-     * This creates an adapter for a
-     * {@link org.eclipse.sirius.description.contribution.ComputedEObjectReference}
-     * . <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * This creates an adapter for a {@link org.eclipse.sirius.description.contribution.ComputedEObjectReference}.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -282,10 +247,8 @@ public class ContributionItemProviderAdapterFactory extends ContributionAdapterF
     }
 
     /**
-     * This keeps track of the one adapter used for all
-     * {@link org.eclipse.sirius.description.contribution.Contribution}
-     * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * This keeps track of the one adapter used for all {@link org.eclipse.sirius.description.contribution.Contribution} instances.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @generated
      */
     protected ContributionItemProvider contributionItemProvider;
@@ -307,19 +270,15 @@ public class ContributionItemProviderAdapterFactory extends ContributionAdapterF
     }
 
     /**
-     * This keeps track of the one adapter used for all
-     * {@link org.eclipse.sirius.description.contribution.ContributionPoint}
-     * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * This keeps track of the one adapter used for all {@link org.eclipse.sirius.description.contribution.ContributionPoint} instances.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @generated
      */
     protected ContributionPointItemProvider contributionPointItemProvider;
 
     /**
-     * This creates an adapter for a
-     * {@link org.eclipse.sirius.description.contribution.ContributionPoint}.
+     * This creates an adapter for a {@link org.eclipse.sirius.description.contribution.ContributionPoint}.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
      * @generated
      */
     @Override
@@ -353,7 +312,6 @@ public class ContributionItemProviderAdapterFactory extends ContributionAdapterF
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
      * @generated
      */
     @Override
@@ -362,9 +320,8 @@ public class ContributionItemProviderAdapterFactory extends ContributionAdapterF
     }
 
     /**
-     * This implementation substitutes the factory itself as the key for the
-     * adapter. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * This implementation substitutes the factory itself as the key for the adapter.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -374,14 +331,13 @@ public class ContributionItemProviderAdapterFactory extends ContributionAdapterF
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
      * @generated
      */
     @Override
     public Object adapt(Object object, Object type) {
         if (isFactoryForType(type)) {
             Object adapter = super.adapt(object, type);
-            if (!(type instanceof Class<?>) || (((Class<?>) type).isInstance(adapter))) {
+            if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {
                 return adapter;
             }
         }
@@ -390,8 +346,8 @@ public class ContributionItemProviderAdapterFactory extends ContributionAdapterF
     }
 
     /**
-     * This adds a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * This adds a listener.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @generated
      */
     public void addListener(INotifyChangedListener notifyChangedListener) {
@@ -399,8 +355,8 @@ public class ContributionItemProviderAdapterFactory extends ContributionAdapterF
     }
 
     /**
-     * This removes a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * This removes a listener.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @generated
      */
     public void removeListener(INotifyChangedListener notifyChangedListener) {
@@ -429,26 +385,16 @@ public class ContributionItemProviderAdapterFactory extends ContributionAdapterF
      * @generated
      */
     public void dispose() {
-        if (ignoreFeatureContributionItemProvider != null)
-            ignoreFeatureContributionItemProvider.dispose();
-        if (setFeatureContributionItemProvider != null)
-            setFeatureContributionItemProvider.dispose();
-        if (addFeatureContributionItemProvider != null)
-            addFeatureContributionItemProvider.dispose();
-        if (removeFeatureContributionItemProvider != null)
-            removeFeatureContributionItemProvider.dispose();
-        if (clearFeatureContributionItemProvider != null)
-            clearFeatureContributionItemProvider.dispose();
-        if (resetFeatureContributionItemProvider != null)
-            resetFeatureContributionItemProvider.dispose();
-        if (directEObjectReferenceItemProvider != null)
-            directEObjectReferenceItemProvider.dispose();
-        if (computedEObjectReferenceItemProvider != null)
-            computedEObjectReferenceItemProvider.dispose();
-        if (contributionItemProvider != null)
-            contributionItemProvider.dispose();
-        if (contributionPointItemProvider != null)
-            contributionPointItemProvider.dispose();
+        if (ignoreFeatureContributionItemProvider != null) ignoreFeatureContributionItemProvider.dispose();
+        if (setFeatureContributionItemProvider != null) setFeatureContributionItemProvider.dispose();
+        if (addFeatureContributionItemProvider != null) addFeatureContributionItemProvider.dispose();
+        if (removeFeatureContributionItemProvider != null) removeFeatureContributionItemProvider.dispose();
+        if (clearFeatureContributionItemProvider != null) clearFeatureContributionItemProvider.dispose();
+        if (resetFeatureContributionItemProvider != null) resetFeatureContributionItemProvider.dispose();
+        if (directEObjectReferenceItemProvider != null) directEObjectReferenceItemProvider.dispose();
+        if (computedEObjectReferenceItemProvider != null) computedEObjectReferenceItemProvider.dispose();
+        if (contributionItemProvider != null) contributionItemProvider.dispose();
+        if (contributionPointItemProvider != null) contributionPointItemProvider.dispose();
     }
 
 }
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/description/contribution/provider/ContributionPointItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/description/contribution/provider/ContributionPointItemProvider.java
index 56050f375f..6bfdc0c96b 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/description/contribution/provider/ContributionPointItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/description/contribution/provider/ContributionPointItemProvider.java
@@ -32,10 +32,8 @@ import org.eclipse.sirius.description.contribution.ContributionPoint;
 import org.eclipse.sirius.viewpoint.provider.SiriusEditPlugin;
 
 /**
- * This is the item provider adapter for a
- * {@link org.eclipse.sirius.description.contribution.ContributionPoint} object.
+ * This is the item provider adapter for a {@link org.eclipse.sirius.description.contribution.ContributionPoint} object.
  * <!-- begin-user-doc --> <!-- end-user-doc -->
- * 
  * @generated
  */
 public class ContributionPointItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
@@ -74,9 +72,19 @@ public class ContributionPointItemProvider extends ItemProviderAdapter implement
      * @generated
      */
     protected void addOriginPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_ContributionPoint_origin_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ContributionPoint_origin_feature", "_UI_ContributionPoint_type"),
-                ContributionPackage.Literals.CONTRIBUTION_POINT__ORIGIN, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+        itemPropertyDescriptors.add
+            (createItemPropertyDescriptor
+                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                 getResourceLocator(),
+                 getString("_UI_ContributionPoint_origin_feature"), //$NON-NLS-1$
+                 getString("_UI_PropertyDescriptor_description", "_UI_ContributionPoint_origin_feature", "_UI_ContributionPoint_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                 ContributionPackage.Literals.CONTRIBUTION_POINT__ORIGIN,
+                 true,
+                 false,
+                 false,
+                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                 null,
+                 null));
     }
 
     /**
@@ -86,40 +94,51 @@ public class ContributionPointItemProvider extends ItemProviderAdapter implement
      * @generated
      */
     protected void addContributedPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_ContributionPoint_contributed_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ContributionPoint_contributed_feature", "_UI_ContributionPoint_type"),
-                ContributionPackage.Literals.CONTRIBUTION_POINT__CONTRIBUTED, true, false, true, null, null, null));
+        itemPropertyDescriptors.add
+            (createItemPropertyDescriptor
+                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                 getResourceLocator(),
+                 getString("_UI_ContributionPoint_contributed_feature"), //$NON-NLS-1$
+                 getString("_UI_PropertyDescriptor_description", "_UI_ContributionPoint_contributed_feature", "_UI_ContributionPoint_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                 ContributionPackage.Literals.CONTRIBUTION_POINT__CONTRIBUTED,
+                 true,
+                 false,
+                 true,
+                 null,
+                 null,
+                 null));
     }
 
     /**
-     * This returns ContributionPoint.gif. <!-- begin-user-doc --> <!--
+     * This returns ContributionPoint.gif.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
      * @generated
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ContributionPoint"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/ContributionPoint")); //$NON-NLS-1$
     }
 
     /**
-     * This returns the label text for the adapted class. <!-- begin-user-doc
+     * This returns the label text for the adapted class.
+     * <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
      * @generated
      */
     @Override
     public String getText(Object object) {
-        String label = ((ContributionPoint) object).getOrigin();
-        return label == null || label.length() == 0 ? getString("_UI_ContributionPoint_type") : getString("_UI_ContributionPoint_type") + " " + label;
+        String label = ((ContributionPoint)object).getOrigin();
+        return label == null || label.length() == 0 ?
+            getString("_UI_ContributionPoint_type") : //$NON-NLS-1$
+            getString("_UI_ContributionPoint_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
-     * This handles model notifications by calling {@link #updateChildren} to
-     * update any cached children and by creating a viewer notification, which
-     * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
+     * This handles model notifications by calling {@link #updateChildren} to update any cached
+     * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
      * @generated
      */
     @Override
@@ -127,9 +146,9 @@ public class ContributionPointItemProvider extends ItemProviderAdapter implement
         updateChildren(notification);
 
         switch (notification.getFeatureID(ContributionPoint.class)) {
-        case ContributionPackage.CONTRIBUTION_POINT__ORIGIN:
-            fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-            return;
+            case ContributionPackage.CONTRIBUTION_POINT__ORIGIN:
+                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+                return;
         }
         super.notifyChanged(notification);
     }
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/description/contribution/provider/ContributionProviderItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/description/contribution/provider/ContributionProviderItemProvider.java
index 58e2b9a745..1b1565d4c7 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/description/contribution/provider/ContributionProviderItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/description/contribution/provider/ContributionProviderItemProvider.java
@@ -32,10 +32,8 @@ import org.eclipse.sirius.description.contribution.ContributionProvider;
 import org.eclipse.sirius.viewpoint.provider.SiriusEditPlugin;
 
 /**
- * This is the item provider adapter for a
- * {@link org.eclipse.sirius.description.contribution.ContributionProvider}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
- * 
+ * This is the item provider adapter for a {@link org.eclipse.sirius.description.contribution.ContributionProvider} object.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
  * @generated
  */
 public class ContributionProviderItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
@@ -66,13 +64,10 @@ public class ContributionProviderItemProvider extends ItemProviderAdapter implem
     }
 
     /**
-     * This specifies how to implement {@link #getChildren} and is used to
-     * deduce an appropriate feature for an
-     * {@link org.eclipse.emf.edit.command.AddCommand},
-     * {@link org.eclipse.emf.edit.command.RemoveCommand} or
-     * {@link org.eclipse.emf.edit.command.MoveCommand} in
-     * {@link #createCommand}. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+     * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+     * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -86,35 +81,32 @@ public class ContributionProviderItemProvider extends ItemProviderAdapter implem
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
      * @generated
      */
     @Override
     protected EStructuralFeature getChildFeature(Object object, Object child) {
-        // Check the type of the specified child object and return the proper
-        // feature to use for
+        // Check the type of the specified child object and return the proper feature to use for
         // adding (see {@link AddCommand}) it as a child.
 
         return super.getChildFeature(object, child);
     }
 
     /**
-     * This returns the label text for the adapted class. <!-- begin-user-doc
+     * This returns the label text for the adapted class.
+     * <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
      * @generated
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_ContributionProvider_type");
+        return getString("_UI_ContributionProvider_type"); //$NON-NLS-1$
     }
 
     /**
-     * This handles model notifications by calling {@link #updateChildren} to
-     * update any cached children and by creating a viewer notification, which
-     * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
+     * This handles model notifications by calling {@link #updateChildren} to update any cached
+     * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
      * @generated
      */
     @Override
@@ -122,9 +114,9 @@ public class ContributionProviderItemProvider extends ItemProviderAdapter implem
         updateChildren(notification);
 
         switch (notification.getFeatureID(ContributionProvider.class)) {
-        case ContributionPackage.CONTRIBUTION_PROVIDER__CONTRIBUTIONS:
-            fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-            return;
+            case ContributionPackage.CONTRIBUTION_PROVIDER__CONTRIBUTIONS:
+                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+                return;
         }
         super.notifyChanged(notification);
     }
@@ -140,7 +132,10 @@ public class ContributionProviderItemProvider extends ItemProviderAdapter implem
     protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
         super.collectNewChildDescriptors(newChildDescriptors, object);
 
-        newChildDescriptors.add(createChildParameter(ContributionPackage.Literals.CONTRIBUTION_PROVIDER__CONTRIBUTIONS, ContributionFactory.eINSTANCE.createContribution()));
+        newChildDescriptors.add
+            (createChildParameter
+                (ContributionPackage.Literals.CONTRIBUTION_PROVIDER__CONTRIBUTIONS,
+                 ContributionFactory.eINSTANCE.createContribution()));
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/description/contribution/provider/DirectEObjectReferenceItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/description/contribution/provider/DirectEObjectReferenceItemProvider.java
index a867e5c0dc..f5878a067f 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/description/contribution/provider/DirectEObjectReferenceItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/description/contribution/provider/DirectEObjectReferenceItemProvider.java
@@ -31,10 +31,8 @@ import org.eclipse.sirius.description.contribution.DirectEObjectReference;
 import org.eclipse.sirius.viewpoint.provider.SiriusEditPlugin;
 
 /**
- * This is the item provider adapter for a
- * {@link org.eclipse.sirius.description.contribution.DirectEObjectReference}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
- * 
+ * This is the item provider adapter for a {@link org.eclipse.sirius.description.contribution.DirectEObjectReference} object.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
  * @generated
  */
 public class DirectEObjectReferenceItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
@@ -72,20 +70,30 @@ public class DirectEObjectReferenceItemProvider extends ItemProviderAdapter impl
      * @generated
      */
     protected void addValuePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DirectEObjectReference_value_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DirectEObjectReference_value_feature", "_UI_DirectEObjectReference_type"),
-                ContributionPackage.Literals.DIRECT_EOBJECT_REFERENCE__VALUE, true, false, true, null, getString("_UI_GeneralPropertyCategory"), null));
+        itemPropertyDescriptors.add
+            (createItemPropertyDescriptor
+                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                 getResourceLocator(),
+                 getString("_UI_DirectEObjectReference_value_feature"), //$NON-NLS-1$
+                 getString("_UI_PropertyDescriptor_description", "_UI_DirectEObjectReference_value_feature", "_UI_DirectEObjectReference_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                 ContributionPackage.Literals.DIRECT_EOBJECT_REFERENCE__VALUE,
+                 true,
+                 false,
+                 true,
+                 null,
+                 getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                 null));
     }
 
     /**
-     * This returns DirectEObjectReference.gif. <!-- begin-user-doc --> <!--
+     * This returns DirectEObjectReference.gif.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
      * @generated
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/DirectEObjectReference"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/DirectEObjectReference")); //$NON-NLS-1$
     }
 
     /**
@@ -116,11 +124,10 @@ public class DirectEObjectReferenceItemProvider extends ItemProviderAdapter impl
     }
 
     /**
-     * This handles model notifications by calling {@link #updateChildren} to
-     * update any cached children and by creating a viewer notification, which
-     * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
+     * This handles model notifications by calling {@link #updateChildren} to update any cached
+     * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
      * @generated
      */
     @Override
@@ -128,9 +135,9 @@ public class DirectEObjectReferenceItemProvider extends ItemProviderAdapter impl
         updateChildren(notification);
 
         switch (notification.getFeatureID(DirectEObjectReference.class)) {
-        case ContributionPackage.DIRECT_EOBJECT_REFERENCE__VALUE:
-            fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-            return;
+            case ContributionPackage.DIRECT_EOBJECT_REFERENCE__VALUE:
+                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+                return;
         }
         super.notifyChanged(notification);
     }
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/description/contribution/provider/FeatureContributionItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/description/contribution/provider/FeatureContributionItemProvider.java
index e3c943d7c6..3036caf588 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/description/contribution/provider/FeatureContributionItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/description/contribution/provider/FeatureContributionItemProvider.java
@@ -31,10 +31,8 @@ import org.eclipse.sirius.description.contribution.FeatureContribution;
 import org.eclipse.sirius.viewpoint.provider.SiriusEditPlugin;
 
 /**
- * This is the item provider adapter for a
- * {@link org.eclipse.sirius.description.contribution.FeatureContribution}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
- * 
+ * This is the item provider adapter for a {@link org.eclipse.sirius.description.contribution.FeatureContribution} object.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
  * @generated
  */
 public class FeatureContributionItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
@@ -73,9 +71,19 @@ public class FeatureContributionItemProvider extends ItemProviderAdapter impleme
      * @generated
      */
     protected void addSourceFeaturePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_FeatureContribution_sourceFeature_feature"), getString("_UI_FeatureContribution_sourceFeature_description"),
-                ContributionPackage.Literals.FEATURE_CONTRIBUTION__SOURCE_FEATURE, true, false, true, null, getString("_UI_GeneralPropertyCategory"), null));
+        itemPropertyDescriptors.add
+            (createItemPropertyDescriptor
+                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                 getResourceLocator(),
+                 getString("_UI_FeatureContribution_sourceFeature_feature"), //$NON-NLS-1$
+                 getString("_UI_FeatureContribution_sourceFeature_description"), //$NON-NLS-1$
+                 ContributionPackage.Literals.FEATURE_CONTRIBUTION__SOURCE_FEATURE,
+                 true,
+                 false,
+                 true,
+                 null,
+                 getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                 null));
     }
 
     /**
@@ -85,28 +93,37 @@ public class FeatureContributionItemProvider extends ItemProviderAdapter impleme
      * @generated
      */
     protected void addTargetFeaturePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_FeatureContribution_targetFeature_feature"), getString("_UI_FeatureContribution_targetFeature_description"),
-                ContributionPackage.Literals.FEATURE_CONTRIBUTION__TARGET_FEATURE, true, false, true, null, getString("_UI_GeneralPropertyCategory"), null));
+        itemPropertyDescriptors.add
+            (createItemPropertyDescriptor
+                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                 getResourceLocator(),
+                 getString("_UI_FeatureContribution_targetFeature_feature"), //$NON-NLS-1$
+                 getString("_UI_FeatureContribution_targetFeature_description"), //$NON-NLS-1$
+                 ContributionPackage.Literals.FEATURE_CONTRIBUTION__TARGET_FEATURE,
+                 true,
+                 false,
+                 true,
+                 null,
+                 getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                 null));
     }
 
     /**
-     * This returns the label text for the adapted class. <!-- begin-user-doc
+     * This returns the label text for the adapted class.
+     * <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
      * @generated
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_FeatureContribution_type");
+        return getString("_UI_FeatureContribution_type"); //$NON-NLS-1$
     }
 
     /**
-     * This handles model notifications by calling {@link #updateChildren} to
-     * update any cached children and by creating a viewer notification, which
-     * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
+     * This handles model notifications by calling {@link #updateChildren} to update any cached
+     * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
      * @generated
      */
     @Override
@@ -114,10 +131,10 @@ public class FeatureContributionItemProvider extends ItemProviderAdapter impleme
         updateChildren(notification);
 
         switch (notification.getFeatureID(FeatureContribution.class)) {
-        case ContributionPackage.FEATURE_CONTRIBUTION__SOURCE_FEATURE:
-        case ContributionPackage.FEATURE_CONTRIBUTION__TARGET_FEATURE:
-            fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-            return;
+            case ContributionPackage.FEATURE_CONTRIBUTION__SOURCE_FEATURE:
+            case ContributionPackage.FEATURE_CONTRIBUTION__TARGET_FEATURE:
+                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+                return;
         }
         super.notifyChanged(notification);
     }
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/description/contribution/provider/IgnoreFeatureContributionItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/description/contribution/provider/IgnoreFeatureContributionItemProvider.java
index 81c067a85a..d9fff55402 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/description/contribution/provider/IgnoreFeatureContributionItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/description/contribution/provider/IgnoreFeatureContributionItemProvider.java
@@ -21,10 +21,8 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.sirius.description.contribution.IgnoreFeatureContribution;
 
 /**
- * This is the item provider adapter for a
- * {@link org.eclipse.sirius.description.contribution.IgnoreFeatureContribution}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
- * 
+ * This is the item provider adapter for a {@link org.eclipse.sirius.description.contribution.IgnoreFeatureContribution} object.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
  * @generated
  */
 public class IgnoreFeatureContributionItemProvider extends FeatureContributionItemProvider {
@@ -54,14 +52,14 @@ public class IgnoreFeatureContributionItemProvider extends FeatureContributionIt
     }
 
     /**
-     * This returns IgnoreFeatureContribution.gif. <!-- begin-user-doc --> <!--
+     * This returns IgnoreFeatureContribution.gif.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
      * @generated
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/IgnoreFeatureContribution"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/IgnoreFeatureContribution")); //$NON-NLS-1$
     }
 
     /**
@@ -89,11 +87,10 @@ public class IgnoreFeatureContributionItemProvider extends FeatureContributionIt
     }
 
     /**
-     * This handles model notifications by calling {@link #updateChildren} to
-     * update any cached children and by creating a viewer notification, which
-     * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
+     * This handles model notifications by calling {@link #updateChildren} to update any cached
+     * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
      * @generated
      */
     @Override
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/description/contribution/provider/RemoveFeatureContributionItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/description/contribution/provider/RemoveFeatureContributionItemProvider.java
index a6a353dcd0..70b0821d7c 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/description/contribution/provider/RemoveFeatureContributionItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/description/contribution/provider/RemoveFeatureContributionItemProvider.java
@@ -21,10 +21,8 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.sirius.description.contribution.RemoveFeatureContribution;
 
 /**
- * This is the item provider adapter for a
- * {@link org.eclipse.sirius.description.contribution.RemoveFeatureContribution}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
- * 
+ * This is the item provider adapter for a {@link org.eclipse.sirius.description.contribution.RemoveFeatureContribution} object.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
  * @generated
  */
 public class RemoveFeatureContributionItemProvider extends FeatureContributionItemProvider {
@@ -54,14 +52,14 @@ public class RemoveFeatureContributionItemProvider extends FeatureContributionIt
     }
 
     /**
-     * This returns RemoveFeatureContribution.gif. <!-- begin-user-doc --> <!--
+     * This returns RemoveFeatureContribution.gif.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
      * @generated
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/RemoveFeatureContribution"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/RemoveFeatureContribution")); //$NON-NLS-1$
     }
 
     /**
@@ -89,11 +87,10 @@ public class RemoveFeatureContributionItemProvider extends FeatureContributionIt
     }
 
     /**
-     * This handles model notifications by calling {@link #updateChildren} to
-     * update any cached children and by creating a viewer notification, which
-     * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
+     * This handles model notifications by calling {@link #updateChildren} to update any cached
+     * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
      * @generated
      */
     @Override
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/description/contribution/provider/ResetFeatureContributionItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/description/contribution/provider/ResetFeatureContributionItemProvider.java
index 4ebbc26d1d..255b329401 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/description/contribution/provider/ResetFeatureContributionItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/description/contribution/provider/ResetFeatureContributionItemProvider.java
@@ -21,10 +21,8 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.sirius.description.contribution.ResetFeatureContribution;
 
 /**
- * This is the item provider adapter for a
- * {@link org.eclipse.sirius.description.contribution.ResetFeatureContribution}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
- * 
+ * This is the item provider adapter for a {@link org.eclipse.sirius.description.contribution.ResetFeatureContribution} object.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
  * @generated
  */
 public class ResetFeatureContributionItemProvider extends FeatureContributionItemProvider {
@@ -54,14 +52,14 @@ public class ResetFeatureContributionItemProvider extends FeatureContributionIte
     }
 
     /**
-     * This returns ResetFeatureContribution.gif. <!-- begin-user-doc --> <!--
+     * This returns ResetFeatureContribution.gif.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
      * @generated
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ResetFeatureContribution"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/ResetFeatureContribution")); //$NON-NLS-1$
     }
 
     /**
@@ -89,11 +87,10 @@ public class ResetFeatureContributionItemProvider extends FeatureContributionIte
     }
 
     /**
-     * This handles model notifications by calling {@link #updateChildren} to
-     * update any cached children and by creating a viewer notification, which
-     * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
+     * This handles model notifications by calling {@link #updateChildren} to update any cached
+     * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
      * @generated
      */
     @Override
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/description/contribution/provider/SetFeatureContributionItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/description/contribution/provider/SetFeatureContributionItemProvider.java
index 08be625410..2411750d02 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/description/contribution/provider/SetFeatureContributionItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/description/contribution/provider/SetFeatureContributionItemProvider.java
@@ -21,10 +21,8 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.sirius.description.contribution.SetFeatureContribution;
 
 /**
- * This is the item provider adapter for a
- * {@link org.eclipse.sirius.description.contribution.SetFeatureContribution}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
- * 
+ * This is the item provider adapter for a {@link org.eclipse.sirius.description.contribution.SetFeatureContribution} object.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
  * @generated
  */
 public class SetFeatureContributionItemProvider extends FeatureContributionItemProvider {
@@ -54,14 +52,14 @@ public class SetFeatureContributionItemProvider extends FeatureContributionItemP
     }
 
     /**
-     * This returns SetFeatureContribution.gif. <!-- begin-user-doc --> <!--
+     * This returns SetFeatureContribution.gif.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
      * @generated
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/SetFeatureContribution"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/SetFeatureContribution")); //$NON-NLS-1$
     }
 
     /**
@@ -89,11 +87,10 @@ public class SetFeatureContributionItemProvider extends FeatureContributionItemP
     }
 
     /**
-     * This handles model notifications by calling {@link #updateChildren} to
-     * update any cached children and by creating a viewer notification, which
-     * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
+     * This handles model notifications by calling {@link #updateChildren} to update any cached
+     * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
      * @generated
      */
     @Override
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/audit/provider/InformationSectionItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/audit/provider/InformationSectionItemProvider.java
index 589c5948ee..0599e7df2e 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/audit/provider/InformationSectionItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/audit/provider/InformationSectionItemProvider.java
@@ -68,7 +68,7 @@ IItemPropertySource {
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_InformationSection_type");
+        return getString("_UI_InformationSection_type"); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/audit/provider/TemplateInformationSectionItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/audit/provider/TemplateInformationSectionItemProvider.java
index d812945bde..c32b99ab91 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/audit/provider/TemplateInformationSectionItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/audit/provider/TemplateInformationSectionItemProvider.java
@@ -65,8 +65,10 @@ public class TemplateInformationSectionItemProvider extends InformationSectionIt
      */
     protected void addTemplatePathPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_TemplateInformationSection_templatePath_feature"), getString("_UI_TemplateInformationSection_templatePath_description"),
-                AuditPackage.Literals.TEMPLATE_INFORMATION_SECTION__TEMPLATE_PATH, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_TemplateInformationSection_templatePath_feature"), //$NON-NLS-1$
+                getString("_UI_TemplateInformationSection_templatePath_description"), //$NON-NLS-1$
+                AuditPackage.Literals.TEMPLATE_INFORMATION_SECTION__TEMPLATE_PATH, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -77,7 +79,7 @@ public class TemplateInformationSectionItemProvider extends InformationSectionIt
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/TemplateInformationSection"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/TemplateInformationSection")); //$NON-NLS-1$
     }
 
     /**
@@ -89,7 +91,8 @@ public class TemplateInformationSectionItemProvider extends InformationSectionIt
     @Override
     public String getText(Object object) {
         String label = ((TemplateInformationSection) object).getTemplatePath();
-        return label == null || label.length() == 0 ? getString("_UI_TemplateInformationSection_type") : getString("_UI_TemplateInformationSection_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_TemplateInformationSection_type") : //$NON-NLS-1$
+            getString("_UI_TemplateInformationSection_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/AbstractMappingImportItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/AbstractMappingImportItemProvider.java
index 9ef56f95dc..382bedffe2 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/AbstractMappingImportItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/AbstractMappingImportItemProvider.java
@@ -75,9 +75,10 @@ IItemPropertySource {
      */
     protected void addHideSubMappingsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_AbstractMappingImport_hideSubMappings_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_AbstractMappingImport_hideSubMappings_feature", "_UI_AbstractMappingImport_type"),
-                DescriptionPackage.Literals.ABSTRACT_MAPPING_IMPORT__HIDE_SUB_MAPPINGS, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, getString("_UI_ImportPropertyCategory"), null));
+                getString("_UI_AbstractMappingImport_hideSubMappings_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_AbstractMappingImport_hideSubMappings_feature", "_UI_AbstractMappingImport_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DescriptionPackage.Literals.ABSTRACT_MAPPING_IMPORT__HIDE_SUB_MAPPINGS, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, getString("_UI_ImportPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -87,10 +88,13 @@ IItemPropertySource {
      * @generated
      */
     protected void addInheritsAncestorFiltersPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_AbstractMappingImport_inheritsAncestorFilters_feature"), getString("_UI_AbstractMappingImport_inheritsAncestorFilters_description"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_AbstractMappingImport_inheritsAncestorFilters_feature"), //$NON-NLS-1$
+                getString("_UI_AbstractMappingImport_inheritsAncestorFilters_description"), //$NON-NLS-1$
                 DescriptionPackage.Literals.ABSTRACT_MAPPING_IMPORT__INHERITS_ANCESTOR_FILTERS, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-                getString("_UI_ImportPropertyCategory"), null));
+                getString("_UI_ImportPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -102,7 +106,7 @@ IItemPropertySource {
     @Override
     public String getText(Object object) {
         AbstractMappingImport abstractMappingImport = (AbstractMappingImport) object;
-        return getString("_UI_AbstractMappingImport_type") + " " + abstractMappingImport.isHideSubMappings();
+        return getString("_UI_AbstractMappingImport_type") + " " + abstractMappingImport.isHideSubMappings(); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/AnnotationEntryItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/AnnotationEntryItemProvider.java
index 8c2eeea940..9a73f9dcf4 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/AnnotationEntryItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/AnnotationEntryItemProvider.java
@@ -76,7 +76,8 @@ IItemPropertySource {
      */
     protected void addSourcePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_AnnotationEntry_source_feature"), getString("_UI_PropertyDescriptor_description", "_UI_AnnotationEntry_source_feature", "_UI_AnnotationEntry_type"),
+                getString("_UI_AnnotationEntry_source_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_AnnotationEntry_source_feature", "_UI_AnnotationEntry_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DescriptionPackage.Literals.ANNOTATION_ENTRY__SOURCE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -121,7 +122,7 @@ IItemPropertySource {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/AnnotationEntry"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/AnnotationEntry")); //$NON-NLS-1$
     }
 
     /**
@@ -133,7 +134,8 @@ IItemPropertySource {
     @Override
     public String getText(Object object) {
         String label = ((AnnotationEntry) object).getSource();
-        return label == null || label.length() == 0 ? getString("_UI_AnnotationEntry_type") : getString("_UI_AnnotationEntry_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_AnnotationEntry_type") : //$NON-NLS-1$
+            getString("_UI_AnnotationEntry_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/ColorDescriptionItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/ColorDescriptionItemProvider.java
index f0daa4cbfc..503bb4b103 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/ColorDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/ColorDescriptionItemProvider.java
@@ -68,7 +68,7 @@ IItemPropertySource {
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_ColorDescription_type");
+        return getString("_UI_ColorDescription_type"); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/ColorStepItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/ColorStepItemProvider.java
index 47e394b2e2..72e5f65ee4 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/ColorStepItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/ColorStepItemProvider.java
@@ -74,8 +74,10 @@ public class ColorStepItemProvider extends ItemProviderAdapter implements IEditi
      */
     protected void addAssociatedValuePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_ColorStep_associatedValue_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ColorStep_associatedValue_feature", "_UI_ColorStep_type"),
-                DescriptionPackage.Literals.COLOR_STEP__ASSOCIATED_VALUE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_ColorStep_associatedValue_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_ColorStep_associatedValue_feature", "_UI_ColorStep_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DescriptionPackage.Literals.COLOR_STEP__ASSOCIATED_VALUE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -86,8 +88,10 @@ public class ColorStepItemProvider extends ItemProviderAdapter implements IEditi
      */
     protected void addAssociatedColorPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_ColorStep_associatedColor_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ColorStep_associatedColor_feature", "_UI_ColorStep_type"),
-                DescriptionPackage.Literals.COLOR_STEP__ASSOCIATED_COLOR, true, false, true, null, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_ColorStep_associatedColor_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_ColorStep_associatedColor_feature", "_UI_ColorStep_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DescriptionPackage.Literals.COLOR_STEP__ASSOCIATED_COLOR, true, false, true, null, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -97,7 +101,7 @@ public class ColorStepItemProvider extends ItemProviderAdapter implements IEditi
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ColorStep"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/ColorStep")); //$NON-NLS-1$
     }
 
     /**
@@ -109,7 +113,8 @@ public class ColorStepItemProvider extends ItemProviderAdapter implements IEditi
     @Override
     public String getText(Object object) {
         String label = ((ColorStep) object).getAssociatedValue();
-        return label == null || label.length() == 0 ? getString("_UI_ColorStep_type") : getString("_UI_ColorStep_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_ColorStep_type") : //$NON-NLS-1$
+            getString("_UI_ColorStep_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/ComputedColorItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/ComputedColorItemProvider.java
index 53ef1098cf..c5b5ca6628 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/ComputedColorItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/ComputedColorItemProvider.java
@@ -67,8 +67,10 @@ public class ComputedColorItemProvider extends UserColorItemProvider {
      */
     protected void addRedPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_ComputedColor_red_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ComputedColor_red_feature", "_UI_ComputedColor_type"),
-                DescriptionPackage.Literals.COMPUTED_COLOR__RED, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_ComputedColor_red_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_ComputedColor_red_feature", "_UI_ComputedColor_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DescriptionPackage.Literals.COMPUTED_COLOR__RED, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -79,8 +81,10 @@ public class ComputedColorItemProvider extends UserColorItemProvider {
      */
     protected void addGreenPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_ComputedColor_green_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ComputedColor_green_feature", "_UI_ComputedColor_type"),
-                DescriptionPackage.Literals.COMPUTED_COLOR__GREEN, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_ComputedColor_green_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_ComputedColor_green_feature", "_UI_ComputedColor_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DescriptionPackage.Literals.COMPUTED_COLOR__GREEN, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -91,8 +95,10 @@ public class ComputedColorItemProvider extends UserColorItemProvider {
      */
     protected void addBluePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_ComputedColor_blue_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ComputedColor_blue_feature", "_UI_ComputedColor_type"),
-                DescriptionPackage.Literals.COMPUTED_COLOR__BLUE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_ComputedColor_blue_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_ComputedColor_blue_feature", "_UI_ComputedColor_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DescriptionPackage.Literals.COMPUTED_COLOR__BLUE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -103,7 +109,7 @@ public class ComputedColorItemProvider extends UserColorItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ComputedColor"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/ComputedColor")); //$NON-NLS-1$
     }
 
     /**
@@ -115,7 +121,8 @@ public class ComputedColorItemProvider extends UserColorItemProvider {
     @Override
     public String getText(Object object) {
         String label = ((ComputedColor) object).getName();
-        return label == null || label.length() == 0 ? getString("_UI_ComputedColor_type") : getString("_UI_ComputedColor_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_ComputedColor_type") : //$NON-NLS-1$
+            getString("_UI_ComputedColor_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/ConditionalStyleDescriptionItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/ConditionalStyleDescriptionItemProvider.java
index 74ed65b4f6..205ec71c15 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/ConditionalStyleDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/ConditionalStyleDescriptionItemProvider.java
@@ -73,10 +73,13 @@ IItemPropertySource {
      * @generated
      */
     protected void addPredicateExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_ConditionalStyleDescription_predicateExpression_feature"), getString("_UI_ConditionalStyleDescription_predicateExpression_description"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_ConditionalStyleDescription_predicateExpression_feature"), //$NON-NLS-1$
+                getString("_UI_ConditionalStyleDescription_predicateExpression_description"), //$NON-NLS-1$
                 DescriptionPackage.Literals.CONDITIONAL_STYLE_DESCRIPTION__PREDICATE_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -88,7 +91,8 @@ IItemPropertySource {
     @Override
     public String getText(Object object) {
         String label = ((ConditionalStyleDescription) object).getPredicateExpression();
-        return label == null || label.length() == 0 ? getString("_UI_ConditionalStyleDescription_type") : getString("_UI_ConditionalStyleDescription_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_ConditionalStyleDescription_type") : //$NON-NLS-1$
+            getString("_UI_ConditionalStyleDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/CustomizationItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/CustomizationItemProvider.java
index f621920492..18a22daae2 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/CustomizationItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/CustomizationItemProvider.java
@@ -106,7 +106,7 @@ IItemPropertySource {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/Customization"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/Customization")); //$NON-NLS-1$
     }
 
     /**
@@ -117,7 +117,7 @@ IItemPropertySource {
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_Customization_type");
+        return getString("_UI_Customization_type"); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/DAnnotationEntryItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/DAnnotationEntryItemProvider.java
index 6b232a997b..49ed1c6cfe 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/DAnnotationEntryItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/DAnnotationEntryItemProvider.java
@@ -75,7 +75,8 @@ IItemPropertySource {
      */
     protected void addSourcePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DAnnotationEntry_source_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DAnnotationEntry_source_feature", "_UI_DAnnotationEntry_type"),
+                getString("_UI_DAnnotationEntry_source_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DAnnotationEntry_source_feature", "_UI_DAnnotationEntry_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DescriptionPackage.Literals.DANNOTATION_ENTRY__SOURCE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -87,7 +88,8 @@ IItemPropertySource {
      */
     protected void addDetailsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DAnnotationEntry_details_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DAnnotationEntry_details_feature", "_UI_DAnnotationEntry_type"),
+                getString("_UI_DAnnotationEntry_details_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DAnnotationEntry_details_feature", "_UI_DAnnotationEntry_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DescriptionPackage.Literals.DANNOTATION_ENTRY__DETAILS, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -99,7 +101,7 @@ IItemPropertySource {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/DAnnotationEntry"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/DAnnotationEntry")); //$NON-NLS-1$
     }
 
     /**
@@ -111,7 +113,8 @@ IItemPropertySource {
     @Override
     public String getText(Object object) {
         String label = ((DAnnotationEntry) object).getSource();
-        return label == null || label.length() == 0 ? getString("_UI_DAnnotationEntry_type") : getString("_UI_DAnnotationEntry_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_DAnnotationEntry_type") : //$NON-NLS-1$
+            getString("_UI_DAnnotationEntry_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/DAnnotationItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/DAnnotationItemProvider.java
index 501f61d126..c5bd761dbc 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/DAnnotationItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/DAnnotationItemProvider.java
@@ -77,7 +77,8 @@ IItemPropertySource {
      */
     protected void addSourcePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DAnnotation_source_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DAnnotation_source_feature", "_UI_DAnnotation_type"),
+                getString("_UI_DAnnotation_source_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DAnnotation_source_feature", "_UI_DAnnotation_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DescriptionPackage.Literals.DANNOTATION__SOURCE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -122,7 +123,7 @@ IItemPropertySource {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/DAnnotation"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/DAnnotation")); //$NON-NLS-1$
     }
 
     /**
@@ -134,7 +135,8 @@ IItemPropertySource {
     @Override
     public String getText(Object object) {
         String label = ((DAnnotation) object).getSource();
-        return label == null || label.length() == 0 ? getString("_UI_DAnnotation_type") : getString("_UI_DAnnotation_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_DAnnotation_type") : //$NON-NLS-1$
+            getString("_UI_DAnnotation_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/DModelElementItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/DModelElementItemProvider.java
index 311362069f..4c872f5400 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/DModelElementItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/DModelElementItemProvider.java
@@ -106,7 +106,7 @@ IItemPropertySource {
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_DModelElement_type");
+        return getString("_UI_DModelElement_type"); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/DecorationDescriptionItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/DecorationDescriptionItemProvider.java
index c6cccc164c..2bea66f288 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/DecorationDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/DecorationDescriptionItemProvider.java
@@ -77,8 +77,10 @@ IItemPropertySource {
      */
     protected void addNamePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DecorationDescription_name_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DecorationDescription_name_feature", "_UI_DecorationDescription_type"),
-                DescriptionPackage.Literals.DECORATION_DESCRIPTION__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_DecorationDescription_name_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DecorationDescription_name_feature", "_UI_DecorationDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DescriptionPackage.Literals.DECORATION_DESCRIPTION__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -89,8 +91,10 @@ IItemPropertySource {
      */
     protected void addPositionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DecorationDescription_position_feature"), getString("_UI_DecorationDescription_position_description"), DescriptionPackage.Literals.DECORATION_DESCRIPTION__POSITION,
-                true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_DecorationDescription_position_feature"), //$NON-NLS-1$
+                getString("_UI_DecorationDescription_position_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.DECORATION_DESCRIPTION__POSITION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -101,8 +105,10 @@ IItemPropertySource {
      */
     protected void addDecoratorPathPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DecorationDescription_decoratorPath_feature"), getString("_UI_DecorationDescription_decoratorPath_description"),
-                DescriptionPackage.Literals.DECORATION_DESCRIPTION__DECORATOR_PATH, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_DecorationDescription_decoratorPath_feature"), //$NON-NLS-1$
+                getString("_UI_DecorationDescription_decoratorPath_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.DECORATION_DESCRIPTION__DECORATOR_PATH, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -113,8 +119,9 @@ IItemPropertySource {
      */
     protected void addPreconditionExpressionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DecorationDescription_preconditionExpression_feature"), getString("_UI_DecorationDescription_preconditionExpression_description"),
-                DescriptionPackage.Literals.DECORATION_DESCRIPTION__PRECONDITION_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"),
+                getString("_UI_DecorationDescription_preconditionExpression_feature"), //$NON-NLS-1$
+                getString("_UI_DecorationDescription_preconditionExpression_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.DECORATION_DESCRIPTION__PRECONDITION_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
                 null));
     }
 
@@ -127,7 +134,8 @@ IItemPropertySource {
     @Override
     public String getText(Object object) {
         String label = ((DecorationDescription) object).getName();
-        return label == null || label.length() == 0 ? getString("_UI_DecorationDescription_type") : getString("_UI_DecorationDescription_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_DecorationDescription_type") : //$NON-NLS-1$
+            getString("_UI_DecorationDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/DecorationDescriptionsSetItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/DecorationDescriptionsSetItemProvider.java
index 125cddb00b..7b52eee02f 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/DecorationDescriptionsSetItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/DecorationDescriptionsSetItemProvider.java
@@ -106,7 +106,7 @@ IItemPropertySource {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/DecorationDescriptionsSet"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/DecorationDescriptionsSet")); //$NON-NLS-1$
     }
 
     /**
@@ -117,7 +117,7 @@ IItemPropertySource {
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_DecorationDescriptionsSet_type");
+        return getString("_UI_DecorationDescriptionsSet_type"); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/DocumentedElementItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/DocumentedElementItemProvider.java
index 5c12670b04..75b3a712d7 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/DocumentedElementItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/DocumentedElementItemProvider.java
@@ -74,8 +74,10 @@ IItemPropertySource {
      */
     protected void addDocumentationPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DocumentedElement_documentation_feature"), getString("_UI_DocumentedElement_documentation_description"), DescriptionPackage.Literals.DOCUMENTED_ELEMENT__DOCUMENTATION,
-                true, true, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_DocumentationPropertyCategory"), null));
+                getString("_UI_DocumentedElement_documentation_feature"), //$NON-NLS-1$
+                getString("_UI_DocumentedElement_documentation_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.DOCUMENTED_ELEMENT__DOCUMENTATION, true, true, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_DocumentationPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -87,7 +89,8 @@ IItemPropertySource {
     @Override
     public String getText(Object object) {
         String label = crop(((DocumentedElement) object).getDocumentation());
-        return label == null || label.length() == 0 ? getString("_UI_DocumentedElement_type") : getString("_UI_DocumentedElement_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_DocumentedElement_type") : //$NON-NLS-1$
+            getString("_UI_DocumentedElement_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/EAttributeCustomizationItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/EAttributeCustomizationItemProvider.java
index a845c234e8..55257bf2d4 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/EAttributeCustomizationItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/EAttributeCustomizationItemProvider.java
@@ -66,7 +66,8 @@ public class EAttributeCustomizationItemProvider extends EStructuralFeatureCusto
      */
     protected void addAttributeNamePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_EAttributeCustomization_attributeName_feature"), getString("_UI_EAttributeCustomization_attributeName_description"),
+                getString("_UI_EAttributeCustomization_attributeName_feature"), //$NON-NLS-1$
+                getString("_UI_EAttributeCustomization_attributeName_description"), //$NON-NLS-1$
                 DescriptionPackage.Literals.EATTRIBUTE_CUSTOMIZATION__ATTRIBUTE_NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -78,8 +79,9 @@ public class EAttributeCustomizationItemProvider extends EStructuralFeatureCusto
      */
     protected void addValuePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_EAttributeCustomization_value_feature"), getString("_UI_EAttributeCustomization_value_description"), DescriptionPackage.Literals.EATTRIBUTE_CUSTOMIZATION__VALUE, true,
-                false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+                getString("_UI_EAttributeCustomization_value_feature"), //$NON-NLS-1$
+                getString("_UI_EAttributeCustomization_value_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.EATTRIBUTE_CUSTOMIZATION__VALUE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
     /**
@@ -90,7 +92,7 @@ public class EAttributeCustomizationItemProvider extends EStructuralFeatureCusto
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/EAttributeCustomization"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/EAttributeCustomization")); //$NON-NLS-1$
     }
 
     /**
@@ -102,7 +104,8 @@ public class EAttributeCustomizationItemProvider extends EStructuralFeatureCusto
     @Override
     public String getText(Object object) {
         String label = ((EAttributeCustomization) object).getAttributeName();
-        return label == null || label.length() == 0 ? getString("_UI_EAttributeCustomization_type") : getString("_UI_EAttributeCustomization_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_EAttributeCustomization_type") : //$NON-NLS-1$
+            getString("_UI_EAttributeCustomization_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/EReferenceCustomizationItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/EReferenceCustomizationItemProvider.java
index 0db3c2b347..c4402ab6de 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/EReferenceCustomizationItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/EReferenceCustomizationItemProvider.java
@@ -66,7 +66,8 @@ public class EReferenceCustomizationItemProvider extends EStructuralFeatureCusto
      */
     protected void addReferenceNamePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_EReferenceCustomization_referenceName_feature"), getString("_UI_EReferenceCustomization_referenceName_description"),
+                getString("_UI_EReferenceCustomization_referenceName_feature"), //$NON-NLS-1$
+                getString("_UI_EReferenceCustomization_referenceName_description"), //$NON-NLS-1$
                 DescriptionPackage.Literals.EREFERENCE_CUSTOMIZATION__REFERENCE_NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -78,8 +79,9 @@ public class EReferenceCustomizationItemProvider extends EStructuralFeatureCusto
      */
     protected void addValuePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_EReferenceCustomization_value_feature"), getString("_UI_EReferenceCustomization_value_description"), DescriptionPackage.Literals.EREFERENCE_CUSTOMIZATION__VALUE, true,
-                false, true, null, null, null));
+                getString("_UI_EReferenceCustomization_value_feature"), //$NON-NLS-1$
+                getString("_UI_EReferenceCustomization_value_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.EREFERENCE_CUSTOMIZATION__VALUE, true, false, true, null, null, null));
     }
 
     /**
@@ -90,7 +92,7 @@ public class EReferenceCustomizationItemProvider extends EStructuralFeatureCusto
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/EReferenceCustomization"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/EReferenceCustomization")); //$NON-NLS-1$
     }
 
     /**
@@ -102,7 +104,8 @@ public class EReferenceCustomizationItemProvider extends EStructuralFeatureCusto
     @Override
     public String getText(Object object) {
         String label = ((EReferenceCustomization) object).getReferenceName();
-        return label == null || label.length() == 0 ? getString("_UI_EReferenceCustomization_type") : getString("_UI_EReferenceCustomization_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_EReferenceCustomization_type") : //$NON-NLS-1$
+            getString("_UI_EReferenceCustomization_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/EStructuralFeatureCustomizationItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/EStructuralFeatureCustomizationItemProvider.java
index 4ea5966068..c2ae4212b3 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/EStructuralFeatureCustomizationItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/EStructuralFeatureCustomizationItemProvider.java
@@ -75,7 +75,8 @@ IItemLabelProvider, IItemPropertySource {
      */
     protected void addAppliedOnPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_EStructuralFeatureCustomization_appliedOn_feature"), getString("_UI_EStructuralFeatureCustomization_appliedOn_description"),
+                getString("_UI_EStructuralFeatureCustomization_appliedOn_feature"), //$NON-NLS-1$
+                getString("_UI_EStructuralFeatureCustomization_appliedOn_description"), //$NON-NLS-1$
                 DescriptionPackage.Literals.ESTRUCTURAL_FEATURE_CUSTOMIZATION__APPLIED_ON, true, false, true, null, null, null));
     }
 
@@ -87,7 +88,8 @@ IItemLabelProvider, IItemPropertySource {
      */
     protected void addApplyOnAllPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_EStructuralFeatureCustomization_applyOnAll_feature"), getString("_UI_EStructuralFeatureCustomization_applyOnAll_description"),
+                getString("_UI_EStructuralFeatureCustomization_applyOnAll_feature"), //$NON-NLS-1$
+                getString("_UI_EStructuralFeatureCustomization_applyOnAll_description"), //$NON-NLS-1$
                 DescriptionPackage.Literals.ESTRUCTURAL_FEATURE_CUSTOMIZATION__APPLY_ON_ALL, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
     }
 
@@ -100,7 +102,7 @@ IItemLabelProvider, IItemPropertySource {
     @Override
     public String getText(Object object) {
         EStructuralFeatureCustomization eStructuralFeatureCustomization = (EStructuralFeatureCustomization) object;
-        return getString("_UI_EStructuralFeatureCustomization_type") + " " + eStructuralFeatureCustomization.isApplyOnAll();
+        return getString("_UI_EStructuralFeatureCustomization_type") + " " + eStructuralFeatureCustomization.isApplyOnAll(); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/EndUserDocumentedElementItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/EndUserDocumentedElementItemProvider.java
index 50fb2b5f53..2bbb47ef75 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/EndUserDocumentedElementItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/EndUserDocumentedElementItemProvider.java
@@ -73,10 +73,13 @@ IItemPropertySource {
      * @generated
      */
     protected void addEndUserDocumentationPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_EndUserDocumentedElement_endUserDocumentation_feature"), getString("_UI_EndUserDocumentedElement_endUserDocumentation_description"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_EndUserDocumentedElement_endUserDocumentation_feature"), //$NON-NLS-1$
+                getString("_UI_EndUserDocumentedElement_endUserDocumentation_description"), //$NON-NLS-1$
                 DescriptionPackage.Literals.END_USER_DOCUMENTED_ELEMENT__END_USER_DOCUMENTATION, true, true, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_DocumentationPropertyCategory"), null));
+                getString("_UI_DocumentationPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -88,7 +91,8 @@ IItemPropertySource {
     @Override
     public String getText(Object object) {
         String label = crop(((EndUserDocumentedElement) object).getEndUserDocumentation());
-        return label == null || label.length() == 0 ? getString("_UI_EndUserDocumentedElement_type") : getString("_UI_EndUserDocumentedElement_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_EndUserDocumentedElement_type") : //$NON-NLS-1$
+            getString("_UI_EndUserDocumentedElement_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/EnvironmentItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/EnvironmentItemProvider.java
index 008c224024..e924b6af11 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/EnvironmentItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/EnvironmentItemProvider.java
@@ -110,7 +110,7 @@ IItemPropertySource {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/Environment"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/Environment")); //$NON-NLS-1$
     }
 
     /**
@@ -121,7 +121,7 @@ IItemPropertySource {
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_Environment_type");
+        return getString("_UI_Environment_type"); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/FixedColorItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/FixedColorItemProvider.java
index 85770b41e9..9c2a23b773 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/FixedColorItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/FixedColorItemProvider.java
@@ -66,9 +66,10 @@ public class FixedColorItemProvider extends ColorDescriptionItemProvider {
      * @generated
      */
     protected void addRedPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_FixedColor_red_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_FixedColor_red_feature", "_UI_FixedColor_type"), DescriptionPackage.Literals.FIXED_COLOR__RED, true, false, false,
-                ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_FixedColor_red_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_FixedColor_red_feature", "_UI_FixedColor_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DescriptionPackage.Literals.FIXED_COLOR__RED, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -78,9 +79,10 @@ public class FixedColorItemProvider extends ColorDescriptionItemProvider {
      * @generated
      */
     protected void addGreenPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_FixedColor_green_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_FixedColor_green_feature", "_UI_FixedColor_type"), DescriptionPackage.Literals.FIXED_COLOR__GREEN, true, false, false,
-                ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_FixedColor_green_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_FixedColor_green_feature", "_UI_FixedColor_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DescriptionPackage.Literals.FIXED_COLOR__GREEN, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -90,9 +92,10 @@ public class FixedColorItemProvider extends ColorDescriptionItemProvider {
      * @generated
      */
     protected void addBluePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_FixedColor_blue_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_FixedColor_blue_feature", "_UI_FixedColor_type"), DescriptionPackage.Literals.FIXED_COLOR__BLUE, true, false, false,
-                ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_FixedColor_blue_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_FixedColor_blue_feature", "_UI_FixedColor_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DescriptionPackage.Literals.FIXED_COLOR__BLUE, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -103,7 +106,7 @@ public class FixedColorItemProvider extends ColorDescriptionItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/FixedColor"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/FixedColor")); //$NON-NLS-1$
     }
 
     /**
@@ -115,7 +118,7 @@ public class FixedColorItemProvider extends ColorDescriptionItemProvider {
     @Override
     public String getText(Object object) {
         FixedColor fixedColor = (FixedColor) object;
-        return getString("_UI_FixedColor_type") + " " + fixedColor.getRed();
+        return getString("_UI_FixedColor_type") + " " + fixedColor.getRed(); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/GroupItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/GroupItemProvider.java
index e7a0c56513..1469cc2f80 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/GroupItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/GroupItemProvider.java
@@ -68,8 +68,10 @@ public class GroupItemProvider extends DModelElementItemProvider {
      */
     protected void addDocumentationPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DocumentedElement_documentation_feature"), getString("_UI_DocumentedElement_documentation_description"), DescriptionPackage.Literals.DOCUMENTED_ELEMENT__DOCUMENTATION,
-                true, true, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_DocumentationPropertyCategory"), null));
+                getString("_UI_DocumentedElement_documentation_feature"), //$NON-NLS-1$
+                getString("_UI_DocumentedElement_documentation_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.DOCUMENTED_ELEMENT__DOCUMENTATION, true, true, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_DocumentationPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -79,9 +81,10 @@ public class GroupItemProvider extends DModelElementItemProvider {
      * @generated
      */
     protected void addNamePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Group_name_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_Group_name_feature", "_UI_Group_type"), DescriptionPackage.Literals.GROUP__NAME, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Group_name_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_Group_name_feature", "_UI_Group_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DescriptionPackage.Literals.GROUP__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -125,7 +128,7 @@ public class GroupItemProvider extends DModelElementItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/Group"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/Group")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/IdentifiedElementItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/IdentifiedElementItemProvider.java
index a90162d6ed..163ebc6a73 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/IdentifiedElementItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/IdentifiedElementItemProvider.java
@@ -77,8 +77,10 @@ IItemPropertySource {
      */
     protected void addNamePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_IdentifiedElement_name_feature"), getString("_UI_IdentifiedElement_name_description"), DescriptionPackage.Literals.IDENTIFIED_ELEMENT__NAME, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_IdentifiedElement_name_feature"), //$NON-NLS-1$
+                getString("_UI_IdentifiedElement_name_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.IDENTIFIED_ELEMENT__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -89,8 +91,10 @@ IItemPropertySource {
      */
     protected void addLabelPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_IdentifiedElement_label_feature"), getString("_UI_IdentifiedElement_label_description"), DescriptionPackage.Literals.IDENTIFIED_ELEMENT__LABEL, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_IdentifiedElement_label_feature"), //$NON-NLS-1$
+                getString("_UI_IdentifiedElement_label_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.IDENTIFIED_ELEMENT__LABEL, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -101,7 +105,7 @@ IItemPropertySource {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/IdentifiedElement"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/IdentifiedElement")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/InterpolatedColorItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/InterpolatedColorItemProvider.java
index 894839251d..7c37583d87 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/InterpolatedColorItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/InterpolatedColorItemProvider.java
@@ -69,9 +69,10 @@ public class InterpolatedColorItemProvider extends ColorDescriptionItemProvider
      * @generated
      */
     protected void addNamePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_UserColor_name_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_UserColor_name_feature", "_UI_UserColor_type"), DescriptionPackage.Literals.USER_COLOR__NAME, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_UserColor_name_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_UserColor_name_feature", "_UI_UserColor_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DescriptionPackage.Literals.USER_COLOR__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -81,11 +82,13 @@ public class InterpolatedColorItemProvider extends ColorDescriptionItemProvider
      * @generated
      */
     protected void addColorValueComputationExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_InterpolatedColor_colorValueComputationExpression_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_InterpolatedColor_colorValueComputationExpression_feature", "_UI_InterpolatedColor_type"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_InterpolatedColor_colorValueComputationExpression_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_InterpolatedColor_colorValueComputationExpression_feature", "_UI_InterpolatedColor_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DescriptionPackage.Literals.INTERPOLATED_COLOR__COLOR_VALUE_COMPUTATION_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -95,11 +98,13 @@ public class InterpolatedColorItemProvider extends ColorDescriptionItemProvider
      * @generated
      */
     protected void addMinValueComputationExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_InterpolatedColor_minValueComputationExpression_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_InterpolatedColor_minValueComputationExpression_feature", "_UI_InterpolatedColor_type"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_InterpolatedColor_minValueComputationExpression_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_InterpolatedColor_minValueComputationExpression_feature", "_UI_InterpolatedColor_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DescriptionPackage.Literals.INTERPOLATED_COLOR__MIN_VALUE_COMPUTATION_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -109,11 +114,13 @@ public class InterpolatedColorItemProvider extends ColorDescriptionItemProvider
      * @generated
      */
     protected void addMaxValueComputationExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_InterpolatedColor_maxValueComputationExpression_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_InterpolatedColor_maxValueComputationExpression_feature", "_UI_InterpolatedColor_type"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_InterpolatedColor_maxValueComputationExpression_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_InterpolatedColor_maxValueComputationExpression_feature", "_UI_InterpolatedColor_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DescriptionPackage.Literals.INTERPOLATED_COLOR__MAX_VALUE_COMPUTATION_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -157,7 +164,7 @@ public class InterpolatedColorItemProvider extends ColorDescriptionItemProvider
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/InterpolatedColor"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/InterpolatedColor")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/JavaExtensionItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/JavaExtensionItemProvider.java
index b97256bb6b..20a0ea706a 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/JavaExtensionItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/JavaExtensionItemProvider.java
@@ -74,8 +74,10 @@ IItemPropertySource {
      */
     protected void addQualifiedClassNamePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_JavaExtension_qualifiedClassName_feature"), getString("_UI_JavaExtension_qualifiedClassName_description"),
-                DescriptionPackage.Literals.JAVA_EXTENSION__QUALIFIED_CLASS_NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_JavaExtension_qualifiedClassName_feature"), //$NON-NLS-1$
+                getString("_UI_JavaExtension_qualifiedClassName_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.JAVA_EXTENSION__QUALIFIED_CLASS_NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -86,7 +88,7 @@ IItemPropertySource {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/JavaExtension"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/JavaExtension")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/MetamodelExtensionSettingItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/MetamodelExtensionSettingItemProvider.java
index 465ef04fda..5eae966cd8 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/MetamodelExtensionSettingItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/MetamodelExtensionSettingItemProvider.java
@@ -71,9 +71,10 @@ IItemPropertySource {
      */
     protected void addExtensionGroupPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_MetamodelExtensionSetting_extensionGroup_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_MetamodelExtensionSetting_extensionGroup_feature", "_UI_MetamodelExtensionSetting_type"),
-                DescriptionPackage.Literals.METAMODEL_EXTENSION_SETTING__EXTENSION_GROUP, true, false, true, null, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_MetamodelExtensionSetting_extensionGroup_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_MetamodelExtensionSetting_extensionGroup_feature", "_UI_MetamodelExtensionSetting_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DescriptionPackage.Literals.METAMODEL_EXTENSION_SETTING__EXTENSION_GROUP, true, false, true, null, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -84,7 +85,7 @@ IItemPropertySource {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/MetamodelExtensionSetting"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/MetamodelExtensionSetting")); //$NON-NLS-1$
     }
 
     /**
@@ -95,7 +96,7 @@ IItemPropertySource {
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_MetamodelExtensionSetting_type");
+        return getString("_UI_MetamodelExtensionSetting_type"); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/PasteTargetDescriptionItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/PasteTargetDescriptionItemProvider.java
index 9ed800c298..2dc90aaeb6 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/PasteTargetDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/PasteTargetDescriptionItemProvider.java
@@ -71,8 +71,10 @@ IItemPropertySource {
      */
     protected void addPasteDescriptionsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_PasteTargetDescription_pasteDescriptions_feature"), getString("_UI_PasteTargetDescription_pasteDescriptions_description"),
-                DescriptionPackage.Literals.PASTE_TARGET_DESCRIPTION__PASTE_DESCRIPTIONS, true, false, true, null, getString("_UI_BehaviorPropertyCategory"), null));
+                getString("_UI_PasteTargetDescription_pasteDescriptions_feature"), //$NON-NLS-1$
+                getString("_UI_PasteTargetDescription_pasteDescriptions_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.PASTE_TARGET_DESCRIPTION__PASTE_DESCRIPTIONS, true, false, true, null, getString("_UI_BehaviorPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -83,7 +85,7 @@ IItemPropertySource {
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_PasteTargetDescription_type");
+        return getString("_UI_PasteTargetDescription_type"); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/RepresentationElementMappingItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/RepresentationElementMappingItemProvider.java
index d1e77f64f3..0309e49b02 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/RepresentationElementMappingItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/RepresentationElementMappingItemProvider.java
@@ -65,8 +65,10 @@ public class RepresentationElementMappingItemProvider extends IdentifiedElementI
      */
     protected void addDetailDescriptionsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_RepresentationElementMapping_detailDescriptions_feature"), getString("_UI_RepresentationElementMapping_detailDescriptions_description"),
-                DescriptionPackage.Literals.REPRESENTATION_ELEMENT_MAPPING__DETAIL_DESCRIPTIONS, false, false, false, null, getString("_UI_BehaviorPropertyCategory"), null));
+                getString("_UI_RepresentationElementMapping_detailDescriptions_feature"), //$NON-NLS-1$
+                getString("_UI_RepresentationElementMapping_detailDescriptions_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.REPRESENTATION_ELEMENT_MAPPING__DETAIL_DESCRIPTIONS, false, false, false, null, getString("_UI_BehaviorPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -77,8 +79,10 @@ public class RepresentationElementMappingItemProvider extends IdentifiedElementI
      */
     protected void addNavigationDescriptionsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_RepresentationElementMapping_navigationDescriptions_feature"), getString("_UI_RepresentationElementMapping_navigationDescriptions_description"),
-                DescriptionPackage.Literals.REPRESENTATION_ELEMENT_MAPPING__NAVIGATION_DESCRIPTIONS, true, false, true, null, getString("_UI_BehaviorPropertyCategory"), null));
+                getString("_UI_RepresentationElementMapping_navigationDescriptions_feature"), //$NON-NLS-1$
+                getString("_UI_RepresentationElementMapping_navigationDescriptions_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.REPRESENTATION_ELEMENT_MAPPING__NAVIGATION_DESCRIPTIONS, true, false, true, null, getString("_UI_BehaviorPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/RepresentationTemplateItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/RepresentationTemplateItemProvider.java
index 64bc328045..d8abb28718 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/RepresentationTemplateItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/RepresentationTemplateItemProvider.java
@@ -75,7 +75,8 @@ IItemPropertySource {
      */
     protected void addNamePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_RepresentationTemplate_name_feature"), getString("_UI_PropertyDescriptor_description", "_UI_RepresentationTemplate_name_feature", "_UI_RepresentationTemplate_type"),
+                getString("_UI_RepresentationTemplate_name_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_RepresentationTemplate_name_feature", "_UI_RepresentationTemplate_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DescriptionPackage.Literals.REPRESENTATION_TEMPLATE__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -121,7 +122,8 @@ IItemPropertySource {
     @Override
     public String getText(Object object) {
         String label = ((RepresentationTemplate) object).getName();
-        return label == null || label.length() == 0 ? getString("_UI_RepresentationTemplate_type") : getString("_UI_RepresentationTemplate_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_RepresentationTemplate_type") : //$NON-NLS-1$
+            getString("_UI_RepresentationTemplate_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/SemanticBasedDecorationItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/SemanticBasedDecorationItemProvider.java
index 45f72cd9ce..e27fed5213 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/SemanticBasedDecorationItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/SemanticBasedDecorationItemProvider.java
@@ -65,9 +65,10 @@ public class SemanticBasedDecorationItemProvider extends DecorationDescriptionIt
      */
     protected void addDomainClassPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_SemanticBasedDecoration_domainClass_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_SemanticBasedDecoration_domainClass_feature", "_UI_SemanticBasedDecoration_type"),
-                DescriptionPackage.Literals.SEMANTIC_BASED_DECORATION__DOMAIN_CLASS, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_SemanticBasedDecoration_domainClass_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_SemanticBasedDecoration_domainClass_feature", "_UI_SemanticBasedDecoration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DescriptionPackage.Literals.SEMANTIC_BASED_DECORATION__DOMAIN_CLASS, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -78,7 +79,7 @@ public class SemanticBasedDecorationItemProvider extends DecorationDescriptionIt
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/SemanticBasedDecoration"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/SemanticBasedDecoration")); //$NON-NLS-1$
     }
 
     /**
@@ -90,7 +91,8 @@ public class SemanticBasedDecorationItemProvider extends DecorationDescriptionIt
     @Override
     public String getText(Object object) {
         String label = ((SemanticBasedDecoration) object).getName();
-        return label == null || label.length() == 0 ? getString("_UI_SemanticBasedDecoration_type") : getString("_UI_SemanticBasedDecoration_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_SemanticBasedDecoration_type") : //$NON-NLS-1$
+            getString("_UI_SemanticBasedDecoration_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/SystemColorItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/SystemColorItemProvider.java
index 5339cd6945..353789de4f 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/SystemColorItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/SystemColorItemProvider.java
@@ -64,9 +64,9 @@ public class SystemColorItemProvider extends FixedColorItemProvider {
      * @generated
      */
     protected void addNamePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_SystemColor_name_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_SystemColor_name_feature", "_UI_SystemColor_type"), DescriptionPackage.Literals.SYSTEM_COLOR__NAME, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_SystemColor_name_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_SystemColor_name_feature", "_UI_SystemColor_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DescriptionPackage.Literals.SYSTEM_COLOR__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
     /**
@@ -77,7 +77,7 @@ public class SystemColorItemProvider extends FixedColorItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/SystemColor"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/SystemColor")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/SytemColorsPaletteItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/SytemColorsPaletteItemProvider.java
index 2ce3a83096..4aafa5abd0 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/SytemColorsPaletteItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/SytemColorsPaletteItemProvider.java
@@ -106,7 +106,7 @@ IItemPropertySource {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/SytemColorsPalette"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/SytemColorsPalette")); //$NON-NLS-1$
     }
 
     /**
@@ -117,7 +117,7 @@ IItemPropertySource {
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_SytemColorsPalette_type");
+        return getString("_UI_SytemColorsPalette_type"); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/UserColorItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/UserColorItemProvider.java
index 6780608063..48b7dedfb4 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/UserColorItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/UserColorItemProvider.java
@@ -72,9 +72,10 @@ public class UserColorItemProvider extends ItemProviderAdapter implements IEditi
      * @generated
      */
     protected void addNamePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_UserColor_name_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_UserColor_name_feature", "_UI_UserColor_type"), DescriptionPackage.Literals.USER_COLOR__NAME, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_UserColor_name_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_UserColor_name_feature", "_UI_UserColor_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DescriptionPackage.Literals.USER_COLOR__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -84,7 +85,7 @@ public class UserColorItemProvider extends ItemProviderAdapter implements IEditi
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/UserColor"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/UserColor")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/UserColorsPaletteItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/UserColorsPaletteItemProvider.java
index eb2de05a79..887e1fcc7c 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/UserColorsPaletteItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/UserColorsPaletteItemProvider.java
@@ -77,8 +77,10 @@ IItemPropertySource {
      */
     protected void addNamePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_UserColorsPalette_name_feature"), getString("_UI_PropertyDescriptor_description", "_UI_UserColorsPalette_name_feature", "_UI_UserColorsPalette_type"),
-                DescriptionPackage.Literals.USER_COLORS_PALETTE__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_UserColorsPalette_name_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_UserColorsPalette_name_feature", "_UI_UserColorsPalette_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DescriptionPackage.Literals.USER_COLORS_PALETTE__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -122,7 +124,7 @@ IItemPropertySource {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/UserColorsPalette"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/UserColorsPalette")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/UserFixedColorItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/UserFixedColorItemProvider.java
index eb615515b7..22c85d0b7b 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/UserFixedColorItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/UserFixedColorItemProvider.java
@@ -64,9 +64,10 @@ public class UserFixedColorItemProvider extends FixedColorItemProvider {
      * @generated
      */
     protected void addNamePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_UserColor_name_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_UserColor_name_feature", "_UI_UserColor_type"), DescriptionPackage.Literals.USER_COLOR__NAME, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_UserColor_name_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_UserColor_name_feature", "_UI_UserColor_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DescriptionPackage.Literals.USER_COLOR__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -77,7 +78,7 @@ public class UserFixedColorItemProvider extends FixedColorItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/UserFixedColor"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/UserFixedColor")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/VSMElementCustomizationItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/VSMElementCustomizationItemProvider.java
index 13e9083e36..c5c6b5a728 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/VSMElementCustomizationItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/VSMElementCustomizationItemProvider.java
@@ -76,7 +76,8 @@ IItemPropertySource {
      */
     protected void addPredicateExpressionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_VSMElementCustomization_predicateExpression_feature"), getString("_UI_VSMElementCustomization_predicateExpression_description"),
+                getString("_UI_VSMElementCustomization_predicateExpression_feature"), //$NON-NLS-1$
+                getString("_UI_VSMElementCustomization_predicateExpression_description"), //$NON-NLS-1$
                 DescriptionPackage.Literals.VSM_ELEMENT_CUSTOMIZATION__PREDICATE_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -121,7 +122,7 @@ IItemPropertySource {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/VSMElementCustomization"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/VSMElementCustomization")); //$NON-NLS-1$
     }
 
     /**
@@ -133,7 +134,8 @@ IItemPropertySource {
     @Override
     public String getText(Object object) {
         String label = ((VSMElementCustomization) object).getPredicateExpression();
-        return label == null || label.length() == 0 ? getString("_UI_VSMElementCustomization_type") : getString("_UI_VSMElementCustomization_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_VSMElementCustomization_type") : //$NON-NLS-1$
+            getString("_UI_VSMElementCustomization_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/VSMElementCustomizationReuseItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/VSMElementCustomizationReuseItemProvider.java
index cf1fb56d03..f485f40ffe 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/VSMElementCustomizationReuseItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/VSMElementCustomizationReuseItemProvider.java
@@ -72,7 +72,8 @@ IItemPropertySource {
      */
     protected void addReusePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_VSMElementCustomizationReuse_reuse_feature"), getString("_UI_VSMElementCustomizationReuse_reuse_description"),
+                getString("_UI_VSMElementCustomizationReuse_reuse_feature"), //$NON-NLS-1$
+                getString("_UI_VSMElementCustomizationReuse_reuse_description"), //$NON-NLS-1$
                 DescriptionPackage.Literals.VSM_ELEMENT_CUSTOMIZATION_REUSE__REUSE, true, false, true, null, null, null));
     }
 
@@ -84,7 +85,8 @@ IItemPropertySource {
      */
     protected void addAppliedOnPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_VSMElementCustomizationReuse_appliedOn_feature"), getString("_UI_VSMElementCustomizationReuse_appliedOn_description"),
+                getString("_UI_VSMElementCustomizationReuse_appliedOn_feature"), //$NON-NLS-1$
+                getString("_UI_VSMElementCustomizationReuse_appliedOn_description"), //$NON-NLS-1$
                 DescriptionPackage.Literals.VSM_ELEMENT_CUSTOMIZATION_REUSE__APPLIED_ON, true, false, true, null, null, null));
     }
 
@@ -96,7 +98,7 @@ IItemPropertySource {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/VSMElementCustomizationReuse"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/VSMElementCustomizationReuse")); //$NON-NLS-1$
     }
 
     /**
@@ -107,7 +109,7 @@ IItemPropertySource {
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_VSMElementCustomizationReuse_type");
+        return getString("_UI_VSMElementCustomizationReuse_type"); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/ViewpointItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/ViewpointItemProvider.java
index cbbef51a8a..4bc3622bda 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/ViewpointItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/ViewpointItemProvider.java
@@ -82,10 +82,13 @@ public class ViewpointItemProvider extends DocumentedElementItemProvider {
      * @generated
      */
     protected void addEndUserDocumentationPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_EndUserDocumentedElement_endUserDocumentation_feature"), getString("_UI_EndUserDocumentedElement_endUserDocumentation_description"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_EndUserDocumentedElement_endUserDocumentation_feature"), //$NON-NLS-1$
+                getString("_UI_EndUserDocumentedElement_endUserDocumentation_description"), //$NON-NLS-1$
                 DescriptionPackage.Literals.END_USER_DOCUMENTED_ELEMENT__END_USER_DOCUMENTATION, true, true, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_DocumentationPropertyCategory"), null));
+                getString("_UI_DocumentationPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -96,8 +99,10 @@ public class ViewpointItemProvider extends DocumentedElementItemProvider {
      */
     protected void addNamePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_IdentifiedElement_name_feature"), getString("_UI_IdentifiedElement_name_description"), DescriptionPackage.Literals.IDENTIFIED_ELEMENT__NAME, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_IdentifiedElement_name_feature"), //$NON-NLS-1$
+                getString("_UI_IdentifiedElement_name_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.IDENTIFIED_ELEMENT__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -108,8 +113,10 @@ public class ViewpointItemProvider extends DocumentedElementItemProvider {
      */
     protected void addLabelPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_IdentifiedElement_label_feature"), getString("_UI_IdentifiedElement_label_description"), DescriptionPackage.Literals.IDENTIFIED_ELEMENT__LABEL, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_IdentifiedElement_label_feature"), //$NON-NLS-1$
+                getString("_UI_IdentifiedElement_label_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.IDENTIFIED_ELEMENT__LABEL, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -120,8 +127,10 @@ public class ViewpointItemProvider extends DocumentedElementItemProvider {
      */
     protected void addModelFileExtensionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_Viewpoint_modelFileExtension_feature"), getString("_UI_Viewpoint_modelFileExtension_description"), DescriptionPackage.Literals.VIEWPOINT__MODEL_FILE_EXTENSION, true,
-                false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_Viewpoint_modelFileExtension_feature"), //$NON-NLS-1$
+                getString("_UI_Viewpoint_modelFileExtension_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.VIEWPOINT__MODEL_FILE_EXTENSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -131,9 +140,10 @@ public class ViewpointItemProvider extends DocumentedElementItemProvider {
      * @generated
      */
     protected void addIconPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Viewpoint_icon_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_Viewpoint_icon_feature", "_UI_Viewpoint_type"), DescriptionPackage.Literals.VIEWPOINT__ICON, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Viewpoint_icon_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_Viewpoint_icon_feature", "_UI_Viewpoint_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DescriptionPackage.Literals.VIEWPOINT__ICON, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -144,7 +154,8 @@ public class ViewpointItemProvider extends DocumentedElementItemProvider {
      */
     protected void addConflictsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_Viewpoint_conflicts_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Viewpoint_conflicts_feature", "_UI_Viewpoint_type"),
+                getString("_UI_Viewpoint_conflicts_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_Viewpoint_conflicts_feature", "_UI_Viewpoint_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DescriptionPackage.Literals.VIEWPOINT__CONFLICTS, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -155,9 +166,9 @@ public class ViewpointItemProvider extends DocumentedElementItemProvider {
      * @generated
      */
     protected void addReusesPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Viewpoint_reuses_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_Viewpoint_reuses_feature", "_UI_Viewpoint_type"), DescriptionPackage.Literals.VIEWPOINT__REUSES, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Viewpoint_reuses_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_Viewpoint_reuses_feature", "_UI_Viewpoint_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DescriptionPackage.Literals.VIEWPOINT__REUSES, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
     /**
@@ -168,7 +179,8 @@ public class ViewpointItemProvider extends DocumentedElementItemProvider {
      */
     protected void addCustomizesPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_Viewpoint_customizes_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Viewpoint_customizes_feature", "_UI_Viewpoint_type"),
+                getString("_UI_Viewpoint_customizes_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_Viewpoint_customizes_feature", "_UI_Viewpoint_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 DescriptionPackage.Literals.VIEWPOINT__CUSTOMIZES, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/style/provider/BasicLabelStyleDescriptionItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/style/provider/BasicLabelStyleDescriptionItemProvider.java
index 7476e50a4e..5c935b4255 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/style/provider/BasicLabelStyleDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/style/provider/BasicLabelStyleDescriptionItemProvider.java
@@ -79,9 +79,10 @@ IItemPropertySource {
      */
     protected void addLabelSizePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_BasicLabelStyleDescription_labelSize_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_BasicLabelStyleDescription_labelSize_feature", "_UI_BasicLabelStyleDescription_type"),
-                StylePackage.Literals.BASIC_LABEL_STYLE_DESCRIPTION__LABEL_SIZE, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, getString("_UI_LabelPropertyCategory"), null));
+                getString("_UI_BasicLabelStyleDescription_labelSize_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_BasicLabelStyleDescription_labelSize_feature", "_UI_BasicLabelStyleDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                StylePackage.Literals.BASIC_LABEL_STYLE_DESCRIPTION__LABEL_SIZE, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, getString("_UI_LabelPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -92,9 +93,10 @@ IItemPropertySource {
      */
     protected void addLabelFormatPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_BasicLabelStyleDescription_labelFormat_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_BasicLabelStyleDescription_labelFormat_feature", "_UI_BasicLabelStyleDescription_type"),
-                StylePackage.Literals.BASIC_LABEL_STYLE_DESCRIPTION__LABEL_FORMAT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_LabelPropertyCategory"), null));
+                getString("_UI_BasicLabelStyleDescription_labelFormat_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_BasicLabelStyleDescription_labelFormat_feature", "_UI_BasicLabelStyleDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                StylePackage.Literals.BASIC_LABEL_STYLE_DESCRIPTION__LABEL_FORMAT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_LabelPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -105,9 +107,10 @@ IItemPropertySource {
      */
     protected void addShowIconPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_BasicLabelStyleDescription_showIcon_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_BasicLabelStyleDescription_showIcon_feature", "_UI_BasicLabelStyleDescription_type"),
-                StylePackage.Literals.BASIC_LABEL_STYLE_DESCRIPTION__SHOW_ICON, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, getString("_UI_LabelPropertyCategory"), null));
+                getString("_UI_BasicLabelStyleDescription_showIcon_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_BasicLabelStyleDescription_showIcon_feature", "_UI_BasicLabelStyleDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                StylePackage.Literals.BASIC_LABEL_STYLE_DESCRIPTION__SHOW_ICON, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, getString("_UI_LabelPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -118,9 +121,10 @@ IItemPropertySource {
      */
     protected void addLabelExpressionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_BasicLabelStyleDescription_labelExpression_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_BasicLabelStyleDescription_labelExpression_feature", "_UI_BasicLabelStyleDescription_type"),
-                StylePackage.Literals.BASIC_LABEL_STYLE_DESCRIPTION__LABEL_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_LabelPropertyCategory"), null));
+                getString("_UI_BasicLabelStyleDescription_labelExpression_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_BasicLabelStyleDescription_labelExpression_feature", "_UI_BasicLabelStyleDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                StylePackage.Literals.BASIC_LABEL_STYLE_DESCRIPTION__LABEL_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_LabelPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -131,9 +135,10 @@ IItemPropertySource {
      */
     protected void addLabelColorPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_BasicLabelStyleDescription_labelColor_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_BasicLabelStyleDescription_labelColor_feature", "_UI_BasicLabelStyleDescription_type"),
-                StylePackage.Literals.BASIC_LABEL_STYLE_DESCRIPTION__LABEL_COLOR, true, false, true, null, getString("_UI_ColorPropertyCategory"), null));
+                getString("_UI_BasicLabelStyleDescription_labelColor_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_BasicLabelStyleDescription_labelColor_feature", "_UI_BasicLabelStyleDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                StylePackage.Literals.BASIC_LABEL_STYLE_DESCRIPTION__LABEL_COLOR, true, false, true, null, getString("_UI_ColorPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -144,8 +149,10 @@ IItemPropertySource {
      */
     protected void addIconPathPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_BasicLabelStyleDescription_iconPath_feature"), getString("_UI_BasicLabelStyleDescription_iconPath_description"),
-                StylePackage.Literals.BASIC_LABEL_STYLE_DESCRIPTION__ICON_PATH, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_AdvancedPropertyCategory"), null));
+                getString("_UI_BasicLabelStyleDescription_iconPath_feature"), //$NON-NLS-1$
+                getString("_UI_BasicLabelStyleDescription_iconPath_description"), //$NON-NLS-1$
+                StylePackage.Literals.BASIC_LABEL_STYLE_DESCRIPTION__ICON_PATH, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_AdvancedPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -156,7 +163,7 @@ IItemPropertySource {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/BasicLabelStyleDescription"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/BasicLabelStyleDescription")); //$NON-NLS-1$
     }
 
     /**
@@ -168,7 +175,7 @@ IItemPropertySource {
     @Override
     public String getText(Object object) {
         BasicLabelStyleDescription basicLabelStyleDescription = (BasicLabelStyleDescription) object;
-        return getString("_UI_BasicLabelStyleDescription_type") + " " + basicLabelStyleDescription.getLabelSize();
+        return getString("_UI_BasicLabelStyleDescription_type") + " " + basicLabelStyleDescription.getLabelSize(); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/style/provider/LabelBorderStyleDescriptionItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/style/provider/LabelBorderStyleDescriptionItemProvider.java
index d0232f892c..573ec35457 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/style/provider/LabelBorderStyleDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/style/provider/LabelBorderStyleDescriptionItemProvider.java
@@ -77,8 +77,8 @@ IItemPropertySource {
      */
     protected void addIdPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_LabelBorderStyleDescription_id_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_LabelBorderStyleDescription_id_feature", "_UI_LabelBorderStyleDescription_type"),
+                getString("_UI_LabelBorderStyleDescription_id_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_LabelBorderStyleDescription_id_feature", "_UI_LabelBorderStyleDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 StylePackage.Literals.LABEL_BORDER_STYLE_DESCRIPTION__ID, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -90,8 +90,8 @@ IItemPropertySource {
      */
     protected void addNamePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_LabelBorderStyleDescription_name_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_LabelBorderStyleDescription_name_feature", "_UI_LabelBorderStyleDescription_type"),
+                getString("_UI_LabelBorderStyleDescription_name_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_LabelBorderStyleDescription_name_feature", "_UI_LabelBorderStyleDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 StylePackage.Literals.LABEL_BORDER_STYLE_DESCRIPTION__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -103,8 +103,8 @@ IItemPropertySource {
      */
     protected void addCornerHeightPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_LabelBorderStyleDescription_cornerHeight_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_LabelBorderStyleDescription_cornerHeight_feature", "_UI_LabelBorderStyleDescription_type"),
+                getString("_UI_LabelBorderStyleDescription_cornerHeight_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_LabelBorderStyleDescription_cornerHeight_feature", "_UI_LabelBorderStyleDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 StylePackage.Literals.LABEL_BORDER_STYLE_DESCRIPTION__CORNER_HEIGHT, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
     }
 
@@ -116,8 +116,8 @@ IItemPropertySource {
      */
     protected void addCornerWidthPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_LabelBorderStyleDescription_cornerWidth_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_LabelBorderStyleDescription_cornerWidth_feature", "_UI_LabelBorderStyleDescription_type"),
+                getString("_UI_LabelBorderStyleDescription_cornerWidth_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_LabelBorderStyleDescription_cornerWidth_feature", "_UI_LabelBorderStyleDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 StylePackage.Literals.LABEL_BORDER_STYLE_DESCRIPTION__CORNER_WIDTH, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
     }
 
@@ -129,7 +129,7 @@ IItemPropertySource {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/LabelBorderStyleDescription"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/LabelBorderStyleDescription")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/style/provider/LabelBorderStylesItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/style/provider/LabelBorderStylesItemProvider.java
index e383512b06..3c7efa7298 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/style/provider/LabelBorderStylesItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/style/provider/LabelBorderStylesItemProvider.java
@@ -106,7 +106,7 @@ IItemPropertySource {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/LabelBorderStyles"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/LabelBorderStyles")); //$NON-NLS-1$
     }
 
     /**
@@ -117,7 +117,7 @@ IItemPropertySource {
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_LabelBorderStyles_type");
+        return getString("_UI_LabelBorderStyles_type"); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/style/provider/LabelStyleDescriptionItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/style/provider/LabelStyleDescriptionItemProvider.java
index b012c904d1..c291c2bc63 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/style/provider/LabelStyleDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/style/provider/LabelStyleDescriptionItemProvider.java
@@ -66,8 +66,10 @@ public class LabelStyleDescriptionItemProvider extends BasicLabelStyleDescriptio
      */
     protected void addLabelAlignmentPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_LabelStyleDescription_labelAlignment_feature"), getString("_UI_LabelStyleDescription_labelAlignment_description"),
-                StylePackage.Literals.LABEL_STYLE_DESCRIPTION__LABEL_ALIGNMENT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_LabelPropertyCategory"), null));
+                getString("_UI_LabelStyleDescription_labelAlignment_feature"), //$NON-NLS-1$
+                getString("_UI_LabelStyleDescription_labelAlignment_description"), //$NON-NLS-1$
+                StylePackage.Literals.LABEL_STYLE_DESCRIPTION__LABEL_ALIGNMENT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_LabelPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -78,7 +80,7 @@ public class LabelStyleDescriptionItemProvider extends BasicLabelStyleDescriptio
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/LabelStyleDescription"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/LabelStyleDescription")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/style/provider/TooltipStyleDescriptionItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/style/provider/TooltipStyleDescriptionItemProvider.java
index 93e1cb1d5b..5a5debbe4f 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/style/provider/TooltipStyleDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/style/provider/TooltipStyleDescriptionItemProvider.java
@@ -75,8 +75,10 @@ IItemPropertySource {
      */
     protected void addTooltipExpressionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_TooltipStyleDescription_tooltipExpression_feature"), getString("_UI_TooltipStyleDescription_tooltipExpression_description"),
-                StylePackage.Literals.TOOLTIP_STYLE_DESCRIPTION__TOOLTIP_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_TooltipStyleDescription_tooltipExpression_feature"), //$NON-NLS-1$
+                getString("_UI_TooltipStyleDescription_tooltipExpression_description"), //$NON-NLS-1$
+                StylePackage.Literals.TOOLTIP_STYLE_DESCRIPTION__TOOLTIP_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -87,7 +89,7 @@ IItemPropertySource {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/TooltipStyleDescription"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/TooltipStyleDescription")); //$NON-NLS-1$
     }
 
     /**
@@ -99,7 +101,8 @@ IItemPropertySource {
     @Override
     public String getText(Object object) {
         String label = ((TooltipStyleDescription) object).getTooltipExpression();
-        return label == null || label.length() == 0 ? getString("_UI_TooltipStyleDescription_type") : getString("_UI_TooltipStyleDescription_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_TooltipStyleDescription_type") : //$NON-NLS-1$
+            getString("_UI_TooltipStyleDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/AbstractToolDescriptionItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/AbstractToolDescriptionItemProvider.java
index a8ce6d9856..ffb2db3ba6 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/AbstractToolDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/AbstractToolDescriptionItemProvider.java
@@ -76,8 +76,10 @@ public class AbstractToolDescriptionItemProvider extends DocumentedElementItemPr
      */
     protected void addNamePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_IdentifiedElement_name_feature"), getString("_UI_IdentifiedElement_name_description"), DescriptionPackage.Literals.IDENTIFIED_ELEMENT__NAME, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_IdentifiedElement_name_feature"), //$NON-NLS-1$
+                getString("_UI_IdentifiedElement_name_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.IDENTIFIED_ELEMENT__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -88,8 +90,10 @@ public class AbstractToolDescriptionItemProvider extends DocumentedElementItemPr
      */
     protected void addLabelPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_IdentifiedElement_label_feature"), getString("_UI_IdentifiedElement_label_description"), DescriptionPackage.Literals.IDENTIFIED_ELEMENT__LABEL, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_IdentifiedElement_label_feature"), //$NON-NLS-1$
+                getString("_UI_IdentifiedElement_label_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.IDENTIFIED_ELEMENT__LABEL, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -100,9 +104,10 @@ public class AbstractToolDescriptionItemProvider extends DocumentedElementItemPr
      */
     protected void addPreconditionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_AbstractToolDescription_precondition_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_AbstractToolDescription_precondition_feature", "_UI_AbstractToolDescription_type"),
-                ToolPackage.Literals.ABSTRACT_TOOL_DESCRIPTION__PRECONDITION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_AbstractToolDescription_precondition_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_AbstractToolDescription_precondition_feature", "_UI_AbstractToolDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                ToolPackage.Literals.ABSTRACT_TOOL_DESCRIPTION__PRECONDITION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -113,9 +118,10 @@ public class AbstractToolDescriptionItemProvider extends DocumentedElementItemPr
      */
     protected void addForceRefreshPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_AbstractToolDescription_forceRefresh_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_AbstractToolDescription_forceRefresh_feature", "_UI_AbstractToolDescription_type"),
-                ToolPackage.Literals.ABSTRACT_TOOL_DESCRIPTION__FORCE_REFRESH, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_AbstractToolDescription_forceRefresh_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_AbstractToolDescription_forceRefresh_feature", "_UI_AbstractToolDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                ToolPackage.Literals.ABSTRACT_TOOL_DESCRIPTION__FORCE_REFRESH, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -126,7 +132,8 @@ public class AbstractToolDescriptionItemProvider extends DocumentedElementItemPr
      */
     protected void addElementsToSelectPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_AbstractToolDescription_elementsToSelect_feature"), getString("_UI_AbstractToolDescription_elementsToSelect_description"),
+                getString("_UI_AbstractToolDescription_elementsToSelect_feature"), //$NON-NLS-1$
+                getString("_UI_AbstractToolDescription_elementsToSelect_description"), //$NON-NLS-1$
                 ToolPackage.Literals.ABSTRACT_TOOL_DESCRIPTION__ELEMENTS_TO_SELECT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -138,7 +145,8 @@ public class AbstractToolDescriptionItemProvider extends DocumentedElementItemPr
      */
     protected void addInverseSelectionOrderPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_AbstractToolDescription_inverseSelectionOrder_feature"), getString("_UI_AbstractToolDescription_inverseSelectionOrder_description"),
+                getString("_UI_AbstractToolDescription_inverseSelectionOrder_feature"), //$NON-NLS-1$
+                getString("_UI_AbstractToolDescription_inverseSelectionOrder_description"), //$NON-NLS-1$
                 ToolPackage.Literals.ABSTRACT_TOOL_DESCRIPTION__INVERSE_SELECTION_ORDER, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
     }
 
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/AbstractVariableItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/AbstractVariableItemProvider.java
index 08e2bee45f..c5105160a7 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/AbstractVariableItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/AbstractVariableItemProvider.java
@@ -74,8 +74,10 @@ IItemPropertySource {
      */
     protected void addNamePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_AbstractVariable_name_feature"), getString("_UI_AbstractVariable_name_description"), ToolPackage.Literals.ABSTRACT_VARIABLE__NAME, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_AbstractVariable_name_feature"), //$NON-NLS-1$
+                getString("_UI_AbstractVariable_name_description"), //$NON-NLS-1$
+                ToolPackage.Literals.ABSTRACT_VARIABLE__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -87,7 +89,8 @@ IItemPropertySource {
     @Override
     public String getText(Object object) {
         String label = ((AbstractVariable) object).getName();
-        return label == null || label.length() == 0 ? getString("_UI_AbstractVariable_type") : getString("_UI_AbstractVariable_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_AbstractVariable_type") : //$NON-NLS-1$
+            getString("_UI_AbstractVariable_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/AcceleoVariableItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/AcceleoVariableItemProvider.java
index 93ffeec2f2..5673db5db7 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/AcceleoVariableItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/AcceleoVariableItemProvider.java
@@ -66,8 +66,10 @@ public class AcceleoVariableItemProvider extends VariableContainerItemProvider {
      */
     protected void addNamePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_AbstractVariable_name_feature"), getString("_UI_AbstractVariable_name_description"), ToolPackage.Literals.ABSTRACT_VARIABLE__NAME, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_AbstractVariable_name_feature"), //$NON-NLS-1$
+                getString("_UI_AbstractVariable_name_description"), //$NON-NLS-1$
+                ToolPackage.Literals.ABSTRACT_VARIABLE__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -78,8 +80,10 @@ public class AcceleoVariableItemProvider extends VariableContainerItemProvider {
      */
     protected void addComputationExpressionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_AcceleoVariable_computationExpression_feature"), getString("_UI_AcceleoVariable_computationExpression_description"),
-                ToolPackage.Literals.ACCELEO_VARIABLE__COMPUTATION_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_AcceleoVariable_computationExpression_feature"), //$NON-NLS-1$
+                getString("_UI_AcceleoVariable_computationExpression_description"), //$NON-NLS-1$
+                ToolPackage.Literals.ACCELEO_VARIABLE__COMPUTATION_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -90,7 +94,7 @@ public class AcceleoVariableItemProvider extends VariableContainerItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/AcceleoVariable"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/AcceleoVariable")); //$NON-NLS-1$
     }
 
     /**
@@ -102,7 +106,8 @@ public class AcceleoVariableItemProvider extends VariableContainerItemProvider {
     @Override
     public String getText(Object object) {
         String label = ((AcceleoVariable) object).getName();
-        return label == null || label.length() == 0 ? getString("_UI_AcceleoVariable_type") : getString("_UI_AcceleoVariable_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_AcceleoVariable_type") : //$NON-NLS-1$
+            getString("_UI_AcceleoVariable_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/CaseItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/CaseItemProvider.java
index 0f823d639e..8326d552d9 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/CaseItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/CaseItemProvider.java
@@ -65,8 +65,10 @@ public class CaseItemProvider extends SwitchChildItemProvider {
      */
     protected void addConditionExpressionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_Case_conditionExpression_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Case_conditionExpression_feature", "_UI_Case_type"),
-                ToolPackage.Literals.CASE__CONDITION_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_Case_conditionExpression_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_Case_conditionExpression_feature", "_UI_Case_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                ToolPackage.Literals.CASE__CONDITION_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -76,7 +78,7 @@ public class CaseItemProvider extends SwitchChildItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/Case"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/Case")); //$NON-NLS-1$
     }
 
     /**
@@ -88,7 +90,8 @@ public class CaseItemProvider extends SwitchChildItemProvider {
     @Override
     public String getText(Object object) {
         String label = ((Case) object).getConditionExpression();
-        return label == null || label.length() == 0 ? getString("_UI_Case_type") : getString("_UI_Case_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_Case_type") : //$NON-NLS-1$
+            getString("_UI_Case_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ChangeContextItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ChangeContextItemProvider.java
index 408546ee4c..a4f44cd43d 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ChangeContextItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ChangeContextItemProvider.java
@@ -65,8 +65,10 @@ public class ChangeContextItemProvider extends ContainerModelOperationItemProvid
      */
     protected void addBrowseExpressionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_ChangeContext_browseExpression_feature"), getString("_UI_ChangeContext_browseExpression_description"), ToolPackage.Literals.CHANGE_CONTEXT__BROWSE_EXPRESSION, true,
-                false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_ChangeContext_browseExpression_feature"), //$NON-NLS-1$
+                getString("_UI_ChangeContext_browseExpression_description"), //$NON-NLS-1$
+                ToolPackage.Literals.CHANGE_CONTEXT__BROWSE_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -77,7 +79,7 @@ public class ChangeContextItemProvider extends ContainerModelOperationItemProvid
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ChangeContext"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/ChangeContext")); //$NON-NLS-1$
     }
 
     /**
@@ -89,7 +91,8 @@ public class ChangeContextItemProvider extends ContainerModelOperationItemProvid
     @Override
     public String getText(Object object) {
         String label = ((ChangeContext) object).getBrowseExpression();
-        return label == null || label.length() == 0 ? getString("_UI_ChangeContext_type") : getString("_UI_ChangeContext_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_ChangeContext_type") : //$NON-NLS-1$
+            getString("_UI_ChangeContext_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ContainerModelOperationItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ContainerModelOperationItemProvider.java
index 665e93e3ce..9d04b29c41 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ContainerModelOperationItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ContainerModelOperationItemProvider.java
@@ -100,7 +100,7 @@ public class ContainerModelOperationItemProvider extends ModelOperationItemProvi
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_ContainerModelOperation_type");
+        return getString("_UI_ContainerModelOperation_type"); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ContainerViewVariableItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ContainerViewVariableItemProvider.java
index e2c8d9e1c3..2090e3eaac 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ContainerViewVariableItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ContainerViewVariableItemProvider.java
@@ -97,7 +97,7 @@ public class ContainerViewVariableItemProvider extends AbstractVariableItemProvi
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ContainerViewVariable"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/ContainerViewVariable")); //$NON-NLS-1$
     }
 
     /**
@@ -109,7 +109,8 @@ public class ContainerViewVariableItemProvider extends AbstractVariableItemProvi
     @Override
     public String getText(Object object) {
         String label = ((ContainerViewVariable) object).getName();
-        return label == null || label.length() == 0 ? getString("_UI_ContainerViewVariable_type") : getString("_UI_ContainerViewVariable_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_ContainerViewVariable_type") : //$NON-NLS-1$
+            getString("_UI_ContainerViewVariable_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/CreateInstanceItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/CreateInstanceItemProvider.java
index dc68988b55..02489927a1 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/CreateInstanceItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/CreateInstanceItemProvider.java
@@ -67,8 +67,10 @@ public class CreateInstanceItemProvider extends ContainerModelOperationItemProvi
      */
     protected void addTypeNamePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_CreateInstance_typeName_feature"), getString("_UI_CreateInstance_typeName_description"), ToolPackage.Literals.CREATE_INSTANCE__TYPE_NAME, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_CreateInstance_typeName_feature"), //$NON-NLS-1$
+                getString("_UI_CreateInstance_typeName_description"), //$NON-NLS-1$
+                ToolPackage.Literals.CREATE_INSTANCE__TYPE_NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -79,8 +81,10 @@ public class CreateInstanceItemProvider extends ContainerModelOperationItemProvi
      */
     protected void addReferenceNamePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_CreateInstance_referenceName_feature"), getString("_UI_CreateInstance_referenceName_description"), ToolPackage.Literals.CREATE_INSTANCE__REFERENCE_NAME, true, false,
-                false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_CreateInstance_referenceName_feature"), //$NON-NLS-1$
+                getString("_UI_CreateInstance_referenceName_description"), //$NON-NLS-1$
+                ToolPackage.Literals.CREATE_INSTANCE__REFERENCE_NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -91,8 +95,10 @@ public class CreateInstanceItemProvider extends ContainerModelOperationItemProvi
      */
     protected void addVariableNamePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_CreateInstance_variableName_feature"), getString("_UI_CreateInstance_variableName_description"), ToolPackage.Literals.CREATE_INSTANCE__VARIABLE_NAME, true, false,
-                false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_CreateInstance_variableName_feature"), //$NON-NLS-1$
+                getString("_UI_CreateInstance_variableName_description"), //$NON-NLS-1$
+                ToolPackage.Literals.CREATE_INSTANCE__VARIABLE_NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -103,7 +109,7 @@ public class CreateInstanceItemProvider extends ContainerModelOperationItemProvi
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/CreateInstance"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/CreateInstance")); //$NON-NLS-1$
     }
 
     /**
@@ -115,7 +121,8 @@ public class CreateInstanceItemProvider extends ContainerModelOperationItemProvi
     @Override
     public String getText(Object object) {
         String label = ((CreateInstance) object).getTypeName();
-        return label == null || label.length() == 0 ? getString("_UI_CreateInstance_type") : getString("_UI_CreateInstance_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_CreateInstance_type") : //$NON-NLS-1$
+            getString("_UI_CreateInstance_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/DefaultItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/DefaultItemProvider.java
index 9eab88d831..ee6953d2da 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/DefaultItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/DefaultItemProvider.java
@@ -58,7 +58,7 @@ public class DefaultItemProvider extends SwitchChildItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/Default"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/Default")); //$NON-NLS-1$
     }
 
     /**
@@ -69,7 +69,7 @@ public class DefaultItemProvider extends SwitchChildItemProvider {
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_Default_type");
+        return getString("_UI_Default_type"); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/DeleteViewItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/DeleteViewItemProvider.java
index 042fd2e580..bfb5efebac 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/DeleteViewItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/DeleteViewItemProvider.java
@@ -59,7 +59,7 @@ public class DeleteViewItemProvider extends ContainerModelOperationItemProvider
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/DeleteView"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/DeleteView")); //$NON-NLS-1$
     }
 
     /**
@@ -70,7 +70,7 @@ public class DeleteViewItemProvider extends ContainerModelOperationItemProvider
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_DeleteView_type");
+        return getString("_UI_DeleteView_type"); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/DialogVariableItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/DialogVariableItemProvider.java
index db6e3829ab..3174a52337 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/DialogVariableItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/DialogVariableItemProvider.java
@@ -65,8 +65,10 @@ public class DialogVariableItemProvider extends AbstractVariableItemProvider {
      */
     protected void addDialogPromptPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DialogVariable_dialogPrompt_feature"), getString("_UI_DialogVariable_dialogPrompt_description"), ToolPackage.Literals.DIALOG_VARIABLE__DIALOG_PROMPT, true, false,
-                false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_DialogVariable_dialogPrompt_feature"), //$NON-NLS-1$
+                getString("_UI_DialogVariable_dialogPrompt_description"), //$NON-NLS-1$
+                ToolPackage.Literals.DIALOG_VARIABLE__DIALOG_PROMPT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -78,7 +80,8 @@ public class DialogVariableItemProvider extends AbstractVariableItemProvider {
     @Override
     public String getText(Object object) {
         String label = ((DialogVariable) object).getName();
-        return label == null || label.length() == 0 ? getString("_UI_DialogVariable_type") : getString("_UI_DialogVariable_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_DialogVariable_type") : //$NON-NLS-1$
+            getString("_UI_DialogVariable_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/DropContainerVariableItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/DropContainerVariableItemProvider.java
index fa7a039a8b..a223103e60 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/DropContainerVariableItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/DropContainerVariableItemProvider.java
@@ -97,7 +97,7 @@ public class DropContainerVariableItemProvider extends AbstractVariableItemProvi
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/DropContainerVariable"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/DropContainerVariable")); //$NON-NLS-1$
     }
 
     /**
@@ -109,7 +109,8 @@ public class DropContainerVariableItemProvider extends AbstractVariableItemProvi
     @Override
     public String getText(Object object) {
         String label = ((DropContainerVariable) object).getName();
-        return label == null || label.length() == 0 ? getString("_UI_DropContainerVariable_type") : getString("_UI_DropContainerVariable_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_DropContainerVariable_type") : //$NON-NLS-1$
+            getString("_UI_DropContainerVariable_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/EditMaskVariablesItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/EditMaskVariablesItemProvider.java
index 1d84b2272e..0d528fc5b5 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/EditMaskVariablesItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/EditMaskVariablesItemProvider.java
@@ -74,8 +74,10 @@ IItemPropertySource {
      */
     protected void addMaskPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_EditMaskVariables_mask_feature"), getString("_UI_EditMaskVariables_mask_description"), ToolPackage.Literals.EDIT_MASK_VARIABLES__MASK, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_EditMaskVariables_mask_feature"), //$NON-NLS-1$
+                getString("_UI_EditMaskVariables_mask_description"), //$NON-NLS-1$
+                ToolPackage.Literals.EDIT_MASK_VARIABLES__MASK, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -86,7 +88,7 @@ IItemPropertySource {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/EditMaskVariables"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/EditMaskVariables")); //$NON-NLS-1$
     }
 
     /**
@@ -98,7 +100,8 @@ IItemPropertySource {
     @Override
     public String getText(Object object) {
         String label = ((EditMaskVariables) object).getMask();
-        return label == null || label.length() == 0 ? getString("_UI_EditMaskVariables_type") : getString("_UI_EditMaskVariables_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_EditMaskVariables_type") : //$NON-NLS-1$
+            getString("_UI_EditMaskVariables_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ElementDeleteVariableItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ElementDeleteVariableItemProvider.java
index 0cabc7b771..be08740b9e 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ElementDeleteVariableItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ElementDeleteVariableItemProvider.java
@@ -97,7 +97,7 @@ public class ElementDeleteVariableItemProvider extends AbstractVariableItemProvi
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ElementDeleteVariable"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/ElementDeleteVariable")); //$NON-NLS-1$
     }
 
     /**
@@ -109,7 +109,8 @@ public class ElementDeleteVariableItemProvider extends AbstractVariableItemProvi
     @Override
     public String getText(Object object) {
         String label = ((ElementDeleteVariable) object).getName();
-        return label == null || label.length() == 0 ? getString("_UI_ElementDeleteVariable_type") : getString("_UI_ElementDeleteVariable_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_ElementDeleteVariable_type") : //$NON-NLS-1$
+            getString("_UI_ElementDeleteVariable_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ElementDropVariableItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ElementDropVariableItemProvider.java
index e6d26ed19e..5a38e17789 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ElementDropVariableItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ElementDropVariableItemProvider.java
@@ -97,7 +97,7 @@ public class ElementDropVariableItemProvider extends AbstractVariableItemProvide
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ElementDropVariable"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/ElementDropVariable")); //$NON-NLS-1$
     }
 
     /**
@@ -109,7 +109,8 @@ public class ElementDropVariableItemProvider extends AbstractVariableItemProvide
     @Override
     public String getText(Object object) {
         String label = ((ElementDropVariable) object).getName();
-        return label == null || label.length() == 0 ? getString("_UI_ElementDropVariable_type") : getString("_UI_ElementDropVariable_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_ElementDropVariable_type") : //$NON-NLS-1$
+            getString("_UI_ElementDropVariable_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ElementSelectVariableItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ElementSelectVariableItemProvider.java
index f7ed425e9b..f28b1e6a1d 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ElementSelectVariableItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ElementSelectVariableItemProvider.java
@@ -60,7 +60,7 @@ public class ElementSelectVariableItemProvider extends AbstractVariableItemProvi
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ElementSelectVariable"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/ElementSelectVariable")); //$NON-NLS-1$
     }
 
     /**
@@ -72,7 +72,8 @@ public class ElementSelectVariableItemProvider extends AbstractVariableItemProvi
     @Override
     public String getText(Object object) {
         String label = ((ElementSelectVariable) object).getName();
-        return label == null || label.length() == 0 ? getString("_UI_ElementSelectVariable_type") : getString("_UI_ElementSelectVariable_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_ElementSelectVariable_type") : //$NON-NLS-1$
+            getString("_UI_ElementSelectVariable_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ElementVariableItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ElementVariableItemProvider.java
index 313221f3e0..586813cbd7 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ElementVariableItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ElementVariableItemProvider.java
@@ -97,7 +97,7 @@ public class ElementVariableItemProvider extends AbstractVariableItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ElementVariable"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/ElementVariable")); //$NON-NLS-1$
     }
 
     /**
@@ -109,7 +109,8 @@ public class ElementVariableItemProvider extends AbstractVariableItemProvider {
     @Override
     public String getText(Object object) {
         String label = ((ElementVariable) object).getName();
-        return label == null || label.length() == 0 ? getString("_UI_ElementVariable_type") : getString("_UI_ElementVariable_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_ElementVariable_type") : //$NON-NLS-1$
+            getString("_UI_ElementVariable_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ElementViewVariableItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ElementViewVariableItemProvider.java
index 087deea034..29c450e329 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ElementViewVariableItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ElementViewVariableItemProvider.java
@@ -97,7 +97,7 @@ public class ElementViewVariableItemProvider extends AbstractVariableItemProvide
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ElementViewVariable"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/ElementViewVariable")); //$NON-NLS-1$
     }
 
     /**
@@ -109,7 +109,8 @@ public class ElementViewVariableItemProvider extends AbstractVariableItemProvide
     @Override
     public String getText(Object object) {
         String label = ((ElementViewVariable) object).getName();
-        return label == null || label.length() == 0 ? getString("_UI_ElementViewVariable_type") : getString("_UI_ElementViewVariable_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_ElementViewVariable_type") : //$NON-NLS-1$
+            getString("_UI_ElementViewVariable_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ExternalJavaActionCallItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ExternalJavaActionCallItemProvider.java
index 6da3eed0c1..5fe094198a 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ExternalJavaActionCallItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ExternalJavaActionCallItemProvider.java
@@ -68,9 +68,10 @@ public class ExternalJavaActionCallItemProvider extends MenuItemDescriptionItemP
      */
     protected void addActionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_ExternalJavaActionCall_action_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_ExternalJavaActionCall_action_feature", "_UI_ExternalJavaActionCall_type"),
-                ToolPackage.Literals.EXTERNAL_JAVA_ACTION_CALL__ACTION, true, false, true, null, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_ExternalJavaActionCall_action_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_ExternalJavaActionCall_action_feature", "_UI_ExternalJavaActionCall_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                ToolPackage.Literals.EXTERNAL_JAVA_ACTION_CALL__ACTION, true, false, true, null, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -114,7 +115,7 @@ public class ExternalJavaActionCallItemProvider extends MenuItemDescriptionItemP
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ExternalJavaActionCall"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/ExternalJavaActionCall")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ExternalJavaActionItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ExternalJavaActionItemProvider.java
index 8dda7dae88..90a477c07a 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ExternalJavaActionItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ExternalJavaActionItemProvider.java
@@ -69,8 +69,10 @@ public class ExternalJavaActionItemProvider extends MenuItemDescriptionItemProvi
      */
     protected void addIdPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_ExternalJavaAction_id_feature"), getString("_UI_ExternalJavaAction_id_description"), ToolPackage.Literals.EXTERNAL_JAVA_ACTION__ID, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_ExternalJavaAction_id_feature"), //$NON-NLS-1$
+                getString("_UI_ExternalJavaAction_id_description"), //$NON-NLS-1$
+                ToolPackage.Literals.EXTERNAL_JAVA_ACTION__ID, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -115,7 +117,7 @@ public class ExternalJavaActionItemProvider extends MenuItemDescriptionItemProvi
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ExternalJavaAction"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/ExternalJavaAction")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ExternalJavaActionParameterItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ExternalJavaActionParameterItemProvider.java
index 525ebc1f0b..111f4db95a 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ExternalJavaActionParameterItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ExternalJavaActionParameterItemProvider.java
@@ -75,8 +75,10 @@ IItemPropertySource {
      */
     protected void addNamePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_ExternalJavaActionParameter_name_feature"), getString("_UI_ExternalJavaActionParameter_name_description"), ToolPackage.Literals.EXTERNAL_JAVA_ACTION_PARAMETER__NAME,
-                true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_ExternalJavaActionParameter_name_feature"), //$NON-NLS-1$
+                getString("_UI_ExternalJavaActionParameter_name_description"), //$NON-NLS-1$
+                ToolPackage.Literals.EXTERNAL_JAVA_ACTION_PARAMETER__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -87,8 +89,10 @@ IItemPropertySource {
      */
     protected void addValuePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_ExternalJavaActionParameter_value_feature"), getString("_UI_ExternalJavaActionParameter_value_description"), ToolPackage.Literals.EXTERNAL_JAVA_ACTION_PARAMETER__VALUE,
-                true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_ExternalJavaActionParameter_value_feature"), //$NON-NLS-1$
+                getString("_UI_ExternalJavaActionParameter_value_description"), //$NON-NLS-1$
+                ToolPackage.Literals.EXTERNAL_JAVA_ACTION_PARAMETER__VALUE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -99,7 +103,7 @@ IItemPropertySource {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ExternalJavaActionParameter"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/ExternalJavaActionParameter")); //$NON-NLS-1$
     }
 
     /**
@@ -111,7 +115,8 @@ IItemPropertySource {
     @Override
     public String getText(Object object) {
         String label = ((ExternalJavaActionParameter) object).getName();
-        return label == null || label.length() == 0 ? getString("_UI_ExternalJavaActionParameter_type") : getString("_UI_ExternalJavaActionParameter_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_ExternalJavaActionParameter_type") : //$NON-NLS-1$
+            getString("_UI_ExternalJavaActionParameter_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/FeatureChangeListenerItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/FeatureChangeListenerItemProvider.java
index 7dae14ba3e..eafd2e9282 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/FeatureChangeListenerItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/FeatureChangeListenerItemProvider.java
@@ -75,8 +75,10 @@ IItemPropertySource {
      */
     protected void addDomainClassPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_FeatureChangeListener_domainClass_feature"), getString("_UI_FeatureChangeListener_domainClass_description"), ToolPackage.Literals.FEATURE_CHANGE_LISTENER__DOMAIN_CLASS,
-                true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_FeatureChangeListener_domainClass_feature"), //$NON-NLS-1$
+                getString("_UI_FeatureChangeListener_domainClass_description"), //$NON-NLS-1$
+                ToolPackage.Literals.FEATURE_CHANGE_LISTENER__DOMAIN_CLASS, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -87,8 +89,10 @@ IItemPropertySource {
      */
     protected void addFeatureNamePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_FeatureChangeListener_featureName_feature"), getString("_UI_FeatureChangeListener_featureName_description"), ToolPackage.Literals.FEATURE_CHANGE_LISTENER__FEATURE_NAME,
-                true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_FeatureChangeListener_featureName_feature"), //$NON-NLS-1$
+                getString("_UI_FeatureChangeListener_featureName_description"), //$NON-NLS-1$
+                ToolPackage.Literals.FEATURE_CHANGE_LISTENER__FEATURE_NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -99,7 +103,7 @@ IItemPropertySource {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/FeatureChangeListener"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/FeatureChangeListener")); //$NON-NLS-1$
     }
 
     /**
@@ -111,7 +115,8 @@ IItemPropertySource {
     @Override
     public String getText(Object object) {
         String label = ((FeatureChangeListener) object).getFeatureName();
-        return label == null || label.length() == 0 ? getString("_UI_FeatureChangeListener_type") : getString("_UI_FeatureChangeListener_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_FeatureChangeListener_type") : //$NON-NLS-1$
+            getString("_UI_FeatureChangeListener_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ForItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ForItemProvider.java
index a904a315bf..8fa9eadda8 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ForItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ForItemProvider.java
@@ -65,9 +65,10 @@ public class ForItemProvider extends ContainerModelOperationItemProvider {
      * @generated
      */
     protected void addExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_For_expression_feature"),
-                getString("_UI_For_expression_description"), ToolPackage.Literals.FOR__EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_GeneralPropertyCategory"), null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_For_expression_feature"), //$NON-NLS-1$
+                getString("_UI_For_expression_description"), //$NON-NLS-1$
+                ToolPackage.Literals.FOR__EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -77,9 +78,10 @@ public class ForItemProvider extends ContainerModelOperationItemProvider {
      * @generated
      */
     protected void addIteratorNamePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_For_iteratorName_feature"),
-                getString("_UI_For_iteratorName_description"), ToolPackage.Literals.FOR__ITERATOR_NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_GeneralPropertyCategory"), null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_For_iteratorName_feature"), //$NON-NLS-1$
+                getString("_UI_For_iteratorName_description"), //$NON-NLS-1$
+                ToolPackage.Literals.FOR__ITERATOR_NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -89,7 +91,7 @@ public class ForItemProvider extends ContainerModelOperationItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/For"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/For")); //$NON-NLS-1$
     }
 
     /**
@@ -101,7 +103,8 @@ public class ForItemProvider extends ContainerModelOperationItemProvider {
     @Override
     public String getText(Object object) {
         String label = ((For) object).getIteratorName();
-        return label == null || label.length() == 0 ? getString("_UI_For_type") : getString("_UI_For_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_For_type") : //$NON-NLS-1$
+            getString("_UI_For_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/IfItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/IfItemProvider.java
index 2b64c13950..ae17e13b3e 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/IfItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/IfItemProvider.java
@@ -65,8 +65,10 @@ public class IfItemProvider extends ContainerModelOperationItemProvider {
      */
     protected void addConditionExpressionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_If_conditionExpression_feature"), getString("_UI_If_conditionExpression_description"), ToolPackage.Literals.IF__CONDITION_EXPRESSION, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_If_conditionExpression_feature"), //$NON-NLS-1$
+                getString("_UI_If_conditionExpression_description"), //$NON-NLS-1$
+                ToolPackage.Literals.IF__CONDITION_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -76,7 +78,7 @@ public class IfItemProvider extends ContainerModelOperationItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/If"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/If")); //$NON-NLS-1$
     }
 
     /**
@@ -88,7 +90,8 @@ public class IfItemProvider extends ContainerModelOperationItemProvider {
     @Override
     public String getText(Object object) {
         String label = ((If) object).getConditionExpression();
-        return label == null || label.length() == 0 ? getString("_UI_If_type") : getString("_UI_If_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_If_type") : //$NON-NLS-1$
+            getString("_UI_If_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/InitEdgeCreationOperationItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/InitEdgeCreationOperationItemProvider.java
index 617d643da5..31d2fc8d89 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/InitEdgeCreationOperationItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/InitEdgeCreationOperationItemProvider.java
@@ -106,7 +106,7 @@ IItemPropertySource {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/InitEdgeCreationOperation"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/InitEdgeCreationOperation")); //$NON-NLS-1$
     }
 
     /**
@@ -117,7 +117,7 @@ IItemPropertySource {
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_InitEdgeCreationOperation_type");
+        return getString("_UI_InitEdgeCreationOperation_type"); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/InitialContainerDropOperationItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/InitialContainerDropOperationItemProvider.java
index edba7ea498..6b6dbf2794 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/InitialContainerDropOperationItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/InitialContainerDropOperationItemProvider.java
@@ -106,7 +106,7 @@ IItemPropertySource {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/InitialContainerDropOperation"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/InitialContainerDropOperation")); //$NON-NLS-1$
     }
 
     /**
@@ -117,7 +117,7 @@ IItemPropertySource {
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_InitialContainerDropOperation_type");
+        return getString("_UI_InitialContainerDropOperation_type"); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/InitialNodeCreationOperationItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/InitialNodeCreationOperationItemProvider.java
index b6ad1af22a..aad142128c 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/InitialNodeCreationOperationItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/InitialNodeCreationOperationItemProvider.java
@@ -106,7 +106,7 @@ IItemPropertySource {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/InitialNodeCreationOperation"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/InitialNodeCreationOperation")); //$NON-NLS-1$
     }
 
     /**
@@ -117,7 +117,7 @@ IItemPropertySource {
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_InitialNodeCreationOperation_type");
+        return getString("_UI_InitialNodeCreationOperation_type"); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/InitialOperationItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/InitialOperationItemProvider.java
index 716f19be87..9e11abcb02 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/InitialOperationItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/InitialOperationItemProvider.java
@@ -106,7 +106,7 @@ IItemPropertySource {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/InitialOperation"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/InitialOperation")); //$NON-NLS-1$
     }
 
     /**
@@ -117,7 +117,7 @@ IItemPropertySource {
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_InitialOperation_type");
+        return getString("_UI_InitialOperation_type"); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/MenuItemDescriptionItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/MenuItemDescriptionItemProvider.java
index 78cd22ab09..60ffafd4dc 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/MenuItemDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/MenuItemDescriptionItemProvider.java
@@ -67,8 +67,10 @@ public class MenuItemDescriptionItemProvider extends AbstractToolDescriptionItem
      */
     protected void addIconPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_MenuItemDescription_icon_feature"), getString("_UI_PropertyDescriptor_description", "_UI_MenuItemDescription_icon_feature", "_UI_MenuItemDescription_type"),
-                ToolPackage.Literals.MENU_ITEM_DESCRIPTION__ICON, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_MenuItemDescription_icon_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_MenuItemDescription_icon_feature", "_UI_MenuItemDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                ToolPackage.Literals.MENU_ITEM_DESCRIPTION__ICON, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/MenuItemDescriptionReferenceItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/MenuItemDescriptionReferenceItemProvider.java
index bd4ccbf823..f638f2ff31 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/MenuItemDescriptionReferenceItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/MenuItemDescriptionReferenceItemProvider.java
@@ -71,8 +71,8 @@ IItemPropertySource {
      */
     protected void addItemPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_MenuItemDescriptionReference_item_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_MenuItemDescriptionReference_item_feature", "_UI_MenuItemDescriptionReference_type"),
+                getString("_UI_MenuItemDescriptionReference_item_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_MenuItemDescriptionReference_item_feature", "_UI_MenuItemDescriptionReference_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 ToolPackage.Literals.MENU_ITEM_DESCRIPTION_REFERENCE__ITEM, true, false, true, null, null, null));
     }
 
@@ -84,7 +84,7 @@ IItemPropertySource {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/MenuItemDescriptionReference"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/MenuItemDescriptionReference")); //$NON-NLS-1$
     }
 
     /**
@@ -95,7 +95,7 @@ IItemPropertySource {
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_MenuItemDescriptionReference_type");
+        return getString("_UI_MenuItemDescriptionReference_type"); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ModelOperationItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ModelOperationItemProvider.java
index 0ee060a9d2..3ce06d8fa7 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ModelOperationItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ModelOperationItemProvider.java
@@ -68,7 +68,7 @@ IItemPropertySource {
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_ModelOperation_type");
+        return getString("_UI_ModelOperation_type"); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/MoveElementItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/MoveElementItemProvider.java
index 00512360c1..de4f820871 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/MoveElementItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/MoveElementItemProvider.java
@@ -66,8 +66,10 @@ public class MoveElementItemProvider extends ContainerModelOperationItemProvider
      */
     protected void addNewContainerExpressionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_MoveElement_newContainerExpression_feature"), getString("_UI_MoveElement_newContainerExpression_description"),
-                ToolPackage.Literals.MOVE_ELEMENT__NEW_CONTAINER_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_MoveElement_newContainerExpression_feature"), //$NON-NLS-1$
+                getString("_UI_MoveElement_newContainerExpression_description"), //$NON-NLS-1$
+                ToolPackage.Literals.MOVE_ELEMENT__NEW_CONTAINER_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -78,8 +80,10 @@ public class MoveElementItemProvider extends ContainerModelOperationItemProvider
      */
     protected void addFeatureNamePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_MoveElement_featureName_feature"), getString("_UI_MoveElement_featureName_description"), ToolPackage.Literals.MOVE_ELEMENT__FEATURE_NAME, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_MoveElement_featureName_feature"), //$NON-NLS-1$
+                getString("_UI_MoveElement_featureName_description"), //$NON-NLS-1$
+                ToolPackage.Literals.MOVE_ELEMENT__FEATURE_NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -90,7 +94,7 @@ public class MoveElementItemProvider extends ContainerModelOperationItemProvider
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/MoveElement"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/MoveElement")); //$NON-NLS-1$
     }
 
     /**
@@ -102,7 +106,8 @@ public class MoveElementItemProvider extends ContainerModelOperationItemProvider
     @Override
     public String getText(Object object) {
         String label = ((MoveElement) object).getFeatureName();
-        return label == null || label.length() == 0 ? getString("_UI_MoveElement_type") : getString("_UI_MoveElement_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_MoveElement_type") : //$NON-NLS-1$
+            getString("_UI_MoveElement_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/NameVariableItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/NameVariableItemProvider.java
index 41439e2024..00829da133 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/NameVariableItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/NameVariableItemProvider.java
@@ -60,7 +60,7 @@ public class NameVariableItemProvider extends AbstractVariableItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/NameVariable"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/NameVariable")); //$NON-NLS-1$
     }
 
     /**
@@ -72,7 +72,8 @@ public class NameVariableItemProvider extends AbstractVariableItemProvider {
     @Override
     public String getText(Object object) {
         String label = ((NameVariable) object).getName();
-        return label == null || label.length() == 0 ? getString("_UI_NameVariable_type") : getString("_UI_NameVariable_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_NameVariable_type") : //$NON-NLS-1$
+            getString("_UI_NameVariable_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/OperationActionItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/OperationActionItemProvider.java
index 37862e3a9f..44bb0e2987 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/OperationActionItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/OperationActionItemProvider.java
@@ -100,7 +100,7 @@ public class OperationActionItemProvider extends MenuItemDescriptionItemProvider
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/OperationAction"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/OperationAction")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/PaneBasedSelectionWizardDescriptionItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/PaneBasedSelectionWizardDescriptionItemProvider.java
index 9a18043ed8..2a04144624 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/PaneBasedSelectionWizardDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/PaneBasedSelectionWizardDescriptionItemProvider.java
@@ -79,9 +79,9 @@ public class PaneBasedSelectionWizardDescriptionItemProvider extends AbstractToo
      */
     protected void addIconPathPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_PaneBasedSelectionWizardDescription_iconPath_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_PaneBasedSelectionWizardDescription_iconPath_feature", "_UI_PaneBasedSelectionWizardDescription_type"),
-                ToolPackage.Literals.PANE_BASED_SELECTION_WIZARD_DESCRIPTION__ICON_PATH, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_AdvancedPropertyCategory"),
+                getString("_UI_PaneBasedSelectionWizardDescription_iconPath_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_PaneBasedSelectionWizardDescription_iconPath_feature", "_UI_PaneBasedSelectionWizardDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                ToolPackage.Literals.PANE_BASED_SELECTION_WIZARD_DESCRIPTION__ICON_PATH, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_AdvancedPropertyCategory"), //$NON-NLS-1$
                 null));
     }
 
@@ -93,9 +93,9 @@ public class PaneBasedSelectionWizardDescriptionItemProvider extends AbstractToo
      */
     protected void addWindowTitlePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_PaneBasedSelectionWizardDescription_windowTitle_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_PaneBasedSelectionWizardDescription_windowTitle_feature", "_UI_PaneBasedSelectionWizardDescription_type"),
-                ToolPackage.Literals.PANE_BASED_SELECTION_WIZARD_DESCRIPTION__WINDOW_TITLE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_AdvancedPropertyCategory"),
+                getString("_UI_PaneBasedSelectionWizardDescription_windowTitle_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_PaneBasedSelectionWizardDescription_windowTitle_feature", "_UI_PaneBasedSelectionWizardDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                ToolPackage.Literals.PANE_BASED_SELECTION_WIZARD_DESCRIPTION__WINDOW_TITLE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_AdvancedPropertyCategory"), //$NON-NLS-1$
                 null));
     }
 
@@ -106,11 +106,13 @@ public class PaneBasedSelectionWizardDescriptionItemProvider extends AbstractToo
      * @generated
      */
     protected void addWindowImagePathPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_PaneBasedSelectionWizardDescription_windowImagePath_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_PaneBasedSelectionWizardDescription_windowImagePath_feature", "_UI_PaneBasedSelectionWizardDescription_type"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_PaneBasedSelectionWizardDescription_windowImagePath_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_PaneBasedSelectionWizardDescription_windowImagePath_feature", "_UI_PaneBasedSelectionWizardDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 ToolPackage.Literals.PANE_BASED_SELECTION_WIZARD_DESCRIPTION__WINDOW_IMAGE_PATH, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_AdvancedPropertyCategory"), null));
+                getString("_UI_AdvancedPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -121,9 +123,10 @@ public class PaneBasedSelectionWizardDescriptionItemProvider extends AbstractToo
      */
     protected void addMessagePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_PaneBasedSelectionWizardDescription_message_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_PaneBasedSelectionWizardDescription_message_feature", "_UI_PaneBasedSelectionWizardDescription_type"),
-                ToolPackage.Literals.PANE_BASED_SELECTION_WIZARD_DESCRIPTION__MESSAGE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_PaneBasedSelectionWizardDescription_message_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_PaneBasedSelectionWizardDescription_message_feature", "_UI_PaneBasedSelectionWizardDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                ToolPackage.Literals.PANE_BASED_SELECTION_WIZARD_DESCRIPTION__MESSAGE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -133,11 +136,13 @@ public class PaneBasedSelectionWizardDescriptionItemProvider extends AbstractToo
      * @generated
      */
     protected void addChoiceOfValuesMessagePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_PaneBasedSelectionWizardDescription_choiceOfValuesMessage_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_PaneBasedSelectionWizardDescription_choiceOfValuesMessage_feature", "_UI_PaneBasedSelectionWizardDescription_type"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_PaneBasedSelectionWizardDescription_choiceOfValuesMessage_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_PaneBasedSelectionWizardDescription_choiceOfValuesMessage_feature", "_UI_PaneBasedSelectionWizardDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 ToolPackage.Literals.PANE_BASED_SELECTION_WIZARD_DESCRIPTION__CHOICE_OF_VALUES_MESSAGE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -147,11 +152,13 @@ public class PaneBasedSelectionWizardDescriptionItemProvider extends AbstractToo
      * @generated
      */
     protected void addCandidatesExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_PaneBasedSelectionWizardDescription_candidatesExpression_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_PaneBasedSelectionWizardDescription_candidatesExpression_feature", "_UI_PaneBasedSelectionWizardDescription_type"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_PaneBasedSelectionWizardDescription_candidatesExpression_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_PaneBasedSelectionWizardDescription_candidatesExpression_feature", "_UI_PaneBasedSelectionWizardDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 ToolPackage.Literals.PANE_BASED_SELECTION_WIZARD_DESCRIPTION__CANDIDATES_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -162,9 +169,10 @@ public class PaneBasedSelectionWizardDescriptionItemProvider extends AbstractToo
      */
     protected void addTreePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_PaneBasedSelectionWizardDescription_tree_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_PaneBasedSelectionWizardDescription_tree_feature", "_UI_PaneBasedSelectionWizardDescription_type"),
-                ToolPackage.Literals.PANE_BASED_SELECTION_WIZARD_DESCRIPTION__TREE, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_PaneBasedSelectionWizardDescription_tree_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_PaneBasedSelectionWizardDescription_tree_feature", "_UI_PaneBasedSelectionWizardDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                ToolPackage.Literals.PANE_BASED_SELECTION_WIZARD_DESCRIPTION__TREE, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -174,11 +182,13 @@ public class PaneBasedSelectionWizardDescriptionItemProvider extends AbstractToo
      * @generated
      */
     protected void addRootExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_PaneBasedSelectionWizardDescription_rootExpression_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_PaneBasedSelectionWizardDescription_rootExpression_feature", "_UI_PaneBasedSelectionWizardDescription_type"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_PaneBasedSelectionWizardDescription_rootExpression_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_PaneBasedSelectionWizardDescription_rootExpression_feature", "_UI_PaneBasedSelectionWizardDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 ToolPackage.Literals.PANE_BASED_SELECTION_WIZARD_DESCRIPTION__ROOT_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -188,11 +198,13 @@ public class PaneBasedSelectionWizardDescriptionItemProvider extends AbstractToo
      * @generated
      */
     protected void addChildrenExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_PaneBasedSelectionWizardDescription_childrenExpression_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_PaneBasedSelectionWizardDescription_childrenExpression_feature", "_UI_PaneBasedSelectionWizardDescription_type"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_PaneBasedSelectionWizardDescription_childrenExpression_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_PaneBasedSelectionWizardDescription_childrenExpression_feature", "_UI_PaneBasedSelectionWizardDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 ToolPackage.Literals.PANE_BASED_SELECTION_WIZARD_DESCRIPTION__CHILDREN_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -202,11 +214,13 @@ public class PaneBasedSelectionWizardDescriptionItemProvider extends AbstractToo
      * @generated
      */
     protected void addSelectedValuesMessagePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_PaneBasedSelectionWizardDescription_selectedValuesMessage_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_PaneBasedSelectionWizardDescription_selectedValuesMessage_feature", "_UI_PaneBasedSelectionWizardDescription_type"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_PaneBasedSelectionWizardDescription_selectedValuesMessage_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_PaneBasedSelectionWizardDescription_selectedValuesMessage_feature", "_UI_PaneBasedSelectionWizardDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 ToolPackage.Literals.PANE_BASED_SELECTION_WIZARD_DESCRIPTION__SELECTED_VALUES_MESSAGE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -216,11 +230,13 @@ public class PaneBasedSelectionWizardDescriptionItemProvider extends AbstractToo
      * @generated
      */
     protected void addPreSelectedCandidatesExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_PaneBasedSelectionWizardDescription_preSelectedCandidatesExpression_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_PaneBasedSelectionWizardDescription_preSelectedCandidatesExpression_feature", "_UI_PaneBasedSelectionWizardDescription_type"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_PaneBasedSelectionWizardDescription_preSelectedCandidatesExpression_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_PaneBasedSelectionWizardDescription_preSelectedCandidatesExpression_feature", "_UI_PaneBasedSelectionWizardDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 ToolPackage.Literals.PANE_BASED_SELECTION_WIZARD_DESCRIPTION__PRE_SELECTED_CANDIDATES_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -267,7 +283,7 @@ public class PaneBasedSelectionWizardDescriptionItemProvider extends AbstractToo
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/PaneBasedSelectionWizardDescription"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/PaneBasedSelectionWizardDescription")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/PasteDescriptionItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/PasteDescriptionItemProvider.java
index e1676a1c7d..4873f83e6b 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/PasteDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/PasteDescriptionItemProvider.java
@@ -103,7 +103,7 @@ public class PasteDescriptionItemProvider extends MappingBasedToolDescriptionIte
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/PasteDescription"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/PasteDescription")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/PopupMenuItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/PopupMenuItemProvider.java
index f6bb0da41a..84927099a3 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/PopupMenuItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/PopupMenuItemProvider.java
@@ -98,7 +98,7 @@ public class PopupMenuItemProvider extends AbstractToolDescriptionItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/PopupMenu"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/PopupMenu")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/RemoveElementItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/RemoveElementItemProvider.java
index cdadd64059..a02bc6936f 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/RemoveElementItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/RemoveElementItemProvider.java
@@ -59,7 +59,7 @@ public class RemoveElementItemProvider extends ContainerModelOperationItemProvid
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/RemoveElement"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/RemoveElement")); //$NON-NLS-1$
     }
 
     /**
@@ -70,7 +70,7 @@ public class RemoveElementItemProvider extends ContainerModelOperationItemProvid
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_RemoveElement_type");
+        return getString("_UI_RemoveElement_type"); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/RepresentationCreationDescriptionItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/RepresentationCreationDescriptionItemProvider.java
index c4fcf32393..0ff0f03d84 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/RepresentationCreationDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/RepresentationCreationDescriptionItemProvider.java
@@ -71,8 +71,9 @@ public class RepresentationCreationDescriptionItemProvider extends AbstractToolD
      */
     protected void addTitleExpressionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_RepresentationCreationDescription_titleExpression_feature"), getString("_UI_RepresentationCreationDescription_titleExpression_description"),
-                ToolPackage.Literals.REPRESENTATION_CREATION_DESCRIPTION__TITLE_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_AdvancedPropertyCategory"),
+                getString("_UI_RepresentationCreationDescription_titleExpression_feature"), //$NON-NLS-1$
+                getString("_UI_RepresentationCreationDescription_titleExpression_description"), //$NON-NLS-1$
+                ToolPackage.Literals.REPRESENTATION_CREATION_DESCRIPTION__TITLE_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_AdvancedPropertyCategory"), //$NON-NLS-1$
                 null));
     }
 
@@ -84,8 +85,9 @@ public class RepresentationCreationDescriptionItemProvider extends AbstractToolD
      */
     protected void addBrowseExpressionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_RepresentationCreationDescription_browseExpression_feature"), getString("_UI_RepresentationCreationDescription_browseExpression_description"),
-                ToolPackage.Literals.REPRESENTATION_CREATION_DESCRIPTION__BROWSE_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_AdvancedPropertyCategory"),
+                getString("_UI_RepresentationCreationDescription_browseExpression_feature"), //$NON-NLS-1$
+                getString("_UI_RepresentationCreationDescription_browseExpression_description"), //$NON-NLS-1$
+                ToolPackage.Literals.REPRESENTATION_CREATION_DESCRIPTION__BROWSE_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_AdvancedPropertyCategory"), //$NON-NLS-1$
                 null));
     }
 
@@ -97,8 +99,8 @@ public class RepresentationCreationDescriptionItemProvider extends AbstractToolD
      */
     protected void addRepresentationDescriptionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_RepresentationCreationDescription_representationDescription_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_RepresentationCreationDescription_representationDescription_feature", "_UI_RepresentationCreationDescription_type"),
+                getString("_UI_RepresentationCreationDescription_representationDescription_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_RepresentationCreationDescription_representationDescription_feature", "_UI_RepresentationCreationDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 ToolPackage.Literals.REPRESENTATION_CREATION_DESCRIPTION__REPRESENTATION_DESCRIPTION, false, false, false, null, null, null));
     }
 
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/RepresentationNavigationDescriptionItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/RepresentationNavigationDescriptionItemProvider.java
index 4f25c6997f..d92c8a7761 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/RepresentationNavigationDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/RepresentationNavigationDescriptionItemProvider.java
@@ -70,10 +70,13 @@ public class RepresentationNavigationDescriptionItemProvider extends AbstractToo
      * @generated
      */
     protected void addBrowseExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_RepresentationNavigationDescription_browseExpression_feature"), getString("_UI_RepresentationNavigationDescription_browseExpression_description"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_RepresentationNavigationDescription_browseExpression_feature"), //$NON-NLS-1$
+                getString("_UI_RepresentationNavigationDescription_browseExpression_description"), //$NON-NLS-1$
                 ToolPackage.Literals.REPRESENTATION_NAVIGATION_DESCRIPTION__BROWSE_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_AdvancedPropertyCategory"), null));
+                getString("_UI_AdvancedPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -83,10 +86,13 @@ public class RepresentationNavigationDescriptionItemProvider extends AbstractToo
      * @generated
      */
     protected void addNavigationNameExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_RepresentationNavigationDescription_navigationNameExpression_feature"), getString("_UI_RepresentationNavigationDescription_navigationNameExpression_description"),
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString("_UI_RepresentationNavigationDescription_navigationNameExpression_feature"), //$NON-NLS-1$
+                getString("_UI_RepresentationNavigationDescription_navigationNameExpression_description"), //$NON-NLS-1$
                 ToolPackage.Literals.REPRESENTATION_NAVIGATION_DESCRIPTION__NAVIGATION_NAME_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_AdvancedPropertyCategory"), null));
+                getString("_UI_AdvancedPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -97,8 +103,8 @@ public class RepresentationNavigationDescriptionItemProvider extends AbstractToo
      */
     protected void addRepresentationDescriptionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_RepresentationNavigationDescription_representationDescription_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_RepresentationNavigationDescription_representationDescription_feature", "_UI_RepresentationNavigationDescription_type"),
+                getString("_UI_RepresentationNavigationDescription_representationDescription_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_RepresentationNavigationDescription_representationDescription_feature", "_UI_RepresentationNavigationDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 ToolPackage.Literals.REPRESENTATION_NAVIGATION_DESCRIPTION__REPRESENTATION_DESCRIPTION, false, false, false, null, null, null));
     }
 
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/SelectContainerVariableItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/SelectContainerVariableItemProvider.java
index 6544b3bc3e..9c552988b8 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/SelectContainerVariableItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/SelectContainerVariableItemProvider.java
@@ -97,7 +97,7 @@ public class SelectContainerVariableItemProvider extends AbstractVariableItemPro
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/SelectContainerVariable"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/SelectContainerVariable")); //$NON-NLS-1$
     }
 
     /**
@@ -109,7 +109,8 @@ public class SelectContainerVariableItemProvider extends AbstractVariableItemPro
     @Override
     public String getText(Object object) {
         String label = ((SelectContainerVariable) object).getName();
-        return label == null || label.length() == 0 ? getString("_UI_SelectContainerVariable_type") : getString("_UI_SelectContainerVariable_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_SelectContainerVariable_type") : //$NON-NLS-1$
+            getString("_UI_SelectContainerVariable_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/SelectModelElementVariableItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/SelectModelElementVariableItemProvider.java
index 793a8ae7c6..97ba8d5d9a 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/SelectModelElementVariableItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/SelectModelElementVariableItemProvider.java
@@ -71,9 +71,9 @@ public class SelectModelElementVariableItemProvider extends SubVariableItemProvi
      */
     protected void addCandidatesExpressionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_SelectionDescription_candidatesExpression_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_SelectionDescription_candidatesExpression_feature", "_UI_SelectionDescription_type"),
-                DescriptionPackage.Literals.SELECTION_DESCRIPTION__CANDIDATES_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"),
+                getString("_UI_SelectionDescription_candidatesExpression_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_SelectionDescription_candidatesExpression_feature", "_UI_SelectionDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DescriptionPackage.Literals.SELECTION_DESCRIPTION__CANDIDATES_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
                 null));
     }
 
@@ -85,8 +85,10 @@ public class SelectModelElementVariableItemProvider extends SubVariableItemProvi
      */
     protected void addMultiplePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_SelectionDescription_multiple_feature"), getString("_UI_PropertyDescriptor_description", "_UI_SelectionDescription_multiple_feature", "_UI_SelectionDescription_type"),
-                DescriptionPackage.Literals.SELECTION_DESCRIPTION__MULTIPLE, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_SelectionDescription_multiple_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_SelectionDescription_multiple_feature", "_UI_SelectionDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DescriptionPackage.Literals.SELECTION_DESCRIPTION__MULTIPLE, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -97,8 +99,10 @@ public class SelectModelElementVariableItemProvider extends SubVariableItemProvi
      */
     protected void addTreePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_SelectionDescription_tree_feature"), getString("_UI_PropertyDescriptor_description", "_UI_SelectionDescription_tree_feature", "_UI_SelectionDescription_type"),
-                DescriptionPackage.Literals.SELECTION_DESCRIPTION__TREE, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_SelectionDescription_tree_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_SelectionDescription_tree_feature", "_UI_SelectionDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DescriptionPackage.Literals.SELECTION_DESCRIPTION__TREE, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -109,9 +113,10 @@ public class SelectModelElementVariableItemProvider extends SubVariableItemProvi
      */
     protected void addRootExpressionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_SelectionDescription_rootExpression_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_SelectionDescription_rootExpression_feature", "_UI_SelectionDescription_type"),
-                DescriptionPackage.Literals.SELECTION_DESCRIPTION__ROOT_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_SelectionDescription_rootExpression_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_SelectionDescription_rootExpression_feature", "_UI_SelectionDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DescriptionPackage.Literals.SELECTION_DESCRIPTION__ROOT_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -121,12 +126,11 @@ public class SelectModelElementVariableItemProvider extends SubVariableItemProvi
      * @generated
      */
     protected void addChildrenExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_SelectionDescription_childrenExpression_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_SelectionDescription_childrenExpression_feature", "_UI_SelectionDescription_type"),
-                DescriptionPackage.Literals.SELECTION_DESCRIPTION__CHILDREN_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_GeneralPropertyCategory"), null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+                getString("_UI_SelectionDescription_childrenExpression_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_SelectionDescription_childrenExpression_feature", "_UI_SelectionDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DescriptionPackage.Literals.SELECTION_DESCRIPTION__CHILDREN_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -137,8 +141,10 @@ public class SelectModelElementVariableItemProvider extends SubVariableItemProvi
      */
     protected void addMessagePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_SelectionDescription_message_feature"), getString("_UI_PropertyDescriptor_description", "_UI_SelectionDescription_message_feature", "_UI_SelectionDescription_type"),
-                DescriptionPackage.Literals.SELECTION_DESCRIPTION__MESSAGE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_SelectionDescription_message_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_SelectionDescription_message_feature", "_UI_SelectionDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DescriptionPackage.Literals.SELECTION_DESCRIPTION__MESSAGE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -149,7 +155,7 @@ public class SelectModelElementVariableItemProvider extends SubVariableItemProvi
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/SelectModelElementVariable"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/SelectModelElementVariable")); //$NON-NLS-1$
     }
 
     /**
@@ -161,7 +167,8 @@ public class SelectModelElementVariableItemProvider extends SubVariableItemProvi
     @Override
     public String getText(Object object) {
         String label = ((SelectModelElementVariable) object).getName();
-        return label == null || label.length() == 0 ? getString("_UI_SelectModelElementVariable_type") : getString("_UI_SelectModelElementVariable_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_SelectModelElementVariable_type") : //$NON-NLS-1$
+            getString("_UI_SelectModelElementVariable_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/SelectionWizardDescriptionItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/SelectionWizardDescriptionItemProvider.java
index 0d98fb25e8..2174ccb0c0 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/SelectionWizardDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/SelectionWizardDescriptionItemProvider.java
@@ -78,9 +78,9 @@ public class SelectionWizardDescriptionItemProvider extends AbstractToolDescript
      */
     protected void addCandidatesExpressionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_SelectionDescription_candidatesExpression_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_SelectionDescription_candidatesExpression_feature", "_UI_SelectionDescription_type"),
-                DescriptionPackage.Literals.SELECTION_DESCRIPTION__CANDIDATES_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"),
+                getString("_UI_SelectionDescription_candidatesExpression_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_SelectionDescription_candidatesExpression_feature", "_UI_SelectionDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DescriptionPackage.Literals.SELECTION_DESCRIPTION__CANDIDATES_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
                 null));
     }
 
@@ -92,8 +92,10 @@ public class SelectionWizardDescriptionItemProvider extends AbstractToolDescript
      */
     protected void addMultiplePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_SelectionDescription_multiple_feature"), getString("_UI_PropertyDescriptor_description", "_UI_SelectionDescription_multiple_feature", "_UI_SelectionDescription_type"),
-                DescriptionPackage.Literals.SELECTION_DESCRIPTION__MULTIPLE, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_SelectionDescription_multiple_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_SelectionDescription_multiple_feature", "_UI_SelectionDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DescriptionPackage.Literals.SELECTION_DESCRIPTION__MULTIPLE, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -104,8 +106,10 @@ public class SelectionWizardDescriptionItemProvider extends AbstractToolDescript
      */
     protected void addTreePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_SelectionDescription_tree_feature"), getString("_UI_PropertyDescriptor_description", "_UI_SelectionDescription_tree_feature", "_UI_SelectionDescription_type"),
-                DescriptionPackage.Literals.SELECTION_DESCRIPTION__TREE, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_SelectionDescription_tree_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_SelectionDescription_tree_feature", "_UI_SelectionDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DescriptionPackage.Literals.SELECTION_DESCRIPTION__TREE, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -116,9 +120,10 @@ public class SelectionWizardDescriptionItemProvider extends AbstractToolDescript
      */
     protected void addRootExpressionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_SelectionDescription_rootExpression_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_SelectionDescription_rootExpression_feature", "_UI_SelectionDescription_type"),
-                DescriptionPackage.Literals.SELECTION_DESCRIPTION__ROOT_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_SelectionDescription_rootExpression_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_SelectionDescription_rootExpression_feature", "_UI_SelectionDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DescriptionPackage.Literals.SELECTION_DESCRIPTION__ROOT_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -128,12 +133,11 @@ public class SelectionWizardDescriptionItemProvider extends AbstractToolDescript
      * @generated
      */
     protected void addChildrenExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_SelectionDescription_childrenExpression_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_SelectionDescription_childrenExpression_feature", "_UI_SelectionDescription_type"),
-                DescriptionPackage.Literals.SELECTION_DESCRIPTION__CHILDREN_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_GeneralPropertyCategory"), null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+                getString("_UI_SelectionDescription_childrenExpression_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_SelectionDescription_childrenExpression_feature", "_UI_SelectionDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DescriptionPackage.Literals.SELECTION_DESCRIPTION__CHILDREN_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -144,8 +148,10 @@ public class SelectionWizardDescriptionItemProvider extends AbstractToolDescript
      */
     protected void addMessagePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_SelectionDescription_message_feature"), getString("_UI_PropertyDescriptor_description", "_UI_SelectionDescription_message_feature", "_UI_SelectionDescription_type"),
-                DescriptionPackage.Literals.SELECTION_DESCRIPTION__MESSAGE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_SelectionDescription_message_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_SelectionDescription_message_feature", "_UI_SelectionDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DescriptionPackage.Literals.SELECTION_DESCRIPTION__MESSAGE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -156,8 +162,10 @@ public class SelectionWizardDescriptionItemProvider extends AbstractToolDescript
      */
     protected void addIconPathPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_SelectionWizardDescription_iconPath_feature"), getString("_UI_SelectionWizardDescription_iconPath_description"),
-                ToolPackage.Literals.SELECTION_WIZARD_DESCRIPTION__ICON_PATH, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_AdvancedPropertyCategory"), null));
+                getString("_UI_SelectionWizardDescription_iconPath_feature"), //$NON-NLS-1$
+                getString("_UI_SelectionWizardDescription_iconPath_description"), //$NON-NLS-1$
+                ToolPackage.Literals.SELECTION_WIZARD_DESCRIPTION__ICON_PATH, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_AdvancedPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -168,8 +176,10 @@ public class SelectionWizardDescriptionItemProvider extends AbstractToolDescript
      */
     protected void addWindowTitlePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_SelectionWizardDescription_windowTitle_feature"), getString("_UI_SelectionWizardDescription_windowTitle_description"),
-                ToolPackage.Literals.SELECTION_WIZARD_DESCRIPTION__WINDOW_TITLE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_AdvancedPropertyCategory"), null));
+                getString("_UI_SelectionWizardDescription_windowTitle_feature"), //$NON-NLS-1$
+                getString("_UI_SelectionWizardDescription_windowTitle_description"), //$NON-NLS-1$
+                ToolPackage.Literals.SELECTION_WIZARD_DESCRIPTION__WINDOW_TITLE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_AdvancedPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -180,8 +190,10 @@ public class SelectionWizardDescriptionItemProvider extends AbstractToolDescript
      */
     protected void addWindowImagePathPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_SelectionWizardDescription_windowImagePath_feature"), getString("_UI_SelectionWizardDescription_windowImagePath_description"),
-                ToolPackage.Literals.SELECTION_WIZARD_DESCRIPTION__WINDOW_IMAGE_PATH, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_AdvancedPropertyCategory"), null));
+                getString("_UI_SelectionWizardDescription_windowImagePath_feature"), //$NON-NLS-1$
+                getString("_UI_SelectionWizardDescription_windowImagePath_description"), //$NON-NLS-1$
+                ToolPackage.Literals.SELECTION_WIZARD_DESCRIPTION__WINDOW_IMAGE_PATH, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_AdvancedPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -228,7 +240,7 @@ public class SelectionWizardDescriptionItemProvider extends AbstractToolDescript
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/SelectionWizardDescription"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/SelectionWizardDescription")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/SetObjectItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/SetObjectItemProvider.java
index 5a9ef44fd9..6e8ef0b215 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/SetObjectItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/SetObjectItemProvider.java
@@ -66,8 +66,10 @@ public class SetObjectItemProvider extends ContainerModelOperationItemProvider {
      */
     protected void addFeatureNamePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_SetObject_featureName_feature"), getString("_UI_SetObject_featureName_description"), ToolPackage.Literals.SET_OBJECT__FEATURE_NAME, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_SetObject_featureName_feature"), //$NON-NLS-1$
+                getString("_UI_SetObject_featureName_description"), //$NON-NLS-1$
+                ToolPackage.Literals.SET_OBJECT__FEATURE_NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -77,8 +79,10 @@ public class SetObjectItemProvider extends ContainerModelOperationItemProvider {
      * @generated
      */
     protected void addObjectPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_SetObject_object_feature"),
-                getString("_UI_SetObject_object_description"), ToolPackage.Literals.SET_OBJECT__OBJECT, true, false, true, null, getString("_UI_GeneralPropertyCategory"), null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_SetObject_object_feature"), //$NON-NLS-1$
+                getString("_UI_SetObject_object_description"), //$NON-NLS-1$
+                ToolPackage.Literals.SET_OBJECT__OBJECT, true, false, true, null, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -88,7 +92,7 @@ public class SetObjectItemProvider extends ContainerModelOperationItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/SetObject"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/SetObject")); //$NON-NLS-1$
     }
 
     /**
@@ -100,7 +104,8 @@ public class SetObjectItemProvider extends ContainerModelOperationItemProvider {
     @Override
     public String getText(Object object) {
         String label = ((SetObject) object).getFeatureName();
-        return label == null || label.length() == 0 ? getString("_UI_SetObject_type") : getString("_UI_SetObject_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_SetObject_type") : //$NON-NLS-1$
+            getString("_UI_SetObject_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/SetValueItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/SetValueItemProvider.java
index b29d55579e..b71405a562 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/SetValueItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/SetValueItemProvider.java
@@ -66,8 +66,10 @@ public class SetValueItemProvider extends ContainerModelOperationItemProvider {
      */
     protected void addFeatureNamePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_SetValue_featureName_feature"), getString("_UI_SetValue_featureName_description"), ToolPackage.Literals.SET_VALUE__FEATURE_NAME, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_SetValue_featureName_feature"), //$NON-NLS-1$
+                getString("_UI_SetValue_featureName_description"), //$NON-NLS-1$
+                ToolPackage.Literals.SET_VALUE__FEATURE_NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -78,8 +80,10 @@ public class SetValueItemProvider extends ContainerModelOperationItemProvider {
      */
     protected void addValueExpressionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_SetValue_valueExpression_feature"), getString("_UI_SetValue_valueExpression_description"), ToolPackage.Literals.SET_VALUE__VALUE_EXPRESSION, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_SetValue_valueExpression_feature"), //$NON-NLS-1$
+                getString("_UI_SetValue_valueExpression_description"), //$NON-NLS-1$
+                ToolPackage.Literals.SET_VALUE__VALUE_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -89,7 +93,7 @@ public class SetValueItemProvider extends ContainerModelOperationItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/SetValue"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/SetValue")); //$NON-NLS-1$
     }
 
     /**
@@ -101,7 +105,8 @@ public class SetValueItemProvider extends ContainerModelOperationItemProvider {
     @Override
     public String getText(Object object) {
         String label = ((SetValue) object).getFeatureName();
-        return label == null || label.length() == 0 ? getString("_UI_SetValue_type") : getString("_UI_SetValue_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_SetValue_type") : //$NON-NLS-1$
+            getString("_UI_SetValue_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/SubVariableItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/SubVariableItemProvider.java
index 1e007979ff..97e125b584 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/SubVariableItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/SubVariableItemProvider.java
@@ -61,7 +61,8 @@ public class SubVariableItemProvider extends AbstractVariableItemProvider {
     @Override
     public String getText(Object object) {
         String label = ((SubVariable) object).getName();
-        return label == null || label.length() == 0 ? getString("_UI_SubVariable_type") : getString("_UI_SubVariable_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_SubVariable_type") : //$NON-NLS-1$
+            getString("_UI_SubVariable_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/SwitchChildItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/SwitchChildItemProvider.java
index dd40674075..f32c626499 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/SwitchChildItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/SwitchChildItemProvider.java
@@ -109,7 +109,7 @@ IItemPropertySource {
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_SwitchChild_type");
+        return getString("_UI_SwitchChild_type"); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/SwitchItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/SwitchItemProvider.java
index 68e50e48c7..735ff1a806 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/SwitchItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/SwitchItemProvider.java
@@ -97,7 +97,7 @@ public class SwitchItemProvider extends ModelOperationItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/Switch"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/Switch")); //$NON-NLS-1$
     }
 
     /**
@@ -108,7 +108,7 @@ public class SwitchItemProvider extends ModelOperationItemProvider {
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_Switch_type");
+        return getString("_UI_Switch_type"); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ToolDescriptionItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ToolDescriptionItemProvider.java
index 0f222c352c..d0794252df 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ToolDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ToolDescriptionItemProvider.java
@@ -69,8 +69,10 @@ public class ToolDescriptionItemProvider extends MappingBasedToolDescriptionItem
      */
     protected void addIconPathPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_ToolDescription_iconPath_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ToolDescription_iconPath_feature", "_UI_ToolDescription_type"),
-                ToolPackage.Literals.TOOL_DESCRIPTION__ICON_PATH, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_ToolDescription_iconPath_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_ToolDescription_iconPath_feature", "_UI_ToolDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                ToolPackage.Literals.TOOL_DESCRIPTION__ICON_PATH, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -116,7 +118,7 @@ public class ToolDescriptionItemProvider extends MappingBasedToolDescriptionItem
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ToolDescription"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/ToolDescription")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ToolFilterDescriptionItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ToolFilterDescriptionItemProvider.java
index d28dd65b92..20f180c189 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ToolFilterDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ToolFilterDescriptionItemProvider.java
@@ -77,8 +77,10 @@ IItemPropertySource {
      */
     protected void addPreconditionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_ToolFilterDescription_precondition_feature"), getString("_UI_ToolFilterDescription_precondition_description"),
-                ToolPackage.Literals.TOOL_FILTER_DESCRIPTION__PRECONDITION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_ToolFilterDescription_precondition_feature"), //$NON-NLS-1$
+                getString("_UI_ToolFilterDescription_precondition_description"), //$NON-NLS-1$
+                ToolPackage.Literals.TOOL_FILTER_DESCRIPTION__PRECONDITION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -89,8 +91,10 @@ IItemPropertySource {
      */
     protected void addElementsToListenPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_ToolFilterDescription_elementsToListen_feature"), getString("_UI_ToolFilterDescription_elementsToListen_description"),
-                ToolPackage.Literals.TOOL_FILTER_DESCRIPTION__ELEMENTS_TO_LISTEN, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_ToolFilterDescription_elementsToListen_feature"), //$NON-NLS-1$
+                getString("_UI_ToolFilterDescription_elementsToListen_description"), //$NON-NLS-1$
+                ToolPackage.Literals.TOOL_FILTER_DESCRIPTION__ELEMENTS_TO_LISTEN, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -134,7 +138,7 @@ IItemPropertySource {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ToolFilterDescription"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/ToolFilterDescription")); //$NON-NLS-1$
     }
 
     /**
@@ -146,7 +150,8 @@ IItemPropertySource {
     @Override
     public String getText(Object object) {
         String label = ((ToolFilterDescription) object).getPrecondition();
-        return label == null || label.length() == 0 ? getString("_UI_ToolFilterDescription_type") : getString("_UI_ToolFilterDescription_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_ToolFilterDescription_type") : //$NON-NLS-1$
+            getString("_UI_ToolFilterDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/UnsetItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/UnsetItemProvider.java
index eeb16eb660..be618cf872 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/UnsetItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/UnsetItemProvider.java
@@ -66,8 +66,10 @@ public class UnsetItemProvider extends ContainerModelOperationItemProvider {
      */
     protected void addFeatureNamePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_Unset_featureName_feature"), getString("_UI_Unset_featureName_description"), ToolPackage.Literals.UNSET__FEATURE_NAME, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_Unset_featureName_feature"), //$NON-NLS-1$
+                getString("_UI_Unset_featureName_description"), //$NON-NLS-1$
+                ToolPackage.Literals.UNSET__FEATURE_NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -78,8 +80,10 @@ public class UnsetItemProvider extends ContainerModelOperationItemProvider {
      */
     protected void addElementExpressionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_Unset_elementExpression_feature"), getString("_UI_Unset_elementExpression_description"), ToolPackage.Literals.UNSET__ELEMENT_EXPRESSION, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_Unset_elementExpression_feature"), //$NON-NLS-1$
+                getString("_UI_Unset_elementExpression_description"), //$NON-NLS-1$
+                ToolPackage.Literals.UNSET__ELEMENT_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -89,7 +93,7 @@ public class UnsetItemProvider extends ContainerModelOperationItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/Unset"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/Unset")); //$NON-NLS-1$
     }
 
     /**
@@ -101,7 +105,8 @@ public class UnsetItemProvider extends ContainerModelOperationItemProvider {
     @Override
     public String getText(Object object) {
         String label = ((Unset) object).getFeatureName();
-        return label == null || label.length() == 0 ? getString("_UI_Unset_type") : getString("_UI_Unset_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_Unset_type") : //$NON-NLS-1$
+            getString("_UI_Unset_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/VariableContainerItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/VariableContainerItemProvider.java
index 8ab6c3b045..63cb9c4e89 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/VariableContainerItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/VariableContainerItemProvider.java
@@ -106,7 +106,7 @@ IItemPropertySource {
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_VariableContainer_type");
+        return getString("_UI_VariableContainer_type"); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/validation/provider/RuleAuditItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/validation/provider/RuleAuditItemProvider.java
index b491ebe0dd..3abd033807 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/validation/provider/RuleAuditItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/validation/provider/RuleAuditItemProvider.java
@@ -73,8 +73,10 @@ public class RuleAuditItemProvider extends ItemProviderAdapter implements IEditi
      */
     protected void addAuditExpressionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_RuleAudit_auditExpression_feature"), getString("_UI_RuleAudit_auditExpression_description"), ValidationPackage.Literals.RULE_AUDIT__AUDIT_EXPRESSION, true, false,
-                false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_RuleAudit_auditExpression_feature"), //$NON-NLS-1$
+                getString("_UI_RuleAudit_auditExpression_description"), //$NON-NLS-1$
+                ValidationPackage.Literals.RULE_AUDIT__AUDIT_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -84,7 +86,7 @@ public class RuleAuditItemProvider extends ItemProviderAdapter implements IEditi
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/RuleAudit"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/RuleAudit")); //$NON-NLS-1$
     }
 
     /**
@@ -96,7 +98,8 @@ public class RuleAuditItemProvider extends ItemProviderAdapter implements IEditi
     @Override
     public String getText(Object object) {
         String label = ((RuleAudit) object).getAuditExpression();
-        return label == null || label.length() == 0 ? getString("_UI_RuleAudit_type") : getString("_UI_RuleAudit_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_RuleAudit_type") : //$NON-NLS-1$
+            getString("_UI_RuleAudit_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/validation/provider/SemanticValidationRuleItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/validation/provider/SemanticValidationRuleItemProvider.java
index 7455816399..f0e456164a 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/validation/provider/SemanticValidationRuleItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/validation/provider/SemanticValidationRuleItemProvider.java
@@ -66,9 +66,10 @@ public class SemanticValidationRuleItemProvider extends ValidationRuleItemProvid
      */
     protected void addTargetClassPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_SemanticValidationRule_targetClass_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_SemanticValidationRule_targetClass_feature", "_UI_SemanticValidationRule_type"),
-                ValidationPackage.Literals.SEMANTIC_VALIDATION_RULE__TARGET_CLASS, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_SemanticValidationRule_targetClass_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_SemanticValidationRule_targetClass_feature", "_UI_SemanticValidationRule_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                ValidationPackage.Literals.SEMANTIC_VALIDATION_RULE__TARGET_CLASS, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -79,13 +80,13 @@ public class SemanticValidationRuleItemProvider extends ValidationRuleItemProvid
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/SemanticValidationRule"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/SemanticValidationRule")); //$NON-NLS-1$
     }
 
     /**
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
+     *
      * @not-generated
      */
     @Override
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/validation/provider/ValidationFixItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/validation/provider/ValidationFixItemProvider.java
index 51cc9633f5..415d9b0b29 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/validation/provider/ValidationFixItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/validation/provider/ValidationFixItemProvider.java
@@ -76,8 +76,10 @@ IItemPropertySource {
      */
     protected void addNamePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_ValidationFix_name_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ValidationFix_name_feature", "_UI_ValidationFix_type"),
-                ValidationPackage.Literals.VALIDATION_FIX__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_ValidationFix_name_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_ValidationFix_name_feature", "_UI_ValidationFix_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                ValidationPackage.Literals.VALIDATION_FIX__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -121,7 +123,7 @@ IItemPropertySource {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ValidationFix"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/ValidationFix")); //$NON-NLS-1$
     }
 
     /**
@@ -133,7 +135,8 @@ IItemPropertySource {
     @Override
     public String getText(Object object) {
         String label = ((ValidationFix) object).getName();
-        return label == null || label.length() == 0 ? getString("_UI_ValidationFix_type") : getString("_UI_ValidationFix_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_ValidationFix_type") : //$NON-NLS-1$
+            getString("_UI_ValidationFix_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/validation/provider/ValidationRuleItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/validation/provider/ValidationRuleItemProvider.java
index 5ae8498213..d7f76d9610 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/validation/provider/ValidationRuleItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/validation/provider/ValidationRuleItemProvider.java
@@ -71,8 +71,10 @@ public class ValidationRuleItemProvider extends IdentifiedElementItemProvider {
      */
     protected void addLevelPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_ValidationRule_level_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ValidationRule_level_feature", "_UI_ValidationRule_type"),
-                ValidationPackage.Literals.VALIDATION_RULE__LEVEL, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_ValidationRule_level_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_ValidationRule_level_feature", "_UI_ValidationRule_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                ValidationPackage.Literals.VALIDATION_RULE__LEVEL, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -83,8 +85,10 @@ public class ValidationRuleItemProvider extends IdentifiedElementItemProvider {
      */
     protected void addMessagePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_ValidationRule_message_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ValidationRule_message_feature", "_UI_ValidationRule_type"),
-                ValidationPackage.Literals.VALIDATION_RULE__MESSAGE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_ValidationRule_message_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_ValidationRule_message_feature", "_UI_ValidationRule_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                ValidationPackage.Literals.VALIDATION_RULE__MESSAGE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -124,7 +128,7 @@ public class ValidationRuleItemProvider extends IdentifiedElementItemProvider {
     /**
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
+     *
      * @not-generated
      */
     @Override
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/validation/provider/ValidationSetItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/validation/provider/ValidationSetItemProvider.java
index 644f9a78d9..9b60c65f4f 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/validation/provider/ValidationSetItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/validation/provider/ValidationSetItemProvider.java
@@ -70,8 +70,10 @@ public class ValidationSetItemProvider extends DocumentedElementItemProvider {
      */
     protected void addNamePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_ValidationSet_name_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ValidationSet_name_feature", "_UI_ValidationSet_type"),
-                ValidationPackage.Literals.VALIDATION_SET__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_ValidationSet_name_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_ValidationSet_name_feature", "_UI_ValidationSet_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                ValidationPackage.Literals.VALIDATION_SET__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -82,8 +84,10 @@ public class ValidationSetItemProvider extends DocumentedElementItemProvider {
      */
     protected void addReusedRulesPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_ValidationSet_reusedRules_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ValidationSet_reusedRules_feature", "_UI_ValidationSet_type"),
-                ValidationPackage.Literals.VALIDATION_SET__REUSED_RULES, true, false, true, null, getString("_UI_ImportPropertyCategory"), null));
+                getString("_UI_ValidationSet_reusedRules_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_ValidationSet_reusedRules_feature", "_UI_ValidationSet_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                ValidationPackage.Literals.VALIDATION_SET__REUSED_RULES, true, false, true, null, getString("_UI_ImportPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -94,8 +98,10 @@ public class ValidationSetItemProvider extends DocumentedElementItemProvider {
      */
     protected void addAllRulesPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_ValidationSet_allRules_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ValidationSet_allRules_feature", "_UI_ValidationSet_type"),
-                ValidationPackage.Literals.VALIDATION_SET__ALL_RULES, false, false, false, null, getString("_UI_ImportPropertyCategory"), null));
+                getString("_UI_ValidationSet_allRules_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_ValidationSet_allRules_feature", "_UI_ValidationSet_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                ValidationPackage.Literals.VALIDATION_SET__ALL_RULES, false, false, false, null, getString("_UI_ImportPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -139,7 +145,7 @@ public class ValidationSetItemProvider extends DocumentedElementItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ValidationSet"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/ValidationSet")); //$NON-NLS-1$
     }
 
     /**
@@ -151,7 +157,8 @@ public class ValidationSetItemProvider extends DocumentedElementItemProvider {
     @Override
     public String getText(Object object) {
         String label = ((ValidationSet) object).getName();
-        return label == null || label.length() == 0 ? getString("_UI_ValidationSet_type") : getString("_UI_ValidationSet_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_ValidationSet_type") : //$NON-NLS-1$
+            getString("_UI_ValidationSet_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/validation/provider/ViewValidationRuleItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/validation/provider/ViewValidationRuleItemProvider.java
index 8248297d7b..d3e7ce0d05 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/validation/provider/ViewValidationRuleItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/validation/provider/ViewValidationRuleItemProvider.java
@@ -64,8 +64,10 @@ public class ViewValidationRuleItemProvider extends ValidationRuleItemProvider {
      */
     protected void addTargetsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_ViewValidationRule_targets_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ViewValidationRule_targets_feature", "_UI_ViewValidationRule_type"),
-                ValidationPackage.Literals.VIEW_VALIDATION_RULE__TARGETS, true, false, true, null, getString("_UI_GeneralPropertyCategory"), null));
+                getString("_UI_ViewValidationRule_targets_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_ViewValidationRule_targets_feature", "_UI_ViewValidationRule_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                ValidationPackage.Literals.VIEW_VALIDATION_RULE__TARGETS, true, false, true, null, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                null));
     }
 
     /**
@@ -76,13 +78,13 @@ public class ViewValidationRuleItemProvider extends ValidationRuleItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ViewValidationRule"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/ViewValidationRule")); //$NON-NLS-1$
     }
 
     /**
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
+     *
      * @not-generated
      */
     @Override
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/BasicLabelStyleItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/BasicLabelStyleItemProvider.java
index e87836bb3e..b00fdc04b0 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/BasicLabelStyleItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/BasicLabelStyleItemProvider.java
@@ -69,7 +69,8 @@ public class BasicLabelStyleItemProvider extends CustomizableItemProvider {
      */
     protected void addLabelSizePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_BasicLabelStyle_labelSize_feature"), getString("_UI_PropertyDescriptor_description", "_UI_BasicLabelStyle_labelSize_feature", "_UI_BasicLabelStyle_type"),
+                getString("_UI_BasicLabelStyle_labelSize_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_BasicLabelStyle_labelSize_feature", "_UI_BasicLabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 ViewpointPackage.Literals.BASIC_LABEL_STYLE__LABEL_SIZE, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
     }
 
@@ -81,7 +82,8 @@ public class BasicLabelStyleItemProvider extends CustomizableItemProvider {
      */
     protected void addLabelFormatPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_BasicLabelStyle_labelFormat_feature"), getString("_UI_PropertyDescriptor_description", "_UI_BasicLabelStyle_labelFormat_feature", "_UI_BasicLabelStyle_type"),
+                getString("_UI_BasicLabelStyle_labelFormat_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_BasicLabelStyle_labelFormat_feature", "_UI_BasicLabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 ViewpointPackage.Literals.BASIC_LABEL_STYLE__LABEL_FORMAT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -93,7 +95,8 @@ public class BasicLabelStyleItemProvider extends CustomizableItemProvider {
      */
     protected void addShowIconPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_BasicLabelStyle_showIcon_feature"), getString("_UI_PropertyDescriptor_description", "_UI_BasicLabelStyle_showIcon_feature", "_UI_BasicLabelStyle_type"),
+                getString("_UI_BasicLabelStyle_showIcon_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_BasicLabelStyle_showIcon_feature", "_UI_BasicLabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 ViewpointPackage.Literals.BASIC_LABEL_STYLE__SHOW_ICON, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
     }
 
@@ -105,7 +108,8 @@ public class BasicLabelStyleItemProvider extends CustomizableItemProvider {
      */
     protected void addIconPathPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_BasicLabelStyle_iconPath_feature"), getString("_UI_PropertyDescriptor_description", "_UI_BasicLabelStyle_iconPath_feature", "_UI_BasicLabelStyle_type"),
+                getString("_UI_BasicLabelStyle_iconPath_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_BasicLabelStyle_iconPath_feature", "_UI_BasicLabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 ViewpointPackage.Literals.BASIC_LABEL_STYLE__ICON_PATH, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -117,7 +121,8 @@ public class BasicLabelStyleItemProvider extends CustomizableItemProvider {
      */
     protected void addLabelColorPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_BasicLabelStyle_labelColor_feature"), getString("_UI_PropertyDescriptor_description", "_UI_BasicLabelStyle_labelColor_feature", "_UI_BasicLabelStyle_type"),
+                getString("_UI_BasicLabelStyle_labelColor_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_BasicLabelStyle_labelColor_feature", "_UI_BasicLabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 ViewpointPackage.Literals.BASIC_LABEL_STYLE__LABEL_COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -129,7 +134,7 @@ public class BasicLabelStyleItemProvider extends CustomizableItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/BasicLabelStyle"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/BasicLabelStyle")); //$NON-NLS-1$
     }
 
     /**
@@ -141,7 +146,7 @@ public class BasicLabelStyleItemProvider extends CustomizableItemProvider {
     @Override
     public String getText(Object object) {
         BasicLabelStyle basicLabelStyle = (BasicLabelStyle) object;
-        return getString("_UI_BasicLabelStyle_type") + " " + basicLabelStyle.getLabelSize();
+        return getString("_UI_BasicLabelStyle_type") + " " + basicLabelStyle.getLabelSize(); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/CustomizableItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/CustomizableItemProvider.java
index 799483edd9..4380f9a7d4 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/CustomizableItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/CustomizableItemProvider.java
@@ -71,7 +71,8 @@ IItemPropertySource {
      */
     protected void addCustomFeaturesPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_Customizable_customFeatures_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Customizable_customFeatures_feature", "_UI_Customizable_type"),
+                getString("_UI_Customizable_customFeatures_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_Customizable_customFeatures_feature", "_UI_Customizable_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 ViewpointPackage.Literals.CUSTOMIZABLE__CUSTOM_FEATURES, true, false, true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -83,7 +84,7 @@ IItemPropertySource {
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_Customizable_type");
+        return getString("_UI_Customizable_type"); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DAnalysisCustomDataItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DAnalysisCustomDataItemProvider.java
index 4aa23c020d..e0ea333442 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DAnalysisCustomDataItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DAnalysisCustomDataItemProvider.java
@@ -75,7 +75,8 @@ IItemPropertySource {
      */
     protected void addKeyPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DAnalysisCustomData_key_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DAnalysisCustomData_key_feature", "_UI_DAnalysisCustomData_type"),
+                getString("_UI_DAnalysisCustomData_key_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DAnalysisCustomData_key_feature", "_UI_DAnalysisCustomData_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 ViewpointPackage.Literals.DANALYSIS_CUSTOM_DATA__KEY, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -120,7 +121,7 @@ IItemPropertySource {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/DAnalysisCustomData"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/DAnalysisCustomData")); //$NON-NLS-1$
     }
 
     /**
@@ -132,7 +133,8 @@ IItemPropertySource {
     @Override
     public String getText(Object object) {
         String label = ((DAnalysisCustomData) object).getKey();
-        return label == null || label.length() == 0 ? getString("_UI_DAnalysisCustomData_type") : getString("_UI_DAnalysisCustomData_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_DAnalysisCustomData_type") : //$NON-NLS-1$
+            getString("_UI_DAnalysisCustomData_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DAnalysisItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DAnalysisItemProvider.java
index 61dbb1ffde..64ab8b645f 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DAnalysisItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DAnalysisItemProvider.java
@@ -79,7 +79,8 @@ public class DAnalysisItemProvider extends ItemProviderAdapter implements IEditi
      */
     protected void addReferencedAnalysisPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DAnalysis_referencedAnalysis_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DAnalysis_referencedAnalysis_feature", "_UI_DAnalysis_type"),
+                getString("_UI_DAnalysis_referencedAnalysis_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DAnalysis_referencedAnalysis_feature", "_UI_DAnalysis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 ViewpointPackage.Literals.DANALYSIS__REFERENCED_ANALYSIS, true, false, true, null, null, null));
     }
 
@@ -90,10 +91,9 @@ public class DAnalysisItemProvider extends ItemProviderAdapter implements IEditi
      * @generated
      */
     protected void addModelsPropertyDescriptor(Object object) {
-        itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DAnalysis_models_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_DAnalysis_models_feature", "_UI_DAnalysis_type"), ViewpointPackage.Literals.DANALYSIS__MODELS, true, false, true, null,
-                null, null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DAnalysis_models_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DAnalysis_models_feature", "_UI_DAnalysis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                ViewpointPackage.Literals.DANALYSIS__MODELS, true, false, true, null, null, null));
     }
 
     /**
@@ -104,7 +104,8 @@ public class DAnalysisItemProvider extends ItemProviderAdapter implements IEditi
      */
     protected void addSelectedViewsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DAnalysis_selectedViews_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DAnalysis_selectedViews_feature", "_UI_DAnalysis_type"),
+                getString("_UI_DAnalysis_selectedViews_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DAnalysis_selectedViews_feature", "_UI_DAnalysis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 ViewpointPackage.Literals.DANALYSIS__SELECTED_VIEWS, true, false, true, null, null, null));
     }
 
@@ -116,7 +117,8 @@ public class DAnalysisItemProvider extends ItemProviderAdapter implements IEditi
      */
     protected void addVersionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DAnalysis_version_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DAnalysis_version_feature", "_UI_DAnalysis_type"),
+                getString("_UI_DAnalysis_version_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DAnalysis_version_feature", "_UI_DAnalysis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 ViewpointPackage.Literals.DANALYSIS__VERSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -128,7 +130,8 @@ public class DAnalysisItemProvider extends ItemProviderAdapter implements IEditi
      */
     protected void addSemanticResourcesPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DAnalysis_semanticResources_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DAnalysis_semanticResources_feature", "_UI_DAnalysis_type"),
+                getString("_UI_DAnalysis_semanticResources_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DAnalysis_semanticResources_feature", "_UI_DAnalysis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 ViewpointPackage.Literals.DANALYSIS__SEMANTIC_RESOURCES, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -174,7 +177,7 @@ public class DAnalysisItemProvider extends ItemProviderAdapter implements IEditi
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/DAnalysis"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/DAnalysis")); //$NON-NLS-1$
     }
 
     /**
@@ -186,7 +189,8 @@ public class DAnalysisItemProvider extends ItemProviderAdapter implements IEditi
     @Override
     public String getText(Object object) {
         String label = ((DAnalysis) object).getVersion();
-        return label == null || label.length() == 0 ? getString("_UI_DAnalysis_type") : getString("_UI_DAnalysis_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_DAnalysis_type") : //$NON-NLS-1$
+            getString("_UI_DAnalysis_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DAnalysisSessionEObjectItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DAnalysisSessionEObjectItemProvider.java
index fbb9148a04..8c98310142 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DAnalysisSessionEObjectItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DAnalysisSessionEObjectItemProvider.java
@@ -79,7 +79,8 @@ IItemPropertySource {
      */
     protected void addOpenPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DAnalysisSessionEObject_open_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DAnalysisSessionEObject_open_feature", "_UI_DAnalysisSessionEObject_type"),
+                getString("_UI_DAnalysisSessionEObject_open_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DAnalysisSessionEObject_open_feature", "_UI_DAnalysisSessionEObject_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 ViewpointPackage.Literals.DANALYSIS_SESSION_EOBJECT__OPEN, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
     }
 
@@ -91,8 +92,8 @@ IItemPropertySource {
      */
     protected void addResourcesPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DAnalysisSessionEObject_resources_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_DAnalysisSessionEObject_resources_feature", "_UI_DAnalysisSessionEObject_type"),
+                getString("_UI_DAnalysisSessionEObject_resources_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DAnalysisSessionEObject_resources_feature", "_UI_DAnalysisSessionEObject_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 ViewpointPackage.Literals.DANALYSIS_SESSION_EOBJECT__RESOURCES, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -104,8 +105,8 @@ IItemPropertySource {
      */
     protected void addControlledResourcesPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DAnalysisSessionEObject_controlledResources_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_DAnalysisSessionEObject_controlledResources_feature", "_UI_DAnalysisSessionEObject_type"),
+                getString("_UI_DAnalysisSessionEObject_controlledResources_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DAnalysisSessionEObject_controlledResources_feature", "_UI_DAnalysisSessionEObject_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 ViewpointPackage.Literals.DANALYSIS_SESSION_EOBJECT__CONTROLLED_RESOURCES, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -117,8 +118,8 @@ IItemPropertySource {
      */
     protected void addActivatedViewpointsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DAnalysisSessionEObject_activatedViewpoints_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_DAnalysisSessionEObject_activatedViewpoints_feature", "_UI_DAnalysisSessionEObject_type"),
+                getString("_UI_DAnalysisSessionEObject_activatedViewpoints_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DAnalysisSessionEObject_activatedViewpoints_feature", "_UI_DAnalysisSessionEObject_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 ViewpointPackage.Literals.DANALYSIS_SESSION_EOBJECT__ACTIVATED_VIEWPOINTS, true, false, true, null, null, null));
     }
 
@@ -130,8 +131,8 @@ IItemPropertySource {
      */
     protected void addAnalysesPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DAnalysisSessionEObject_analyses_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_DAnalysisSessionEObject_analyses_feature", "_UI_DAnalysisSessionEObject_type"),
+                getString("_UI_DAnalysisSessionEObject_analyses_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DAnalysisSessionEObject_analyses_feature", "_UI_DAnalysisSessionEObject_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 ViewpointPackage.Literals.DANALYSIS_SESSION_EOBJECT__ANALYSES, true, false, true, null, null, null));
     }
 
@@ -143,8 +144,8 @@ IItemPropertySource {
      */
     protected void addSynchronizationStatusPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DAnalysisSessionEObject_synchronizationStatus_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_DAnalysisSessionEObject_synchronizationStatus_feature", "_UI_DAnalysisSessionEObject_type"),
+                getString("_UI_DAnalysisSessionEObject_synchronizationStatus_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DAnalysisSessionEObject_synchronizationStatus_feature", "_UI_DAnalysisSessionEObject_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 ViewpointPackage.Literals.DANALYSIS_SESSION_EOBJECT__SYNCHRONIZATION_STATUS, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -156,7 +157,7 @@ IItemPropertySource {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/DAnalysisSessionEObject"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/DAnalysisSessionEObject")); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DFeatureExtensionItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DFeatureExtensionItemProvider.java
index c18acf03ed..6f841bda03 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DFeatureExtensionItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DFeatureExtensionItemProvider.java
@@ -70,7 +70,8 @@ IItemPropertySource {
      */
     protected void addDescriptionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DFeatureExtension_description_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DFeatureExtension_description_feature", "_UI_DFeatureExtension_type"),
+                getString("_UI_DFeatureExtension_description_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DFeatureExtension_description_feature", "_UI_DFeatureExtension_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 ViewpointPackage.Literals.DFEATURE_EXTENSION__DESCRIPTION, true, false, true, null, null, null));
     }
 
@@ -82,7 +83,7 @@ IItemPropertySource {
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_DFeatureExtension_type");
+        return getString("_UI_DFeatureExtension_type"); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DFileItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DFileItemProvider.java
index 5a1a33acc0..96ee8237ba 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DFileItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DFileItemProvider.java
@@ -72,9 +72,9 @@ public class DFileItemProvider extends ItemProviderAdapter implements IEditingDo
      * @generated
      */
     protected void addNamePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DResource_name_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_DResource_name_feature", "_UI_DResource_type"), ViewpointPackage.Literals.DRESOURCE__NAME, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DResource_name_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DResource_name_feature", "_UI_DResource_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                ViewpointPackage.Literals.DRESOURCE__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
     /**
@@ -84,9 +84,9 @@ public class DFileItemProvider extends ItemProviderAdapter implements IEditingDo
      * @generated
      */
     protected void addPathPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DResource_path_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_DResource_path_feature", "_UI_DResource_type"), ViewpointPackage.Literals.DRESOURCE__PATH, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DResource_path_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DResource_path_feature", "_UI_DResource_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                ViewpointPackage.Literals.DRESOURCE__PATH, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
     /**
@@ -96,7 +96,7 @@ public class DFileItemProvider extends ItemProviderAdapter implements IEditingDo
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/DFile"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/DFile")); //$NON-NLS-1$
     }
 
     /**
@@ -108,7 +108,8 @@ public class DFileItemProvider extends ItemProviderAdapter implements IEditingDo
     @Override
     public String getText(Object object) {
         String label = ((DFile) object).getName();
-        return label == null || label.length() == 0 ? getString("_UI_DFile_type") : getString("_UI_DFile_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_DFile_type") : //$NON-NLS-1$
+            getString("_UI_DFile_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DFolderItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DFolderItemProvider.java
index b555ed646b..2d86fecd35 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DFolderItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DFolderItemProvider.java
@@ -59,7 +59,7 @@ public class DFolderItemProvider extends DResourceContainerItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/DFolder"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/DFolder")); //$NON-NLS-1$
     }
 
     /**
@@ -71,7 +71,8 @@ public class DFolderItemProvider extends DResourceContainerItemProvider {
     @Override
     public String getText(Object object) {
         String label = ((DFolder) object).getName();
-        return label == null || label.length() == 0 ? getString("_UI_DFolder_type") : getString("_UI_DFolder_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_DFolder_type") : //$NON-NLS-1$
+            getString("_UI_DFolder_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DModelItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DModelItemProvider.java
index f004306942..2899a788cf 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DModelItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DModelItemProvider.java
@@ -59,7 +59,7 @@ public class DModelItemProvider extends DFileItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/DModel"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/DModel")); //$NON-NLS-1$
     }
 
     /**
@@ -71,7 +71,8 @@ public class DModelItemProvider extends DFileItemProvider {
     @Override
     public String getText(Object object) {
         String label = ((DModel) object).getName();
-        return label == null || label.length() == 0 ? getString("_UI_DModel_type") : getString("_UI_DModel_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_DModel_type") : //$NON-NLS-1$
+            getString("_UI_DModel_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DProjectItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DProjectItemProvider.java
index 7f13b118d1..06fc3f9bfc 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DProjectItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DProjectItemProvider.java
@@ -59,7 +59,7 @@ public class DProjectItemProvider extends DResourceContainerItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/DProject"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/DProject")); //$NON-NLS-1$
     }
 
     /**
@@ -71,7 +71,8 @@ public class DProjectItemProvider extends DResourceContainerItemProvider {
     @Override
     public String getText(Object object) {
         String label = ((DProject) object).getName();
-        return label == null || label.length() == 0 ? getString("_UI_DProject_type") : getString("_UI_DProject_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_DProject_type") : //$NON-NLS-1$
+            getString("_UI_DProject_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DRepresentationContainerItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DRepresentationContainerItemProvider.java
index 8dd3d57539..d2ddf61a71 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DRepresentationContainerItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DRepresentationContainerItemProvider.java
@@ -62,8 +62,8 @@ public class DRepresentationContainerItemProvider extends DViewItemProvider {
      */
     protected void addModelsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DRepresentationContainer_models_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_DRepresentationContainer_models_feature", "_UI_DRepresentationContainer_type"),
+                getString("_UI_DRepresentationContainer_models_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DRepresentationContainer_models_feature", "_UI_DRepresentationContainer_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 ViewpointPackage.Literals.DREPRESENTATION_CONTAINER__MODELS, false, false, false, null, null, null));
     }
 
@@ -75,7 +75,7 @@ public class DRepresentationContainerItemProvider extends DViewItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/DRepresentationContainer"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/DRepresentationContainer")); //$NON-NLS-1$
     }
 
     /**
@@ -86,7 +86,7 @@ public class DRepresentationContainerItemProvider extends DViewItemProvider {
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_DRepresentationContainer_type");
+        return getString("_UI_DRepresentationContainer_type"); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DRepresentationElementItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DRepresentationElementItemProvider.java
index 6d5fd630a0..bc4ff6e6c2 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DRepresentationElementItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DRepresentationElementItemProvider.java
@@ -75,7 +75,8 @@ IItemPropertySource {
      */
     protected void addTargetPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DSemanticDecorator_target_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DSemanticDecorator_target_feature", "_UI_DSemanticDecorator_type"),
+                getString("_UI_DSemanticDecorator_target_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DSemanticDecorator_target_feature", "_UI_DSemanticDecorator_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 ViewpointPackage.Literals.DSEMANTIC_DECORATOR__TARGET, true, false, true, null, null, null));
     }
 
@@ -87,7 +88,8 @@ IItemPropertySource {
      */
     protected void addNamePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DRepresentationElement_name_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DRepresentationElement_name_feature", "_UI_DRepresentationElement_type"),
+                getString("_UI_DRepresentationElement_name_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DRepresentationElement_name_feature", "_UI_DRepresentationElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 ViewpointPackage.Literals.DREPRESENTATION_ELEMENT__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -99,8 +101,8 @@ IItemPropertySource {
      */
     protected void addSemanticElementsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DRepresentationElement_semanticElements_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_DRepresentationElement_semanticElements_feature", "_UI_DRepresentationElement_type"),
+                getString("_UI_DRepresentationElement_semanticElements_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DRepresentationElement_semanticElements_feature", "_UI_DRepresentationElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 ViewpointPackage.Literals.DREPRESENTATION_ELEMENT__SEMANTIC_ELEMENTS, true, false, true, null, null, null));
     }
 
@@ -113,7 +115,8 @@ IItemPropertySource {
     @Override
     public String getText(Object object) {
         String label = ((DRepresentationElement) object).getName();
-        return label == null || label.length() == 0 ? getString("_UI_DRepresentationElement_type") : getString("_UI_DRepresentationElement_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_DRepresentationElement_type") : //$NON-NLS-1$
+            getString("_UI_DRepresentationElement_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DRepresentationItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DRepresentationItemProvider.java
index 02d2481a2d..7a53efda28 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DRepresentationItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DRepresentationItemProvider.java
@@ -73,8 +73,8 @@ public class DRepresentationItemProvider extends DocumentedElementItemProvider {
      */
     protected void addOwnedRepresentationElementsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DRepresentation_ownedRepresentationElements_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_DRepresentation_ownedRepresentationElements_feature", "_UI_DRepresentation_type"),
+                getString("_UI_DRepresentation_ownedRepresentationElements_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DRepresentation_ownedRepresentationElements_feature", "_UI_DRepresentation_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 ViewpointPackage.Literals.DREPRESENTATION__OWNED_REPRESENTATION_ELEMENTS, false, false, false, null, null, null));
     }
 
@@ -86,8 +86,8 @@ public class DRepresentationItemProvider extends DocumentedElementItemProvider {
      */
     protected void addRepresentationElementsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DRepresentation_representationElements_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_DRepresentation_representationElements_feature", "_UI_DRepresentation_type"),
+                getString("_UI_DRepresentation_representationElements_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DRepresentation_representationElements_feature", "_UI_DRepresentation_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 ViewpointPackage.Literals.DREPRESENTATION__REPRESENTATION_ELEMENTS, false, false, false, null, null, null));
     }
 
@@ -99,7 +99,8 @@ public class DRepresentationItemProvider extends DocumentedElementItemProvider {
      */
     protected void addNamePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DRepresentation_name_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DRepresentation_name_feature", "_UI_DRepresentation_type"),
+                getString("_UI_DRepresentation_name_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DRepresentation_name_feature", "_UI_DRepresentation_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 ViewpointPackage.Literals.DREPRESENTATION__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -147,7 +148,8 @@ public class DRepresentationItemProvider extends DocumentedElementItemProvider {
     @Override
     public String getText(Object object) {
         String label = ((DRepresentation) object).getName();
-        return label == null || label.length() == 0 ? getString("_UI_DRepresentation_type") : getString("_UI_DRepresentation_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_DRepresentation_type") : //$NON-NLS-1$
+            getString("_UI_DRepresentation_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DResourceContainerItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DResourceContainerItemProvider.java
index cccf8d8db5..79cb6d21a6 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DResourceContainerItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DResourceContainerItemProvider.java
@@ -75,9 +75,9 @@ IItemPropertySource {
      * @generated
      */
     protected void addNamePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DResource_name_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_DResource_name_feature", "_UI_DResource_type"), ViewpointPackage.Literals.DRESOURCE__NAME, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DResource_name_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DResource_name_feature", "_UI_DResource_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                ViewpointPackage.Literals.DRESOURCE__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
     /**
@@ -87,9 +87,9 @@ IItemPropertySource {
      * @generated
      */
     protected void addPathPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DResource_path_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_DResource_path_feature", "_UI_DResource_type"), ViewpointPackage.Literals.DRESOURCE__PATH, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DResource_path_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DResource_path_feature", "_UI_DResource_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                ViewpointPackage.Literals.DRESOURCE__PATH, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
     /**
@@ -133,7 +133,7 @@ IItemPropertySource {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/DResourceContainer"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/DResourceContainer")); //$NON-NLS-1$
     }
 
     /**
@@ -145,7 +145,8 @@ IItemPropertySource {
     @Override
     public String getText(Object object) {
         String label = ((DResourceContainer) object).getName();
-        return label == null || label.length() == 0 ? getString("_UI_DResourceContainer_type") : getString("_UI_DResourceContainer_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_DResourceContainer_type") : //$NON-NLS-1$
+            getString("_UI_DResourceContainer_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DSemanticDecoratorItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DSemanticDecoratorItemProvider.java
index 8045049166..cf3ededaf9 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DSemanticDecoratorItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DSemanticDecoratorItemProvider.java
@@ -70,7 +70,8 @@ IItemPropertySource {
      */
     protected void addTargetPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DSemanticDecorator_target_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DSemanticDecorator_target_feature", "_UI_DSemanticDecorator_type"),
+                getString("_UI_DSemanticDecorator_target_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DSemanticDecorator_target_feature", "_UI_DSemanticDecorator_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 ViewpointPackage.Literals.DSEMANTIC_DECORATOR__TARGET, true, false, true, null, null, null));
     }
 
@@ -82,7 +83,7 @@ IItemPropertySource {
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_DSemanticDecorator_type");
+        return getString("_UI_DSemanticDecorator_type"); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DViewItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DViewItemProvider.java
index 50010be1ab..a16926bb92 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DViewItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DViewItemProvider.java
@@ -72,8 +72,9 @@ public class DViewItemProvider extends ItemProviderAdapter implements IEditingDo
      * @generated
      */
     protected void addViewpointPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DView_viewpoint_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_DView_viewpoint_feature", "_UI_DView_type"), ViewpointPackage.Literals.DVIEW__VIEWPOINT, true, false, true, null, null, null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DView_viewpoint_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_DView_viewpoint_feature", "_UI_DView_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                ViewpointPackage.Literals.DVIEW__VIEWPOINT, true, false, true, null, null, null));
     }
 
     /**
@@ -117,7 +118,7 @@ public class DViewItemProvider extends ItemProviderAdapter implements IEditingDo
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/DView"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/DView")); //$NON-NLS-1$
     }
 
     /**
@@ -128,7 +129,7 @@ public class DViewItemProvider extends ItemProviderAdapter implements IEditingDo
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_DView_type");
+        return getString("_UI_DView_type"); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DecorationItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DecorationItemProvider.java
index e53f512ee1..a43682600b 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DecorationItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DecorationItemProvider.java
@@ -70,7 +70,8 @@ IItemPropertySource {
      */
     protected void addDescriptionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_Decoration_description_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Decoration_description_feature", "_UI_Decoration_type"),
+                getString("_UI_Decoration_description_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_Decoration_description_feature", "_UI_Decoration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 ViewpointPackage.Literals.DECORATION__DESCRIPTION, true, false, true, null, null, null));
     }
 
@@ -82,7 +83,7 @@ IItemPropertySource {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/Decoration"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/Decoration")); //$NON-NLS-1$
     }
 
     /**
@@ -93,7 +94,7 @@ IItemPropertySource {
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_Decoration_type");
+        return getString("_UI_Decoration_type"); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/LabelStyleItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/LabelStyleItemProvider.java
index abb4541b11..ff1cd3f749 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/LabelStyleItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/LabelStyleItemProvider.java
@@ -66,7 +66,8 @@ public class LabelStyleItemProvider extends BasicLabelStyleItemProvider {
      */
     protected void addLabelAlignmentPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_LabelStyle_labelAlignment_feature"), getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_labelAlignment_feature", "_UI_LabelStyle_type"),
+                getString("_UI_LabelStyle_labelAlignment_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_labelAlignment_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 ViewpointPackage.Literals.LABEL_STYLE__LABEL_ALIGNMENT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -78,7 +79,7 @@ public class LabelStyleItemProvider extends BasicLabelStyleItemProvider {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/LabelStyle"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/LabelStyle")); //$NON-NLS-1$
     }
 
     /**
@@ -90,7 +91,7 @@ public class LabelStyleItemProvider extends BasicLabelStyleItemProvider {
     @Override
     public String getText(Object object) {
         LabelStyle labelStyle = (LabelStyle) object;
-        return getString("_UI_LabelStyle_type") + " " + labelStyle.getLabelSize();
+        return getString("_UI_LabelStyle_type") + " " + labelStyle.getLabelSize(); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/MetaModelExtensionItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/MetaModelExtensionItemProvider.java
index eb72d7574d..f88e5779d3 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/MetaModelExtensionItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/MetaModelExtensionItemProvider.java
@@ -70,8 +70,8 @@ IItemPropertySource {
      */
     protected void addExtensionGroupPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_MetaModelExtension_extensionGroup_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_MetaModelExtension_extensionGroup_feature", "_UI_MetaModelExtension_type"),
+                getString("_UI_MetaModelExtension_extensionGroup_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_MetaModelExtension_extensionGroup_feature", "_UI_MetaModelExtension_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 ViewpointPackage.Literals.META_MODEL_EXTENSION__EXTENSION_GROUP, true, false, true, null, null, null));
     }
 
@@ -83,7 +83,7 @@ IItemPropertySource {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/MetaModelExtension"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/MetaModelExtension")); //$NON-NLS-1$
     }
 
     /**
@@ -94,7 +94,7 @@ IItemPropertySource {
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_MetaModelExtension_type");
+        return getString("_UI_MetaModelExtension_type"); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/SessionManagerEObjectItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/SessionManagerEObjectItemProvider.java
index 775e2cf87a..3ecf2feb5a 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/SessionManagerEObjectItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/SessionManagerEObjectItemProvider.java
@@ -105,7 +105,7 @@ IItemPropertySource {
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/SessionManagerEObject"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/SessionManagerEObject")); //$NON-NLS-1$
     }
 
     /**
@@ -116,7 +116,7 @@ IItemPropertySource {
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_SessionManagerEObject_type");
+        return getString("_UI_SessionManagerEObject_type"); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/StyleItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/StyleItemProvider.java
index c86423ffdb..6e4743d09d 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/StyleItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/StyleItemProvider.java
@@ -71,7 +71,8 @@ public class StyleItemProvider extends ItemProviderAdapter implements IEditingDo
      */
     protected void addCustomFeaturesPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_Customizable_customFeatures_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Customizable_customFeatures_feature", "_UI_Customizable_type"),
+                getString("_UI_Customizable_customFeatures_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_Customizable_customFeatures_feature", "_UI_Customizable_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 ViewpointPackage.Literals.CUSTOMIZABLE__CUSTOM_FEATURES, true, false, true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -83,7 +84,8 @@ public class StyleItemProvider extends ItemProviderAdapter implements IEditingDo
      */
     protected void addDescriptionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_Style_description_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Style_description_feature", "_UI_Style_type"),
+                getString("_UI_Style_description_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_Style_description_feature", "_UI_Style_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 ViewpointPackage.Literals.STYLE__DESCRIPTION, true, false, true, null, null, null));
     }
 
@@ -95,7 +97,7 @@ public class StyleItemProvider extends ItemProviderAdapter implements IEditingDo
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_Style_type");
+        return getString("_UI_Style_type"); //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/UIStateItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/UIStateItemProvider.java
index 3b146a5cf3..c6babae82a 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/UIStateItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/UIStateItemProvider.java
@@ -73,7 +73,8 @@ public class UIStateItemProvider extends ItemProviderAdapter implements IEditing
      */
     protected void addInverseSelectionOrderPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_UIState_inverseSelectionOrder_feature"), getString("_UI_PropertyDescriptor_description", "_UI_UIState_inverseSelectionOrder_feature", "_UI_UIState_type"),
+                getString("_UI_UIState_inverseSelectionOrder_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_UIState_inverseSelectionOrder_feature", "_UI_UIState_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 ViewpointPackage.Literals.UI_STATE__INVERSE_SELECTION_ORDER, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
     }
 
@@ -85,7 +86,8 @@ public class UIStateItemProvider extends ItemProviderAdapter implements IEditing
      */
     protected void addElementsToSelectPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_UIState_elementsToSelect_feature"), getString("_UI_PropertyDescriptor_description", "_UI_UIState_elementsToSelect_feature", "_UI_UIState_type"),
+                getString("_UI_UIState_elementsToSelect_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_UIState_elementsToSelect_feature", "_UI_UIState_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 ViewpointPackage.Literals.UI_STATE__ELEMENTS_TO_SELECT, true, false, true, null, null, null));
     }
 
@@ -98,7 +100,7 @@ public class UIStateItemProvider extends ItemProviderAdapter implements IEditing
     @Override
     public String getText(Object object) {
         UIState uiState = (UIState) object;
-        return getString("_UI_UIState_type") + " " + uiState.isInverseSelectionOrder();
+        return getString("_UI_UIState_type") + " " + uiState.isInverseSelectionOrder(); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/AddFeatureContribution.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/AddFeatureContribution.java
index d5affb6f91..a327473170 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/AddFeatureContribution.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/AddFeatureContribution.java
@@ -4,10 +4,10 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Obeo - initial API and implementation
- * 
+ *
  */
 package org.eclipse.sirius.description.contribution;
 
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/ClearFeatureContribution.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/ClearFeatureContribution.java
index e661703784..54d6ce5db7 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/ClearFeatureContribution.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/ClearFeatureContribution.java
@@ -4,10 +4,10 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Obeo - initial API and implementation
- * 
+ *
  */
 package org.eclipse.sirius.description.contribution;
 
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/ComputedEObjectReference.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/ComputedEObjectReference.java
index cb34d30c90..ce8f3d4047 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/ComputedEObjectReference.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/ComputedEObjectReference.java
@@ -4,10 +4,10 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Obeo - initial API and implementation
- * 
+ *
  */
 package org.eclipse.sirius.description.contribution;
 
@@ -37,7 +37,7 @@ public interface ComputedEObjectReference extends EObjectReference {
      * there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     * 
+     *
      * @return the value of the '<em>Value Expression</em>' attribute.
      * @see #setValueExpression(String)
      * @see org.eclipse.sirius.description.contribution.ContributionPackage#getComputedEObjectReference_ValueExpression()
@@ -51,7 +51,7 @@ public interface ComputedEObjectReference extends EObjectReference {
      * {@link org.eclipse.sirius.description.contribution.ComputedEObjectReference#getValueExpression
      * <em>Value Expression</em>}' attribute. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @param value
      *            the new value of the '<em>Value Expression</em>' attribute.
      * @see #getValueExpression()
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/Contribution.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/Contribution.java
index 0dec538a85..529495e98f 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/Contribution.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/Contribution.java
@@ -4,10 +4,10 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Obeo - initial API and implementation
- * 
+ *
  */
 package org.eclipse.sirius.description.contribution;
 
@@ -52,7 +52,7 @@ public interface Contribution extends EObject {
      * clear, there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     * 
+     *
      * @return the value of the '<em>Source</em>' containment reference.
      * @see #setSource(EObjectReference)
      * @see org.eclipse.sirius.description.contribution.ContributionPackage#getContribution_Source()
@@ -66,7 +66,7 @@ public interface Contribution extends EObject {
      * {@link org.eclipse.sirius.description.contribution.Contribution#getSource
      * <em>Source</em>}' containment reference. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @param value
      *            the new value of the '<em>Source</em>' containment reference.
      * @see #getSource()
@@ -82,7 +82,7 @@ public interface Contribution extends EObject {
      * clear, there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     * 
+     *
      * @return the value of the '<em>Target</em>' containment reference.
      * @see #setTarget(EObjectReference)
      * @see org.eclipse.sirius.description.contribution.ContributionPackage#getContribution_Target()
@@ -96,7 +96,7 @@ public interface Contribution extends EObject {
      * {@link org.eclipse.sirius.description.contribution.Contribution#getTarget
      * <em>Target</em>}' containment reference. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @param value
      *            the new value of the '<em>Target</em>' containment reference.
      * @see #getTarget()
@@ -114,7 +114,7 @@ public interface Contribution extends EObject {
      * isn't clear, there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     * 
+     *
      * @return the value of the '<em>Feature Mask</em>' containment reference
      *         list.
      * @see org.eclipse.sirius.description.contribution.ContributionPackage#getContribution_FeatureMask()
@@ -134,7 +134,7 @@ public interface Contribution extends EObject {
      * list isn't clear, there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     * 
+     *
      * @return the value of the '<em>Sub Contributions</em>' containment
      *         reference list.
      * @see org.eclipse.sirius.description.contribution.ContributionPackage#getContribution_SubContributions()
@@ -151,7 +151,7 @@ public interface Contribution extends EObject {
      * really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     * 
+     *
      * @return the value of the '<em>Description</em>' attribute.
      * @see #setDescription(String)
      * @see org.eclipse.sirius.description.contribution.ContributionPackage#getContribution_Description()
@@ -165,7 +165,7 @@ public interface Contribution extends EObject {
      * {@link org.eclipse.sirius.description.contribution.Contribution#getDescription
      * <em>Description</em>}' attribute. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @param value
      *            the new value of the '<em>Description</em>' attribute.
      * @see #getDescription()
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/ContributionFactory.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/ContributionFactory.java
index 3661d0e5fd..475eb019df 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/ContributionFactory.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/ContributionFactory.java
@@ -4,10 +4,10 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Obeo - initial API and implementation
- * 
+ *
  */
 package org.eclipse.sirius.description.contribution;
 
@@ -16,7 +16,7 @@ import org.eclipse.emf.ecore.EFactory;
 /**
  * <!-- begin-user-doc --> 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.sirius.description.contribution.ContributionPackage
  * @generated
  */
@@ -24,7 +24,7 @@ public interface ContributionFactory extends EFactory {
     /**
      * The singleton instance of the factory. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     ContributionFactory eINSTANCE = org.eclipse.sirius.description.contribution.impl.ContributionFactoryImpl.init();
@@ -32,7 +32,7 @@ public interface ContributionFactory extends EFactory {
     /**
      * Returns a new object of class '<em>Ignore Feature Contribution</em>'.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @return a new object of class '<em>Ignore Feature Contribution</em>'.
      * @generated
      */
@@ -41,7 +41,7 @@ public interface ContributionFactory extends EFactory {
     /**
      * Returns a new object of class '<em>Set Feature Contribution</em>'. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @return a new object of class '<em>Set Feature Contribution</em>'.
      * @generated
      */
@@ -50,7 +50,7 @@ public interface ContributionFactory extends EFactory {
     /**
      * Returns a new object of class '<em>Add Feature Contribution</em>'. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @return a new object of class '<em>Add Feature Contribution</em>'.
      * @generated
      */
@@ -59,7 +59,7 @@ public interface ContributionFactory extends EFactory {
     /**
      * Returns a new object of class '<em>Remove Feature Contribution</em>'.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @return a new object of class '<em>Remove Feature Contribution</em>'.
      * @generated
      */
@@ -68,7 +68,7 @@ public interface ContributionFactory extends EFactory {
     /**
      * Returns a new object of class '<em>Clear Feature Contribution</em>'. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @return a new object of class '<em>Clear Feature Contribution</em>'.
      * @generated
      */
@@ -77,7 +77,7 @@ public interface ContributionFactory extends EFactory {
     /**
      * Returns a new object of class '<em>Reset Feature Contribution</em>'. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @return a new object of class '<em>Reset Feature Contribution</em>'.
      * @generated
      */
@@ -86,7 +86,7 @@ public interface ContributionFactory extends EFactory {
     /**
      * Returns a new object of class '<em>Direct EObject Reference</em>'. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @return a new object of class '<em>Direct EObject Reference</em>'.
      * @generated
      */
@@ -95,7 +95,7 @@ public interface ContributionFactory extends EFactory {
     /**
      * Returns a new object of class '<em>Computed EObject Reference</em>'. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @return a new object of class '<em>Computed EObject Reference</em>'.
      * @generated
      */
@@ -104,7 +104,7 @@ public interface ContributionFactory extends EFactory {
     /**
      * Returns a new object of class '<em>Contribution</em>'. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @return a new object of class '<em>Contribution</em>'.
      * @generated
      */
@@ -113,7 +113,7 @@ public interface ContributionFactory extends EFactory {
     /**
      * Returns a new object of class '<em>Point</em>'. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * 
+     *
      * @return a new object of class '<em>Point</em>'.
      * @generated
      */
@@ -122,7 +122,7 @@ public interface ContributionFactory 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/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/ContributionPackage.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/ContributionPackage.java
index e8515df091..82b3e5008f 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/ContributionPackage.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/ContributionPackage.java
@@ -4,10 +4,10 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Obeo - initial API and implementation
- * 
+ *
  */
 package org.eclipse.sirius.description.contribution;
 
@@ -26,7 +26,7 @@ import org.eclipse.emf.ecore.EReference;
  * <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
- * 
+ *
  * @see org.eclipse.sirius.description.contribution.ContributionFactory
  * @model kind="package"
  * @generated
@@ -34,21 +34,21 @@ import org.eclipse.emf.ecore.EReference;
 public interface ContributionPackage extends EPackage {
     /**
      * The package name. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     String eNAME = "contribution";
 
     /**
      * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     String eNS_URI = "http://www.eclipse.org/sirius/description/contribution/1.0.0";
 
     /**
      * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     String eNS_PREFIX = "contribution";
@@ -56,7 +56,7 @@ public interface ContributionPackage extends EPackage {
     /**
      * The singleton instance of the package. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     ContributionPackage eINSTANCE = org.eclipse.sirius.description.contribution.impl.ContributionPackageImpl.init();
@@ -66,7 +66,7 @@ public interface ContributionPackage extends EPackage {
      * {@link org.eclipse.sirius.description.contribution.impl.FeatureContributionImpl
      * <em>Feature Contribution</em>}' class. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @see org.eclipse.sirius.description.contribution.impl.FeatureContributionImpl
      * @see org.eclipse.sirius.description.contribution.impl.ContributionPackageImpl#getFeatureContribution()
      * @generated
@@ -76,7 +76,7 @@ public interface ContributionPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Source Feature</b></em>' reference. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -85,7 +85,7 @@ public interface ContributionPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Target Feature</b></em>' reference. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -94,7 +94,7 @@ public interface ContributionPackage extends EPackage {
     /**
      * The number of structural features of the '<em>Feature Contribution</em>'
      * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -105,7 +105,7 @@ public interface ContributionPackage extends EPackage {
      * {@link org.eclipse.sirius.description.contribution.impl.IgnoreFeatureContributionImpl
      * <em>Ignore Feature Contribution</em>}' class. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * 
+     *
      * @see org.eclipse.sirius.description.contribution.impl.IgnoreFeatureContributionImpl
      * @see org.eclipse.sirius.description.contribution.impl.ContributionPackageImpl#getIgnoreFeatureContribution()
      * @generated
@@ -115,37 +115,37 @@ public interface ContributionPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Source Feature</b></em>' reference. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
-    int IGNORE_FEATURE_CONTRIBUTION__SOURCE_FEATURE = FEATURE_CONTRIBUTION__SOURCE_FEATURE;
+    int IGNORE_FEATURE_CONTRIBUTION__SOURCE_FEATURE = ContributionPackage.FEATURE_CONTRIBUTION__SOURCE_FEATURE;
 
     /**
      * The feature id for the '<em><b>Target Feature</b></em>' reference. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
-    int IGNORE_FEATURE_CONTRIBUTION__TARGET_FEATURE = FEATURE_CONTRIBUTION__TARGET_FEATURE;
+    int IGNORE_FEATURE_CONTRIBUTION__TARGET_FEATURE = ContributionPackage.FEATURE_CONTRIBUTION__TARGET_FEATURE;
 
     /**
      * The number of structural features of the '
      * <em>Ignore Feature Contribution</em>' class. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
-    int IGNORE_FEATURE_CONTRIBUTION_FEATURE_COUNT = FEATURE_CONTRIBUTION_FEATURE_COUNT + 0;
+    int IGNORE_FEATURE_CONTRIBUTION_FEATURE_COUNT = ContributionPackage.FEATURE_CONTRIBUTION_FEATURE_COUNT + 0;
 
     /**
      * The meta object id for the '
      * {@link org.eclipse.sirius.description.contribution.impl.SetFeatureContributionImpl
      * <em>Set Feature Contribution</em>}' class. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @see org.eclipse.sirius.description.contribution.impl.SetFeatureContributionImpl
      * @see org.eclipse.sirius.description.contribution.impl.ContributionPackageImpl#getSetFeatureContribution()
      * @generated
@@ -155,37 +155,37 @@ public interface ContributionPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Source Feature</b></em>' reference. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
-    int SET_FEATURE_CONTRIBUTION__SOURCE_FEATURE = FEATURE_CONTRIBUTION__SOURCE_FEATURE;
+    int SET_FEATURE_CONTRIBUTION__SOURCE_FEATURE = ContributionPackage.FEATURE_CONTRIBUTION__SOURCE_FEATURE;
 
     /**
      * The feature id for the '<em><b>Target Feature</b></em>' reference. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
-    int SET_FEATURE_CONTRIBUTION__TARGET_FEATURE = FEATURE_CONTRIBUTION__TARGET_FEATURE;
+    int SET_FEATURE_CONTRIBUTION__TARGET_FEATURE = ContributionPackage.FEATURE_CONTRIBUTION__TARGET_FEATURE;
 
     /**
      * The number of structural features of the '
      * <em>Set Feature Contribution</em>' class. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
-    int SET_FEATURE_CONTRIBUTION_FEATURE_COUNT = FEATURE_CONTRIBUTION_FEATURE_COUNT + 0;
+    int SET_FEATURE_CONTRIBUTION_FEATURE_COUNT = ContributionPackage.FEATURE_CONTRIBUTION_FEATURE_COUNT + 0;
 
     /**
      * The meta object id for the '
      * {@link org.eclipse.sirius.description.contribution.impl.AddFeatureContributionImpl
      * <em>Add Feature Contribution</em>}' class. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @see org.eclipse.sirius.description.contribution.impl.AddFeatureContributionImpl
      * @see org.eclipse.sirius.description.contribution.impl.ContributionPackageImpl#getAddFeatureContribution()
      * @generated
@@ -195,37 +195,37 @@ public interface ContributionPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Source Feature</b></em>' reference. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
-    int ADD_FEATURE_CONTRIBUTION__SOURCE_FEATURE = FEATURE_CONTRIBUTION__SOURCE_FEATURE;
+    int ADD_FEATURE_CONTRIBUTION__SOURCE_FEATURE = ContributionPackage.FEATURE_CONTRIBUTION__SOURCE_FEATURE;
 
     /**
      * The feature id for the '<em><b>Target Feature</b></em>' reference. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
-    int ADD_FEATURE_CONTRIBUTION__TARGET_FEATURE = FEATURE_CONTRIBUTION__TARGET_FEATURE;
+    int ADD_FEATURE_CONTRIBUTION__TARGET_FEATURE = ContributionPackage.FEATURE_CONTRIBUTION__TARGET_FEATURE;
 
     /**
      * The number of structural features of the '
      * <em>Add Feature Contribution</em>' class. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
-    int ADD_FEATURE_CONTRIBUTION_FEATURE_COUNT = FEATURE_CONTRIBUTION_FEATURE_COUNT + 0;
+    int ADD_FEATURE_CONTRIBUTION_FEATURE_COUNT = ContributionPackage.FEATURE_CONTRIBUTION_FEATURE_COUNT + 0;
 
     /**
      * The meta object id for the '
      * {@link org.eclipse.sirius.description.contribution.impl.RemoveFeatureContributionImpl
      * <em>Remove Feature Contribution</em>}' class. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * 
+     *
      * @see org.eclipse.sirius.description.contribution.impl.RemoveFeatureContributionImpl
      * @see org.eclipse.sirius.description.contribution.impl.ContributionPackageImpl#getRemoveFeatureContribution()
      * @generated
@@ -235,37 +235,37 @@ public interface ContributionPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Source Feature</b></em>' reference. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
-    int REMOVE_FEATURE_CONTRIBUTION__SOURCE_FEATURE = FEATURE_CONTRIBUTION__SOURCE_FEATURE;
+    int REMOVE_FEATURE_CONTRIBUTION__SOURCE_FEATURE = ContributionPackage.FEATURE_CONTRIBUTION__SOURCE_FEATURE;
 
     /**
      * The feature id for the '<em><b>Target Feature</b></em>' reference. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
-    int REMOVE_FEATURE_CONTRIBUTION__TARGET_FEATURE = FEATURE_CONTRIBUTION__TARGET_FEATURE;
+    int REMOVE_FEATURE_CONTRIBUTION__TARGET_FEATURE = ContributionPackage.FEATURE_CONTRIBUTION__TARGET_FEATURE;
 
     /**
      * The number of structural features of the '
      * <em>Remove Feature Contribution</em>' class. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
-    int REMOVE_FEATURE_CONTRIBUTION_FEATURE_COUNT = FEATURE_CONTRIBUTION_FEATURE_COUNT + 0;
+    int REMOVE_FEATURE_CONTRIBUTION_FEATURE_COUNT = ContributionPackage.FEATURE_CONTRIBUTION_FEATURE_COUNT + 0;
 
     /**
      * The meta object id for the '
      * {@link org.eclipse.sirius.description.contribution.impl.ClearFeatureContributionImpl
      * <em>Clear Feature Contribution</em>}' class. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @see org.eclipse.sirius.description.contribution.impl.ClearFeatureContributionImpl
      * @see org.eclipse.sirius.description.contribution.impl.ContributionPackageImpl#getClearFeatureContribution()
      * @generated
@@ -275,37 +275,37 @@ public interface ContributionPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Source Feature</b></em>' reference. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
-    int CLEAR_FEATURE_CONTRIBUTION__SOURCE_FEATURE = FEATURE_CONTRIBUTION__SOURCE_FEATURE;
+    int CLEAR_FEATURE_CONTRIBUTION__SOURCE_FEATURE = ContributionPackage.FEATURE_CONTRIBUTION__SOURCE_FEATURE;
 
     /**
      * The feature id for the '<em><b>Target Feature</b></em>' reference. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
-    int CLEAR_FEATURE_CONTRIBUTION__TARGET_FEATURE = FEATURE_CONTRIBUTION__TARGET_FEATURE;
+    int CLEAR_FEATURE_CONTRIBUTION__TARGET_FEATURE = ContributionPackage.FEATURE_CONTRIBUTION__TARGET_FEATURE;
 
     /**
      * The number of structural features of the '
      * <em>Clear Feature Contribution</em>' class. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
-    int CLEAR_FEATURE_CONTRIBUTION_FEATURE_COUNT = FEATURE_CONTRIBUTION_FEATURE_COUNT + 0;
+    int CLEAR_FEATURE_CONTRIBUTION_FEATURE_COUNT = ContributionPackage.FEATURE_CONTRIBUTION_FEATURE_COUNT + 0;
 
     /**
      * The meta object id for the '
      * {@link org.eclipse.sirius.description.contribution.impl.ResetFeatureContributionImpl
      * <em>Reset Feature Contribution</em>}' class. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @see org.eclipse.sirius.description.contribution.impl.ResetFeatureContributionImpl
      * @see org.eclipse.sirius.description.contribution.impl.ContributionPackageImpl#getResetFeatureContribution()
      * @generated
@@ -315,37 +315,37 @@ public interface ContributionPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Source Feature</b></em>' reference. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
-    int RESET_FEATURE_CONTRIBUTION__SOURCE_FEATURE = FEATURE_CONTRIBUTION__SOURCE_FEATURE;
+    int RESET_FEATURE_CONTRIBUTION__SOURCE_FEATURE = ContributionPackage.FEATURE_CONTRIBUTION__SOURCE_FEATURE;
 
     /**
      * The feature id for the '<em><b>Target Feature</b></em>' reference. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
-    int RESET_FEATURE_CONTRIBUTION__TARGET_FEATURE = FEATURE_CONTRIBUTION__TARGET_FEATURE;
+    int RESET_FEATURE_CONTRIBUTION__TARGET_FEATURE = ContributionPackage.FEATURE_CONTRIBUTION__TARGET_FEATURE;
 
     /**
      * The number of structural features of the '
      * <em>Reset Feature Contribution</em>' class. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
-    int RESET_FEATURE_CONTRIBUTION_FEATURE_COUNT = FEATURE_CONTRIBUTION_FEATURE_COUNT + 0;
+    int RESET_FEATURE_CONTRIBUTION_FEATURE_COUNT = ContributionPackage.FEATURE_CONTRIBUTION_FEATURE_COUNT + 0;
 
     /**
      * The meta object id for the '
      * {@link org.eclipse.sirius.description.contribution.EObjectReference
      * <em>EObject Reference</em>}' class. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @see org.eclipse.sirius.description.contribution.EObjectReference
      * @see org.eclipse.sirius.description.contribution.impl.ContributionPackageImpl#getEObjectReference()
      * @generated
@@ -355,7 +355,7 @@ public interface ContributionPackage extends EPackage {
     /**
      * The number of structural features of the '<em>EObject Reference</em>'
      * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -366,7 +366,7 @@ public interface ContributionPackage extends EPackage {
      * {@link org.eclipse.sirius.description.contribution.impl.DirectEObjectReferenceImpl
      * <em>Direct EObject Reference</em>}' class. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @see org.eclipse.sirius.description.contribution.impl.DirectEObjectReferenceImpl
      * @see org.eclipse.sirius.description.contribution.impl.ContributionPackageImpl#getDirectEObjectReference()
      * @generated
@@ -376,28 +376,28 @@ public interface ContributionPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Value</b></em>' reference. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
-    int DIRECT_EOBJECT_REFERENCE__VALUE = EOBJECT_REFERENCE_FEATURE_COUNT + 0;
+    int DIRECT_EOBJECT_REFERENCE__VALUE = ContributionPackage.EOBJECT_REFERENCE_FEATURE_COUNT + 0;
 
     /**
      * The number of structural features of the '
      * <em>Direct EObject Reference</em>' class. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
-    int DIRECT_EOBJECT_REFERENCE_FEATURE_COUNT = EOBJECT_REFERENCE_FEATURE_COUNT + 1;
+    int DIRECT_EOBJECT_REFERENCE_FEATURE_COUNT = ContributionPackage.EOBJECT_REFERENCE_FEATURE_COUNT + 1;
 
     /**
      * The meta object id for the '
      * {@link org.eclipse.sirius.description.contribution.impl.ComputedEObjectReferenceImpl
      * <em>Computed EObject Reference</em>}' class. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @see org.eclipse.sirius.description.contribution.impl.ComputedEObjectReferenceImpl
      * @see org.eclipse.sirius.description.contribution.impl.ContributionPackageImpl#getComputedEObjectReference()
      * @generated
@@ -407,28 +407,28 @@ public interface ContributionPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Value Expression</b></em>' attribute. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
-    int COMPUTED_EOBJECT_REFERENCE__VALUE_EXPRESSION = EOBJECT_REFERENCE_FEATURE_COUNT + 0;
+    int COMPUTED_EOBJECT_REFERENCE__VALUE_EXPRESSION = ContributionPackage.EOBJECT_REFERENCE_FEATURE_COUNT + 0;
 
     /**
      * The number of structural features of the '
      * <em>Computed EObject Reference</em>' class. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
-    int COMPUTED_EOBJECT_REFERENCE_FEATURE_COUNT = EOBJECT_REFERENCE_FEATURE_COUNT + 1;
+    int COMPUTED_EOBJECT_REFERENCE_FEATURE_COUNT = ContributionPackage.EOBJECT_REFERENCE_FEATURE_COUNT + 1;
 
     /**
      * The meta object id for the '
      * {@link org.eclipse.sirius.description.contribution.impl.ContributionImpl
      * <em>Contribution</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @see org.eclipse.sirius.description.contribution.impl.ContributionImpl
      * @see org.eclipse.sirius.description.contribution.impl.ContributionPackageImpl#getContribution()
      * @generated
@@ -438,7 +438,7 @@ public interface ContributionPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Source</b></em>' containment reference.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -447,7 +447,7 @@ public interface ContributionPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Target</b></em>' containment reference.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -456,7 +456,7 @@ public interface ContributionPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Feature Mask</b></em>' containment
      * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -465,7 +465,7 @@ public interface ContributionPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Sub Contributions</b></em>' containment
      * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -474,7 +474,7 @@ public interface ContributionPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Description</b></em>' attribute. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -483,7 +483,7 @@ public interface ContributionPackage extends EPackage {
     /**
      * The number of structural features of the '<em>Contribution</em>' class.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -493,7 +493,7 @@ public interface ContributionPackage extends EPackage {
      * The meta object id for the '
      * {@link org.eclipse.sirius.description.contribution.impl.ContributionProviderImpl
      * <em>Provider</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.eclipse.sirius.description.contribution.impl.ContributionProviderImpl
      * @see org.eclipse.sirius.description.contribution.impl.ContributionPackageImpl#getContributionProvider()
      * @generated
@@ -503,7 +503,7 @@ public interface ContributionPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Contributions</b></em>' containment
      * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -512,7 +512,7 @@ public interface ContributionPackage extends EPackage {
     /**
      * The number of structural features of the '<em>Provider</em>' class. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -522,7 +522,7 @@ public interface ContributionPackage extends EPackage {
      * The meta object id for the '
      * {@link org.eclipse.sirius.description.contribution.impl.ContributionPointImpl
      * <em>Point</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.eclipse.sirius.description.contribution.impl.ContributionPointImpl
      * @see org.eclipse.sirius.description.contribution.impl.ContributionPackageImpl#getContributionPoint()
      * @generated
@@ -532,7 +532,7 @@ public interface ContributionPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Origin</b></em>' attribute. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -541,7 +541,7 @@ public interface ContributionPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Contributed</b></em>' reference. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -550,7 +550,7 @@ public interface ContributionPackage extends EPackage {
     /**
      * The number of structural features of the '<em>Point</em>' class. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -561,7 +561,7 @@ public interface ContributionPackage extends EPackage {
      * {@link org.eclipse.sirius.description.contribution.FeatureContribution
      * <em>Feature Contribution</em>}'. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @return the meta object for class '<em>Feature Contribution</em>'.
      * @see org.eclipse.sirius.description.contribution.FeatureContribution
      * @generated
@@ -572,7 +572,7 @@ public interface ContributionPackage extends EPackage {
      * Returns the meta object for the reference '
      * {@link org.eclipse.sirius.description.contribution.FeatureContribution#getSourceFeature
      * <em>Source Feature</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @return the meta object for the reference '<em>Source Feature</em>'.
      * @see org.eclipse.sirius.description.contribution.FeatureContribution#getSourceFeature()
      * @see #getFeatureContribution()
@@ -584,7 +584,7 @@ public interface ContributionPackage extends EPackage {
      * Returns the meta object for the reference '
      * {@link org.eclipse.sirius.description.contribution.FeatureContribution#getTargetFeature
      * <em>Target Feature</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @return the meta object for the reference '<em>Target Feature</em>'.
      * @see org.eclipse.sirius.description.contribution.FeatureContribution#getTargetFeature()
      * @see #getFeatureContribution()
@@ -597,7 +597,7 @@ public interface ContributionPackage extends EPackage {
      * {@link org.eclipse.sirius.description.contribution.IgnoreFeatureContribution
      * <em>Ignore Feature Contribution</em>}'. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @return the meta object for class '<em>Ignore Feature Contribution</em>'.
      * @see org.eclipse.sirius.description.contribution.IgnoreFeatureContribution
      * @generated
@@ -609,7 +609,7 @@ public interface ContributionPackage extends EPackage {
      * {@link org.eclipse.sirius.description.contribution.SetFeatureContribution
      * <em>Set Feature Contribution</em>}'. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @return the meta object for class '<em>Set Feature Contribution</em>'.
      * @see org.eclipse.sirius.description.contribution.SetFeatureContribution
      * @generated
@@ -621,7 +621,7 @@ public interface ContributionPackage extends EPackage {
      * {@link org.eclipse.sirius.description.contribution.AddFeatureContribution
      * <em>Add Feature Contribution</em>}'. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @return the meta object for class '<em>Add Feature Contribution</em>'.
      * @see org.eclipse.sirius.description.contribution.AddFeatureContribution
      * @generated
@@ -633,7 +633,7 @@ public interface ContributionPackage extends EPackage {
      * {@link org.eclipse.sirius.description.contribution.RemoveFeatureContribution
      * <em>Remove Feature Contribution</em>}'. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @return the meta object for class '<em>Remove Feature Contribution</em>'.
      * @see org.eclipse.sirius.description.contribution.RemoveFeatureContribution
      * @generated
@@ -645,7 +645,7 @@ public interface ContributionPackage extends EPackage {
      * {@link org.eclipse.sirius.description.contribution.ClearFeatureContribution
      * <em>Clear Feature Contribution</em>}'. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @return the meta object for class '<em>Clear Feature Contribution</em>'.
      * @see org.eclipse.sirius.description.contribution.ClearFeatureContribution
      * @generated
@@ -657,7 +657,7 @@ public interface ContributionPackage extends EPackage {
      * {@link org.eclipse.sirius.description.contribution.ResetFeatureContribution
      * <em>Reset Feature Contribution</em>}'. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @return the meta object for class '<em>Reset Feature Contribution</em>'.
      * @see org.eclipse.sirius.description.contribution.ResetFeatureContribution
      * @generated
@@ -669,7 +669,7 @@ public interface ContributionPackage extends EPackage {
      * {@link org.eclipse.sirius.description.contribution.EObjectReference
      * <em>EObject Reference</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @return the meta object for class '<em>EObject Reference</em>'.
      * @see org.eclipse.sirius.description.contribution.EObjectReference
      * @generated
@@ -681,7 +681,7 @@ public interface ContributionPackage extends EPackage {
      * {@link org.eclipse.sirius.description.contribution.DirectEObjectReference
      * <em>Direct EObject Reference</em>}'. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @return the meta object for class '<em>Direct EObject Reference</em>'.
      * @see org.eclipse.sirius.description.contribution.DirectEObjectReference
      * @generated
@@ -692,7 +692,7 @@ public interface ContributionPackage extends EPackage {
      * Returns the meta object for the reference '
      * {@link org.eclipse.sirius.description.contribution.DirectEObjectReference#getValue
      * <em>Value</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @return the meta object for the reference '<em>Value</em>'.
      * @see org.eclipse.sirius.description.contribution.DirectEObjectReference#getValue()
      * @see #getDirectEObjectReference()
@@ -705,7 +705,7 @@ public interface ContributionPackage extends EPackage {
      * {@link org.eclipse.sirius.description.contribution.ComputedEObjectReference
      * <em>Computed EObject Reference</em>}'. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @return the meta object for class '<em>Computed EObject Reference</em>'.
      * @see org.eclipse.sirius.description.contribution.ComputedEObjectReference
      * @generated
@@ -717,7 +717,7 @@ public interface ContributionPackage extends EPackage {
      * {@link org.eclipse.sirius.description.contribution.ComputedEObjectReference#getValueExpression
      * <em>Value Expression</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @return the meta object for the attribute '<em>Value Expression</em>'.
      * @see org.eclipse.sirius.description.contribution.ComputedEObjectReference#getValueExpression()
      * @see #getComputedEObjectReference()
@@ -729,7 +729,7 @@ public interface ContributionPackage extends EPackage {
      * Returns the meta object for class '
      * {@link org.eclipse.sirius.description.contribution.Contribution
      * <em>Contribution</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @return the meta object for class '<em>Contribution</em>'.
      * @see org.eclipse.sirius.description.contribution.Contribution
      * @generated
@@ -740,7 +740,7 @@ public interface ContributionPackage extends EPackage {
      * Returns the meta object for the containment reference '
      * {@link org.eclipse.sirius.description.contribution.Contribution#getSource
      * <em>Source</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @return the meta object for the containment reference '<em>Source</em>'.
      * @see org.eclipse.sirius.description.contribution.Contribution#getSource()
      * @see #getContribution()
@@ -752,7 +752,7 @@ public interface ContributionPackage extends EPackage {
      * Returns the meta object for the containment reference '
      * {@link org.eclipse.sirius.description.contribution.Contribution#getTarget
      * <em>Target</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @return the meta object for the containment reference '<em>Target</em>'.
      * @see org.eclipse.sirius.description.contribution.Contribution#getTarget()
      * @see #getContribution()
@@ -764,7 +764,7 @@ public interface ContributionPackage extends EPackage {
      * Returns the meta object for the containment reference list '
      * {@link org.eclipse.sirius.description.contribution.Contribution#getFeatureMask
      * <em>Feature Mask</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @return the meta object for the containment reference list '
      *         <em>Feature Mask</em>'.
      * @see org.eclipse.sirius.description.contribution.Contribution#getFeatureMask()
@@ -778,7 +778,7 @@ public interface ContributionPackage extends EPackage {
      * {@link org.eclipse.sirius.description.contribution.Contribution#getSubContributions
      * <em>Sub Contributions</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @return the meta object for the containment reference list '
      *         <em>Sub Contributions</em>'.
      * @see org.eclipse.sirius.description.contribution.Contribution#getSubContributions()
@@ -791,7 +791,7 @@ public interface ContributionPackage extends EPackage {
      * Returns the meta object for the attribute '
      * {@link org.eclipse.sirius.description.contribution.Contribution#getDescription
      * <em>Description</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @return the meta object for the attribute '<em>Description</em>'.
      * @see org.eclipse.sirius.description.contribution.Contribution#getDescription()
      * @see #getContribution()
@@ -803,7 +803,7 @@ public interface ContributionPackage extends EPackage {
      * Returns the meta object for class '
      * {@link org.eclipse.sirius.description.contribution.ContributionProvider
      * <em>Provider</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @return the meta object for class '<em>Provider</em>'.
      * @see org.eclipse.sirius.description.contribution.ContributionProvider
      * @generated
@@ -814,7 +814,7 @@ public interface ContributionPackage extends EPackage {
      * Returns the meta object for the containment reference list '
      * {@link org.eclipse.sirius.description.contribution.ContributionProvider#getContributions
      * <em>Contributions</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @return the meta object for the containment reference list '
      *         <em>Contributions</em>'.
      * @see org.eclipse.sirius.description.contribution.ContributionProvider#getContributions()
@@ -827,7 +827,7 @@ public interface ContributionPackage extends EPackage {
      * Returns the meta object for class '
      * {@link org.eclipse.sirius.description.contribution.ContributionPoint
      * <em>Point</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @return the meta object for class '<em>Point</em>'.
      * @see org.eclipse.sirius.description.contribution.ContributionPoint
      * @generated
@@ -838,7 +838,7 @@ public interface ContributionPackage extends EPackage {
      * Returns the meta object for the attribute '
      * {@link org.eclipse.sirius.description.contribution.ContributionPoint#getOrigin
      * <em>Origin</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @return the meta object for the attribute '<em>Origin</em>'.
      * @see org.eclipse.sirius.description.contribution.ContributionPoint#getOrigin()
      * @see #getContributionPoint()
@@ -850,7 +850,7 @@ public interface ContributionPackage extends EPackage {
      * Returns the meta object for the reference '
      * {@link org.eclipse.sirius.description.contribution.ContributionPoint#getContributed
      * <em>Contributed</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @return the meta object for the reference '<em>Contributed</em>'.
      * @see org.eclipse.sirius.description.contribution.ContributionPoint#getContributed()
      * @see #getContributionPoint()
@@ -861,7 +861,7 @@ public interface ContributionPackage 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
      */
@@ -877,7 +877,7 @@ public interface ContributionPackage extends EPackage {
      * <li>and each data type</li>
      * </ul>
      * <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     interface Literals {
@@ -886,254 +886,254 @@ public interface ContributionPackage extends EPackage {
          * {@link org.eclipse.sirius.description.contribution.impl.FeatureContributionImpl
          * <em>Feature Contribution</em>}' class. <!-- begin-user-doc --> <!--
          * end-user-doc -->
-         * 
+         *
          * @see org.eclipse.sirius.description.contribution.impl.FeatureContributionImpl
          * @see org.eclipse.sirius.description.contribution.impl.ContributionPackageImpl#getFeatureContribution()
          * @generated
          */
-        EClass FEATURE_CONTRIBUTION = eINSTANCE.getFeatureContribution();
+        EClass FEATURE_CONTRIBUTION = ContributionPackage.eINSTANCE.getFeatureContribution();
 
         /**
          * The meta object literal for the '<em><b>Source Feature</b></em>'
          * reference feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-         * 
+         *
          * @generated
          */
-        EReference FEATURE_CONTRIBUTION__SOURCE_FEATURE = eINSTANCE.getFeatureContribution_SourceFeature();
+        EReference FEATURE_CONTRIBUTION__SOURCE_FEATURE = ContributionPackage.eINSTANCE.getFeatureContribution_SourceFeature();
 
         /**
          * The meta object literal for the '<em><b>Target Feature</b></em>'
          * reference feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-         * 
+         *
          * @generated
          */
-        EReference FEATURE_CONTRIBUTION__TARGET_FEATURE = eINSTANCE.getFeatureContribution_TargetFeature();
+        EReference FEATURE_CONTRIBUTION__TARGET_FEATURE = ContributionPackage.eINSTANCE.getFeatureContribution_TargetFeature();
 
         /**
          * The meta object literal for the '
          * {@link org.eclipse.sirius.description.contribution.impl.IgnoreFeatureContributionImpl
          * <em>Ignore Feature Contribution</em>}' class. <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * 
+         *
          * @see org.eclipse.sirius.description.contribution.impl.IgnoreFeatureContributionImpl
          * @see org.eclipse.sirius.description.contribution.impl.ContributionPackageImpl#getIgnoreFeatureContribution()
          * @generated
          */
-        EClass IGNORE_FEATURE_CONTRIBUTION = eINSTANCE.getIgnoreFeatureContribution();
+        EClass IGNORE_FEATURE_CONTRIBUTION = ContributionPackage.eINSTANCE.getIgnoreFeatureContribution();
 
         /**
          * The meta object literal for the '
          * {@link org.eclipse.sirius.description.contribution.impl.SetFeatureContributionImpl
          * <em>Set Feature Contribution</em>}' class. <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * 
+         *
          * @see org.eclipse.sirius.description.contribution.impl.SetFeatureContributionImpl
          * @see org.eclipse.sirius.description.contribution.impl.ContributionPackageImpl#getSetFeatureContribution()
          * @generated
          */
-        EClass SET_FEATURE_CONTRIBUTION = eINSTANCE.getSetFeatureContribution();
+        EClass SET_FEATURE_CONTRIBUTION = ContributionPackage.eINSTANCE.getSetFeatureContribution();
 
         /**
          * The meta object literal for the '
          * {@link org.eclipse.sirius.description.contribution.impl.AddFeatureContributionImpl
          * <em>Add Feature Contribution</em>}' class. <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * 
+         *
          * @see org.eclipse.sirius.description.contribution.impl.AddFeatureContributionImpl
          * @see org.eclipse.sirius.description.contribution.impl.ContributionPackageImpl#getAddFeatureContribution()
          * @generated
          */
-        EClass ADD_FEATURE_CONTRIBUTION = eINSTANCE.getAddFeatureContribution();
+        EClass ADD_FEATURE_CONTRIBUTION = ContributionPackage.eINSTANCE.getAddFeatureContribution();
 
         /**
          * The meta object literal for the '
          * {@link org.eclipse.sirius.description.contribution.impl.RemoveFeatureContributionImpl
          * <em>Remove Feature Contribution</em>}' class. <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * 
+         *
          * @see org.eclipse.sirius.description.contribution.impl.RemoveFeatureContributionImpl
          * @see org.eclipse.sirius.description.contribution.impl.ContributionPackageImpl#getRemoveFeatureContribution()
          * @generated
          */
-        EClass REMOVE_FEATURE_CONTRIBUTION = eINSTANCE.getRemoveFeatureContribution();
+        EClass REMOVE_FEATURE_CONTRIBUTION = ContributionPackage.eINSTANCE.getRemoveFeatureContribution();
 
         /**
          * The meta object literal for the '
          * {@link org.eclipse.sirius.description.contribution.impl.ClearFeatureContributionImpl
          * <em>Clear Feature Contribution</em>}' class. <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * 
+         *
          * @see org.eclipse.sirius.description.contribution.impl.ClearFeatureContributionImpl
          * @see org.eclipse.sirius.description.contribution.impl.ContributionPackageImpl#getClearFeatureContribution()
          * @generated
          */
-        EClass CLEAR_FEATURE_CONTRIBUTION = eINSTANCE.getClearFeatureContribution();
+        EClass CLEAR_FEATURE_CONTRIBUTION = ContributionPackage.eINSTANCE.getClearFeatureContribution();
 
         /**
          * The meta object literal for the '
          * {@link org.eclipse.sirius.description.contribution.impl.ResetFeatureContributionImpl
          * <em>Reset Feature Contribution</em>}' class. <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * 
+         *
          * @see org.eclipse.sirius.description.contribution.impl.ResetFeatureContributionImpl
          * @see org.eclipse.sirius.description.contribution.impl.ContributionPackageImpl#getResetFeatureContribution()
          * @generated
          */
-        EClass RESET_FEATURE_CONTRIBUTION = eINSTANCE.getResetFeatureContribution();
+        EClass RESET_FEATURE_CONTRIBUTION = ContributionPackage.eINSTANCE.getResetFeatureContribution();
 
         /**
          * The meta object literal for the '
          * {@link org.eclipse.sirius.description.contribution.EObjectReference
          * <em>EObject Reference</em>}' class. <!-- begin-user-doc --> <!--
          * end-user-doc -->
-         * 
+         *
          * @see org.eclipse.sirius.description.contribution.EObjectReference
          * @see org.eclipse.sirius.description.contribution.impl.ContributionPackageImpl#getEObjectReference()
          * @generated
          */
-        EClass EOBJECT_REFERENCE = eINSTANCE.getEObjectReference();
+        EClass EOBJECT_REFERENCE = ContributionPackage.eINSTANCE.getEObjectReference();
 
         /**
          * The meta object literal for the '
          * {@link org.eclipse.sirius.description.contribution.impl.DirectEObjectReferenceImpl
          * <em>Direct EObject Reference</em>}' class. <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * 
+         *
          * @see org.eclipse.sirius.description.contribution.impl.DirectEObjectReferenceImpl
          * @see org.eclipse.sirius.description.contribution.impl.ContributionPackageImpl#getDirectEObjectReference()
          * @generated
          */
-        EClass DIRECT_EOBJECT_REFERENCE = eINSTANCE.getDirectEObjectReference();
+        EClass DIRECT_EOBJECT_REFERENCE = ContributionPackage.eINSTANCE.getDirectEObjectReference();
 
         /**
          * The meta object literal for the '<em><b>Value</b></em>' reference
          * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-         * 
+         *
          * @generated
          */
-        EReference DIRECT_EOBJECT_REFERENCE__VALUE = eINSTANCE.getDirectEObjectReference_Value();
+        EReference DIRECT_EOBJECT_REFERENCE__VALUE = ContributionPackage.eINSTANCE.getDirectEObjectReference_Value();
 
         /**
          * The meta object literal for the '
          * {@link org.eclipse.sirius.description.contribution.impl.ComputedEObjectReferenceImpl
          * <em>Computed EObject Reference</em>}' class. <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * 
+         *
          * @see org.eclipse.sirius.description.contribution.impl.ComputedEObjectReferenceImpl
          * @see org.eclipse.sirius.description.contribution.impl.ContributionPackageImpl#getComputedEObjectReference()
          * @generated
          */
-        EClass COMPUTED_EOBJECT_REFERENCE = eINSTANCE.getComputedEObjectReference();
+        EClass COMPUTED_EOBJECT_REFERENCE = ContributionPackage.eINSTANCE.getComputedEObjectReference();
 
         /**
          * The meta object literal for the '<em><b>Value Expression</b></em>'
          * attribute feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-         * 
+         *
          * @generated
          */
-        EAttribute COMPUTED_EOBJECT_REFERENCE__VALUE_EXPRESSION = eINSTANCE.getComputedEObjectReference_ValueExpression();
+        EAttribute COMPUTED_EOBJECT_REFERENCE__VALUE_EXPRESSION = ContributionPackage.eINSTANCE.getComputedEObjectReference_ValueExpression();
 
         /**
          * The meta object literal for the '
          * {@link org.eclipse.sirius.description.contribution.impl.ContributionImpl
          * <em>Contribution</em>}' class. <!-- begin-user-doc --> <!--
          * end-user-doc -->
-         * 
+         *
          * @see org.eclipse.sirius.description.contribution.impl.ContributionImpl
          * @see org.eclipse.sirius.description.contribution.impl.ContributionPackageImpl#getContribution()
          * @generated
          */
-        EClass CONTRIBUTION = eINSTANCE.getContribution();
+        EClass CONTRIBUTION = ContributionPackage.eINSTANCE.getContribution();
 
         /**
          * The meta object literal for the '<em><b>Source</b></em>' containment
          * reference feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-         * 
+         *
          * @generated
          */
-        EReference CONTRIBUTION__SOURCE = eINSTANCE.getContribution_Source();
+        EReference CONTRIBUTION__SOURCE = ContributionPackage.eINSTANCE.getContribution_Source();
 
         /**
          * The meta object literal for the '<em><b>Target</b></em>' containment
          * reference feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-         * 
+         *
          * @generated
          */
-        EReference CONTRIBUTION__TARGET = eINSTANCE.getContribution_Target();
+        EReference CONTRIBUTION__TARGET = ContributionPackage.eINSTANCE.getContribution_Target();
 
         /**
          * The meta object literal for the '<em><b>Feature Mask</b></em>'
          * containment reference list feature. <!-- begin-user-doc --> <!--
          * end-user-doc -->
-         * 
+         *
          * @generated
          */
-        EReference CONTRIBUTION__FEATURE_MASK = eINSTANCE.getContribution_FeatureMask();
+        EReference CONTRIBUTION__FEATURE_MASK = ContributionPackage.eINSTANCE.getContribution_FeatureMask();
 
         /**
          * The meta object literal for the '<em><b>Sub Contributions</b></em>'
          * containment reference list feature. <!-- begin-user-doc --> <!--
          * end-user-doc -->
-         * 
+         *
          * @generated
          */
-        EReference CONTRIBUTION__SUB_CONTRIBUTIONS = eINSTANCE.getContribution_SubContributions();
+        EReference CONTRIBUTION__SUB_CONTRIBUTIONS = ContributionPackage.eINSTANCE.getContribution_SubContributions();
 
         /**
          * The meta object literal for the '<em><b>Description</b></em>'
          * attribute feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-         * 
+         *
          * @generated
          */
-        EAttribute CONTRIBUTION__DESCRIPTION = eINSTANCE.getContribution_Description();
+        EAttribute CONTRIBUTION__DESCRIPTION = ContributionPackage.eINSTANCE.getContribution_Description();
 
         /**
          * The meta object literal for the '
          * {@link org.eclipse.sirius.description.contribution.impl.ContributionProviderImpl
          * <em>Provider</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc
          * -->
-         * 
+         *
          * @see org.eclipse.sirius.description.contribution.impl.ContributionProviderImpl
          * @see org.eclipse.sirius.description.contribution.impl.ContributionPackageImpl#getContributionProvider()
          * @generated
          */
-        EClass CONTRIBUTION_PROVIDER = eINSTANCE.getContributionProvider();
+        EClass CONTRIBUTION_PROVIDER = ContributionPackage.eINSTANCE.getContributionProvider();
 
         /**
          * The meta object literal for the '<em><b>Contributions</b></em>'
          * containment reference list feature. <!-- begin-user-doc --> <!--
          * end-user-doc -->
-         * 
+         *
          * @generated
          */
-        EReference CONTRIBUTION_PROVIDER__CONTRIBUTIONS = eINSTANCE.getContributionProvider_Contributions();
+        EReference CONTRIBUTION_PROVIDER__CONTRIBUTIONS = ContributionPackage.eINSTANCE.getContributionProvider_Contributions();
 
         /**
          * The meta object literal for the '
          * {@link org.eclipse.sirius.description.contribution.impl.ContributionPointImpl
          * <em>Point</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-         * 
+         *
          * @see org.eclipse.sirius.description.contribution.impl.ContributionPointImpl
          * @see org.eclipse.sirius.description.contribution.impl.ContributionPackageImpl#getContributionPoint()
          * @generated
          */
-        EClass CONTRIBUTION_POINT = eINSTANCE.getContributionPoint();
+        EClass CONTRIBUTION_POINT = ContributionPackage.eINSTANCE.getContributionPoint();
 
         /**
          * The meta object literal for the '<em><b>Origin</b></em>' attribute
          * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-         * 
+         *
          * @generated
          */
-        EAttribute CONTRIBUTION_POINT__ORIGIN = eINSTANCE.getContributionPoint_Origin();
+        EAttribute CONTRIBUTION_POINT__ORIGIN = ContributionPackage.eINSTANCE.getContributionPoint_Origin();
 
         /**
          * The meta object literal for the '<em><b>Contributed</b></em>'
          * reference feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-         * 
+         *
          * @generated
          */
-        EReference CONTRIBUTION_POINT__CONTRIBUTED = eINSTANCE.getContributionPoint_Contributed();
+        EReference CONTRIBUTION_POINT__CONTRIBUTED = ContributionPackage.eINSTANCE.getContributionPoint_Contributed();
 
     }
 
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/ContributionPoint.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/ContributionPoint.java
index dda173ad6c..be455e4946 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/ContributionPoint.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/ContributionPoint.java
@@ -4,10 +4,10 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Obeo - initial API and implementation
- * 
+ *
  */
 package org.eclipse.sirius.description.contribution;
 
@@ -42,7 +42,7 @@ public interface ContributionPoint extends EObject {
      * really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     * 
+     *
      * @return the value of the '<em>Origin</em>' attribute.
      * @see #setOrigin(String)
      * @see org.eclipse.sirius.description.contribution.ContributionPackage#getContributionPoint_Origin()
@@ -56,7 +56,7 @@ public interface ContributionPoint extends EObject {
      * {@link org.eclipse.sirius.description.contribution.ContributionPoint#getOrigin
      * <em>Origin</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @param value
      *            the new value of the '<em>Origin</em>' attribute.
      * @see #getOrigin()
@@ -72,7 +72,7 @@ public interface ContributionPoint extends EObject {
      * really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     * 
+     *
      * @return the value of the '<em>Contributed</em>' reference.
      * @see #setContributed(EObject)
      * @see org.eclipse.sirius.description.contribution.ContributionPackage#getContributionPoint_Contributed()
@@ -86,7 +86,7 @@ public interface ContributionPoint extends EObject {
      * {@link org.eclipse.sirius.description.contribution.ContributionPoint#getContributed
      * <em>Contributed</em>}' reference. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @param value
      *            the new value of the '<em>Contributed</em>' reference.
      * @see #getContributed()
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/ContributionProvider.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/ContributionProvider.java
index b34befa2f8..c0b0f0aa0f 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/ContributionProvider.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/ContributionProvider.java
@@ -4,10 +4,10 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Obeo - initial API and implementation
- * 
+ *
  */
 package org.eclipse.sirius.description.contribution;
 
@@ -42,7 +42,7 @@ public interface ContributionProvider extends EObject {
      * isn't clear, there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     * 
+     *
      * @return the value of the '<em>Contributions</em>' containment reference
      *         list.
      * @see org.eclipse.sirius.description.contribution.ContributionPackage#getContributionProvider_Contributions()
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/DirectEObjectReference.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/DirectEObjectReference.java
index 53812cf9d0..ad95a968d6 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/DirectEObjectReference.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/DirectEObjectReference.java
@@ -4,10 +4,10 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Obeo - initial API and implementation
- * 
+ *
  */
 package org.eclipse.sirius.description.contribution;
 
@@ -39,7 +39,7 @@ public interface DirectEObjectReference extends EObjectReference {
      * really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     * 
+     *
      * @return the value of the '<em>Value</em>' reference.
      * @see #setValue(EObject)
      * @see org.eclipse.sirius.description.contribution.ContributionPackage#getDirectEObjectReference_Value()
@@ -52,7 +52,7 @@ public interface DirectEObjectReference extends EObjectReference {
      * Sets the value of the '
      * {@link org.eclipse.sirius.description.contribution.DirectEObjectReference#getValue
      * <em>Value</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @param value
      *            the new value of the '<em>Value</em>' reference.
      * @see #getValue()
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/EObjectReference.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/EObjectReference.java
index 4f24a4cfd3..9fb8de02f2 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/EObjectReference.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/EObjectReference.java
@@ -4,10 +4,10 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Obeo - initial API and implementation
- * 
+ *
  */
 package org.eclipse.sirius.description.contribution;
 
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/FeatureContribution.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/FeatureContribution.java
index f7585c8f77..1d3d67d0a8 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/FeatureContribution.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/FeatureContribution.java
@@ -4,10 +4,10 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Obeo - initial API and implementation
- * 
+ *
  */
 package org.eclipse.sirius.description.contribution;
 
@@ -43,7 +43,7 @@ public interface FeatureContribution extends EObject {
      * there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     * 
+     *
      * @return the value of the '<em>Source Feature</em>' reference.
      * @see #setSourceFeature(EStructuralFeature)
      * @see org.eclipse.sirius.description.contribution.ContributionPackage#getFeatureContribution_SourceFeature()
@@ -57,7 +57,7 @@ public interface FeatureContribution extends EObject {
      * {@link org.eclipse.sirius.description.contribution.FeatureContribution#getSourceFeature
      * <em>Source Feature</em>}' reference. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @param value
      *            the new value of the '<em>Source Feature</em>' reference.
      * @see #getSourceFeature()
@@ -73,7 +73,7 @@ public interface FeatureContribution extends EObject {
      * there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     * 
+     *
      * @return the value of the '<em>Target Feature</em>' reference.
      * @see #setTargetFeature(EStructuralFeature)
      * @see org.eclipse.sirius.description.contribution.ContributionPackage#getFeatureContribution_TargetFeature()
@@ -87,7 +87,7 @@ public interface FeatureContribution extends EObject {
      * {@link org.eclipse.sirius.description.contribution.FeatureContribution#getTargetFeature
      * <em>Target Feature</em>}' reference. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @param value
      *            the new value of the '<em>Target Feature</em>' reference.
      * @see #getTargetFeature()
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/IgnoreFeatureContribution.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/IgnoreFeatureContribution.java
index 1926f12b3f..d9828886d8 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/IgnoreFeatureContribution.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/IgnoreFeatureContribution.java
@@ -4,10 +4,10 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Obeo - initial API and implementation
- * 
+ *
  */
 package org.eclipse.sirius.description.contribution;
 
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/RemoveFeatureContribution.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/RemoveFeatureContribution.java
index 338931ec01..55b4e6961f 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/RemoveFeatureContribution.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/RemoveFeatureContribution.java
@@ -4,10 +4,10 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Obeo - initial API and implementation
- * 
+ *
  */
 package org.eclipse.sirius.description.contribution;
 
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/ResetFeatureContribution.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/ResetFeatureContribution.java
index ed4142d984..23ec02b29e 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/ResetFeatureContribution.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/ResetFeatureContribution.java
@@ -4,10 +4,10 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Obeo - initial API and implementation
- * 
+ *
  */
 package org.eclipse.sirius.description.contribution;
 
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/SetFeatureContribution.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/SetFeatureContribution.java
index 900fa746c5..abbfaecf95 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/SetFeatureContribution.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/SetFeatureContribution.java
@@ -4,10 +4,10 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Obeo - initial API and implementation
- * 
+ *
  */
 package org.eclipse.sirius.description.contribution;
 
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/impl/AddFeatureContributionImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/impl/AddFeatureContributionImpl.java
index bcde1f8b83..c1d8f5f613 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/impl/AddFeatureContributionImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/impl/AddFeatureContributionImpl.java
@@ -4,10 +4,10 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Obeo - initial API and implementation
- * 
+ *
  */
 package org.eclipse.sirius.description.contribution.impl;
 
@@ -26,7 +26,7 @@ import org.eclipse.sirius.description.contribution.ContributionPackage;
 public class AddFeatureContributionImpl extends FeatureContributionImpl implements AddFeatureContribution {
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected AddFeatureContributionImpl() {
@@ -35,7 +35,7 @@ public class AddFeatureContributionImpl extends FeatureContributionImpl implemen
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/impl/ClearFeatureContributionImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/impl/ClearFeatureContributionImpl.java
index c3b9ac01e0..1cab2f8b8d 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/impl/ClearFeatureContributionImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/impl/ClearFeatureContributionImpl.java
@@ -4,10 +4,10 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Obeo - initial API and implementation
- * 
+ *
  */
 package org.eclipse.sirius.description.contribution.impl;
 
@@ -26,7 +26,7 @@ import org.eclipse.sirius.description.contribution.ContributionPackage;
 public class ClearFeatureContributionImpl extends FeatureContributionImpl implements ClearFeatureContribution {
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected ClearFeatureContributionImpl() {
@@ -35,7 +35,7 @@ public class ClearFeatureContributionImpl extends FeatureContributionImpl implem
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/impl/ComputedEObjectReferenceImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/impl/ComputedEObjectReferenceImpl.java
index 395e9fc862..7c6de9f7cf 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/impl/ComputedEObjectReferenceImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/impl/ComputedEObjectReferenceImpl.java
@@ -4,10 +4,10 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Obeo - initial API and implementation
- * 
+ *
  */
 package org.eclipse.sirius.description.contribution.impl;
 
@@ -37,7 +37,7 @@ public class ComputedEObjectReferenceImpl extends EObjectImpl implements Compute
      * The default value of the '{@link #getValueExpression()
      * <em>Value Expression</em>}' attribute. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @see #getValueExpression()
      * @generated
      * @ordered
@@ -48,16 +48,16 @@ public class ComputedEObjectReferenceImpl extends EObjectImpl implements Compute
      * The cached value of the '{@link #getValueExpression()
      * <em>Value Expression</em>}' attribute. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @see #getValueExpression()
      * @generated
      * @ordered
      */
-    protected String valueExpression = VALUE_EXPRESSION_EDEFAULT;
+    protected String valueExpression = ComputedEObjectReferenceImpl.VALUE_EXPRESSION_EDEFAULT;
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected ComputedEObjectReferenceImpl() {
@@ -66,7 +66,7 @@ public class ComputedEObjectReferenceImpl extends EObjectImpl implements Compute
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -76,28 +76,31 @@ public class ComputedEObjectReferenceImpl extends EObjectImpl implements Compute
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
+    @Override
     public String getValueExpression() {
         return valueExpression;
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
+    @Override
     public void setValueExpression(String newValueExpression) {
         String oldValueExpression = valueExpression;
         valueExpression = newValueExpression;
-        if (eNotificationRequired())
+        if (eNotificationRequired()) {
             eNotify(new ENotificationImpl(this, Notification.SET, ContributionPackage.COMPUTED_EOBJECT_REFERENCE__VALUE_EXPRESSION, oldValueExpression, valueExpression));
+        }
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -111,7 +114,7 @@ public class ComputedEObjectReferenceImpl extends EObjectImpl implements Compute
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -126,14 +129,14 @@ public class ComputedEObjectReferenceImpl extends EObjectImpl implements Compute
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
     public void eUnset(int featureID) {
         switch (featureID) {
         case ContributionPackage.COMPUTED_EOBJECT_REFERENCE__VALUE_EXPRESSION:
-            setValueExpression(VALUE_EXPRESSION_EDEFAULT);
+            setValueExpression(ComputedEObjectReferenceImpl.VALUE_EXPRESSION_EDEFAULT);
             return;
         }
         super.eUnset(featureID);
@@ -141,30 +144,31 @@ public class ComputedEObjectReferenceImpl extends EObjectImpl implements Compute
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
     public boolean eIsSet(int featureID) {
         switch (featureID) {
         case ContributionPackage.COMPUTED_EOBJECT_REFERENCE__VALUE_EXPRESSION:
-            return VALUE_EXPRESSION_EDEFAULT == null ? valueExpression != null : !VALUE_EXPRESSION_EDEFAULT.equals(valueExpression);
+            return ComputedEObjectReferenceImpl.VALUE_EXPRESSION_EDEFAULT == null ? valueExpression != null : !ComputedEObjectReferenceImpl.VALUE_EXPRESSION_EDEFAULT.equals(valueExpression);
         }
         return super.eIsSet(featureID);
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
     public String toString() {
-        if (eIsProxy())
+        if (eIsProxy()) {
             return super.toString();
+        }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (valueExpression: ");
+        result.append(" (valueExpression: "); //$NON-NLS-1$
         result.append(valueExpression);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/impl/ContributionFactoryImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/impl/ContributionFactoryImpl.java
index 797a3a1c04..22f282ba2b 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/impl/ContributionFactoryImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/impl/ContributionFactoryImpl.java
@@ -4,10 +4,10 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Obeo - initial API and implementation
- * 
+ *
  */
 package org.eclipse.sirius.description.contribution.impl;
 
@@ -32,14 +32,14 @@ import org.eclipse.sirius.description.contribution.SetFeatureContribution;
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!--
  * end-user-doc -->
- * 
+ *
  * @generated
  */
 public class ContributionFactoryImpl extends EFactoryImpl implements ContributionFactory {
     /**
      * Creates the default factory implementation. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     public static ContributionFactory init() {
@@ -57,7 +57,7 @@ public class ContributionFactoryImpl extends EFactoryImpl implements Contributio
     /**
      * Creates an instance of the factory. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     public ContributionFactoryImpl() {
@@ -66,7 +66,7 @@ public class ContributionFactoryImpl extends EFactoryImpl implements Contributio
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -93,15 +93,16 @@ public class ContributionFactoryImpl extends EFactoryImpl implements Contributio
         case ContributionPackage.CONTRIBUTION_POINT:
             return createContributionPoint();
         default:
-            throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+            throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
         }
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
+    @Override
     public IgnoreFeatureContribution createIgnoreFeatureContribution() {
         IgnoreFeatureContributionImpl ignoreFeatureContribution = new IgnoreFeatureContributionImpl();
         return ignoreFeatureContribution;
@@ -109,9 +110,10 @@ public class ContributionFactoryImpl extends EFactoryImpl implements Contributio
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
+    @Override
     public SetFeatureContribution createSetFeatureContribution() {
         SetFeatureContributionImpl setFeatureContribution = new SetFeatureContributionImpl();
         return setFeatureContribution;
@@ -119,9 +121,10 @@ public class ContributionFactoryImpl extends EFactoryImpl implements Contributio
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
+    @Override
     public AddFeatureContribution createAddFeatureContribution() {
         AddFeatureContributionImpl addFeatureContribution = new AddFeatureContributionImpl();
         return addFeatureContribution;
@@ -129,9 +132,10 @@ public class ContributionFactoryImpl extends EFactoryImpl implements Contributio
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
+    @Override
     public RemoveFeatureContribution createRemoveFeatureContribution() {
         RemoveFeatureContributionImpl removeFeatureContribution = new RemoveFeatureContributionImpl();
         return removeFeatureContribution;
@@ -139,9 +143,10 @@ public class ContributionFactoryImpl extends EFactoryImpl implements Contributio
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
+    @Override
     public ClearFeatureContribution createClearFeatureContribution() {
         ClearFeatureContributionImpl clearFeatureContribution = new ClearFeatureContributionImpl();
         return clearFeatureContribution;
@@ -149,9 +154,10 @@ public class ContributionFactoryImpl extends EFactoryImpl implements Contributio
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
+    @Override
     public ResetFeatureContribution createResetFeatureContribution() {
         ResetFeatureContributionImpl resetFeatureContribution = new ResetFeatureContributionImpl();
         return resetFeatureContribution;
@@ -159,9 +165,10 @@ public class ContributionFactoryImpl extends EFactoryImpl implements Contributio
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
+    @Override
     public DirectEObjectReference createDirectEObjectReference() {
         DirectEObjectReferenceImpl directEObjectReference = new DirectEObjectReferenceImpl();
         return directEObjectReference;
@@ -169,9 +176,10 @@ public class ContributionFactoryImpl extends EFactoryImpl implements Contributio
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
+    @Override
     public ComputedEObjectReference createComputedEObjectReference() {
         ComputedEObjectReferenceImpl computedEObjectReference = new ComputedEObjectReferenceImpl();
         return computedEObjectReference;
@@ -179,9 +187,10 @@ public class ContributionFactoryImpl extends EFactoryImpl implements Contributio
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
+    @Override
     public Contribution createContribution() {
         ContributionImpl contribution = new ContributionImpl();
         return contribution;
@@ -189,9 +198,10 @@ public class ContributionFactoryImpl extends EFactoryImpl implements Contributio
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
+    @Override
     public ContributionPoint createContributionPoint() {
         ContributionPointImpl contributionPoint = new ContributionPointImpl();
         return contributionPoint;
@@ -199,16 +209,17 @@ public class ContributionFactoryImpl extends EFactoryImpl implements Contributio
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
+    @Override
     public ContributionPackage getContributionPackage() {
         return (ContributionPackage) getEPackage();
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @deprecated
      * @generated
      */
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/impl/ContributionImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/impl/ContributionImpl.java
index 9d2b7871ce..632f709d5f 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/impl/ContributionImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/impl/ContributionImpl.java
@@ -4,10 +4,10 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Obeo - initial API and implementation
- * 
+ *
  */
 package org.eclipse.sirius.description.contribution.impl;
 
@@ -57,7 +57,7 @@ public class ContributionImpl extends EObjectImpl implements Contribution {
     /**
      * The cached value of the '{@link #getSource() <em>Source</em>}'
      * containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see #getSource()
      * @generated
      * @ordered
@@ -67,7 +67,7 @@ public class ContributionImpl extends EObjectImpl implements Contribution {
     /**
      * The cached value of the '{@link #getTarget() <em>Target</em>}'
      * containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see #getTarget()
      * @generated
      * @ordered
@@ -77,7 +77,7 @@ public class ContributionImpl extends EObjectImpl implements Contribution {
     /**
      * The cached value of the '{@link #getFeatureMask() <em>Feature Mask</em>}'
      * containment reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see #getFeatureMask()
      * @generated
      * @ordered
@@ -88,7 +88,7 @@ public class ContributionImpl extends EObjectImpl implements Contribution {
      * The cached value of the '{@link #getSubContributions()
      * <em>Sub Contributions</em>}' containment reference list. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see #getSubContributions()
      * @generated
      * @ordered
@@ -98,7 +98,7 @@ public class ContributionImpl extends EObjectImpl implements Contribution {
     /**
      * The default value of the '{@link #getDescription() <em>Description</em>}'
      * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see #getDescription()
      * @generated
      * @ordered
@@ -108,16 +108,16 @@ public class ContributionImpl extends EObjectImpl implements Contribution {
     /**
      * The cached value of the '{@link #getDescription() <em>Description</em>}'
      * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see #getDescription()
      * @generated
      * @ordered
      */
-    protected String description = DESCRIPTION_EDEFAULT;
+    protected String description = ContributionImpl.DESCRIPTION_EDEFAULT;
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected ContributionImpl() {
@@ -126,7 +126,7 @@ public class ContributionImpl extends EObjectImpl implements Contribution {
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -136,23 +136,26 @@ public class ContributionImpl extends EObjectImpl implements Contribution {
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
+    @Override
     public EObjectReference getSource() {
         if (source != null && source.eIsProxy()) {
             InternalEObject oldSource = (InternalEObject) source;
             source = (EObjectReference) eResolveProxy(oldSource);
             if (source != oldSource) {
                 InternalEObject newSource = (InternalEObject) source;
-                NotificationChain msgs = oldSource.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ContributionPackage.CONTRIBUTION__SOURCE, null, null);
+                NotificationChain msgs = oldSource.eInverseRemove(this, InternalEObject.EOPPOSITE_FEATURE_BASE - ContributionPackage.CONTRIBUTION__SOURCE, null, null);
                 if (newSource.eInternalContainer() == null) {
-                    msgs = newSource.eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ContributionPackage.CONTRIBUTION__SOURCE, null, msgs);
+                    msgs = newSource.eInverseAdd(this, InternalEObject.EOPPOSITE_FEATURE_BASE - ContributionPackage.CONTRIBUTION__SOURCE, null, msgs);
                 }
-                if (msgs != null)
+                if (msgs != null) {
                     msgs.dispatch();
-                if (eNotificationRequired())
+                }
+                if (eNotificationRequired()) {
                     eNotify(new ENotificationImpl(this, Notification.RESOLVE, ContributionPackage.CONTRIBUTION__SOURCE, oldSource, source));
+                }
             }
         }
         return source;
@@ -160,7 +163,7 @@ public class ContributionImpl extends EObjectImpl implements Contribution {
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     public EObjectReference basicGetSource() {
@@ -169,7 +172,7 @@ public class ContributionImpl extends EObjectImpl implements Contribution {
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     public NotificationChain basicSetSource(EObjectReference newSource, NotificationChain msgs) {
@@ -177,52 +180,61 @@ public class ContributionImpl extends EObjectImpl implements Contribution {
         source = newSource;
         if (eNotificationRequired()) {
             ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ContributionPackage.CONTRIBUTION__SOURCE, oldSource, newSource);
-            if (msgs == null)
+            if (msgs == null) {
                 msgs = notification;
-            else
+            } else {
                 msgs.add(notification);
+            }
         }
         return msgs;
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
+    @Override
     public void setSource(EObjectReference newSource) {
         if (newSource != source) {
             NotificationChain msgs = null;
-            if (source != null)
-                msgs = ((InternalEObject) source).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ContributionPackage.CONTRIBUTION__SOURCE, null, msgs);
-            if (newSource != null)
-                msgs = ((InternalEObject) newSource).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ContributionPackage.CONTRIBUTION__SOURCE, null, msgs);
+            if (source != null) {
+                msgs = ((InternalEObject) source).eInverseRemove(this, InternalEObject.EOPPOSITE_FEATURE_BASE - ContributionPackage.CONTRIBUTION__SOURCE, null, msgs);
+            }
+            if (newSource != null) {
+                msgs = ((InternalEObject) newSource).eInverseAdd(this, InternalEObject.EOPPOSITE_FEATURE_BASE - ContributionPackage.CONTRIBUTION__SOURCE, null, msgs);
+            }
             msgs = basicSetSource(newSource, msgs);
-            if (msgs != null)
+            if (msgs != null) {
                 msgs.dispatch();
-        } else if (eNotificationRequired())
+            }
+        } else if (eNotificationRequired()) {
             eNotify(new ENotificationImpl(this, Notification.SET, ContributionPackage.CONTRIBUTION__SOURCE, newSource, newSource));
+        }
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
+    @Override
     public EObjectReference getTarget() {
         if (target != null && target.eIsProxy()) {
             InternalEObject oldTarget = (InternalEObject) target;
             target = (EObjectReference) eResolveProxy(oldTarget);
             if (target != oldTarget) {
                 InternalEObject newTarget = (InternalEObject) target;
-                NotificationChain msgs = oldTarget.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ContributionPackage.CONTRIBUTION__TARGET, null, null);
+                NotificationChain msgs = oldTarget.eInverseRemove(this, InternalEObject.EOPPOSITE_FEATURE_BASE - ContributionPackage.CONTRIBUTION__TARGET, null, null);
                 if (newTarget.eInternalContainer() == null) {
-                    msgs = newTarget.eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ContributionPackage.CONTRIBUTION__TARGET, null, msgs);
+                    msgs = newTarget.eInverseAdd(this, InternalEObject.EOPPOSITE_FEATURE_BASE - ContributionPackage.CONTRIBUTION__TARGET, null, msgs);
                 }
-                if (msgs != null)
+                if (msgs != null) {
                     msgs.dispatch();
-                if (eNotificationRequired())
+                }
+                if (eNotificationRequired()) {
                     eNotify(new ENotificationImpl(this, Notification.RESOLVE, ContributionPackage.CONTRIBUTION__TARGET, oldTarget, target));
+                }
             }
         }
         return target;
@@ -230,7 +242,7 @@ public class ContributionImpl extends EObjectImpl implements Contribution {
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     public EObjectReference basicGetTarget() {
@@ -239,7 +251,7 @@ public class ContributionImpl extends EObjectImpl implements Contribution {
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     public NotificationChain basicSetTarget(EObjectReference newTarget, NotificationChain msgs) {
@@ -247,38 +259,45 @@ public class ContributionImpl extends EObjectImpl implements Contribution {
         target = newTarget;
         if (eNotificationRequired()) {
             ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ContributionPackage.CONTRIBUTION__TARGET, oldTarget, newTarget);
-            if (msgs == null)
+            if (msgs == null) {
                 msgs = notification;
-            else
+            } else {
                 msgs.add(notification);
+            }
         }
         return msgs;
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
+    @Override
     public void setTarget(EObjectReference newTarget) {
         if (newTarget != target) {
             NotificationChain msgs = null;
-            if (target != null)
-                msgs = ((InternalEObject) target).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ContributionPackage.CONTRIBUTION__TARGET, null, msgs);
-            if (newTarget != null)
-                msgs = ((InternalEObject) newTarget).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ContributionPackage.CONTRIBUTION__TARGET, null, msgs);
+            if (target != null) {
+                msgs = ((InternalEObject) target).eInverseRemove(this, InternalEObject.EOPPOSITE_FEATURE_BASE - ContributionPackage.CONTRIBUTION__TARGET, null, msgs);
+            }
+            if (newTarget != null) {
+                msgs = ((InternalEObject) newTarget).eInverseAdd(this, InternalEObject.EOPPOSITE_FEATURE_BASE - ContributionPackage.CONTRIBUTION__TARGET, null, msgs);
+            }
             msgs = basicSetTarget(newTarget, msgs);
-            if (msgs != null)
+            if (msgs != null) {
                 msgs.dispatch();
-        } else if (eNotificationRequired())
+            }
+        } else if (eNotificationRequired()) {
             eNotify(new ENotificationImpl(this, Notification.SET, ContributionPackage.CONTRIBUTION__TARGET, newTarget, newTarget));
+        }
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
+    @Override
     public EList<FeatureContribution> getFeatureMask() {
         if (featureMask == null) {
             featureMask = new EObjectContainmentEList.Resolving<FeatureContribution>(FeatureContribution.class, this, ContributionPackage.CONTRIBUTION__FEATURE_MASK);
@@ -288,9 +307,10 @@ public class ContributionImpl extends EObjectImpl implements Contribution {
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
+    @Override
     public EList<Contribution> getSubContributions() {
         if (subContributions == null) {
             subContributions = new EObjectContainmentEList.Resolving<Contribution>(Contribution.class, this, ContributionPackage.CONTRIBUTION__SUB_CONTRIBUTIONS);
@@ -300,28 +320,31 @@ public class ContributionImpl extends EObjectImpl implements Contribution {
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
+    @Override
     public String getDescription() {
         return description;
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
+    @Override
     public void setDescription(String newDescription) {
         String oldDescription = description;
         description = newDescription;
-        if (eNotificationRequired())
+        if (eNotificationRequired()) {
             eNotify(new ENotificationImpl(this, Notification.SET, ContributionPackage.CONTRIBUTION__DESCRIPTION, oldDescription, description));
+        }
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -341,19 +364,21 @@ public class ContributionImpl extends EObjectImpl implements Contribution {
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
     public Object eGet(int featureID, boolean resolve, boolean coreType) {
         switch (featureID) {
         case ContributionPackage.CONTRIBUTION__SOURCE:
-            if (resolve)
+            if (resolve) {
                 return getSource();
+            }
             return basicGetSource();
         case ContributionPackage.CONTRIBUTION__TARGET:
-            if (resolve)
+            if (resolve) {
                 return getTarget();
+            }
             return basicGetTarget();
         case ContributionPackage.CONTRIBUTION__FEATURE_MASK:
             return getFeatureMask();
@@ -367,7 +392,7 @@ public class ContributionImpl extends EObjectImpl implements Contribution {
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @SuppressWarnings("unchecked")
@@ -397,7 +422,7 @@ public class ContributionImpl extends EObjectImpl implements Contribution {
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -416,7 +441,7 @@ public class ContributionImpl extends EObjectImpl implements Contribution {
             getSubContributions().clear();
             return;
         case ContributionPackage.CONTRIBUTION__DESCRIPTION:
-            setDescription(DESCRIPTION_EDEFAULT);
+            setDescription(ContributionImpl.DESCRIPTION_EDEFAULT);
             return;
         }
         super.eUnset(featureID);
@@ -424,7 +449,7 @@ public class ContributionImpl extends EObjectImpl implements Contribution {
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -439,23 +464,24 @@ public class ContributionImpl extends EObjectImpl implements Contribution {
         case ContributionPackage.CONTRIBUTION__SUB_CONTRIBUTIONS:
             return subContributions != null && !subContributions.isEmpty();
         case ContributionPackage.CONTRIBUTION__DESCRIPTION:
-            return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
+            return ContributionImpl.DESCRIPTION_EDEFAULT == null ? description != null : !ContributionImpl.DESCRIPTION_EDEFAULT.equals(description);
         }
         return super.eIsSet(featureID);
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
     public String toString() {
-        if (eIsProxy())
+        if (eIsProxy()) {
             return super.toString();
+        }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (description: ");
+        result.append(" (description: "); //$NON-NLS-1$
         result.append(description);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/impl/ContributionPackageImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/impl/ContributionPackageImpl.java
index fbfff1ffb6..0d13db04d1 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/impl/ContributionPackageImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/impl/ContributionPackageImpl.java
@@ -4,10 +4,10 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Obeo - initial API and implementation
- * 
+ *
  */
 package org.eclipse.sirius.description.contribution.impl;
 
@@ -36,97 +36,97 @@ import org.eclipse.sirius.description.contribution.SetFeatureContribution;
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!--
  * end-user-doc -->
- * 
+ *
  * @generated
  */
 public class ContributionPackageImpl extends EPackageImpl implements ContributionPackage {
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     private EClass featureContributionEClass = null;
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     private EClass ignoreFeatureContributionEClass = null;
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     private EClass setFeatureContributionEClass = null;
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     private EClass addFeatureContributionEClass = null;
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     private EClass removeFeatureContributionEClass = null;
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     private EClass clearFeatureContributionEClass = null;
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     private EClass resetFeatureContributionEClass = null;
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     private EClass eObjectReferenceEClass = null;
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     private EClass directEObjectReferenceEClass = null;
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     private EClass computedEObjectReferenceEClass = null;
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     private EClass contributionEClass = null;
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     private EClass contributionProviderEClass = null;
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     private EClass contributionPointEClass = null;
@@ -140,19 +140,19 @@ public class ContributionPackageImpl extends EPackageImpl implements Contributio
      * 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.sirius.description.contribution.ContributionPackage#eNS_URI
      * @see #init()
      * @generated
      */
     private ContributionPackageImpl() {
-        super(eNS_URI, ContributionFactory.eINSTANCE);
+        super(ContributionPackage.eNS_URI, ContributionFactory.eINSTANCE);
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     private static boolean isInited = false;
@@ -160,27 +160,28 @@ public class ContributionPackageImpl extends EPackageImpl implements Contributio
     /**
      * Creates, registers, and initializes the <b>Package</b> for this model,
      * and for any others upon which it depends.
-     * 
+     *
      * <p>
      * This method is used to initialize {@link ContributionPackage#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()
      * @generated
      */
     public static ContributionPackage init() {
-        if (isInited)
+        if (ContributionPackageImpl.isInited) {
             return (ContributionPackage) EPackage.Registry.INSTANCE.getEPackage(ContributionPackage.eNS_URI);
+        }
 
         // Obtain or create and register package
-        ContributionPackageImpl theContributionPackage = (ContributionPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ContributionPackageImpl ? EPackage.Registry.INSTANCE
-                .get(eNS_URI) : new ContributionPackageImpl());
+        ContributionPackageImpl theContributionPackage = (ContributionPackageImpl) (EPackage.Registry.INSTANCE.get(ContributionPackage.eNS_URI) instanceof ContributionPackageImpl ? EPackage.Registry.INSTANCE
+                .get(ContributionPackage.eNS_URI) : new ContributionPackageImpl());
 
-        isInited = true;
+        ContributionPackageImpl.isInited = true;
 
         // Initialize simple dependencies
         EcorePackage.eINSTANCE.eClass();
@@ -201,241 +202,267 @@ public class ContributionPackageImpl extends EPackageImpl implements Contributio
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
+    @Override
     public EClass getFeatureContribution() {
         return featureContributionEClass;
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
+    @Override
     public EReference getFeatureContribution_SourceFeature() {
         return (EReference) featureContributionEClass.getEStructuralFeatures().get(0);
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
+    @Override
     public EReference getFeatureContribution_TargetFeature() {
         return (EReference) featureContributionEClass.getEStructuralFeatures().get(1);
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
+    @Override
     public EClass getIgnoreFeatureContribution() {
         return ignoreFeatureContributionEClass;
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
+    @Override
     public EClass getSetFeatureContribution() {
         return setFeatureContributionEClass;
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
+    @Override
     public EClass getAddFeatureContribution() {
         return addFeatureContributionEClass;
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
+    @Override
     public EClass getRemoveFeatureContribution() {
         return removeFeatureContributionEClass;
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
+    @Override
     public EClass getClearFeatureContribution() {
         return clearFeatureContributionEClass;
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
+    @Override
     public EClass getResetFeatureContribution() {
         return resetFeatureContributionEClass;
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
+    @Override
     public EClass getEObjectReference() {
         return eObjectReferenceEClass;
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
+    @Override
     public EClass getDirectEObjectReference() {
         return directEObjectReferenceEClass;
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
+    @Override
     public EReference getDirectEObjectReference_Value() {
         return (EReference) directEObjectReferenceEClass.getEStructuralFeatures().get(0);
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
+    @Override
     public EClass getComputedEObjectReference() {
         return computedEObjectReferenceEClass;
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
+    @Override
     public EAttribute getComputedEObjectReference_ValueExpression() {
         return (EAttribute) computedEObjectReferenceEClass.getEStructuralFeatures().get(0);
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
+    @Override
     public EClass getContribution() {
         return contributionEClass;
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
+    @Override
     public EReference getContribution_Source() {
         return (EReference) contributionEClass.getEStructuralFeatures().get(0);
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
+    @Override
     public EReference getContribution_Target() {
         return (EReference) contributionEClass.getEStructuralFeatures().get(1);
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
+    @Override
     public EReference getContribution_FeatureMask() {
         return (EReference) contributionEClass.getEStructuralFeatures().get(2);
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
+    @Override
     public EReference getContribution_SubContributions() {
         return (EReference) contributionEClass.getEStructuralFeatures().get(3);
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
+    @Override
     public EAttribute getContribution_Description() {
         return (EAttribute) contributionEClass.getEStructuralFeatures().get(4);
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
+    @Override
     public EClass getContributionProvider() {
         return contributionProviderEClass;
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
+    @Override
     public EReference getContributionProvider_Contributions() {
         return (EReference) contributionProviderEClass.getEStructuralFeatures().get(0);
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
+    @Override
     public EClass getContributionPoint() {
         return contributionPointEClass;
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
+    @Override
     public EAttribute getContributionPoint_Origin() {
         return (EAttribute) contributionPointEClass.getEStructuralFeatures().get(0);
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
+    @Override
     public EReference getContributionPoint_Contributed() {
         return (EReference) contributionPointEClass.getEStructuralFeatures().get(1);
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
+    @Override
     public ContributionFactory getContributionFactory() {
         return (ContributionFactory) getEFactoryInstance();
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     private boolean isCreated = false;
@@ -444,57 +471,58 @@ public class ContributionPackageImpl extends EPackageImpl implements Contributio
      * 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)
+        if (isCreated) {
             return;
+        }
         isCreated = true;
 
         // Create classes and their features
-        featureContributionEClass = createEClass(FEATURE_CONTRIBUTION);
-        createEReference(featureContributionEClass, FEATURE_CONTRIBUTION__SOURCE_FEATURE);
-        createEReference(featureContributionEClass, FEATURE_CONTRIBUTION__TARGET_FEATURE);
+        featureContributionEClass = createEClass(ContributionPackage.FEATURE_CONTRIBUTION);
+        createEReference(featureContributionEClass, ContributionPackage.FEATURE_CONTRIBUTION__SOURCE_FEATURE);
+        createEReference(featureContributionEClass, ContributionPackage.FEATURE_CONTRIBUTION__TARGET_FEATURE);
 
-        ignoreFeatureContributionEClass = createEClass(IGNORE_FEATURE_CONTRIBUTION);
+        ignoreFeatureContributionEClass = createEClass(ContributionPackage.IGNORE_FEATURE_CONTRIBUTION);
 
-        setFeatureContributionEClass = createEClass(SET_FEATURE_CONTRIBUTION);
+        setFeatureContributionEClass = createEClass(ContributionPackage.SET_FEATURE_CONTRIBUTION);
 
-        addFeatureContributionEClass = createEClass(ADD_FEATURE_CONTRIBUTION);
+        addFeatureContributionEClass = createEClass(ContributionPackage.ADD_FEATURE_CONTRIBUTION);
 
-        removeFeatureContributionEClass = createEClass(REMOVE_FEATURE_CONTRIBUTION);
+        removeFeatureContributionEClass = createEClass(ContributionPackage.REMOVE_FEATURE_CONTRIBUTION);
 
-        clearFeatureContributionEClass = createEClass(CLEAR_FEATURE_CONTRIBUTION);
+        clearFeatureContributionEClass = createEClass(ContributionPackage.CLEAR_FEATURE_CONTRIBUTION);
 
-        resetFeatureContributionEClass = createEClass(RESET_FEATURE_CONTRIBUTION);
+        resetFeatureContributionEClass = createEClass(ContributionPackage.RESET_FEATURE_CONTRIBUTION);
 
-        eObjectReferenceEClass = createEClass(EOBJECT_REFERENCE);
+        eObjectReferenceEClass = createEClass(ContributionPackage.EOBJECT_REFERENCE);
 
-        directEObjectReferenceEClass = createEClass(DIRECT_EOBJECT_REFERENCE);
-        createEReference(directEObjectReferenceEClass, DIRECT_EOBJECT_REFERENCE__VALUE);
+        directEObjectReferenceEClass = createEClass(ContributionPackage.DIRECT_EOBJECT_REFERENCE);
+        createEReference(directEObjectReferenceEClass, ContributionPackage.DIRECT_EOBJECT_REFERENCE__VALUE);
 
-        computedEObjectReferenceEClass = createEClass(COMPUTED_EOBJECT_REFERENCE);
-        createEAttribute(computedEObjectReferenceEClass, COMPUTED_EOBJECT_REFERENCE__VALUE_EXPRESSION);
+        computedEObjectReferenceEClass = createEClass(ContributionPackage.COMPUTED_EOBJECT_REFERENCE);
+        createEAttribute(computedEObjectReferenceEClass, ContributionPackage.COMPUTED_EOBJECT_REFERENCE__VALUE_EXPRESSION);
 
-        contributionEClass = createEClass(CONTRIBUTION);
-        createEReference(contributionEClass, CONTRIBUTION__SOURCE);
-        createEReference(contributionEClass, CONTRIBUTION__TARGET);
-        createEReference(contributionEClass, CONTRIBUTION__FEATURE_MASK);
-        createEReference(contributionEClass, CONTRIBUTION__SUB_CONTRIBUTIONS);
-        createEAttribute(contributionEClass, CONTRIBUTION__DESCRIPTION);
+        contributionEClass = createEClass(ContributionPackage.CONTRIBUTION);
+        createEReference(contributionEClass, ContributionPackage.CONTRIBUTION__SOURCE);
+        createEReference(contributionEClass, ContributionPackage.CONTRIBUTION__TARGET);
+        createEReference(contributionEClass, ContributionPackage.CONTRIBUTION__FEATURE_MASK);
+        createEReference(contributionEClass, ContributionPackage.CONTRIBUTION__SUB_CONTRIBUTIONS);
+        createEAttribute(contributionEClass, ContributionPackage.CONTRIBUTION__DESCRIPTION);
 
-        contributionProviderEClass = createEClass(CONTRIBUTION_PROVIDER);
-        createEReference(contributionProviderEClass, CONTRIBUTION_PROVIDER__CONTRIBUTIONS);
+        contributionProviderEClass = createEClass(ContributionPackage.CONTRIBUTION_PROVIDER);
+        createEReference(contributionProviderEClass, ContributionPackage.CONTRIBUTION_PROVIDER__CONTRIBUTIONS);
 
-        contributionPointEClass = createEClass(CONTRIBUTION_POINT);
-        createEAttribute(contributionPointEClass, CONTRIBUTION_POINT__ORIGIN);
-        createEReference(contributionPointEClass, CONTRIBUTION_POINT__CONTRIBUTED);
+        contributionPointEClass = createEClass(ContributionPackage.CONTRIBUTION_POINT);
+        createEAttribute(contributionPointEClass, ContributionPackage.CONTRIBUTION_POINT__ORIGIN);
+        createEReference(contributionPointEClass, ContributionPackage.CONTRIBUTION_POINT__CONTRIBUTED);
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     private boolean isInitialized = false;
@@ -503,18 +531,19 @@ public class ContributionPackageImpl extends EPackageImpl implements Contributio
      * 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)
+        if (isInitialized) {
             return;
+        }
         isInitialized = true;
 
         // Initialize package
-        setName(eNAME);
-        setNsPrefix(eNS_PREFIX);
-        setNsURI(eNS_URI);
+        setName(ContributionPackage.eNAME);
+        setNsPrefix(ContributionPackage.eNS_PREFIX);
+        setNsURI(ContributionPackage.eNS_URI);
 
         // Obtain other dependent packages
         EcorePackage theEcorePackage = (EcorePackage) EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
@@ -534,58 +563,99 @@ public class ContributionPackageImpl extends EPackageImpl implements Contributio
         computedEObjectReferenceEClass.getESuperTypes().add(this.getEObjectReference());
 
         // Initialize classes and features; add operations and parameters
-        initEClass(featureContributionEClass, FeatureContribution.class, "FeatureContribution", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getFeatureContribution_SourceFeature(), theEcorePackage.getEStructuralFeature(), null, "sourceFeature", null, 1, 1, FeatureContribution.class, !IS_TRANSIENT, !IS_VOLATILE,
-                IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getFeatureContribution_TargetFeature(), theEcorePackage.getEStructuralFeature(), null, "targetFeature", null, 1, 1, FeatureContribution.class, !IS_TRANSIENT, !IS_VOLATILE,
-                IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        initEClass(ignoreFeatureContributionEClass, IgnoreFeatureContribution.class, "IgnoreFeatureContribution", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(setFeatureContributionEClass, SetFeatureContribution.class, "SetFeatureContribution", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(addFeatureContributionEClass, AddFeatureContribution.class, "AddFeatureContribution", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(removeFeatureContributionEClass, RemoveFeatureContribution.class, "RemoveFeatureContribution", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(clearFeatureContributionEClass, ClearFeatureContribution.class, "ClearFeatureContribution", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(resetFeatureContributionEClass, ResetFeatureContribution.class, "ResetFeatureContribution", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(eObjectReferenceEClass, EObjectReference.class, "EObjectReference", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(directEObjectReferenceEClass, DirectEObjectReference.class, "DirectEObjectReference", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getDirectEObjectReference_Value(), theEcorePackage.getEObject(), null, "value", null, 1, 1, DirectEObjectReference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
-                !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        initEClass(computedEObjectReferenceEClass, ComputedEObjectReference.class, "ComputedEObjectReference", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getComputedEObjectReference_ValueExpression(), ecorePackage.getEString(), "valueExpression", null, 1, 1, ComputedEObjectReference.class, !IS_TRANSIENT, !IS_VOLATILE,
-                IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        initEClass(contributionEClass, Contribution.class, "Contribution", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getContribution_Source(), this.getEObjectReference(), null, "source", null, 1, 1, Contribution.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
-                IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getContribution_Target(), this.getEObjectReference(), null, "target", null, 1, 1, Contribution.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
-                IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getContribution_FeatureMask(), this.getFeatureContribution(), null, "featureMask", null, 1, -1, Contribution.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
-                IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-        initEReference(getContribution_SubContributions(), this.getContribution(), null, "subContributions", null, 0, -1, Contribution.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
-                IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getContribution_Description(), ecorePackage.getEString(), "description", null, 0, 1, Contribution.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
-                IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        initEClass(contributionProviderEClass, ContributionProvider.class, "ContributionProvider", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getContributionProvider_Contributions(), this.getContribution(), null, "contributions", null, 0, -1, ContributionProvider.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
-                IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        initEClass(contributionPointEClass, ContributionPoint.class, "ContributionPoint", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getContributionPoint_Origin(), ecorePackage.getEString(), "origin", null, 1, 1, ContributionPoint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
-                IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getContributionPoint_Contributed(), theEcorePackage.getEObject(), null, "contributed", null, 1, 1, ContributionPoint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
-                !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEClass(featureContributionEClass, FeatureContribution.class, "FeatureContribution", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getFeatureContribution_SourceFeature(),
+                theEcorePackage.getEStructuralFeature(),
+                null,
+                "sourceFeature", null, 1, 1, FeatureContribution.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getFeatureContribution_TargetFeature(),
+                theEcorePackage.getEStructuralFeature(),
+                null,
+                "targetFeature", null, 1, 1, FeatureContribution.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(ignoreFeatureContributionEClass, IgnoreFeatureContribution.class,
+                "IgnoreFeatureContribution", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(setFeatureContributionEClass, SetFeatureContribution.class,
+                "SetFeatureContribution", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(addFeatureContributionEClass, AddFeatureContribution.class,
+                "AddFeatureContribution", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(removeFeatureContributionEClass, RemoveFeatureContribution.class,
+                "RemoveFeatureContribution", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(clearFeatureContributionEClass, ClearFeatureContribution.class,
+                "ClearFeatureContribution", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(resetFeatureContributionEClass, ResetFeatureContribution.class,
+                "ResetFeatureContribution", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(eObjectReferenceEClass, EObjectReference.class, "EObjectReference", EPackageImpl.IS_ABSTRACT, EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(directEObjectReferenceEClass, DirectEObjectReference.class,
+                "DirectEObjectReference", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getDirectEObjectReference_Value(),
+                theEcorePackage.getEObject(),
+                null,
+                "value", null, 1, 1, DirectEObjectReference.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(computedEObjectReferenceEClass, ComputedEObjectReference.class,
+                "ComputedEObjectReference", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getComputedEObjectReference_ValueExpression(),
+                theEcorePackage.getEString(),
+                "valueExpression", null, 1, 1, ComputedEObjectReference.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(contributionEClass, Contribution.class, "Contribution", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getContribution_Source(),
+                this.getEObjectReference(),
+                null,
+                "source", null, 1, 1, Contribution.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getContribution_Target(),
+                this.getEObjectReference(),
+                null,
+                "target", null, 1, 1, Contribution.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getContribution_FeatureMask(),
+                this.getFeatureContribution(),
+                null,
+                "featureMask", null, 1, -1, Contribution.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, !EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getContribution_SubContributions(),
+                this.getContribution(),
+                null,
+                "subContributions", null, 0, -1, Contribution.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getContribution_Description(),
+                theEcorePackage.getEString(),
+                "description", null, 0, 1, Contribution.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(contributionProviderEClass, ContributionProvider.class, "ContributionProvider", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getContributionProvider_Contributions(),
+                this.getContribution(),
+                null,
+                "contributions", null, 0, -1, ContributionProvider.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(contributionPointEClass, ContributionPoint.class, "ContributionPoint", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getContributionPoint_Origin(),
+                theEcorePackage.getEString(),
+                "origin", null, 1, 1, ContributionPoint.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getContributionPoint_Contributed(),
+                theEcorePackage.getEObject(),
+                null,
+                "contributed", null, 1, 1, ContributionPoint.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
 
         // Create resource
-        createResource(eNS_URI);
+        createResource(ContributionPackage.eNS_URI);
     }
 
 } // ContributionPackageImpl
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/impl/ContributionPointImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/impl/ContributionPointImpl.java
index ccc562b932..3087c759ee 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/impl/ContributionPointImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/impl/ContributionPointImpl.java
@@ -4,10 +4,10 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Obeo - initial API and implementation
- * 
+ *
  */
 package org.eclipse.sirius.description.contribution.impl;
 
@@ -41,7 +41,7 @@ public class ContributionPointImpl extends EObjectImpl implements ContributionPo
     /**
      * The default value of the '{@link #getOrigin() <em>Origin</em>}'
      * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see #getOrigin()
      * @generated
      * @ordered
@@ -51,17 +51,17 @@ public class ContributionPointImpl extends EObjectImpl implements ContributionPo
     /**
      * The cached value of the '{@link #getOrigin() <em>Origin</em>}' attribute.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see #getOrigin()
      * @generated
      * @ordered
      */
-    protected String origin = ORIGIN_EDEFAULT;
+    protected String origin = ContributionPointImpl.ORIGIN_EDEFAULT;
 
     /**
      * The cached value of the '{@link #getContributed() <em>Contributed</em>}'
      * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see #getContributed()
      * @generated
      * @ordered
@@ -70,7 +70,7 @@ public class ContributionPointImpl extends EObjectImpl implements ContributionPo
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected ContributionPointImpl() {
@@ -79,7 +79,7 @@ public class ContributionPointImpl extends EObjectImpl implements ContributionPo
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -89,37 +89,42 @@ public class ContributionPointImpl extends EObjectImpl implements ContributionPo
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
+    @Override
     public String getOrigin() {
         return origin;
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
+    @Override
     public void setOrigin(String newOrigin) {
         String oldOrigin = origin;
         origin = newOrigin;
-        if (eNotificationRequired())
+        if (eNotificationRequired()) {
             eNotify(new ENotificationImpl(this, Notification.SET, ContributionPackage.CONTRIBUTION_POINT__ORIGIN, oldOrigin, origin));
+        }
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
+    @Override
     public EObject getContributed() {
         if (contributed != null && contributed.eIsProxy()) {
             InternalEObject oldContributed = (InternalEObject) contributed;
             contributed = eResolveProxy(oldContributed);
             if (contributed != oldContributed) {
-                if (eNotificationRequired())
+                if (eNotificationRequired()) {
                     eNotify(new ENotificationImpl(this, Notification.RESOLVE, ContributionPackage.CONTRIBUTION_POINT__CONTRIBUTED, oldContributed, contributed));
+                }
             }
         }
         return contributed;
@@ -127,7 +132,7 @@ public class ContributionPointImpl extends EObjectImpl implements ContributionPo
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     public EObject basicGetContributed() {
@@ -136,19 +141,21 @@ public class ContributionPointImpl extends EObjectImpl implements ContributionPo
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
+    @Override
     public void setContributed(EObject newContributed) {
         EObject oldContributed = contributed;
         contributed = newContributed;
-        if (eNotificationRequired())
+        if (eNotificationRequired()) {
             eNotify(new ENotificationImpl(this, Notification.SET, ContributionPackage.CONTRIBUTION_POINT__CONTRIBUTED, oldContributed, contributed));
+        }
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -157,8 +164,9 @@ public class ContributionPointImpl extends EObjectImpl implements ContributionPo
         case ContributionPackage.CONTRIBUTION_POINT__ORIGIN:
             return getOrigin();
         case ContributionPackage.CONTRIBUTION_POINT__CONTRIBUTED:
-            if (resolve)
+            if (resolve) {
                 return getContributed();
+            }
             return basicGetContributed();
         }
         return super.eGet(featureID, resolve, coreType);
@@ -166,7 +174,7 @@ public class ContributionPointImpl extends EObjectImpl implements ContributionPo
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -184,14 +192,14 @@ public class ContributionPointImpl extends EObjectImpl implements ContributionPo
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
     public void eUnset(int featureID) {
         switch (featureID) {
         case ContributionPackage.CONTRIBUTION_POINT__ORIGIN:
-            setOrigin(ORIGIN_EDEFAULT);
+            setOrigin(ContributionPointImpl.ORIGIN_EDEFAULT);
             return;
         case ContributionPackage.CONTRIBUTION_POINT__CONTRIBUTED:
             setContributed((EObject) null);
@@ -202,14 +210,14 @@ public class ContributionPointImpl extends EObjectImpl implements ContributionPo
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
     public boolean eIsSet(int featureID) {
         switch (featureID) {
         case ContributionPackage.CONTRIBUTION_POINT__ORIGIN:
-            return ORIGIN_EDEFAULT == null ? origin != null : !ORIGIN_EDEFAULT.equals(origin);
+            return ContributionPointImpl.ORIGIN_EDEFAULT == null ? origin != null : !ContributionPointImpl.ORIGIN_EDEFAULT.equals(origin);
         case ContributionPackage.CONTRIBUTION_POINT__CONTRIBUTED:
             return contributed != null;
         }
@@ -218,16 +226,17 @@ public class ContributionPointImpl extends EObjectImpl implements ContributionPo
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
     public String toString() {
-        if (eIsProxy())
+        if (eIsProxy()) {
             return super.toString();
+        }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (origin: ");
+        result.append(" (origin: "); //$NON-NLS-1$
         result.append(origin);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/impl/ContributionProviderImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/impl/ContributionProviderImpl.java
index 4909e5e149..18a444108e 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/impl/ContributionProviderImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/impl/ContributionProviderImpl.java
@@ -4,10 +4,10 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Obeo - initial API and implementation
- * 
+ *
  */
 package org.eclipse.sirius.description.contribution.impl;
 
@@ -43,7 +43,7 @@ public abstract class ContributionProviderImpl extends EObjectImpl implements Co
      * The cached value of the '{@link #getContributions()
      * <em>Contributions</em>}' containment reference list. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
+     *
      * @see #getContributions()
      * @generated
      * @ordered
@@ -52,7 +52,7 @@ public abstract class ContributionProviderImpl extends EObjectImpl implements Co
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected ContributionProviderImpl() {
@@ -61,7 +61,7 @@ public abstract class ContributionProviderImpl extends EObjectImpl implements Co
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -71,9 +71,10 @@ public abstract class ContributionProviderImpl extends EObjectImpl implements Co
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
+    @Override
     public EList<Contribution> getContributions() {
         if (contributions == null) {
             contributions = new EObjectContainmentEList.Resolving<Contribution>(Contribution.class, this, ContributionPackage.CONTRIBUTION_PROVIDER__CONTRIBUTIONS);
@@ -83,7 +84,7 @@ public abstract class ContributionProviderImpl extends EObjectImpl implements Co
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -97,7 +98,7 @@ public abstract class ContributionProviderImpl extends EObjectImpl implements Co
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -111,7 +112,7 @@ public abstract class ContributionProviderImpl extends EObjectImpl implements Co
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @SuppressWarnings("unchecked")
@@ -128,7 +129,7 @@ public abstract class ContributionProviderImpl extends EObjectImpl implements Co
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -143,7 +144,7 @@ public abstract class ContributionProviderImpl extends EObjectImpl implements Co
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/impl/DirectEObjectReferenceImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/impl/DirectEObjectReferenceImpl.java
index f77321ada4..39d3b4db96 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/impl/DirectEObjectReferenceImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/impl/DirectEObjectReferenceImpl.java
@@ -4,10 +4,10 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Obeo - initial API and implementation
- * 
+ *
  */
 package org.eclipse.sirius.description.contribution.impl;
 
@@ -38,7 +38,7 @@ public class DirectEObjectReferenceImpl extends EObjectImpl implements DirectEOb
     /**
      * The cached value of the '{@link #getValue() <em>Value</em>}' reference.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see #getValue()
      * @generated
      * @ordered
@@ -47,7 +47,7 @@ public class DirectEObjectReferenceImpl extends EObjectImpl implements DirectEOb
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected DirectEObjectReferenceImpl() {
@@ -56,7 +56,7 @@ public class DirectEObjectReferenceImpl extends EObjectImpl implements DirectEOb
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -66,16 +66,18 @@ public class DirectEObjectReferenceImpl extends EObjectImpl implements DirectEOb
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
+    @Override
     public EObject getValue() {
         if (value != null && value.eIsProxy()) {
             InternalEObject oldValue = (InternalEObject) value;
             value = eResolveProxy(oldValue);
             if (value != oldValue) {
-                if (eNotificationRequired())
+                if (eNotificationRequired()) {
                     eNotify(new ENotificationImpl(this, Notification.RESOLVE, ContributionPackage.DIRECT_EOBJECT_REFERENCE__VALUE, oldValue, value));
+                }
             }
         }
         return value;
@@ -83,7 +85,7 @@ public class DirectEObjectReferenceImpl extends EObjectImpl implements DirectEOb
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     public EObject basicGetValue() {
@@ -92,27 +94,30 @@ public class DirectEObjectReferenceImpl extends EObjectImpl implements DirectEOb
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
+    @Override
     public void setValue(EObject newValue) {
         EObject oldValue = value;
         value = newValue;
-        if (eNotificationRequired())
+        if (eNotificationRequired()) {
             eNotify(new ENotificationImpl(this, Notification.SET, ContributionPackage.DIRECT_EOBJECT_REFERENCE__VALUE, oldValue, value));
+        }
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
     public Object eGet(int featureID, boolean resolve, boolean coreType) {
         switch (featureID) {
         case ContributionPackage.DIRECT_EOBJECT_REFERENCE__VALUE:
-            if (resolve)
+            if (resolve) {
                 return getValue();
+            }
             return basicGetValue();
         }
         return super.eGet(featureID, resolve, coreType);
@@ -120,7 +125,7 @@ public class DirectEObjectReferenceImpl extends EObjectImpl implements DirectEOb
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -135,7 +140,7 @@ public class DirectEObjectReferenceImpl extends EObjectImpl implements DirectEOb
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -150,7 +155,7 @@ public class DirectEObjectReferenceImpl extends EObjectImpl implements DirectEOb
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/impl/FeatureContributionImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/impl/FeatureContributionImpl.java
index 617bbdf0b1..36ab39f68f 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/impl/FeatureContributionImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/impl/FeatureContributionImpl.java
@@ -4,10 +4,10 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Obeo - initial API and implementation
- * 
+ *
  */
 package org.eclipse.sirius.description.contribution.impl;
 
@@ -42,7 +42,7 @@ public abstract class FeatureContributionImpl extends EObjectImpl implements Fea
      * The cached value of the '{@link #getSourceFeature()
      * <em>Source Feature</em>}' reference. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @see #getSourceFeature()
      * @generated
      * @ordered
@@ -53,7 +53,7 @@ public abstract class FeatureContributionImpl extends EObjectImpl implements Fea
      * The cached value of the '{@link #getTargetFeature()
      * <em>Target Feature</em>}' reference. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @see #getTargetFeature()
      * @generated
      * @ordered
@@ -62,7 +62,7 @@ public abstract class FeatureContributionImpl extends EObjectImpl implements Fea
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected FeatureContributionImpl() {
@@ -71,7 +71,7 @@ public abstract class FeatureContributionImpl extends EObjectImpl implements Fea
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -81,16 +81,18 @@ public abstract class FeatureContributionImpl extends EObjectImpl implements Fea
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
+    @Override
     public EStructuralFeature getSourceFeature() {
         if (sourceFeature != null && sourceFeature.eIsProxy()) {
             InternalEObject oldSourceFeature = (InternalEObject) sourceFeature;
             sourceFeature = (EStructuralFeature) eResolveProxy(oldSourceFeature);
             if (sourceFeature != oldSourceFeature) {
-                if (eNotificationRequired())
+                if (eNotificationRequired()) {
                     eNotify(new ENotificationImpl(this, Notification.RESOLVE, ContributionPackage.FEATURE_CONTRIBUTION__SOURCE_FEATURE, oldSourceFeature, sourceFeature));
+                }
             }
         }
         return sourceFeature;
@@ -98,7 +100,7 @@ public abstract class FeatureContributionImpl extends EObjectImpl implements Fea
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     public EStructuralFeature basicGetSourceFeature() {
@@ -107,28 +109,32 @@ public abstract class FeatureContributionImpl extends EObjectImpl implements Fea
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
+    @Override
     public void setSourceFeature(EStructuralFeature newSourceFeature) {
         EStructuralFeature oldSourceFeature = sourceFeature;
         sourceFeature = newSourceFeature;
-        if (eNotificationRequired())
+        if (eNotificationRequired()) {
             eNotify(new ENotificationImpl(this, Notification.SET, ContributionPackage.FEATURE_CONTRIBUTION__SOURCE_FEATURE, oldSourceFeature, sourceFeature));
+        }
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
+    @Override
     public EStructuralFeature getTargetFeature() {
         if (targetFeature != null && targetFeature.eIsProxy()) {
             InternalEObject oldTargetFeature = (InternalEObject) targetFeature;
             targetFeature = (EStructuralFeature) eResolveProxy(oldTargetFeature);
             if (targetFeature != oldTargetFeature) {
-                if (eNotificationRequired())
+                if (eNotificationRequired()) {
                     eNotify(new ENotificationImpl(this, Notification.RESOLVE, ContributionPackage.FEATURE_CONTRIBUTION__TARGET_FEATURE, oldTargetFeature, targetFeature));
+                }
             }
         }
         return targetFeature;
@@ -136,7 +142,7 @@ public abstract class FeatureContributionImpl extends EObjectImpl implements Fea
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     public EStructuralFeature basicGetTargetFeature() {
@@ -145,31 +151,35 @@ public abstract class FeatureContributionImpl extends EObjectImpl implements Fea
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
+    @Override
     public void setTargetFeature(EStructuralFeature newTargetFeature) {
         EStructuralFeature oldTargetFeature = targetFeature;
         targetFeature = newTargetFeature;
-        if (eNotificationRequired())
+        if (eNotificationRequired()) {
             eNotify(new ENotificationImpl(this, Notification.SET, ContributionPackage.FEATURE_CONTRIBUTION__TARGET_FEATURE, oldTargetFeature, targetFeature));
+        }
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
     public Object eGet(int featureID, boolean resolve, boolean coreType) {
         switch (featureID) {
         case ContributionPackage.FEATURE_CONTRIBUTION__SOURCE_FEATURE:
-            if (resolve)
+            if (resolve) {
                 return getSourceFeature();
+            }
             return basicGetSourceFeature();
         case ContributionPackage.FEATURE_CONTRIBUTION__TARGET_FEATURE:
-            if (resolve)
+            if (resolve) {
                 return getTargetFeature();
+            }
             return basicGetTargetFeature();
         }
         return super.eGet(featureID, resolve, coreType);
@@ -177,7 +187,7 @@ public abstract class FeatureContributionImpl extends EObjectImpl implements Fea
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -195,7 +205,7 @@ public abstract class FeatureContributionImpl extends EObjectImpl implements Fea
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -213,7 +223,7 @@ public abstract class FeatureContributionImpl extends EObjectImpl implements Fea
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/impl/IgnoreFeatureContributionImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/impl/IgnoreFeatureContributionImpl.java
index 8364e264c0..13916ac5cb 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/impl/IgnoreFeatureContributionImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/impl/IgnoreFeatureContributionImpl.java
@@ -4,10 +4,10 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Obeo - initial API and implementation
- * 
+ *
  */
 package org.eclipse.sirius.description.contribution.impl;
 
@@ -26,7 +26,7 @@ import org.eclipse.sirius.description.contribution.IgnoreFeatureContribution;
 public class IgnoreFeatureContributionImpl extends FeatureContributionImpl implements IgnoreFeatureContribution {
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected IgnoreFeatureContributionImpl() {
@@ -35,7 +35,7 @@ public class IgnoreFeatureContributionImpl extends FeatureContributionImpl imple
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/impl/RemoveFeatureContributionImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/impl/RemoveFeatureContributionImpl.java
index cedf56d270..7a891dbf21 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/impl/RemoveFeatureContributionImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/impl/RemoveFeatureContributionImpl.java
@@ -4,10 +4,10 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Obeo - initial API and implementation
- * 
+ *
  */
 package org.eclipse.sirius.description.contribution.impl;
 
@@ -26,7 +26,7 @@ import org.eclipse.sirius.description.contribution.RemoveFeatureContribution;
 public class RemoveFeatureContributionImpl extends FeatureContributionImpl implements RemoveFeatureContribution {
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected RemoveFeatureContributionImpl() {
@@ -35,7 +35,7 @@ public class RemoveFeatureContributionImpl extends FeatureContributionImpl imple
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/impl/ResetFeatureContributionImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/impl/ResetFeatureContributionImpl.java
index 975966593a..a206fc508d 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/impl/ResetFeatureContributionImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/impl/ResetFeatureContributionImpl.java
@@ -4,10 +4,10 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Obeo - initial API and implementation
- * 
+ *
  */
 package org.eclipse.sirius.description.contribution.impl;
 
@@ -26,7 +26,7 @@ import org.eclipse.sirius.description.contribution.ResetFeatureContribution;
 public class ResetFeatureContributionImpl extends FeatureContributionImpl implements ResetFeatureContribution {
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected ResetFeatureContributionImpl() {
@@ -35,7 +35,7 @@ public class ResetFeatureContributionImpl extends FeatureContributionImpl implem
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/impl/SetFeatureContributionImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/impl/SetFeatureContributionImpl.java
index fc5fd4dc9e..9a91978ac9 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/impl/SetFeatureContributionImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/impl/SetFeatureContributionImpl.java
@@ -4,10 +4,10 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Obeo - initial API and implementation
- * 
+ *
  */
 package org.eclipse.sirius.description.contribution.impl;
 
@@ -26,7 +26,7 @@ import org.eclipse.sirius.description.contribution.SetFeatureContribution;
 public class SetFeatureContributionImpl extends FeatureContributionImpl implements SetFeatureContribution {
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected SetFeatureContributionImpl() {
@@ -35,7 +35,7 @@ public class SetFeatureContributionImpl extends FeatureContributionImpl implemen
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/util/ContributionAdapterFactory.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/util/ContributionAdapterFactory.java
index ead5d05241..207b29bcde 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/util/ContributionAdapterFactory.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/util/ContributionAdapterFactory.java
@@ -4,10 +4,10 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Obeo - initial API and implementation
- * 
+ *
  */
 package org.eclipse.sirius.description.contribution.util;
 
@@ -34,14 +34,14 @@ import org.eclipse.sirius.description.contribution.SetFeatureContribution;
  * <!-- 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.sirius.description.contribution.ContributionPackage
  * @generated
  */
 public class ContributionAdapterFactory extends AdapterFactoryImpl {
     /**
      * The cached model package. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected static ContributionPackage modelPackage;
@@ -49,12 +49,12 @@ public class ContributionAdapterFactory extends AdapterFactoryImpl {
     /**
      * Creates an instance of the adapter factory. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     public ContributionAdapterFactory() {
-        if (modelPackage == null) {
-            modelPackage = ContributionPackage.eINSTANCE;
+        if (ContributionAdapterFactory.modelPackage == null) {
+            ContributionAdapterFactory.modelPackage = ContributionPackage.eINSTANCE;
         }
     }
 
@@ -63,17 +63,17 @@ public class ContributionAdapterFactory 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
      */
     @Override
     public boolean isFactoryForType(Object object) {
-        if (object == modelPackage) {
+        if (object == ContributionAdapterFactory.modelPackage) {
             return true;
         }
         if (object instanceof EObject) {
-            return ((EObject) object).eClass().getEPackage() == modelPackage;
+            return ((EObject) object).eClass().getEPackage() == ContributionAdapterFactory.modelPackage;
         }
         return false;
     }
@@ -81,7 +81,7 @@ public class ContributionAdapterFactory extends AdapterFactoryImpl {
     /**
      * The switch that delegates to the <code>createXXX</code> methods. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected ContributionSwitch<Adapter> modelSwitch = new ContributionSwitch<Adapter>() {
@@ -159,7 +159,7 @@ public class ContributionAdapterFactory 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>.
@@ -177,7 +177,7 @@ public class ContributionAdapterFactory extends AdapterFactoryImpl {
      * 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.sirius.description.contribution.FeatureContribution
      * @generated
@@ -193,7 +193,7 @@ public class ContributionAdapterFactory extends AdapterFactoryImpl {
      * 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.sirius.description.contribution.IgnoreFeatureContribution
      * @generated
@@ -209,7 +209,7 @@ public class ContributionAdapterFactory extends AdapterFactoryImpl {
      * 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.sirius.description.contribution.SetFeatureContribution
      * @generated
@@ -225,7 +225,7 @@ public class ContributionAdapterFactory extends AdapterFactoryImpl {
      * 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.sirius.description.contribution.AddFeatureContribution
      * @generated
@@ -241,7 +241,7 @@ public class ContributionAdapterFactory extends AdapterFactoryImpl {
      * 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.sirius.description.contribution.RemoveFeatureContribution
      * @generated
@@ -257,7 +257,7 @@ public class ContributionAdapterFactory extends AdapterFactoryImpl {
      * 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.sirius.description.contribution.ClearFeatureContribution
      * @generated
@@ -273,7 +273,7 @@ public class ContributionAdapterFactory extends AdapterFactoryImpl {
      * 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.sirius.description.contribution.ResetFeatureContribution
      * @generated
@@ -289,7 +289,7 @@ public class ContributionAdapterFactory extends AdapterFactoryImpl {
      * 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.sirius.description.contribution.EObjectReference
      * @generated
@@ -305,7 +305,7 @@ public class ContributionAdapterFactory extends AdapterFactoryImpl {
      * 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.sirius.description.contribution.DirectEObjectReference
      * @generated
@@ -321,7 +321,7 @@ public class ContributionAdapterFactory extends AdapterFactoryImpl {
      * 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.sirius.description.contribution.ComputedEObjectReference
      * @generated
@@ -337,7 +337,7 @@ public class ContributionAdapterFactory extends AdapterFactoryImpl {
      * 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.sirius.description.contribution.Contribution
      * @generated
@@ -353,7 +353,7 @@ public class ContributionAdapterFactory extends AdapterFactoryImpl {
      * 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.sirius.description.contribution.ContributionProvider
      * @generated
@@ -369,7 +369,7 @@ public class ContributionAdapterFactory extends AdapterFactoryImpl {
      * 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.sirius.description.contribution.ContributionPoint
      * @generated
@@ -381,7 +381,7 @@ public class ContributionAdapterFactory extends AdapterFactoryImpl {
     /**
      * Creates a new adapter for the default case. <!-- begin-user-doc --> This
      * default implementation returns null. <!-- end-user-doc -->
-     * 
+     *
      * @return the new adapter.
      * @generated
      */
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/util/ContributionSwitch.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/util/ContributionSwitch.java
index 7b0d597112..a6593d309b 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/util/ContributionSwitch.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/description/contribution/util/ContributionSwitch.java
@@ -4,10 +4,10 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Obeo - initial API and implementation
- * 
+ *
  */
 package org.eclipse.sirius.description.contribution.util;
 
@@ -37,14 +37,14 @@ import org.eclipse.sirius.description.contribution.SetFeatureContribution;
  * starting with the actual class of the object and proceeding up the
  * inheritance hierarchy until a non-null result is returned, which is the
  * result of the switch. <!-- end-user-doc -->
- * 
+ *
  * @see org.eclipse.sirius.description.contribution.ContributionPackage
  * @generated
  */
 public class ContributionSwitch<T> {
     /**
      * The cached model package <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected static ContributionPackage modelPackage;
@@ -52,12 +52,12 @@ public class ContributionSwitch<T> {
     /**
      * Creates an instance of the switch. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     public ContributionSwitch() {
-        if (modelPackage == null) {
-            modelPackage = ContributionPackage.eINSTANCE;
+        if (ContributionSwitch.modelPackage == null) {
+            ContributionSwitch.modelPackage = ContributionPackage.eINSTANCE;
         }
     }
 
@@ -65,7 +65,7 @@ public class ContributionSwitch<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
@@ -78,13 +78,13 @@ public class ContributionSwitch<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
      */
     protected T doSwitch(EClass theEClass, EObject theEObject) {
-        if (theEClass.eContainer() == modelPackage) {
+        if (theEClass.eContainer() == ContributionSwitch.modelPackage) {
             return doSwitch(theEClass.getClassifierID(), theEObject);
         } else {
             List<EClass> eSuperTypes = theEClass.getESuperTypes();
@@ -96,7 +96,7 @@ public class ContributionSwitch<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
@@ -106,108 +106,129 @@ public class ContributionSwitch<T> {
         case ContributionPackage.FEATURE_CONTRIBUTION: {
             FeatureContribution featureContribution = (FeatureContribution) theEObject;
             T result = caseFeatureContribution(featureContribution);
-            if (result == null)
+            if (result == null) {
                 result = defaultCase(theEObject);
+            }
             return result;
         }
         case ContributionPackage.IGNORE_FEATURE_CONTRIBUTION: {
             IgnoreFeatureContribution ignoreFeatureContribution = (IgnoreFeatureContribution) theEObject;
             T result = caseIgnoreFeatureContribution(ignoreFeatureContribution);
-            if (result == null)
+            if (result == null) {
                 result = caseFeatureContribution(ignoreFeatureContribution);
-            if (result == null)
+            }
+            if (result == null) {
                 result = defaultCase(theEObject);
+            }
             return result;
         }
         case ContributionPackage.SET_FEATURE_CONTRIBUTION: {
             SetFeatureContribution setFeatureContribution = (SetFeatureContribution) theEObject;
             T result = caseSetFeatureContribution(setFeatureContribution);
-            if (result == null)
+            if (result == null) {
                 result = caseFeatureContribution(setFeatureContribution);
-            if (result == null)
+            }
+            if (result == null) {
                 result = defaultCase(theEObject);
+            }
             return result;
         }
         case ContributionPackage.ADD_FEATURE_CONTRIBUTION: {
             AddFeatureContribution addFeatureContribution = (AddFeatureContribution) theEObject;
             T result = caseAddFeatureContribution(addFeatureContribution);
-            if (result == null)
+            if (result == null) {
                 result = caseFeatureContribution(addFeatureContribution);
-            if (result == null)
+            }
+            if (result == null) {
                 result = defaultCase(theEObject);
+            }
             return result;
         }
         case ContributionPackage.REMOVE_FEATURE_CONTRIBUTION: {
             RemoveFeatureContribution removeFeatureContribution = (RemoveFeatureContribution) theEObject;
             T result = caseRemoveFeatureContribution(removeFeatureContribution);
-            if (result == null)
+            if (result == null) {
                 result = caseFeatureContribution(removeFeatureContribution);
-            if (result == null)
+            }
+            if (result == null) {
                 result = defaultCase(theEObject);
+            }
             return result;
         }
         case ContributionPackage.CLEAR_FEATURE_CONTRIBUTION: {
             ClearFeatureContribution clearFeatureContribution = (ClearFeatureContribution) theEObject;
             T result = caseClearFeatureContribution(clearFeatureContribution);
-            if (result == null)
+            if (result == null) {
                 result = caseFeatureContribution(clearFeatureContribution);
-            if (result == null)
+            }
+            if (result == null) {
                 result = defaultCase(theEObject);
+            }
             return result;
         }
         case ContributionPackage.RESET_FEATURE_CONTRIBUTION: {
             ResetFeatureContribution resetFeatureContribution = (ResetFeatureContribution) theEObject;
             T result = caseResetFeatureContribution(resetFeatureContribution);
-            if (result == null)
+            if (result == null) {
                 result = caseFeatureContribution(resetFeatureContribution);
-            if (result == null)
+            }
+            if (result == null) {
                 result = defaultCase(theEObject);
+            }
             return result;
         }
         case ContributionPackage.EOBJECT_REFERENCE: {
             EObjectReference eObjectReference = (EObjectReference) theEObject;
             T result = caseEObjectReference(eObjectReference);
-            if (result == null)
+            if (result == null) {
                 result = defaultCase(theEObject);
+            }
             return result;
         }
         case ContributionPackage.DIRECT_EOBJECT_REFERENCE: {
             DirectEObjectReference directEObjectReference = (DirectEObjectReference) theEObject;
             T result = caseDirectEObjectReference(directEObjectReference);
-            if (result == null)
+            if (result == null) {
                 result = caseEObjectReference(directEObjectReference);
-            if (result == null)
+            }
+            if (result == null) {
                 result = defaultCase(theEObject);
+            }
             return result;
         }
         case ContributionPackage.COMPUTED_EOBJECT_REFERENCE: {
             ComputedEObjectReference computedEObjectReference = (ComputedEObjectReference) theEObject;
             T result = caseComputedEObjectReference(computedEObjectReference);
-            if (result == null)
+            if (result == null) {
                 result = caseEObjectReference(computedEObjectReference);
-            if (result == null)
+            }
+            if (result == null) {
                 result = defaultCase(theEObject);
+            }
             return result;
         }
         case ContributionPackage.CONTRIBUTION: {
             Contribution contribution = (Contribution) theEObject;
             T result = caseContribution(contribution);
-            if (result == null)
+            if (result == null) {
                 result = defaultCase(theEObject);
+            }
             return result;
         }
         case ContributionPackage.CONTRIBUTION_PROVIDER: {
             ContributionProvider contributionProvider = (ContributionProvider) theEObject;
             T result = caseContributionProvider(contributionProvider);
-            if (result == null)
+            if (result == null) {
                 result = defaultCase(theEObject);
+            }
             return result;
         }
         case ContributionPackage.CONTRIBUTION_POINT: {
             ContributionPoint contributionPoint = (ContributionPoint) theEObject;
             T result = caseContributionPoint(contributionPoint);
-            if (result == null)
+            if (result == null) {
                 result = defaultCase(theEObject);
+            }
             return result;
         }
         default:
@@ -220,7 +241,7 @@ public class ContributionSwitch<T> {
      * <em>Feature Contribution</em>'. <!-- begin-user-doc --> 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 '
@@ -237,7 +258,7 @@ public class ContributionSwitch<T> {
      * <em>Ignore Feature Contribution</em>'. <!-- begin-user-doc --> 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 '
@@ -254,7 +275,7 @@ public class ContributionSwitch<T> {
      * <em>Set Feature Contribution</em>'. <!-- begin-user-doc --> 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 '
@@ -271,7 +292,7 @@ public class ContributionSwitch<T> {
      * <em>Add Feature Contribution</em>'. <!-- begin-user-doc --> 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 '
@@ -288,7 +309,7 @@ public class ContributionSwitch<T> {
      * <em>Remove Feature Contribution</em>'. <!-- begin-user-doc --> 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 '
@@ -305,7 +326,7 @@ public class ContributionSwitch<T> {
      * <em>Clear Feature Contribution</em>'. <!-- begin-user-doc --> 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 '
@@ -322,7 +343,7 @@ public class ContributionSwitch<T> {
      * <em>Reset Feature Contribution</em>'. <!-- begin-user-doc --> 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 '
@@ -339,7 +360,7 @@ public class ContributionSwitch<T> {
      * <em>EObject Reference</em>'. <!-- begin-user-doc --> 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 '
@@ -356,7 +377,7 @@ public class ContributionSwitch<T> {
      * <em>Direct EObject Reference</em>'. <!-- begin-user-doc --> 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 '
@@ -373,7 +394,7 @@ public class ContributionSwitch<T> {
      * <em>Computed EObject Reference</em>'. <!-- begin-user-doc --> 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 '
@@ -390,7 +411,7 @@ public class ContributionSwitch<T> {
      * <em>Contribution</em>'. <!-- begin-user-doc --> 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 '
@@ -407,7 +428,7 @@ public class ContributionSwitch<T> {
      * <em>Provider</em>'. <!-- begin-user-doc --> 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 '
@@ -424,7 +445,7 @@ public class ContributionSwitch<T> {
      * <em>Point</em>'. <!-- begin-user-doc --> 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 '
@@ -441,7 +462,7 @@ public class ContributionSwitch<T> {
      * <em>EObject</em>'. <!-- begin-user-doc --> 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 '
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/audit/impl/AuditFactoryImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/audit/impl/AuditFactoryImpl.java
index 807b87f788..8e040f13af 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/audit/impl/AuditFactoryImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/audit/impl/AuditFactoryImpl.java
@@ -66,7 +66,7 @@ public class AuditFactoryImpl extends EFactoryImpl implements AuditFactory {
         case AuditPackage.TEMPLATE_INFORMATION_SECTION:
             return createTemplateInformationSection();
         default:
-            throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+            throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
         }
     }
 
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/audit/impl/AuditPackageImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/audit/impl/AuditPackageImpl.java
index d443a7886d..7c5bbee3a2 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/audit/impl/AuditPackageImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/audit/impl/AuditPackageImpl.java
@@ -247,15 +247,17 @@ public class AuditPackageImpl extends EPackageImpl implements AuditPackage {
         templateInformationSectionEClass.getESuperTypes().add(this.getInformationSection());
 
         // Initialize classes and features; add operations and parameters
-        initEClass(informationSectionEClass, InformationSection.class, "InformationSection", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
+        initEClass(informationSectionEClass, InformationSection.class, "InformationSection", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
-        EOperation op = addEOperation(informationSectionEClass, theEcorePackage.getEString(), "getContent", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-        addEParameter(op, theEcorePackage.getEObject(), "eObj", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
+        EOperation op = addEOperation(informationSectionEClass, theEcorePackage.getEString(), "getContent", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        addEParameter(op, theEcorePackage.getEObject(), "eObj", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
 
-        initEClass(templateInformationSectionEClass, TemplateInformationSection.class, "TemplateInformationSection", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getTemplateInformationSection_TemplatePath(), theEcorePackage.getEString(), "templatePath", null, 0, 1, TemplateInformationSection.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEClass(templateInformationSectionEClass, TemplateInformationSection.class,
+                "TemplateInformationSection", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getTemplateInformationSection_TemplatePath(),
+                theEcorePackage.getEString(),
+                "templatePath", null, 0, 1, TemplateInformationSection.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
     }
 
 } // AuditPackageImpl
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/audit/impl/TemplateInformationSectionImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/audit/impl/TemplateInformationSectionImpl.java
index c041ddb30d..93c067458a 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/audit/impl/TemplateInformationSectionImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/audit/impl/TemplateInformationSectionImpl.java
@@ -167,7 +167,7 @@ public class TemplateInformationSectionImpl extends InformationSectionImpl imple
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (templatePath: ");
+        result.append(" (templatePath: "); //$NON-NLS-1$
         result.append(templatePath);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/AbstractMappingImportImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/AbstractMappingImportImpl.java
index 933a099b48..3b660c4327 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/AbstractMappingImportImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/AbstractMappingImportImpl.java
@@ -227,9 +227,9 @@ public abstract class AbstractMappingImportImpl extends MinimalEObjectImpl.Conta
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (hideSubMappings: ");
+        result.append(" (hideSubMappings: "); //$NON-NLS-1$
         result.append(hideSubMappings);
-        result.append(", inheritsAncestorFilters: ");
+        result.append(", inheritsAncestorFilters: "); //$NON-NLS-1$
         result.append(inheritsAncestorFilters);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/AnnotationEntryImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/AnnotationEntryImpl.java
index b2ffe65e8f..d291cebbbf 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/AnnotationEntryImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/AnnotationEntryImpl.java
@@ -259,7 +259,7 @@ public class AnnotationEntryImpl extends MinimalEObjectImpl.Container implements
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (source: ");
+        result.append(" (source: "); //$NON-NLS-1$
         result.append(source);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/ColorStepImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/ColorStepImpl.java
index 828c4873ad..dd703bbe27 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/ColorStepImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/ColorStepImpl.java
@@ -239,7 +239,7 @@ public class ColorStepImpl extends MinimalEObjectImpl.Container implements Color
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (associatedValue: ");
+        result.append(" (associatedValue: "); //$NON-NLS-1$
         result.append(associatedValue);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/ComputedColorImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/ComputedColorImpl.java
index 083a60c9e8..d45a495bc1 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/ComputedColorImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/ComputedColorImpl.java
@@ -279,11 +279,11 @@ public class ComputedColorImpl extends UserColorImpl implements ComputedColor {
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (red: ");
+        result.append(" (red: "); //$NON-NLS-1$
         result.append(red);
-        result.append(", green: ");
+        result.append(", green: "); //$NON-NLS-1$
         result.append(green);
-        result.append(", blue: ");
+        result.append(", blue: "); //$NON-NLS-1$
         result.append(blue);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/ConditionalStyleDescriptionImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/ConditionalStyleDescriptionImpl.java
index eaeafe0f97..57400e98f5 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/ConditionalStyleDescriptionImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/ConditionalStyleDescriptionImpl.java
@@ -182,7 +182,7 @@ public abstract class ConditionalStyleDescriptionImpl extends MinimalEObjectImpl
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (predicateExpression: ");
+        result.append(" (predicateExpression: "); //$NON-NLS-1$
         result.append(predicateExpression);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/DAnnotationEntryImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/DAnnotationEntryImpl.java
index 8c56dfa5f3..35972192e8 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/DAnnotationEntryImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/DAnnotationEntryImpl.java
@@ -208,9 +208,9 @@ public class DAnnotationEntryImpl extends MinimalEObjectImpl.Container implement
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (source: ");
+        result.append(" (source: "); //$NON-NLS-1$
         result.append(source);
-        result.append(", details: ");
+        result.append(", details: "); //$NON-NLS-1$
         result.append(details);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/DAnnotationImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/DAnnotationImpl.java
index ee1ccdef6c..aa2e41831d 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/DAnnotationImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/DAnnotationImpl.java
@@ -228,7 +228,7 @@ public class DAnnotationImpl extends MinimalEObjectImpl.Container implements DAn
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (source: ");
+        result.append(" (source: "); //$NON-NLS-1$
         result.append(source);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/DecorationDescriptionImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/DecorationDescriptionImpl.java
index daaeacee6c..4312fabd80 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/DecorationDescriptionImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/DecorationDescriptionImpl.java
@@ -343,13 +343,13 @@ public abstract class DecorationDescriptionImpl extends MinimalEObjectImpl.Conta
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (name: ");
+        result.append(" (name: "); //$NON-NLS-1$
         result.append(name);
-        result.append(", position: ");
+        result.append(", position: "); //$NON-NLS-1$
         result.append(position);
-        result.append(", decoratorPath: ");
+        result.append(", decoratorPath: "); //$NON-NLS-1$
         result.append(decoratorPath);
-        result.append(", preconditionExpression: ");
+        result.append(", preconditionExpression: "); //$NON-NLS-1$
         result.append(preconditionExpression);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/DescriptionFactoryImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/DescriptionFactoryImpl.java
index 3704c9b5cc..20ed01e900 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/DescriptionFactoryImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/DescriptionFactoryImpl.java
@@ -148,7 +148,7 @@ public class DescriptionFactoryImpl extends EFactoryImpl implements DescriptionF
         case DescriptionPackage.DANNOTATION_ENTRY:
             return createDAnnotationEntry();
         default:
-            throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+            throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
         }
     }
 
@@ -175,7 +175,7 @@ public class DescriptionFactoryImpl extends EFactoryImpl implements DescriptionF
         case DescriptionPackage.URI:
             return createURIFromString(eDataType, initialValue);
         default:
-            throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+            throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
         }
     }
 
@@ -202,7 +202,7 @@ public class DescriptionFactoryImpl extends EFactoryImpl implements DescriptionF
         case DescriptionPackage.URI:
             return convertURIToString(eDataType, instanceValue);
         default:
-            throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+            throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
         }
     }
 
@@ -488,7 +488,7 @@ public class DescriptionFactoryImpl extends EFactoryImpl implements DescriptionF
     public Position createPositionFromString(EDataType eDataType, String initialValue) {
         Position result = Position.get(initialValue);
         if (result == null) {
-            throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+            throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
         }
         return result;
     }
@@ -510,7 +510,7 @@ public class DescriptionFactoryImpl extends EFactoryImpl implements DescriptionF
     public SystemColors createSystemColorsFromString(EDataType eDataType, String initialValue) {
         SystemColors result = SystemColors.get(initialValue);
         if (result == null) {
-            throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+            throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
         }
         return result;
     }
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/DescriptionPackageImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/DescriptionPackageImpl.java
index 5047e949eb..13f4d7ac6f 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/DescriptionPackageImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/DescriptionPackageImpl.java
@@ -2203,350 +2203,520 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
         computedColorEClass.getESuperTypes().add(this.getColorDescription());
 
         // Initialize classes and features; add operations and parameters
-        initEClass(groupEClass, Group.class, "Group", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getGroup_Name(), theEcorePackage.getEString(), "name", "", 0, 1, Group.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE,
-                !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getGroup_OwnedViewpoints(), this.getViewpoint(), null, "ownedViewpoints", null, 0, -1, Group.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
+        initEClass(groupEClass, Group.class, "Group", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getGroup_Name(),
+                theEcorePackage.getEString(),
+                "name", "", 0, 1, Group.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEReference(
+                getGroup_OwnedViewpoints(),
+                this.getViewpoint(),
+                null,
+                "ownedViewpoints", null, 0, -1, Group.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
         getGroup_OwnedViewpoints().getEKeys().add(this.getIdentifiedElement_Name());
-        initEReference(getGroup_SystemColorsPalette(), this.getSytemColorsPalette(), null, "systemColorsPalette", null, 1, 1, Group.class, EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getGroup_UserColorsPalettes(), this.getUserColorsPalette(), null, "userColorsPalettes", null, 0, -1, Group.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
+        initEReference(
+                getGroup_SystemColorsPalette(),
+                this.getSytemColorsPalette(),
+                null,
+                "systemColorsPalette", null, 1, 1, Group.class, EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getGroup_UserColorsPalettes(),
+                this.getUserColorsPalette(),
+                null,
+                "userColorsPalettes", null, 0, -1, Group.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
         getGroup_UserColorsPalettes().getEKeys().add(this.getUserColorsPalette_Name());
-        initEAttribute(getGroup_Version(), theEcorePackage.getEString(), "version", null, 0, 1, Group.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE,
-                !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(componentEClass, Component.class, "Component", EPackageImpl.IS_ABSTRACT, EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(viewpointEClass, Viewpoint.class, "Viewpoint", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getViewpoint_ModelFileExtension(), theEcorePackage.getEString(), "modelFileExtension", "*", 0, 1, Viewpoint.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getViewpoint_ValidationSet(), theValidationPackage.getValidationSet(), null, "validationSet", null, 0, 1, Viewpoint.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEAttribute(
+                getGroup_Version(),
+                theEcorePackage.getEString(),
+                "version", null, 0, 1, Group.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(componentEClass, Component.class, "Component", EPackageImpl.IS_ABSTRACT, EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(viewpointEClass, Viewpoint.class, "Viewpoint", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getViewpoint_ModelFileExtension(),
+                theEcorePackage.getEString(),
+                "modelFileExtension", "*", 0, 1, Viewpoint.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEReference(
+                getViewpoint_ValidationSet(),
+                theValidationPackage.getValidationSet(),
+                null,
+                "validationSet", null, 0, 1, Viewpoint.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
         getViewpoint_ValidationSet().getEKeys().add(theValidationPackage.getValidationSet_Name());
-        initEReference(getViewpoint_OwnedRepresentations(), this.getRepresentationDescription(), null, "ownedRepresentations", null, 0, -1, Viewpoint.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEReference(
+                getViewpoint_OwnedRepresentations(),
+                this.getRepresentationDescription(),
+                null,
+                "ownedRepresentations", null, 0, -1, Viewpoint.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
         getViewpoint_OwnedRepresentations().getEKeys().add(this.getIdentifiedElement_Name());
-        initEReference(getViewpoint_OwnedRepresentationExtensions(), this.getRepresentationExtensionDescription(), null, "ownedRepresentationExtensions", null, 0, -1, Viewpoint.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEReference(
+                getViewpoint_OwnedRepresentationExtensions(),
+                this.getRepresentationExtensionDescription(),
+                null,
+                "ownedRepresentationExtensions", null, 0, -1, Viewpoint.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
         getViewpoint_OwnedRepresentationExtensions().getEKeys().add(this.getRepresentationExtensionDescription_Name());
-        initEReference(getViewpoint_OwnedJavaExtensions(), this.getJavaExtension(), null, "ownedJavaExtensions", null, 0, -1, Viewpoint.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getViewpoint_OwnedMMExtensions(), this.getMetamodelExtensionSetting(), null, "ownedMMExtensions", null, 0, -1, Viewpoint.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getViewpoint_OwnedFeatureExtensions(), this.getFeatureExtensionDescription(), null, "ownedFeatureExtensions", null, 0, -1, Viewpoint.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getViewpoint_Icon(), this.getImagePath(), "icon", null, 0, 1, Viewpoint.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE,
-                !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getViewpoint_OwnedTemplates(), this.getRepresentationTemplate(), null, "ownedTemplates", null, 0, -1, Viewpoint.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
+        initEReference(
+                getViewpoint_OwnedJavaExtensions(),
+                this.getJavaExtension(),
+                null,
+                "ownedJavaExtensions", null, 0, -1, Viewpoint.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getViewpoint_OwnedMMExtensions(),
+                this.getMetamodelExtensionSetting(),
+                null,
+                "ownedMMExtensions", null, 0, -1, Viewpoint.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getViewpoint_OwnedFeatureExtensions(),
+                this.getFeatureExtensionDescription(),
+                null,
+                "ownedFeatureExtensions", null, 0, -1, Viewpoint.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getViewpoint_Icon(),
+                this.getImagePath(),
+                "icon", null, 0, 1, Viewpoint.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getViewpoint_OwnedTemplates(),
+                this.getRepresentationTemplate(),
+                null,
+                "ownedTemplates", null, 0, -1, Viewpoint.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
         getViewpoint_OwnedTemplates().getEKeys().add(this.getRepresentationTemplate_Name());
-        initEAttribute(getViewpoint_Conflicts(), this.getURI(), "conflicts", null, 0, -1, Viewpoint.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE,
-                !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getViewpoint_Reuses(), this.getURI(), "reuses", null, 0, -1, Viewpoint.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE,
-                !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getViewpoint_Customizes(), this.getURI(), "customizes", null, 0, -1, Viewpoint.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE,
-                !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        EOperation op = addEOperation(viewpointEClass, null, "initView", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-        addEParameter(op, theEcorePackage.getEObject(), "model", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-
-        initEClass(featureExtensionDescriptionEClass, FeatureExtensionDescription.class, "FeatureExtensionDescription", EPackageImpl.IS_ABSTRACT, EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(representationDescriptionEClass, RepresentationDescription.class, "RepresentationDescription", EPackageImpl.IS_ABSTRACT, EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getRepresentationDescription_TitleExpression(), this.getInterpretedExpression(), "titleExpression", "", 0, 1, RepresentationDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getRepresentationDescription_Initialisation(), theEcorePackage.getEBoolean(), "initialisation", null, 1, 1, RepresentationDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getRepresentationDescription_Metamodel(), theEcorePackage.getEPackage(), null, "metamodel", null, 0, -1, RepresentationDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getRepresentationDescription_ShowOnStartup(), theEcorePackage.getEBoolean(), "showOnStartup", null, 0, 1, RepresentationDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(representationTemplateEClass, RepresentationTemplate.class, "RepresentationTemplate", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getRepresentationTemplate_Name(), theEcorePackage.getEString(), "name", null, 1, 1, RepresentationTemplate.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getRepresentationTemplate_OwnedRepresentations(), this.getRepresentationDescription(), null, "ownedRepresentations", null, 0, -1, RepresentationTemplate.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(representationImportDescriptionEClass, RepresentationImportDescription.class, "RepresentationImportDescription", EPackageImpl.IS_ABSTRACT, EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(representationExtensionDescriptionEClass, RepresentationExtensionDescription.class, "RepresentationExtensionDescription", EPackageImpl.IS_ABSTRACT, EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getRepresentationExtensionDescription_Name(), theEcorePackage.getEString(), "name", null, 1, 1, RepresentationExtensionDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getRepresentationExtensionDescription_ViewpointURI(), theEcorePackage.getEString(), "viewpointURI", null, 1, 1, RepresentationExtensionDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEAttribute(getRepresentationExtensionDescription_RepresentationName(), theEcorePackage.getEString(), "representationName", null, 1, 1, RepresentationExtensionDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getRepresentationExtensionDescription_Metamodel(), theEcorePackage.getEPackage(), null, "metamodel", null, 0, -1, RepresentationExtensionDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(metamodelExtensionSettingEClass, MetamodelExtensionSetting.class, "MetamodelExtensionSetting", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getMetamodelExtensionSetting_ExtensionGroup(), theEcorePackage.getEObject(), null, "extensionGroup", null, 0, 1, MetamodelExtensionSetting.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(javaExtensionEClass, JavaExtension.class, "JavaExtension", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getJavaExtension_QualifiedClassName(), theEcorePackage.getEString(), "qualifiedClassName", null, 1, 1, JavaExtension.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(representationElementMappingEClass, RepresentationElementMapping.class, "RepresentationElementMapping", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getRepresentationElementMapping_DetailDescriptions(), theToolPackage.getRepresentationCreationDescription(), null, "detailDescriptions", null, 0, -1,
-                RepresentationElementMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES,
-                !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getRepresentationElementMapping_NavigationDescriptions(), theToolPackage.getRepresentationNavigationDescription(), null, "navigationDescriptions", null, 0, -1,
-                RepresentationElementMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES,
-                !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(abstractMappingImportEClass, AbstractMappingImport.class, "AbstractMappingImport", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getAbstractMappingImport_HideSubMappings(), theEcorePackage.getEBoolean(), "hideSubMappings", "false", 0, 1, AbstractMappingImport.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getAbstractMappingImport_InheritsAncestorFilters(), theEcorePackage.getEBoolean(), "inheritsAncestorFilters", "true", 0, 1, AbstractMappingImport.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-
-        initEClass(documentedElementEClass, DocumentedElement.class, "DocumentedElement", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getDocumentedElement_Documentation(), theEcorePackage.getEString(), "documentation", "", 0, 1, DocumentedElement.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(dModelElementEClass, DModelElement.class, "DModelElement", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getDModelElement_EAnnotations(), this.getDAnnotation(), null, "eAnnotations", null, 0, -1, DModelElement.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-
-        op = addEOperation(dModelElementEClass, this.getDAnnotation(), "getDAnnotation", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-        addEParameter(op, theEcorePackage.getEString(), "source", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-
-        initEClass(dAnnotationEClass, DAnnotation.class, "DAnnotation", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getDAnnotation_Source(), theEcorePackage.getEString(), "source", null, 0, 1, DAnnotation.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getDAnnotation_Details(), theEcorePackage.getEStringToStringMapEntry(), null, "details", null, 0, -1, DAnnotation.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-
-        initEClass(conditionalStyleDescriptionEClass, ConditionalStyleDescription.class, "ConditionalStyleDescription", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getConditionalStyleDescription_PredicateExpression(), this.getInterpretedExpression(), "predicateExpression", null, 1, 1, ConditionalStyleDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-
-        op = addEOperation(conditionalStyleDescriptionEClass, theEcorePackage.getEBoolean(), "checkPredicate", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-        addEParameter(op, theEcorePackage.getEObject(), "modelElement", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-        addEParameter(op, theEcorePackage.getEObject(), "viewVariable", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-        addEParameter(op, theEcorePackage.getEObject(), "containerVariable", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-
-        initEClass(pasteTargetDescriptionEClass, PasteTargetDescription.class, "PasteTargetDescription", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getPasteTargetDescription_PasteDescriptions(), theToolPackage.getPasteDescription(), null, "pasteDescriptions", null, 0, -1, PasteTargetDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(decorationDescriptionsSetEClass, DecorationDescriptionsSet.class, "DecorationDescriptionsSet", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getDecorationDescriptionsSet_DecorationDescriptions(), this.getDecorationDescription(), null, "decorationDescriptions", null, 0, -1, DecorationDescriptionsSet.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEAttribute(
+                getViewpoint_Conflicts(),
+                this.getURI(),
+                "conflicts", null, 0, -1, Viewpoint.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getViewpoint_Reuses(),
+                this.getURI(),
+                "reuses", null, 0, -1, Viewpoint.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getViewpoint_Customizes(),
+                this.getURI(),
+                "customizes", null, 0, -1, Viewpoint.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        EOperation op = addEOperation(viewpointEClass, null, "initView", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        addEParameter(op, theEcorePackage.getEObject(), "model", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(featureExtensionDescriptionEClass, FeatureExtensionDescription.class,
+                "FeatureExtensionDescription", EPackageImpl.IS_ABSTRACT, EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(representationDescriptionEClass, RepresentationDescription.class,
+                "RepresentationDescription", EPackageImpl.IS_ABSTRACT, EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getRepresentationDescription_TitleExpression(),
+                this.getInterpretedExpression(),
+                "titleExpression", "", 0, 1, RepresentationDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(
+                getRepresentationDescription_Initialisation(),
+                theEcorePackage.getEBoolean(),
+                "initialisation", null, 1, 1, RepresentationDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getRepresentationDescription_Metamodel(),
+                theEcorePackage.getEPackage(),
+                null,
+                "metamodel", null, 0, -1, RepresentationDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getRepresentationDescription_ShowOnStartup(),
+                theEcorePackage.getEBoolean(),
+                "showOnStartup", null, 0, 1, RepresentationDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(representationTemplateEClass, RepresentationTemplate.class, "RepresentationTemplate", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getRepresentationTemplate_Name(),
+                theEcorePackage.getEString(),
+                "name", null, 1, 1, RepresentationTemplate.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getRepresentationTemplate_OwnedRepresentations(),
+                this.getRepresentationDescription(),
+                null,
+                "ownedRepresentations", null, 0, -1, RepresentationTemplate.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(representationImportDescriptionEClass, RepresentationImportDescription.class,
+                "RepresentationImportDescription", EPackageImpl.IS_ABSTRACT, EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(representationExtensionDescriptionEClass, RepresentationExtensionDescription.class,
+                "RepresentationExtensionDescription", EPackageImpl.IS_ABSTRACT, EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getRepresentationExtensionDescription_Name(),
+                theEcorePackage.getEString(),
+                "name", null, 1, 1, RepresentationExtensionDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getRepresentationExtensionDescription_ViewpointURI(),
+                theEcorePackage.getEString(),
+                "viewpointURI", null, 1, 1, RepresentationExtensionDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getRepresentationExtensionDescription_RepresentationName(),
+                theEcorePackage.getEString(),
+                "representationName", null, 1, 1, RepresentationExtensionDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getRepresentationExtensionDescription_Metamodel(),
+                theEcorePackage.getEPackage(),
+                null,
+                "metamodel", null, 0, -1, RepresentationExtensionDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(metamodelExtensionSettingEClass, MetamodelExtensionSetting.class,
+                "MetamodelExtensionSetting", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getMetamodelExtensionSetting_ExtensionGroup(),
+                theEcorePackage.getEObject(),
+                null,
+                "extensionGroup", null, 0, 1, MetamodelExtensionSetting.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(javaExtensionEClass, JavaExtension.class, "JavaExtension", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getJavaExtension_QualifiedClassName(),
+                theEcorePackage.getEString(),
+                "qualifiedClassName", null, 1, 1, JavaExtension.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(representationElementMappingEClass, RepresentationElementMapping.class,
+                "RepresentationElementMapping", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getRepresentationElementMapping_DetailDescriptions(),
+                theToolPackage.getRepresentationCreationDescription(),
+                null,
+                "detailDescriptions", null, 0, -1, RepresentationElementMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getRepresentationElementMapping_NavigationDescriptions(),
+                theToolPackage.getRepresentationNavigationDescription(),
+                null,
+                "navigationDescriptions", null, 0, -1, RepresentationElementMapping.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(abstractMappingImportEClass, AbstractMappingImport.class, "AbstractMappingImport", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getAbstractMappingImport_HideSubMappings(),
+                theEcorePackage.getEBoolean(),
+                "hideSubMappings", "false", 0, 1, AbstractMappingImport.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(
+                getAbstractMappingImport_InheritsAncestorFilters(),
+                theEcorePackage.getEBoolean(),
+                "inheritsAncestorFilters", "true", 0, 1, AbstractMappingImport.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+
+        initEClass(documentedElementEClass, DocumentedElement.class, "DocumentedElement", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getDocumentedElement_Documentation(),
+                theEcorePackage.getEString(),
+                "documentation", "", 0, 1, DocumentedElement.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+
+        initEClass(dModelElementEClass, DModelElement.class, "DModelElement", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getDModelElement_EAnnotations(),
+                this.getDAnnotation(),
+                null,
+                "eAnnotations", null, 0, -1, DModelElement.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        op = addEOperation(dModelElementEClass, this.getDAnnotation(), "getDAnnotation", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        addEParameter(op, theEcorePackage.getEString(), "source", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(dAnnotationEClass, DAnnotation.class, "DAnnotation", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getDAnnotation_Source(),
+                theEcorePackage.getEString(),
+                "source", null, 0, 1, DAnnotation.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDAnnotation_Details(),
+                theEcorePackage.getEStringToStringMapEntry(),
+                null,
+                "details", null, 0, -1, DAnnotation.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(conditionalStyleDescriptionEClass, ConditionalStyleDescription.class,
+                "ConditionalStyleDescription", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getConditionalStyleDescription_PredicateExpression(),
+                this.getInterpretedExpression(),
+                "predicateExpression", null, 1, 1, ConditionalStyleDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        op = addEOperation(conditionalStyleDescriptionEClass, theEcorePackage.getEBoolean(), "checkPredicate", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        addEParameter(op, theEcorePackage.getEObject(), "modelElement", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        addEParameter(op, theEcorePackage.getEObject(), "viewVariable", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        addEParameter(op, theEcorePackage.getEObject(), "containerVariable", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(pasteTargetDescriptionEClass, PasteTargetDescription.class, "PasteTargetDescription", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getPasteTargetDescription_PasteDescriptions(),
+                theToolPackage.getPasteDescription(),
+                null,
+                "pasteDescriptions", null, 0, -1, PasteTargetDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(decorationDescriptionsSetEClass, DecorationDescriptionsSet.class,
+                "DecorationDescriptionsSet", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getDecorationDescriptionsSet_DecorationDescriptions(),
+                this.getDecorationDescription(),
+                null,
+                "decorationDescriptions", null, 0, -1, DecorationDescriptionsSet.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
         getDecorationDescriptionsSet_DecorationDescriptions().getEKeys().add(this.getDecorationDescription_Name());
 
-        initEClass(decorationDescriptionEClass, DecorationDescription.class, "DecorationDescription", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getDecorationDescription_Name(), theEcorePackage.getEString(), "name", null, 1, 1, DecorationDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getDecorationDescription_Position(), this.getPosition(), "position", "SOUTH_WEST", 1, 1, DecorationDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getDecorationDescription_DecoratorPath(), this.getImagePath(), "decoratorPath", null, 1, 1, DecorationDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getDecorationDescription_PreconditionExpression(), this.getInterpretedExpression(), "preconditionExpression", null, 0, 1, DecorationDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-
-        initEClass(semanticBasedDecorationEClass, SemanticBasedDecoration.class, "SemanticBasedDecoration", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getSemanticBasedDecoration_DomainClass(), this.getTypeName(), "domainClass", null, 1, 1, SemanticBasedDecoration.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(customizationEClass, Customization.class, "Customization", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getCustomization_VsmElementCustomizations(), this.getIVSMElementCustomization(), null, "vsmElementCustomizations", null, 1, -1, Customization.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(ivsmElementCustomizationEClass, IVSMElementCustomization.class, "IVSMElementCustomization", EPackageImpl.IS_ABSTRACT, EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(vsmElementCustomizationEClass, VSMElementCustomization.class, "VSMElementCustomization", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getVSMElementCustomization_PredicateExpression(), this.getInterpretedExpression(), "predicateExpression", null, 0, 1, VSMElementCustomization.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getVSMElementCustomization_FeatureCustomizations(), this.getEStructuralFeatureCustomization(), null, "featureCustomizations", null, 1, -1, VSMElementCustomization.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(vsmElementCustomizationReuseEClass, VSMElementCustomizationReuse.class, "VSMElementCustomizationReuse", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getVSMElementCustomizationReuse_Reuse(), this.getEStructuralFeatureCustomization(), null, "reuse", null, 1, -1, VSMElementCustomizationReuse.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getVSMElementCustomizationReuse_AppliedOn(), theEcorePackage.getEObject(), null, "appliedOn", null, 1, -1, VSMElementCustomizationReuse.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(eStructuralFeatureCustomizationEClass, EStructuralFeatureCustomization.class, "EStructuralFeatureCustomization", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getEStructuralFeatureCustomization_AppliedOn(), theEcorePackage.getEObject(), null, "appliedOn", null, 0, -1, EStructuralFeatureCustomization.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getEStructuralFeatureCustomization_ApplyOnAll(), theEcorePackage.getEBoolean(), "applyOnAll", null, 0, 1, EStructuralFeatureCustomization.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(eAttributeCustomizationEClass, EAttributeCustomization.class, "EAttributeCustomization", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getEAttributeCustomization_AttributeName(), theEcorePackage.getEString(), "attributeName", null, 1, 1, EAttributeCustomization.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getEAttributeCustomization_Value(), this.getInterpretedExpression(), "value", null, 0, 1, EAttributeCustomization.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(eReferenceCustomizationEClass, EReferenceCustomization.class, "EReferenceCustomization", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getEReferenceCustomization_ReferenceName(), theEcorePackage.getEString(), "referenceName", null, 1, 1, EReferenceCustomization.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getEReferenceCustomization_Value(), theEcorePackage.getEObject(), null, "value", null, 0, 1, EReferenceCustomization.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(selectionDescriptionEClass, SelectionDescription.class, "SelectionDescription", EPackageImpl.IS_ABSTRACT, EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getSelectionDescription_CandidatesExpression(), this.getInterpretedExpression(), "candidatesExpression", null, 1, 1, SelectionDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getSelectionDescription_Multiple(), theEcorePackage.getEBoolean(), "multiple", null, 1, 1, SelectionDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getSelectionDescription_Tree(), theEcorePackage.getEBoolean(), "tree", null, 1, 1, SelectionDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getSelectionDescription_RootExpression(), this.getInterpretedExpression(), "rootExpression", null, 0, 1, SelectionDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getSelectionDescription_ChildrenExpression(), this.getInterpretedExpression(), "childrenExpression", null, 0, 1, SelectionDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getSelectionDescription_Message(), theEcorePackage.getEString(), "message", null, 0, 1, SelectionDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(colorDescriptionEClass, ColorDescription.class, "ColorDescription", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(systemColorEClass, SystemColor.class, "SystemColor", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getSystemColor_Name(), theEcorePackage.getEString(), "name", null, 1, 1, SystemColor.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE,
-                !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(interpolatedColorEClass, InterpolatedColor.class, "InterpolatedColor", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getInterpolatedColor_ColorValueComputationExpression(), this.getInterpretedExpression(), "colorValueComputationExpression", "1", 1, 1, InterpolatedColor.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEAttribute(getInterpolatedColor_MinValueComputationExpression(), this.getInterpretedExpression(), "minValueComputationExpression", "0", 1, 1, InterpolatedColor.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEAttribute(getInterpolatedColor_MaxValueComputationExpression(), this.getInterpretedExpression(), "maxValueComputationExpression", "10", 1, 1, InterpolatedColor.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getInterpolatedColor_ColorSteps(), this.getColorStep(), null, "colorSteps", null, 0, -1, InterpolatedColor.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-
-        initEClass(colorStepEClass, ColorStep.class, "ColorStep", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getColorStep_AssociatedValue(), this.getInterpretedExpression(), "associatedValue", "", 1, 1, ColorStep.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getColorStep_AssociatedColor(), this.getFixedColor(), null, "associatedColor", null, 1, 1, ColorStep.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-
-        initEClass(fixedColorEClass, FixedColor.class, "FixedColor", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getFixedColor_Red(), theEcorePackage.getEInt(), "red", "125", 1, 1, FixedColor.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE,
-                !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getFixedColor_Green(), theEcorePackage.getEInt(), "green", "125", 1, 1, FixedColor.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE,
-                !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getFixedColor_Blue(), theEcorePackage.getEInt(), "blue", "125", 1, 1, FixedColor.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE,
-                !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(userFixedColorEClass, UserFixedColor.class, "UserFixedColor", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(userColorEClass, UserColor.class, "UserColor", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getUserColor_Name(), theEcorePackage.getEString(), "name", null, 1, 1, UserColor.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE,
-                !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(environmentEClass, Environment.class, "Environment", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getEnvironment_SystemColors(), this.getSytemColorsPalette(), null, "systemColors", null, 0, 1, Environment.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getEnvironment_DefaultTools(), theToolPackage.getToolEntry(), null, "defaultTools", null, 0, -1, Environment.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getEnvironment_LabelBorderStyles(), theStylePackage.getLabelBorderStyles(), null, "labelBorderStyles", null, 0, 1, Environment.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(sytemColorsPaletteEClass, SytemColorsPalette.class, "SytemColorsPalette", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getSytemColorsPalette_Entries(), this.getSystemColor(), null, "entries", null, 0, -1, SytemColorsPalette.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
+        initEClass(decorationDescriptionEClass, DecorationDescription.class, "DecorationDescription", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getDecorationDescription_Name(),
+                theEcorePackage.getEString(),
+                "name", null, 1, 1, DecorationDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getDecorationDescription_Position(),
+                this.getPosition(),
+                "position", "SOUTH_WEST", 1, 1, DecorationDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(
+                getDecorationDescription_DecoratorPath(),
+                this.getImagePath(),
+                "decoratorPath", null, 1, 1, DecorationDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getDecorationDescription_PreconditionExpression(),
+                this.getInterpretedExpression(),
+                "preconditionExpression", null, 0, 1, DecorationDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(semanticBasedDecorationEClass, SemanticBasedDecoration.class,
+                "SemanticBasedDecoration", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getSemanticBasedDecoration_DomainClass(),
+                this.getTypeName(),
+                "domainClass", null, 1, 1, SemanticBasedDecoration.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(customizationEClass, Customization.class, "Customization", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getCustomization_VsmElementCustomizations(),
+                this.getIVSMElementCustomization(),
+                null,
+                "vsmElementCustomizations", null, 1, -1, Customization.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(ivsmElementCustomizationEClass, IVSMElementCustomization.class,
+                "IVSMElementCustomization", EPackageImpl.IS_ABSTRACT, EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(vsmElementCustomizationEClass, VSMElementCustomization.class,
+                "VSMElementCustomization", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getVSMElementCustomization_PredicateExpression(),
+                this.getInterpretedExpression(),
+                "predicateExpression", null, 0, 1, VSMElementCustomization.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getVSMElementCustomization_FeatureCustomizations(),
+                this.getEStructuralFeatureCustomization(),
+                null,
+                "featureCustomizations", null, 1, -1, VSMElementCustomization.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(vsmElementCustomizationReuseEClass, VSMElementCustomizationReuse.class,
+                "VSMElementCustomizationReuse", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getVSMElementCustomizationReuse_Reuse(),
+                this.getEStructuralFeatureCustomization(),
+                null,
+                "reuse", null, 1, -1, VSMElementCustomizationReuse.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getVSMElementCustomizationReuse_AppliedOn(),
+                theEcorePackage.getEObject(),
+                null,
+                "appliedOn", null, 1, -1, VSMElementCustomizationReuse.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(eStructuralFeatureCustomizationEClass, EStructuralFeatureCustomization.class,
+                "EStructuralFeatureCustomization", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getEStructuralFeatureCustomization_AppliedOn(),
+                theEcorePackage.getEObject(),
+                null,
+                "appliedOn", null, 0, -1, EStructuralFeatureCustomization.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getEStructuralFeatureCustomization_ApplyOnAll(),
+                theEcorePackage.getEBoolean(),
+                "applyOnAll", null, 0, 1, EStructuralFeatureCustomization.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(eAttributeCustomizationEClass, EAttributeCustomization.class,
+                "EAttributeCustomization", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getEAttributeCustomization_AttributeName(),
+                theEcorePackage.getEString(),
+                "attributeName", null, 1, 1, EAttributeCustomization.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getEAttributeCustomization_Value(),
+                this.getInterpretedExpression(),
+                "value", null, 0, 1, EAttributeCustomization.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(eReferenceCustomizationEClass, EReferenceCustomization.class,
+                "EReferenceCustomization", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getEReferenceCustomization_ReferenceName(),
+                theEcorePackage.getEString(),
+                "referenceName", null, 1, 1, EReferenceCustomization.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getEReferenceCustomization_Value(),
+                theEcorePackage.getEObject(),
+                null,
+                "value", null, 0, 1, EReferenceCustomization.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(selectionDescriptionEClass, SelectionDescription.class, "SelectionDescription", EPackageImpl.IS_ABSTRACT, EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getSelectionDescription_CandidatesExpression(),
+                this.getInterpretedExpression(),
+                "candidatesExpression", null, 1, 1, SelectionDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getSelectionDescription_Multiple(),
+                theEcorePackage.getEBoolean(),
+                "multiple", null, 1, 1, SelectionDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getSelectionDescription_Tree(),
+                theEcorePackage.getEBoolean(),
+                "tree", null, 1, 1, SelectionDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getSelectionDescription_RootExpression(),
+                this.getInterpretedExpression(),
+                "rootExpression", null, 0, 1, SelectionDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getSelectionDescription_ChildrenExpression(),
+                this.getInterpretedExpression(),
+                "childrenExpression", null, 0, 1, SelectionDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getSelectionDescription_Message(),
+                theEcorePackage.getEString(),
+                "message", null, 0, 1, SelectionDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(colorDescriptionEClass, ColorDescription.class, "ColorDescription", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(systemColorEClass, SystemColor.class, "SystemColor", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getSystemColor_Name(),
+                theEcorePackage.getEString(),
+                "name", null, 1, 1, SystemColor.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(interpolatedColorEClass, InterpolatedColor.class, "InterpolatedColor", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getInterpolatedColor_ColorValueComputationExpression(),
+                this.getInterpretedExpression(),
+                "colorValueComputationExpression", "1", 1, 1, InterpolatedColor.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(
+                getInterpolatedColor_MinValueComputationExpression(),
+                this.getInterpretedExpression(),
+                "minValueComputationExpression", "0", 1, 1, InterpolatedColor.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(
+                getInterpolatedColor_MaxValueComputationExpression(),
+                this.getInterpretedExpression(),
+                "maxValueComputationExpression", "10", 1, 1, InterpolatedColor.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEReference(
+                getInterpolatedColor_ColorSteps(),
+                this.getColorStep(),
+                null,
+                "colorSteps", null, 0, -1, InterpolatedColor.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(colorStepEClass, ColorStep.class, "ColorStep", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getColorStep_AssociatedValue(),
+                this.getInterpretedExpression(),
+                "associatedValue", "", 1, 1, ColorStep.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEReference(
+                getColorStep_AssociatedColor(),
+                this.getFixedColor(),
+                null,
+                "associatedColor", null, 1, 1, ColorStep.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(fixedColorEClass, FixedColor.class, "FixedColor", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getFixedColor_Red(),
+                theEcorePackage.getEInt(),
+                "red", "125", 1, 1, FixedColor.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(
+                getFixedColor_Green(),
+                theEcorePackage.getEInt(),
+                "green", "125", 1, 1, FixedColor.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(
+                getFixedColor_Blue(),
+                theEcorePackage.getEInt(),
+                "blue", "125", 1, 1, FixedColor.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+
+        initEClass(userFixedColorEClass, UserFixedColor.class, "UserFixedColor", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(userColorEClass, UserColor.class, "UserColor", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getUserColor_Name(),
+                theEcorePackage.getEString(),
+                "name", null, 1, 1, UserColor.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(environmentEClass, Environment.class, "Environment", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getEnvironment_SystemColors(),
+                this.getSytemColorsPalette(),
+                null,
+                "systemColors", null, 0, 1, Environment.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getEnvironment_DefaultTools(),
+                theToolPackage.getToolEntry(),
+                null,
+                "defaultTools", null, 0, -1, Environment.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getEnvironment_LabelBorderStyles(),
+                theStylePackage.getLabelBorderStyles(),
+                null,
+                "labelBorderStyles", null, 0, 1, Environment.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(sytemColorsPaletteEClass, SytemColorsPalette.class, "SytemColorsPalette", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getSytemColorsPalette_Entries(),
+                this.getSystemColor(),
+                null,
+                "entries", null, 0, -1, SytemColorsPalette.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
         getSytemColorsPalette_Entries().getEKeys().add(this.getSystemColor_Name());
 
-        initEClass(userColorsPaletteEClass, UserColorsPalette.class, "UserColorsPalette", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getUserColorsPalette_Name(), theEcorePackage.getEString(), "name", null, 1, 1, UserColorsPalette.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getUserColorsPalette_Entries(), this.getUserColor(), null, "entries", null, 0, -1, UserColorsPalette.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
+        initEClass(userColorsPaletteEClass, UserColorsPalette.class, "UserColorsPalette", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getUserColorsPalette_Name(),
+                theEcorePackage.getEString(),
+                "name", null, 1, 1, UserColorsPalette.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getUserColorsPalette_Entries(),
+                this.getUserColor(),
+                null,
+                "entries", null, 0, -1, UserColorsPalette.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
         getUserColorsPalette_Entries().getEKeys().add(this.getUserColor_Name());
 
-        initEClass(annotationEntryEClass, AnnotationEntry.class, "AnnotationEntry", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getAnnotationEntry_Source(), theEcorePackage.getEString(), "source", null, 0, 1, AnnotationEntry.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getAnnotationEntry_Data(), theEcorePackage.getEObject(), null, "data", null, 0, 1, AnnotationEntry.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-
-        initEClass(endUserDocumentedElementEClass, EndUserDocumentedElement.class, "EndUserDocumentedElement", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getEndUserDocumentedElement_EndUserDocumentation(), theEcorePackage.getEString(), "endUserDocumentation", "", 0, 1, EndUserDocumentedElement.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(identifiedElementEClass, IdentifiedElement.class, "IdentifiedElement", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getIdentifiedElement_Name(), theEcorePackage.getEString(), "name", "", 1, 1, IdentifiedElement.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getIdentifiedElement_Label(), theEcorePackage.getEString(), "label", null, 0, 1, IdentifiedElement.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(computedColorEClass, ComputedColor.class, "ComputedColor", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getComputedColor_Red(), this.getInterpretedExpression(), "red", "", 1, 1, ComputedColor.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getComputedColor_Green(), this.getInterpretedExpression(), "green", "", 1, 1, ComputedColor.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getComputedColor_Blue(), this.getInterpretedExpression(), "blue", "", 1, 1, ComputedColor.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(dAnnotationEntryEClass, DAnnotationEntry.class, "DAnnotationEntry", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getDAnnotationEntry_Source(), theEcorePackage.getEString(), "source", null, 0, 1, DAnnotationEntry.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getDAnnotationEntry_Details(), theEcorePackage.getEString(), "details", null, 0, -1, DAnnotationEntry.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEClass(annotationEntryEClass, AnnotationEntry.class, "AnnotationEntry", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getAnnotationEntry_Source(),
+                theEcorePackage.getEString(),
+                "source", null, 0, 1, AnnotationEntry.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getAnnotationEntry_Data(),
+                theEcorePackage.getEObject(),
+                null,
+                "data", null, 0, 1, AnnotationEntry.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(endUserDocumentedElementEClass, EndUserDocumentedElement.class,
+                "EndUserDocumentedElement", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getEndUserDocumentedElement_EndUserDocumentation(),
+                theEcorePackage.getEString(),
+                "endUserDocumentation", "", 0, 1, EndUserDocumentedElement.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+
+        initEClass(identifiedElementEClass, IdentifiedElement.class, "IdentifiedElement", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getIdentifiedElement_Name(),
+                theEcorePackage.getEString(),
+                "name", "", 1, 1, IdentifiedElement.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(
+                getIdentifiedElement_Label(),
+                theEcorePackage.getEString(),
+                "label", null, 0, 1, IdentifiedElement.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(computedColorEClass, ComputedColor.class, "ComputedColor", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getComputedColor_Red(),
+                this.getInterpretedExpression(),
+                "red", "", 1, 1, ComputedColor.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(
+                getComputedColor_Green(),
+                this.getInterpretedExpression(),
+                "green", "", 1, 1, ComputedColor.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(
+                getComputedColor_Blue(),
+                this.getInterpretedExpression(),
+                "blue", "", 1, 1, ComputedColor.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+
+        initEClass(dAnnotationEntryEClass, DAnnotationEntry.class, "DAnnotationEntry", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getDAnnotationEntry_Source(),
+                theEcorePackage.getEString(),
+                "source", null, 0, 1, DAnnotationEntry.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getDAnnotationEntry_Details(),
+                theEcorePackage.getEString(),
+                "details", null, 0, -1, DAnnotationEntry.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
 
         // Initialize enums and add enum literals
-        initEEnum(positionEEnum, Position.class, "Position");
+        initEEnum(positionEEnum, Position.class, "Position"); //$NON-NLS-1$
         addEEnumLiteral(positionEEnum, Position.NORTH_LITERAL);
         addEEnumLiteral(positionEEnum, Position.WEST_LITERAL);
         addEEnumLiteral(positionEEnum, Position.SOUTH_LITERAL);
@@ -2557,7 +2727,7 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
         addEEnumLiteral(positionEEnum, Position.SOUTH_EAST_LITERAL);
         addEEnumLiteral(positionEEnum, Position.CENTER_LITERAL);
 
-        initEEnum(systemColorsEEnum, SystemColors.class, "SystemColors");
+        initEEnum(systemColorsEEnum, SystemColors.class, "SystemColors"); //$NON-NLS-1$
         addEEnumLiteral(systemColorsEEnum, SystemColors.BLACK_LITERAL);
         addEEnumLiteral(systemColorsEEnum, SystemColors.BLUE_LITERAL);
         addEEnumLiteral(systemColorsEEnum, SystemColors.RED_LITERAL);
@@ -2586,11 +2756,11 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
         addEEnumLiteral(systemColorsEEnum, SystemColors.LIGHT_GRAY_LITERAL);
 
         // Initialize data types
-        initEDataType(typeNameEDataType, String.class, "TypeName", EPackageImpl.IS_SERIALIZABLE, !EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEDataType(interpretedExpressionEDataType, String.class, "InterpretedExpression", EPackageImpl.IS_SERIALIZABLE, !EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEDataType(featureNameEDataType, String.class, "FeatureName", EPackageImpl.IS_SERIALIZABLE, !EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEDataType(imagePathEDataType, String.class, "ImagePath", EPackageImpl.IS_SERIALIZABLE, !EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEDataType(uriEDataType, org.eclipse.emf.common.util.URI.class, "URI", EPackageImpl.IS_SERIALIZABLE, !EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
+        initEDataType(typeNameEDataType, String.class, "TypeName", EPackageImpl.IS_SERIALIZABLE, !EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEDataType(interpretedExpressionEDataType, String.class, "InterpretedExpression", EPackageImpl.IS_SERIALIZABLE, !EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEDataType(featureNameEDataType, String.class, "FeatureName", EPackageImpl.IS_SERIALIZABLE, !EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEDataType(imagePathEDataType, String.class, "ImagePath", EPackageImpl.IS_SERIALIZABLE, !EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEDataType(uriEDataType, org.eclipse.emf.common.util.URI.class, "URI", EPackageImpl.IS_SERIALIZABLE, !EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
         // Create annotations
         // http://www.eclipse.org/sirius/interpreted/expression/returnType
@@ -2607,23 +2777,38 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
      * @generated
      */
     protected void createReturnTypeAnnotations() {
-        String source = "http://www.eclipse.org/sirius/interpreted/expression/returnType";
-        addAnnotation(getRepresentationDescription_TitleExpression(), source, new String[] { "returnType", "a string." });
-        addAnnotation(getConditionalStyleDescription_PredicateExpression(), source, new String[] { "returnType", "a boolean." });
-        addAnnotation(getDecorationDescription_PreconditionExpression(), source, new String[] { "returnType", "a boolean." });
-        addAnnotation(getVSMElementCustomization_PredicateExpression(), source, new String[] { "returnType",
-        "a boolean result. True to enable the customization, false to disabled it. True by default." });
-        addAnnotation(getEAttributeCustomization_Value(), source, new String[] { "returnType", "A java Object to affect as new value of a EAttribute, for example a java primitive." });
-        addAnnotation(getSelectionDescription_CandidatesExpression(), source, new String[] { "returnType", "a Collection<EObject> or an EObject." });
-        addAnnotation(getSelectionDescription_RootExpression(), source, new String[] { "returnType", "a Collection<EObject> or an EObject." });
-        addAnnotation(getSelectionDescription_ChildrenExpression(), source, new String[] { "returnType", "a Collection<EObject> or an EObject." });
-        addAnnotation(getInterpolatedColor_ColorValueComputationExpression(), source, new String[] { "returnType", "an integer." });
-        addAnnotation(getInterpolatedColor_MinValueComputationExpression(), source, new String[] { "returnType", "an integer." });
-        addAnnotation(getInterpolatedColor_MaxValueComputationExpression(), source, new String[] { "returnType", "an integer." });
-        addAnnotation(getColorStep_AssociatedValue(), source, new String[] { "returnType", "an integer." });
-        addAnnotation(getComputedColor_Red(), source, new String[] { "returnType", "an integer." });
-        addAnnotation(getComputedColor_Green(), source, new String[] { "returnType", "an integer." });
-        addAnnotation(getComputedColor_Blue(), source, new String[] { "returnType", "an integer." });
+        String source = "http://www.eclipse.org/sirius/interpreted/expression/returnType"; //$NON-NLS-1$
+        addAnnotation(getRepresentationDescription_TitleExpression(), source, new String[] { "returnType", "a string." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getConditionalStyleDescription_PredicateExpression(), source, new String[] { "returnType", "a boolean." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getDecorationDescription_PreconditionExpression(), source, new String[] { "returnType", "a boolean." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getVSMElementCustomization_PredicateExpression(), source, new String[] {
+            "returnType", "a boolean result. True to enable the customization, false to disabled it. True by default." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getEAttributeCustomization_Value(), source, new String[] { "returnType", "A java Object to affect as new value of a EAttribute, for example a java primitive." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getSelectionDescription_CandidatesExpression(), source, new String[] { "returnType", "a Collection<EObject> or an EObject." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getSelectionDescription_RootExpression(), source, new String[] { "returnType", "a Collection<EObject> or an EObject." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getSelectionDescription_ChildrenExpression(), source, new String[] { "returnType", "a Collection<EObject> or an EObject." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getInterpolatedColor_ColorValueComputationExpression(), source, new String[] { "returnType", "an integer." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getInterpolatedColor_MinValueComputationExpression(), source, new String[] { "returnType", "an integer." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getInterpolatedColor_MaxValueComputationExpression(), source, new String[] { "returnType", "an integer." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getColorStep_AssociatedValue(), source, new String[] { "returnType", "an integer." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getComputedColor_Red(), source, new String[] { "returnType", "an integer." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getComputedColor_Green(), source, new String[] { "returnType", "an integer." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getComputedColor_Blue(), source, new String[] { "returnType", "an integer." //$NON-NLS-1$ //$NON-NLS-2$
+        });
     }
 
     /**
@@ -2634,21 +2819,35 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
      * @generated
      */
     protected void createVariablesAnnotations() {
-        String source = "http://www.eclipse.org/sirius/interpreted/expression/variables";
+        String source = "http://www.eclipse.org/sirius/interpreted/expression/variables"; //$NON-NLS-1$
         addAnnotation(getRepresentationDescription_TitleExpression(), source, new String[] {});
-        addAnnotation(getConditionalStyleDescription_PredicateExpression(), source,
-                new String[] { "view", "ecore.EObject | the current view.", "container", "ecore.EObject | the semantic container." });
-        addAnnotation(getDecorationDescription_PreconditionExpression(), source, new String[] { "containerView",
-            "viewpoint.DSemanticDecorator | the view that would contain the potential views of the checked elements.", "container", "ecore.EObject | the semantic element of the container view.",
-            "viewpoint", "diagram.DDiagram | (deprecated) the current diagram.", "diagram", "diagram.DDiagram | the current diagram." });
-        addAnnotation(getVSMElementCustomization_PredicateExpression(), source, new String[] { "view", "ecore.EObject | the current view.", "container", "ecore.EObject | the semantic container." });
-        addAnnotation(getEAttributeCustomization_Value(), source, new String[] { "view", "ecore.EObject | the current view.", "container", "ecore.EObject | the semantic container." });
-        addAnnotation(getSelectionDescription_CandidatesExpression(), source, new String[] { "diagram", "diagram.DDiagram | the current DDiagram.", "containerView",
-            "viewpoint.DSemanticDecorator | the view of the container.", "container", "ecore.EObject | the semantic element of the container." });
-        addAnnotation(getSelectionDescription_RootExpression(), source, new String[] { "diagram", "diagram.DDiagram | the current DDiagram.", "containerView",
-            "viewpoint.DSemanticDecorator | the view of the container.", "container", "ecore.EObject | the semantic element of the container." });
-        addAnnotation(getSelectionDescription_ChildrenExpression(), source, new String[] { "diagram", "diagram.DDiagram | the current DDiagram.", "containerView",
-            "viewpoint.DSemanticDecorator | the view of the container.", "container", "ecore.EObject | the semantic element of the container." });
+        addAnnotation(getConditionalStyleDescription_PredicateExpression(), source, new String[] { "view", "ecore.EObject | the current view.", //$NON-NLS-1$ //$NON-NLS-2$
+            "container", "ecore.EObject | the semantic container." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getDecorationDescription_PreconditionExpression(), source, new String[] {
+            "containerView", "viewpoint.DSemanticDecorator | the view that would contain the potential views of the checked elements.", //$NON-NLS-1$ //$NON-NLS-2$
+            "container", "ecore.EObject | the semantic element of the container view.", //$NON-NLS-1$ //$NON-NLS-2$
+            "viewpoint", "diagram.DDiagram | (deprecated) the current diagram.", //$NON-NLS-1$ //$NON-NLS-2$
+            "diagram", "diagram.DDiagram | the current diagram." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getVSMElementCustomization_PredicateExpression(), source, new String[] { "view", "ecore.EObject | the current view.", //$NON-NLS-1$ //$NON-NLS-2$
+            "container", "ecore.EObject | the semantic container." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getEAttributeCustomization_Value(), source, new String[] { "view", "ecore.EObject | the current view.", //$NON-NLS-1$ //$NON-NLS-2$
+            "container", "ecore.EObject | the semantic container." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getSelectionDescription_CandidatesExpression(), source, new String[] { "diagram", "diagram.DDiagram | the current DDiagram.", //$NON-NLS-1$ //$NON-NLS-2$
+            "containerView", "viewpoint.DSemanticDecorator | the view of the container.", //$NON-NLS-1$ //$NON-NLS-2$
+            "container", "ecore.EObject | the semantic element of the container." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getSelectionDescription_RootExpression(), source, new String[] { "diagram", "diagram.DDiagram | the current DDiagram.", //$NON-NLS-1$ //$NON-NLS-2$
+            "containerView", "viewpoint.DSemanticDecorator | the view of the container.", //$NON-NLS-1$ //$NON-NLS-2$
+            "container", "ecore.EObject | the semantic element of the container." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getSelectionDescription_ChildrenExpression(), source, new String[] { "diagram", "diagram.DDiagram | the current DDiagram.", //$NON-NLS-1$ //$NON-NLS-2$
+            "containerView", "viewpoint.DSemanticDecorator | the view of the container.", //$NON-NLS-1$ //$NON-NLS-2$
+            "container", "ecore.EObject | the semantic element of the container." //$NON-NLS-1$ //$NON-NLS-2$
+        });
         addAnnotation(getInterpolatedColor_ColorValueComputationExpression(), source, new String[] {});
         addAnnotation(getInterpolatedColor_MinValueComputationExpression(), source, new String[] {});
         addAnnotation(getInterpolatedColor_MaxValueComputationExpression(), source, new String[] {});
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/DocumentedElementImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/DocumentedElementImpl.java
index 1df4094d4c..3b9a12b3af 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/DocumentedElementImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/DocumentedElementImpl.java
@@ -168,7 +168,7 @@ public abstract class DocumentedElementImpl extends MinimalEObjectImpl.Container
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (documentation: ");
+        result.append(" (documentation: "); //$NON-NLS-1$
         result.append(documentation);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/EAttributeCustomizationImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/EAttributeCustomizationImpl.java
index 99596afac6..2e80685944 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/EAttributeCustomizationImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/EAttributeCustomizationImpl.java
@@ -224,9 +224,9 @@ public class EAttributeCustomizationImpl extends EStructuralFeatureCustomization
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (attributeName: ");
+        result.append(" (attributeName: "); //$NON-NLS-1$
         result.append(attributeName);
-        result.append(", value: ");
+        result.append(", value: "); //$NON-NLS-1$
         result.append(value);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/EReferenceCustomizationImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/EReferenceCustomizationImpl.java
index 2b092247b8..e3d50357dd 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/EReferenceCustomizationImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/EReferenceCustomizationImpl.java
@@ -237,7 +237,7 @@ public class EReferenceCustomizationImpl extends EStructuralFeatureCustomization
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (referenceName: ");
+        result.append(" (referenceName: "); //$NON-NLS-1$
         result.append(referenceName);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/EStructuralFeatureCustomizationImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/EStructuralFeatureCustomizationImpl.java
index c6c1b9994b..2ddfea5d47 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/EStructuralFeatureCustomizationImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/EStructuralFeatureCustomizationImpl.java
@@ -209,7 +209,7 @@ public abstract class EStructuralFeatureCustomizationImpl extends MinimalEObject
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (applyOnAll: ");
+        result.append(" (applyOnAll: "); //$NON-NLS-1$
         result.append(applyOnAll);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/EndUserDocumentedElementImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/EndUserDocumentedElementImpl.java
index 2117462155..8827f3a1ca 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/EndUserDocumentedElementImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/EndUserDocumentedElementImpl.java
@@ -169,7 +169,7 @@ public abstract class EndUserDocumentedElementImpl extends MinimalEObjectImpl.Co
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (endUserDocumentation: ");
+        result.append(" (endUserDocumentation: "); //$NON-NLS-1$
         result.append(endUserDocumentation);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/FixedColorImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/FixedColorImpl.java
index 83307b8abe..1bfcecea7f 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/FixedColorImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/FixedColorImpl.java
@@ -279,11 +279,11 @@ public class FixedColorImpl extends ColorDescriptionImpl implements FixedColor {
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (red: ");
+        result.append(" (red: "); //$NON-NLS-1$
         result.append(red);
-        result.append(", green: ");
+        result.append(", green: "); //$NON-NLS-1$
         result.append(green);
-        result.append(", blue: ");
+        result.append(", blue: "); //$NON-NLS-1$
         result.append(blue);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/GroupImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/GroupImpl.java
index 5349b8f3af..cb17d9cacd 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/GroupImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/GroupImpl.java
@@ -489,11 +489,11 @@ public class GroupImpl extends DModelElementImpl implements Group {
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (documentation: ");
+        result.append(" (documentation: "); //$NON-NLS-1$
         result.append(documentation);
-        result.append(", name: ");
+        result.append(", name: "); //$NON-NLS-1$
         result.append(name);
-        result.append(", version: ");
+        result.append(", version: "); //$NON-NLS-1$
         result.append(version);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/IdentifiedElementImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/IdentifiedElementImpl.java
index 330c3c942a..ce2f9a61de 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/IdentifiedElementImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/IdentifiedElementImpl.java
@@ -223,9 +223,9 @@ public class IdentifiedElementImpl extends MinimalEObjectImpl.Container implemen
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (name: ");
+        result.append(" (name: "); //$NON-NLS-1$
         result.append(name);
-        result.append(", label: ");
+        result.append(", label: "); //$NON-NLS-1$
         result.append(label);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/InterpolatedColorImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/InterpolatedColorImpl.java
index 33b8fc38b0..570d964526 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/InterpolatedColorImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/InterpolatedColorImpl.java
@@ -445,13 +445,13 @@ public class InterpolatedColorImpl extends ColorDescriptionImpl implements Inter
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (name: ");
+        result.append(" (name: "); //$NON-NLS-1$
         result.append(name);
-        result.append(", colorValueComputationExpression: ");
+        result.append(", colorValueComputationExpression: "); //$NON-NLS-1$
         result.append(colorValueComputationExpression);
-        result.append(", minValueComputationExpression: ");
+        result.append(", minValueComputationExpression: "); //$NON-NLS-1$
         result.append(minValueComputationExpression);
-        result.append(", maxValueComputationExpression: ");
+        result.append(", maxValueComputationExpression: "); //$NON-NLS-1$
         result.append(maxValueComputationExpression);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/JavaExtensionImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/JavaExtensionImpl.java
index 916a1d2a0e..59db538d98 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/JavaExtensionImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/JavaExtensionImpl.java
@@ -168,7 +168,7 @@ public class JavaExtensionImpl extends MinimalEObjectImpl.Container implements J
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (qualifiedClassName: ");
+        result.append(" (qualifiedClassName: "); //$NON-NLS-1$
         result.append(qualifiedClassName);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/RepresentationTemplateImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/RepresentationTemplateImpl.java
index 36c18ca347..bccdb558df 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/RepresentationTemplateImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/RepresentationTemplateImpl.java
@@ -228,7 +228,7 @@ public abstract class RepresentationTemplateImpl extends MinimalEObjectImpl.Cont
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (name: ");
+        result.append(" (name: "); //$NON-NLS-1$
         result.append(name);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/SemanticBasedDecorationImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/SemanticBasedDecorationImpl.java
index 6255162e52..48b2b598de 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/SemanticBasedDecorationImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/SemanticBasedDecorationImpl.java
@@ -165,7 +165,7 @@ public class SemanticBasedDecorationImpl extends DecorationDescriptionImpl imple
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (domainClass: ");
+        result.append(" (domainClass: "); //$NON-NLS-1$
         result.append(domainClass);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/SystemColorImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/SystemColorImpl.java
index 20f5780103..44243d9c5b 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/SystemColorImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/SystemColorImpl.java
@@ -165,7 +165,7 @@ public class SystemColorImpl extends FixedColorImpl implements SystemColor {
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (name: ");
+        result.append(" (name: "); //$NON-NLS-1$
         result.append(name);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/UserColorImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/UserColorImpl.java
index 9aaf1fcd0f..497c8cae28 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/UserColorImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/UserColorImpl.java
@@ -166,7 +166,7 @@ public abstract class UserColorImpl extends MinimalEObjectImpl.Container impleme
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (name: ");
+        result.append(" (name: "); //$NON-NLS-1$
         result.append(name);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/UserColorsPaletteImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/UserColorsPaletteImpl.java
index 4f3b9b8e5a..9097d1c965 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/UserColorsPaletteImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/UserColorsPaletteImpl.java
@@ -226,7 +226,7 @@ public class UserColorsPaletteImpl extends MinimalEObjectImpl.Container implemen
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (name: ");
+        result.append(" (name: "); //$NON-NLS-1$
         result.append(name);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/UserFixedColorImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/UserFixedColorImpl.java
index c5f7b05304..9d0c6bd561 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/UserFixedColorImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/UserFixedColorImpl.java
@@ -202,7 +202,7 @@ public class UserFixedColorImpl extends FixedColorImpl implements UserFixedColor
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (name: ");
+        result.append(" (name: "); //$NON-NLS-1$
         result.append(name);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/VSMElementCustomizationImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/VSMElementCustomizationImpl.java
index d7f5f55b8b..4768d4e58b 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/VSMElementCustomizationImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/VSMElementCustomizationImpl.java
@@ -231,7 +231,7 @@ public class VSMElementCustomizationImpl extends MinimalEObjectImpl.Container im
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (predicateExpression: ");
+        result.append(" (predicateExpression: "); //$NON-NLS-1$
         result.append(predicateExpression);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/ViewpointImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/ViewpointImpl.java
index e131a077c6..5ae1369b10 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/ViewpointImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/ViewpointImpl.java
@@ -970,21 +970,21 @@ public class ViewpointImpl extends DocumentedElementImpl implements Viewpoint {
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (endUserDocumentation: ");
+        result.append(" (endUserDocumentation: "); //$NON-NLS-1$
         result.append(endUserDocumentation);
-        result.append(", name: ");
+        result.append(", name: "); //$NON-NLS-1$
         result.append(name);
-        result.append(", label: ");
+        result.append(", label: "); //$NON-NLS-1$
         result.append(label);
-        result.append(", modelFileExtension: ");
+        result.append(", modelFileExtension: "); //$NON-NLS-1$
         result.append(modelFileExtension);
-        result.append(", icon: ");
+        result.append(", icon: "); //$NON-NLS-1$
         result.append(icon);
-        result.append(", conflicts: ");
+        result.append(", conflicts: "); //$NON-NLS-1$
         result.append(conflicts);
-        result.append(", reuses: ");
+        result.append(", reuses: "); //$NON-NLS-1$
         result.append(reuses);
-        result.append(", customizes: ");
+        result.append(", customizes: "); //$NON-NLS-1$
         result.append(customizes);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/style/impl/BasicLabelStyleDescriptionImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/style/impl/BasicLabelStyleDescriptionImpl.java
index f97bfe85e3..003db90ae9 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/style/impl/BasicLabelStyleDescriptionImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/style/impl/BasicLabelStyleDescriptionImpl.java
@@ -453,15 +453,15 @@ public class BasicLabelStyleDescriptionImpl extends MinimalEObjectImpl.Container
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (labelSize: ");
+        result.append(" (labelSize: "); //$NON-NLS-1$
         result.append(labelSize);
-        result.append(", labelFormat: ");
+        result.append(", labelFormat: "); //$NON-NLS-1$
         result.append(labelFormat);
-        result.append(", showIcon: ");
+        result.append(", showIcon: "); //$NON-NLS-1$
         result.append(showIcon);
-        result.append(", labelExpression: ");
+        result.append(", labelExpression: "); //$NON-NLS-1$
         result.append(labelExpression);
-        result.append(", iconPath: ");
+        result.append(", iconPath: "); //$NON-NLS-1$
         result.append(iconPath);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/style/impl/LabelBorderStyleDescriptionImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/style/impl/LabelBorderStyleDescriptionImpl.java
index 70d2101965..161b37c2e6 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/style/impl/LabelBorderStyleDescriptionImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/style/impl/LabelBorderStyleDescriptionImpl.java
@@ -339,13 +339,13 @@ public class LabelBorderStyleDescriptionImpl extends MinimalEObjectImpl.Containe
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (id: ");
+        result.append(" (id: "); //$NON-NLS-1$
         result.append(id);
-        result.append(", name: ");
+        result.append(", name: "); //$NON-NLS-1$
         result.append(name);
-        result.append(", cornerHeight: ");
+        result.append(", cornerHeight: "); //$NON-NLS-1$
         result.append(cornerHeight);
-        result.append(", cornerWidth: ");
+        result.append(", cornerWidth: "); //$NON-NLS-1$
         result.append(cornerWidth);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/style/impl/LabelStyleDescriptionImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/style/impl/LabelStyleDescriptionImpl.java
index ce019109e2..1e7a38154b 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/style/impl/LabelStyleDescriptionImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/style/impl/LabelStyleDescriptionImpl.java
@@ -168,7 +168,7 @@ public class LabelStyleDescriptionImpl extends BasicLabelStyleDescriptionImpl im
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (labelAlignment: ");
+        result.append(" (labelAlignment: "); //$NON-NLS-1$
         result.append(labelAlignment);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/style/impl/StyleFactoryImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/style/impl/StyleFactoryImpl.java
index 250133d150..536b6385c5 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/style/impl/StyleFactoryImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/style/impl/StyleFactoryImpl.java
@@ -79,7 +79,7 @@ public class StyleFactoryImpl extends EFactoryImpl implements StyleFactory {
         case StylePackage.TOOLTIP_STYLE_DESCRIPTION:
             return createTooltipStyleDescription();
         default:
-            throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+            throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
         }
     }
 
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/style/impl/StylePackageImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/style/impl/StylePackageImpl.java
index 56a0e2666b..0573d01c3b 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/style/impl/StylePackageImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/style/impl/StylePackageImpl.java
@@ -95,7 +95,7 @@ public class StylePackageImpl extends EPackageImpl implements StylePackage {
      * 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.sirius.viewpoint.description.style.StylePackage#eNS_URI
      * @see #init()
@@ -121,7 +121,7 @@ public class StylePackageImpl extends EPackageImpl implements StylePackage {
      * 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()
@@ -435,7 +435,7 @@ public class StylePackageImpl extends EPackageImpl implements StylePackage {
      * 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() {
@@ -462,50 +462,74 @@ public class StylePackageImpl extends EPackageImpl implements StylePackage {
         labelStyleDescriptionEClass.getESuperTypes().add(this.getBasicLabelStyleDescription());
 
         // Initialize classes and features; add operations and parameters
-        initEClass(styleDescriptionEClass, StyleDescription.class, "StyleDescription", EPackageImpl.IS_ABSTRACT, EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(basicLabelStyleDescriptionEClass, BasicLabelStyleDescription.class, "BasicLabelStyleDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getBasicLabelStyleDescription_LabelSize(), theEcorePackage.getEInt(), "labelSize", "8", 0, 1, BasicLabelStyleDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getBasicLabelStyleDescription_LabelFormat(), theViewpointPackage.getFontFormat(), "labelFormat", null, 0, 4, BasicLabelStyleDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getBasicLabelStyleDescription_ShowIcon(), theEcorePackage.getEBoolean(), "showIcon", "true", 0, 1, BasicLabelStyleDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getBasicLabelStyleDescription_LabelExpression(), theDescriptionPackage.getInterpretedExpression(), "labelExpression", "feature:name", 0, 1, BasicLabelStyleDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getBasicLabelStyleDescription_LabelColor(), theDescriptionPackage.getColorDescription(), null, "labelColor", null, 1, 1, BasicLabelStyleDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getBasicLabelStyleDescription_IconPath(), theDescriptionPackage.getImagePath(), "iconPath", "", 0, 1, BasicLabelStyleDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(labelStyleDescriptionEClass, LabelStyleDescription.class, "LabelStyleDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getLabelStyleDescription_LabelAlignment(), theViewpointPackage.getLabelAlignment(), "labelAlignment", null, 0, 1, LabelStyleDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(labelBorderStylesEClass, LabelBorderStyles.class, "LabelBorderStyles", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getLabelBorderStyles_LabelBorderStyleDescriptions(), this.getLabelBorderStyleDescription(), null, "labelBorderStyleDescriptions", null, 0, -1, LabelBorderStyles.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(labelBorderStyleDescriptionEClass, LabelBorderStyleDescription.class, "LabelBorderStyleDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getLabelBorderStyleDescription_Id(), theEcorePackage.getEString(), "id", null, 0, 1, LabelBorderStyleDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getLabelBorderStyleDescription_Name(), theEcorePackage.getEString(), "name", null, 0, 1, LabelBorderStyleDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getLabelBorderStyleDescription_CornerHeight(), theEcorePackage.getEInt(), "cornerHeight", null, 0, 1, LabelBorderStyleDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getLabelBorderStyleDescription_CornerWidth(), theEcorePackage.getEInt(), "cornerWidth", null, 0, 1, LabelBorderStyleDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(tooltipStyleDescriptionEClass, TooltipStyleDescription.class, "TooltipStyleDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getTooltipStyleDescription_TooltipExpression(), theDescriptionPackage.getInterpretedExpression(), "tooltipExpression", "", 0, 1, TooltipStyleDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
+        initEClass(styleDescriptionEClass, StyleDescription.class, "StyleDescription", EPackageImpl.IS_ABSTRACT, EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(basicLabelStyleDescriptionEClass, BasicLabelStyleDescription.class,
+                "BasicLabelStyleDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getBasicLabelStyleDescription_LabelSize(),
+                theEcorePackage.getEInt(),
+                "labelSize", "8", 0, 1, BasicLabelStyleDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(
+                getBasicLabelStyleDescription_LabelFormat(),
+                theViewpointPackage.getFontFormat(),
+                "labelFormat", null, 0, 4, BasicLabelStyleDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getBasicLabelStyleDescription_ShowIcon(),
+                theEcorePackage.getEBoolean(),
+                "showIcon", "true", 0, 1, BasicLabelStyleDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(
+                getBasicLabelStyleDescription_LabelExpression(),
+                theDescriptionPackage.getInterpretedExpression(),
+                "labelExpression", "feature:name", 0, 1, BasicLabelStyleDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEReference(
+                getBasicLabelStyleDescription_LabelColor(),
+                theDescriptionPackage.getColorDescription(),
+                null,
+                "labelColor", null, 1, 1, BasicLabelStyleDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getBasicLabelStyleDescription_IconPath(),
+                theDescriptionPackage.getImagePath(),
+                "iconPath", "", 0, 1, BasicLabelStyleDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+
+        initEClass(labelStyleDescriptionEClass, LabelStyleDescription.class, "LabelStyleDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getLabelStyleDescription_LabelAlignment(),
+                theViewpointPackage.getLabelAlignment(),
+                "labelAlignment", null, 0, 1, LabelStyleDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(labelBorderStylesEClass, LabelBorderStyles.class, "LabelBorderStyles", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getLabelBorderStyles_LabelBorderStyleDescriptions(),
+                this.getLabelBorderStyleDescription(),
+                null,
+                "labelBorderStyleDescriptions", null, 0, -1, LabelBorderStyles.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(labelBorderStyleDescriptionEClass, LabelBorderStyleDescription.class,
+                "LabelBorderStyleDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getLabelBorderStyleDescription_Id(),
+                theEcorePackage.getEString(),
+                "id", null, 0, 1, LabelBorderStyleDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getLabelBorderStyleDescription_Name(),
+                theEcorePackage.getEString(),
+                "name", null, 0, 1, LabelBorderStyleDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getLabelBorderStyleDescription_CornerHeight(),
+                theEcorePackage.getEInt(),
+                "cornerHeight", null, 0, 1, LabelBorderStyleDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getLabelBorderStyleDescription_CornerWidth(),
+                theEcorePackage.getEInt(),
+                "cornerWidth", null, 0, 1, LabelBorderStyleDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(tooltipStyleDescriptionEClass, TooltipStyleDescription.class,
+                "TooltipStyleDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getTooltipStyleDescription_TooltipExpression(),
+                theDescriptionPackage.getInterpretedExpression(),
+                "tooltipExpression", "", 0, 1, TooltipStyleDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
 
         // Create annotations
         // http://www.eclipse.org/sirius/interpreted/expression/returnType
@@ -522,9 +546,11 @@ public class StylePackageImpl extends EPackageImpl implements StylePackage {
      * @generated
      */
     protected void createReturnTypeAnnotations() {
-        String source = "http://www.eclipse.org/sirius/interpreted/expression/returnType";
-        addAnnotation(getBasicLabelStyleDescription_LabelExpression(), source, new String[] { "returnType", "a string." });
-        addAnnotation(getTooltipStyleDescription_TooltipExpression(), source, new String[] { "returnType", "a string." });
+        String source = "http://www.eclipse.org/sirius/interpreted/expression/returnType"; //$NON-NLS-1$
+        addAnnotation(getBasicLabelStyleDescription_LabelExpression(), source, new String[] { "returnType", "a string." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getTooltipStyleDescription_TooltipExpression(), source, new String[] { "returnType", "a string." //$NON-NLS-1$ //$NON-NLS-2$
+        });
     }
 
     /**
@@ -535,9 +561,11 @@ public class StylePackageImpl extends EPackageImpl implements StylePackage {
      * @generated
      */
     protected void createVariablesAnnotations() {
-        String source = "http://www.eclipse.org/sirius/interpreted/expression/variables";
-        addAnnotation(getBasicLabelStyleDescription_LabelExpression(), source, new String[] { "diagram", "diagram.DDiagram | the current DSemanticDiagram.", "view",
-        "diagram.DDiagramElement | the current view for which the label is calculated." });
-        addAnnotation(getTooltipStyleDescription_TooltipExpression(), source, new String[] { "view", "viewpoint.DSemanticDecorator | the current view." });
+        String source = "http://www.eclipse.org/sirius/interpreted/expression/variables"; //$NON-NLS-1$
+        addAnnotation(getBasicLabelStyleDescription_LabelExpression(), source, new String[] { "diagram", "diagram.DDiagram | the current DSemanticDiagram.", //$NON-NLS-1$ //$NON-NLS-2$
+            "view", "diagram.DDiagramElement | the current view for which the label is calculated." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getTooltipStyleDescription_TooltipExpression(), source, new String[] { "view", "viewpoint.DSemanticDecorator | the current view." //$NON-NLS-1$ //$NON-NLS-2$
+        });
     }
 } // StylePackageImpl
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/style/impl/TooltipStyleDescriptionImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/style/impl/TooltipStyleDescriptionImpl.java
index a1fb66d48a..96a008c0da 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/style/impl/TooltipStyleDescriptionImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/style/impl/TooltipStyleDescriptionImpl.java
@@ -168,7 +168,7 @@ public class TooltipStyleDescriptionImpl extends MinimalEObjectImpl.Container im
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (tooltipExpression: ");
+        result.append(" (tooltipExpression: "); //$NON-NLS-1$
         result.append(tooltipExpression);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/AbstractToolDescriptionImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/AbstractToolDescriptionImpl.java
index ad11dbaa13..cf278feff7 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/AbstractToolDescriptionImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/AbstractToolDescriptionImpl.java
@@ -559,17 +559,17 @@ public abstract class AbstractToolDescriptionImpl extends DocumentedElementImpl
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (name: ");
+        result.append(" (name: "); //$NON-NLS-1$
         result.append(name);
-        result.append(", label: ");
+        result.append(", label: "); //$NON-NLS-1$
         result.append(label);
-        result.append(", precondition: ");
+        result.append(", precondition: "); //$NON-NLS-1$
         result.append(precondition);
-        result.append(", forceRefresh: ");
+        result.append(", forceRefresh: "); //$NON-NLS-1$
         result.append(forceRefresh);
-        result.append(", elementsToSelect: ");
+        result.append(", elementsToSelect: "); //$NON-NLS-1$
         result.append(elementsToSelect);
-        result.append(", inverseSelectionOrder: ");
+        result.append(", inverseSelectionOrder: "); //$NON-NLS-1$
         result.append(inverseSelectionOrder);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/AbstractVariableImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/AbstractVariableImpl.java
index 9705e3919a..08335e9344 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/AbstractVariableImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/AbstractVariableImpl.java
@@ -166,7 +166,7 @@ public abstract class AbstractVariableImpl extends MinimalEObjectImpl.Container
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (name: ");
+        result.append(" (name: "); //$NON-NLS-1$
         result.append(name);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/AcceleoVariableImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/AcceleoVariableImpl.java
index 267e088ed6..bc9c1da687 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/AcceleoVariableImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/AcceleoVariableImpl.java
@@ -274,9 +274,9 @@ public class AcceleoVariableImpl extends VariableContainerImpl implements Accele
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (name: ");
+        result.append(" (name: "); //$NON-NLS-1$
         result.append(name);
-        result.append(", computationExpression: ");
+        result.append(", computationExpression: "); //$NON-NLS-1$
         result.append(computationExpression);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/CaseImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/CaseImpl.java
index 22752055a0..529109926f 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/CaseImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/CaseImpl.java
@@ -167,7 +167,7 @@ public class CaseImpl extends SwitchChildImpl implements Case {
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (conditionExpression: ");
+        result.append(" (conditionExpression: "); //$NON-NLS-1$
         result.append(conditionExpression);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/ChangeContextImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/ChangeContextImpl.java
index 0da53fe475..056d9364b6 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/ChangeContextImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/ChangeContextImpl.java
@@ -167,7 +167,7 @@ public class ChangeContextImpl extends ContainerModelOperationImpl implements Ch
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (browseExpression: ");
+        result.append(" (browseExpression: "); //$NON-NLS-1$
         result.append(browseExpression);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/CreateInstanceImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/CreateInstanceImpl.java
index f3eea90d3b..76fc1980f6 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/CreateInstanceImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/CreateInstanceImpl.java
@@ -283,11 +283,11 @@ public class CreateInstanceImpl extends ContainerModelOperationImpl implements C
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (typeName: ");
+        result.append(" (typeName: "); //$NON-NLS-1$
         result.append(typeName);
-        result.append(", referenceName: ");
+        result.append(", referenceName: "); //$NON-NLS-1$
         result.append(referenceName);
-        result.append(", variableName: ");
+        result.append(", variableName: "); //$NON-NLS-1$
         result.append(variableName);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/DialogVariableImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/DialogVariableImpl.java
index 468163c9cf..06b8d70c4c 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/DialogVariableImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/DialogVariableImpl.java
@@ -167,7 +167,7 @@ public abstract class DialogVariableImpl extends AbstractVariableImpl implements
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (dialogPrompt: ");
+        result.append(" (dialogPrompt: "); //$NON-NLS-1$
         result.append(dialogPrompt);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/EditMaskVariablesImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/EditMaskVariablesImpl.java
index 8da7d015be..3e62099f7e 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/EditMaskVariablesImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/EditMaskVariablesImpl.java
@@ -166,7 +166,7 @@ public class EditMaskVariablesImpl extends MinimalEObjectImpl.Container implemen
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (mask: ");
+        result.append(" (mask: "); //$NON-NLS-1$
         result.append(mask);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/ExternalJavaActionImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/ExternalJavaActionImpl.java
index 035ccb03e8..28cae3a59b 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/ExternalJavaActionImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/ExternalJavaActionImpl.java
@@ -315,7 +315,7 @@ public class ExternalJavaActionImpl extends MenuItemDescriptionImpl implements E
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (id: ");
+        result.append(" (id: "); //$NON-NLS-1$
         result.append(id);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/ExternalJavaActionParameterImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/ExternalJavaActionParameterImpl.java
index 22478548a1..35ce322a53 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/ExternalJavaActionParameterImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/ExternalJavaActionParameterImpl.java
@@ -223,9 +223,9 @@ public class ExternalJavaActionParameterImpl extends MinimalEObjectImpl.Containe
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (name: ");
+        result.append(" (name: "); //$NON-NLS-1$
         result.append(name);
-        result.append(", value: ");
+        result.append(", value: "); //$NON-NLS-1$
         result.append(value);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/FeatureChangeListenerImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/FeatureChangeListenerImpl.java
index f0156bddc3..adf0b71b05 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/FeatureChangeListenerImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/FeatureChangeListenerImpl.java
@@ -223,9 +223,9 @@ public class FeatureChangeListenerImpl extends MinimalEObjectImpl.Container impl
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (domainClass: ");
+        result.append(" (domainClass: "); //$NON-NLS-1$
         result.append(domainClass);
-        result.append(", featureName: ");
+        result.append(", featureName: "); //$NON-NLS-1$
         result.append(featureName);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/ForImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/ForImpl.java
index d92695271d..04a0d6ddae 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/ForImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/ForImpl.java
@@ -224,9 +224,9 @@ public class ForImpl extends ContainerModelOperationImpl implements For {
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (expression: ");
+        result.append(" (expression: "); //$NON-NLS-1$
         result.append(expression);
-        result.append(", iteratorName: ");
+        result.append(", iteratorName: "); //$NON-NLS-1$
         result.append(iteratorName);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/IfImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/IfImpl.java
index da19132434..5e964b8722 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/IfImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/IfImpl.java
@@ -167,7 +167,7 @@ public class IfImpl extends ContainerModelOperationImpl implements If {
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (conditionExpression: ");
+        result.append(" (conditionExpression: "); //$NON-NLS-1$
         result.append(conditionExpression);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/MenuItemDescriptionImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/MenuItemDescriptionImpl.java
index 7a9ce835b0..35f2ffb2d8 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/MenuItemDescriptionImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/MenuItemDescriptionImpl.java
@@ -165,7 +165,7 @@ public abstract class MenuItemDescriptionImpl extends AbstractToolDescriptionImp
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (icon: ");
+        result.append(" (icon: "); //$NON-NLS-1$
         result.append(icon);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/MoveElementImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/MoveElementImpl.java
index c3697c6048..e782742940 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/MoveElementImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/MoveElementImpl.java
@@ -224,9 +224,9 @@ public class MoveElementImpl extends ContainerModelOperationImpl implements Move
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (newContainerExpression: ");
+        result.append(" (newContainerExpression: "); //$NON-NLS-1$
         result.append(newContainerExpression);
-        result.append(", featureName: ");
+        result.append(", featureName: "); //$NON-NLS-1$
         result.append(featureName);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/PaneBasedSelectionWizardDescriptionImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/PaneBasedSelectionWizardDescriptionImpl.java
index f5b655a8cd..00a9f2a4aa 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/PaneBasedSelectionWizardDescriptionImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/PaneBasedSelectionWizardDescriptionImpl.java
@@ -1211,27 +1211,27 @@ public class PaneBasedSelectionWizardDescriptionImpl extends AbstractToolDescrip
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (iconPath: ");
+        result.append(" (iconPath: "); //$NON-NLS-1$
         result.append(iconPath);
-        result.append(", windowTitle: ");
+        result.append(", windowTitle: "); //$NON-NLS-1$
         result.append(windowTitle);
-        result.append(", windowImagePath: ");
+        result.append(", windowImagePath: "); //$NON-NLS-1$
         result.append(windowImagePath);
-        result.append(", message: ");
+        result.append(", message: "); //$NON-NLS-1$
         result.append(message);
-        result.append(", choiceOfValuesMessage: ");
+        result.append(", choiceOfValuesMessage: "); //$NON-NLS-1$
         result.append(choiceOfValuesMessage);
-        result.append(", candidatesExpression: ");
+        result.append(", candidatesExpression: "); //$NON-NLS-1$
         result.append(candidatesExpression);
-        result.append(", tree: ");
+        result.append(", tree: "); //$NON-NLS-1$
         result.append(tree);
-        result.append(", rootExpression: ");
+        result.append(", rootExpression: "); //$NON-NLS-1$
         result.append(rootExpression);
-        result.append(", childrenExpression: ");
+        result.append(", childrenExpression: "); //$NON-NLS-1$
         result.append(childrenExpression);
-        result.append(", selectedValuesMessage: ");
+        result.append(", selectedValuesMessage: "); //$NON-NLS-1$
         result.append(selectedValuesMessage);
-        result.append(", preSelectedCandidatesExpression: ");
+        result.append(", preSelectedCandidatesExpression: "); //$NON-NLS-1$
         result.append(preSelectedCandidatesExpression);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/RepresentationCreationDescriptionImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/RepresentationCreationDescriptionImpl.java
index e4adc90fc6..32397777e9 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/RepresentationCreationDescriptionImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/RepresentationCreationDescriptionImpl.java
@@ -633,9 +633,9 @@ public abstract class RepresentationCreationDescriptionImpl extends AbstractTool
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (titleExpression: ");
+        result.append(" (titleExpression: "); //$NON-NLS-1$
         result.append(titleExpression);
-        result.append(", browseExpression: ");
+        result.append(", browseExpression: "); //$NON-NLS-1$
         result.append(browseExpression);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/RepresentationNavigationDescriptionImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/RepresentationNavigationDescriptionImpl.java
index f713b69f9a..a0856cea71 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/RepresentationNavigationDescriptionImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/RepresentationNavigationDescriptionImpl.java
@@ -635,9 +635,9 @@ public abstract class RepresentationNavigationDescriptionImpl extends AbstractTo
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (browseExpression: ");
+        result.append(" (browseExpression: "); //$NON-NLS-1$
         result.append(browseExpression);
-        result.append(", navigationNameExpression: ");
+        result.append(", navigationNameExpression: "); //$NON-NLS-1$
         result.append(navigationNameExpression);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/SelectModelElementVariableImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/SelectModelElementVariableImpl.java
index c6eae7319a..5687a75e72 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/SelectModelElementVariableImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/SelectModelElementVariableImpl.java
@@ -516,17 +516,17 @@ public class SelectModelElementVariableImpl extends SubVariableImpl implements S
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (candidatesExpression: ");
+        result.append(" (candidatesExpression: "); //$NON-NLS-1$
         result.append(candidatesExpression);
-        result.append(", multiple: ");
+        result.append(", multiple: "); //$NON-NLS-1$
         result.append(multiple);
-        result.append(", tree: ");
+        result.append(", tree: "); //$NON-NLS-1$
         result.append(tree);
-        result.append(", rootExpression: ");
+        result.append(", rootExpression: "); //$NON-NLS-1$
         result.append(rootExpression);
-        result.append(", childrenExpression: ");
+        result.append(", childrenExpression: "); //$NON-NLS-1$
         result.append(childrenExpression);
-        result.append(", message: ");
+        result.append(", message: "); //$NON-NLS-1$
         result.append(message);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/SelectionWizardDescriptionImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/SelectionWizardDescriptionImpl.java
index 372ab065fa..97118411b1 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/SelectionWizardDescriptionImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/SelectionWizardDescriptionImpl.java
@@ -1137,23 +1137,23 @@ public class SelectionWizardDescriptionImpl extends AbstractToolDescriptionImpl
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (candidatesExpression: ");
+        result.append(" (candidatesExpression: "); //$NON-NLS-1$
         result.append(candidatesExpression);
-        result.append(", multiple: ");
+        result.append(", multiple: "); //$NON-NLS-1$
         result.append(multiple);
-        result.append(", tree: ");
+        result.append(", tree: "); //$NON-NLS-1$
         result.append(tree);
-        result.append(", rootExpression: ");
+        result.append(", rootExpression: "); //$NON-NLS-1$
         result.append(rootExpression);
-        result.append(", childrenExpression: ");
+        result.append(", childrenExpression: "); //$NON-NLS-1$
         result.append(childrenExpression);
-        result.append(", message: ");
+        result.append(", message: "); //$NON-NLS-1$
         result.append(message);
-        result.append(", iconPath: ");
+        result.append(", iconPath: "); //$NON-NLS-1$
         result.append(iconPath);
-        result.append(", windowTitle: ");
+        result.append(", windowTitle: "); //$NON-NLS-1$
         result.append(windowTitle);
-        result.append(", windowImagePath: ");
+        result.append(", windowImagePath: "); //$NON-NLS-1$
         result.append(windowImagePath);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/SetObjectImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/SetObjectImpl.java
index 5c6a59394e..f7b7fd7ff3 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/SetObjectImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/SetObjectImpl.java
@@ -235,7 +235,7 @@ public class SetObjectImpl extends ContainerModelOperationImpl implements SetObj
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (featureName: ");
+        result.append(" (featureName: "); //$NON-NLS-1$
         result.append(featureName);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/SetValueImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/SetValueImpl.java
index 642e279527..d794bcf069 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/SetValueImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/SetValueImpl.java
@@ -224,9 +224,9 @@ public class SetValueImpl extends ContainerModelOperationImpl implements SetValu
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (featureName: ");
+        result.append(" (featureName: "); //$NON-NLS-1$
         result.append(featureName);
-        result.append(", valueExpression: ");
+        result.append(", valueExpression: "); //$NON-NLS-1$
         result.append(valueExpression);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/ToolDescriptionImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/ToolDescriptionImpl.java
index 23caba1af1..ebc1bcf8c4 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/ToolDescriptionImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/ToolDescriptionImpl.java
@@ -504,7 +504,7 @@ public class ToolDescriptionImpl extends MappingBasedToolDescriptionImpl impleme
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (iconPath: ");
+        result.append(" (iconPath: "); //$NON-NLS-1$
         result.append(iconPath);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/ToolFactoryImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/ToolFactoryImpl.java
index 32235dadf7..84b442c659 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/ToolFactoryImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/ToolFactoryImpl.java
@@ -190,7 +190,7 @@ public class ToolFactoryImpl extends EFactoryImpl implements ToolFactory {
         case ToolPackage.SWITCH:
             return createSwitch();
         default:
-            throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+            throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
         }
     }
 
@@ -205,7 +205,7 @@ public class ToolFactoryImpl extends EFactoryImpl implements ToolFactory {
         case ToolPackage.DRAG_SOURCE:
             return createDragSourceFromString(eDataType, initialValue);
         default:
-            throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+            throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
         }
     }
 
@@ -220,7 +220,7 @@ public class ToolFactoryImpl extends EFactoryImpl implements ToolFactory {
         case ToolPackage.DRAG_SOURCE:
             return convertDragSourceToString(eDataType, instanceValue);
         default:
-            throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+            throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
         }
     }
 
@@ -739,7 +739,7 @@ public class ToolFactoryImpl extends EFactoryImpl implements ToolFactory {
     public DragSource createDragSourceFromString(EDataType eDataType, String initialValue) {
         DragSource result = DragSource.get(initialValue);
         if (result == null) {
-            throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+            throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
         }
         return result;
     }
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/ToolFilterDescriptionImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/ToolFilterDescriptionImpl.java
index cfb2de0160..e2c2703e4a 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/ToolFilterDescriptionImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/ToolFilterDescriptionImpl.java
@@ -286,9 +286,9 @@ public class ToolFilterDescriptionImpl extends MinimalEObjectImpl.Container impl
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (precondition: ");
+        result.append(" (precondition: "); //$NON-NLS-1$
         result.append(precondition);
-        result.append(", elementsToListen: ");
+        result.append(", elementsToListen: "); //$NON-NLS-1$
         result.append(elementsToListen);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/ToolPackageImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/ToolPackageImpl.java
index eaee03aa48..70f2145308 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/ToolPackageImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/ToolPackageImpl.java
@@ -2386,384 +2386,549 @@ public class ToolPackageImpl extends EPackageImpl implements ToolPackage {
         switchEClass.getESuperTypes().add(this.getModelOperation());
 
         // Initialize classes and features; add operations and parameters
-        initEClass(toolEntryEClass, ToolEntry.class, "ToolEntry", EPackageImpl.IS_ABSTRACT, EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(abstractToolDescriptionEClass, AbstractToolDescription.class, "AbstractToolDescription", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getAbstractToolDescription_Precondition(), theDescriptionPackage.getInterpretedExpression(), "precondition", "", 0, 1, AbstractToolDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEAttribute(getAbstractToolDescription_ForceRefresh(), theEcorePackage.getEBoolean(), "forceRefresh", "false", 0, 1, AbstractToolDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getAbstractToolDescription_Filters(), this.getToolFilterDescription(), null, "filters", null, 0, -1, AbstractToolDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getAbstractToolDescription_ElementsToSelect(), theDescriptionPackage.getInterpretedExpression(), "elementsToSelect", "", 0, 1, AbstractToolDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEAttribute(getAbstractToolDescription_InverseSelectionOrder(), theEcorePackage.getEBoolean(), "inverseSelectionOrder", "false", 0, 1, AbstractToolDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-
-        initEClass(mappingBasedToolDescriptionEClass, MappingBasedToolDescription.class, "MappingBasedToolDescription", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(toolDescriptionEClass, ToolDescription.class, "ToolDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getToolDescription_IconPath(), theDescriptionPackage.getImagePath(), "iconPath", "", 0, 1, ToolDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getToolDescription_Element(), this.getElementVariable(), null, "element", null, 1, 1, ToolDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getToolDescription_ElementView(), this.getElementViewVariable(), null, "elementView", null, 1, 1, ToolDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getToolDescription_InitialOperation(), this.getInitialOperation(), null, "initialOperation", null, 1, 1, ToolDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(pasteDescriptionEClass, PasteDescription.class, "PasteDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getPasteDescription_Container(), this.getDropContainerVariable(), null, "container", null, 1, 1, PasteDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getPasteDescription_ContainerView(), this.getContainerViewVariable(), null, "containerView", null, 1, 1, PasteDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getPasteDescription_CopiedView(), this.getElementViewVariable(), null, "copiedView", null, 1, 1, PasteDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getPasteDescription_CopiedElement(), this.getElementVariable(), null, "copiedElement", null, 1, 1, PasteDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getPasteDescription_InitialOperation(), this.getInitialOperation(), null, "initialOperation", null, 1, 1, PasteDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        addEOperation(pasteDescriptionEClass, theDescriptionPackage.getPasteTargetDescription(), "getContainers", 0, -1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-
-        initEClass(selectionWizardDescriptionEClass, SelectionWizardDescription.class, "SelectionWizardDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getSelectionWizardDescription_Element(), this.getElementSelectVariable(), null, "element", null, 1, 1, SelectionWizardDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getSelectionWizardDescription_ContainerView(), this.getContainerViewVariable(), null, "containerView", null, 1, 1, SelectionWizardDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getSelectionWizardDescription_Container(), this.getSelectContainerVariable(), null, "container", null, 1, 1, SelectionWizardDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getSelectionWizardDescription_InitialOperation(), this.getInitialOperation(), null, "initialOperation", null, 1, 1, SelectionWizardDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getSelectionWizardDescription_IconPath(), theDescriptionPackage.getImagePath(), "iconPath", "/org.eclipse.sirius.ui/icons/full/obj16/SelectionWizardDescription.gif", 1, 1,
-                SelectionWizardDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getSelectionWizardDescription_WindowTitle(), theEcorePackage.getEString(), "windowTitle", "Selection Wizard", 1, 1, SelectionWizardDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEAttribute(getSelectionWizardDescription_WindowImagePath(), theDescriptionPackage.getImagePath(), "windowImagePath", null, 0, 1, SelectionWizardDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-
-        initEClass(paneBasedSelectionWizardDescriptionEClass, PaneBasedSelectionWizardDescription.class, "PaneBasedSelectionWizardDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getPaneBasedSelectionWizardDescription_Element(), this.getElementSelectVariable(), null, "element", null, 1, 1, PaneBasedSelectionWizardDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getPaneBasedSelectionWizardDescription_ContainerView(), this.getContainerViewVariable(), null, "containerView", null, 1, 1, PaneBasedSelectionWizardDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getPaneBasedSelectionWizardDescription_Container(), this.getSelectContainerVariable(), null, "container", null, 1, 1, PaneBasedSelectionWizardDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getPaneBasedSelectionWizardDescription_InitialOperation(), this.getInitialOperation(), null, "initialOperation", null, 1, 1, PaneBasedSelectionWizardDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getPaneBasedSelectionWizardDescription_IconPath(), theDescriptionPackage.getImagePath(), "iconPath",
-                "/org.eclipse.sirius.ui/icons/full/obj16/PaneBasedSelectionWizardDescription.gif", 1, 1, PaneBasedSelectionWizardDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getPaneBasedSelectionWizardDescription_WindowTitle(), theEcorePackage.getEString(), "windowTitle", "Selection Wizard", 1, 1, PaneBasedSelectionWizardDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEAttribute(getPaneBasedSelectionWizardDescription_WindowImagePath(), theDescriptionPackage.getImagePath(), "windowImagePath", null, 0, 1, PaneBasedSelectionWizardDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEAttribute(getPaneBasedSelectionWizardDescription_Message(), theEcorePackage.getEString(), "message", null, 0, 1, PaneBasedSelectionWizardDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getPaneBasedSelectionWizardDescription_ChoiceOfValuesMessage(), theEcorePackage.getEString(), "choiceOfValuesMessage", "Choice of values", 0, 1,
-                PaneBasedSelectionWizardDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getPaneBasedSelectionWizardDescription_CandidatesExpression(), theDescriptionPackage.getInterpretedExpression(), "candidatesExpression", null, 1, 1,
-                PaneBasedSelectionWizardDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getPaneBasedSelectionWizardDescription_Tree(), theEcorePackage.getEBoolean(), "tree", null, 1, 1, PaneBasedSelectionWizardDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getPaneBasedSelectionWizardDescription_RootExpression(), theDescriptionPackage.getInterpretedExpression(), "rootExpression", null, 0, 1,
-                PaneBasedSelectionWizardDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getPaneBasedSelectionWizardDescription_ChildrenExpression(), theDescriptionPackage.getInterpretedExpression(), "childrenExpression", null, 0, 1,
-                PaneBasedSelectionWizardDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getPaneBasedSelectionWizardDescription_SelectedValuesMessage(), theEcorePackage.getEString(), "selectedValuesMessage", "Selected values", 0, 1,
-                PaneBasedSelectionWizardDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getPaneBasedSelectionWizardDescription_PreSelectedCandidatesExpression(), theDescriptionPackage.getInterpretedExpression(), "preSelectedCandidatesExpression", null, 0, 1,
-                PaneBasedSelectionWizardDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(representationCreationDescriptionEClass, RepresentationCreationDescription.class, "RepresentationCreationDescription", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getRepresentationCreationDescription_TitleExpression(), theDescriptionPackage.getInterpretedExpression(), "titleExpression", "", 0, 1, RepresentationCreationDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEAttribute(getRepresentationCreationDescription_BrowseExpression(), theDescriptionPackage.getInterpretedExpression(), "browseExpression", null, 0, 1,
-                RepresentationCreationDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getRepresentationCreationDescription_RepresentationDescription(), theDescriptionPackage.getRepresentationDescription(), null, "representationDescription", null, 1, 1,
-                RepresentationCreationDescription.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE, !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES,
-                !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getRepresentationCreationDescription_InitialOperation(), this.getInitialOperation(), null, "initialOperation", null, 0, 1, RepresentationCreationDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getRepresentationCreationDescription_ContainerViewVariable(), this.getContainerViewVariable(), null, "containerViewVariable", null, 1, 1,
-                RepresentationCreationDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES,
-                !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getRepresentationCreationDescription_RepresentationNameVariable(), this.getNameVariable(), null, "representationNameVariable", null, 1, 1,
-                RepresentationCreationDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES,
-                !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        addEOperation(representationCreationDescriptionEClass, theDescriptionPackage.getRepresentationElementMapping(), "getMappings", 1, -1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-
-        initEClass(representationNavigationDescriptionEClass, RepresentationNavigationDescription.class, "RepresentationNavigationDescription", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getRepresentationNavigationDescription_BrowseExpression(), theDescriptionPackage.getInterpretedExpression(), "browseExpression", null, 0, 1,
-                RepresentationNavigationDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getRepresentationNavigationDescription_NavigationNameExpression(), theDescriptionPackage.getInterpretedExpression(), "navigationNameExpression", null, 0, 1,
-                RepresentationNavigationDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getRepresentationNavigationDescription_RepresentationDescription(), theDescriptionPackage.getRepresentationDescription(), null, "representationDescription", null, 1, 1,
-                RepresentationNavigationDescription.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE, !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE,
-                EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getRepresentationNavigationDescription_ContainerViewVariable(), this.getContainerViewVariable(), null, "containerViewVariable", null, 1, 1,
-                RepresentationNavigationDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE,
-                EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getRepresentationNavigationDescription_ContainerVariable(), this.getElementSelectVariable(), null, "containerVariable", null, 1, 1, RepresentationNavigationDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getRepresentationNavigationDescription_RepresentationNameVariable(), this.getNameVariable(), null, "representationNameVariable", null, 1, 1,
-                RepresentationNavigationDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE,
-                EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        addEOperation(representationNavigationDescriptionEClass, theDescriptionPackage.getRepresentationElementMapping(), "getMappings", 1, -1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-
-        initEClass(menuItemOrRefEClass, MenuItemOrRef.class, "MenuItemOrRef", EPackageImpl.IS_ABSTRACT, EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(menuItemDescriptionEClass, MenuItemDescription.class, "MenuItemDescription", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getMenuItemDescription_Icon(), theDescriptionPackage.getImagePath(), "icon", null, 0, 1, MenuItemDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(menuItemDescriptionReferenceEClass, MenuItemDescriptionReference.class, "MenuItemDescriptionReference", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getMenuItemDescriptionReference_Item(), this.getMenuItemDescription(), null, "item", null, 1, 1, MenuItemDescriptionReference.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(operationActionEClass, OperationAction.class, "OperationAction", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getOperationAction_View(), this.getContainerViewVariable(), null, "view", null, 1, 1, OperationAction.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getOperationAction_InitialOperation(), this.getInitialOperation(), null, "initialOperation", null, 1, 1, OperationAction.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(externalJavaActionEClass, ExternalJavaAction.class, "ExternalJavaAction", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getExternalJavaAction_Id(), theEcorePackage.getEString(), "id", null, 1, 1, ExternalJavaAction.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getExternalJavaAction_Parameters(), this.getExternalJavaActionParameter(), null, "parameters", null, 0, -1, ExternalJavaAction.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(externalJavaActionCallEClass, ExternalJavaActionCall.class, "ExternalJavaActionCall", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getExternalJavaActionCall_Action(), this.getExternalJavaAction(), null, "action", null, 1, 1, ExternalJavaActionCall.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(popupMenuEClass, PopupMenu.class, "PopupMenu", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getPopupMenu_MenuItemDescription(), this.getMenuItemDescription(), null, "menuItemDescription", null, 1, -1, PopupMenu.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(abstractVariableEClass, AbstractVariable.class, "AbstractVariable", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getAbstractVariable_Name(), theEcorePackage.getEString(), "name", null, 0, 1, AbstractVariable.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(variableContainerEClass, VariableContainer.class, "VariableContainer", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getVariableContainer_SubVariables(), this.getSubVariable(), null, "subVariables", null, 0, -1, VariableContainer.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-
-        initEClass(acceleoVariableEClass, AcceleoVariable.class, "AcceleoVariable", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getAcceleoVariable_ComputationExpression(), theDescriptionPackage.getInterpretedExpression(), "computationExpression", null, 0, 1, AcceleoVariable.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-
-        initEClass(subVariableEClass, SubVariable.class, "SubVariable", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(dialogVariableEClass, DialogVariable.class, "DialogVariable", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getDialogVariable_DialogPrompt(), theEcorePackage.getEString(), "dialogPrompt", null, 0, 1, DialogVariable.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(elementDropVariableEClass, ElementDropVariable.class, "ElementDropVariable", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(elementSelectVariableEClass, ElementSelectVariable.class, "ElementSelectVariable", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(elementVariableEClass, ElementVariable.class, "ElementVariable", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(elementViewVariableEClass, ElementViewVariable.class, "ElementViewVariable", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(elementDeleteVariableEClass, ElementDeleteVariable.class, "ElementDeleteVariable", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(dropContainerVariableEClass, DropContainerVariable.class, "DropContainerVariable", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(selectContainerVariableEClass, SelectContainerVariable.class, "SelectContainerVariable", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(containerViewVariableEClass, ContainerViewVariable.class, "ContainerViewVariable", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(selectModelElementVariableEClass, SelectModelElementVariable.class, "SelectModelElementVariable", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(editMaskVariablesEClass, EditMaskVariables.class, "EditMaskVariables", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getEditMaskVariables_Mask(), theEcorePackage.getEString(), "mask", null, 0, 1, EditMaskVariables.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(containerModelOperationEClass, ContainerModelOperation.class, "ContainerModelOperation", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getContainerModelOperation_SubModelOperations(), this.getModelOperation(), null, "subModelOperations", null, 0, -1, ContainerModelOperation.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(modelOperationEClass, ModelOperation.class, "ModelOperation", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(initialNodeCreationOperationEClass, InitialNodeCreationOperation.class, "InitialNodeCreationOperation", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getInitialNodeCreationOperation_FirstModelOperations(), this.getModelOperation(), null, "firstModelOperations", null, 1, 1, InitialNodeCreationOperation.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(initialOperationEClass, InitialOperation.class, "InitialOperation", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getInitialOperation_FirstModelOperations(), this.getModelOperation(), null, "firstModelOperations", null, 1, 1, InitialOperation.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(initEdgeCreationOperationEClass, InitEdgeCreationOperation.class, "InitEdgeCreationOperation", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getInitEdgeCreationOperation_FirstModelOperations(), this.getModelOperation(), null, "firstModelOperations", null, 1, 1, InitEdgeCreationOperation.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(initialContainerDropOperationEClass, InitialContainerDropOperation.class, "InitialContainerDropOperation", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getInitialContainerDropOperation_FirstModelOperations(), this.getModelOperation(), null, "firstModelOperations", null, 1, 1, InitialContainerDropOperation.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(createInstanceEClass, CreateInstance.class, "CreateInstance", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getCreateInstance_TypeName(), theDescriptionPackage.getTypeName(), "typeName", null, 0, 1, CreateInstance.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getCreateInstance_ReferenceName(), theDescriptionPackage.getFeatureName(), "referenceName", null, 1, 1, CreateInstance.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getCreateInstance_VariableName(), theEcorePackage.getEString(), "variableName", "instance", 0, 1, CreateInstance.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(changeContextEClass, ChangeContext.class, "ChangeContext", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getChangeContext_BrowseExpression(), theDescriptionPackage.getInterpretedExpression(), "browseExpression", null, 0, 1, ChangeContext.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(setValueEClass, SetValue.class, "SetValue", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getSetValue_FeatureName(), theDescriptionPackage.getFeatureName(), "featureName", null, 1, 1, SetValue.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getSetValue_ValueExpression(), theDescriptionPackage.getInterpretedExpression(), "valueExpression", null, 0, 1, SetValue.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(setObjectEClass, SetObject.class, "SetObject", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getSetObject_FeatureName(), theDescriptionPackage.getFeatureName(), "featureName", null, 1, 1, SetObject.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getSetObject_Object(), theEcorePackage.getEObject(), null, "object", null, 0, 1, SetObject.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-
-        initEClass(unsetEClass, Unset.class, "Unset", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getUnset_FeatureName(), theDescriptionPackage.getFeatureName(), "featureName", "", 1, 1, Unset.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getUnset_ElementExpression(), theDescriptionPackage.getInterpretedExpression(), "elementExpression", null, 0, 1, Unset.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(moveElementEClass, MoveElement.class, "MoveElement", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getMoveElement_NewContainerExpression(), theDescriptionPackage.getInterpretedExpression(), "newContainerExpression", null, 1, 1, MoveElement.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getMoveElement_FeatureName(), theDescriptionPackage.getFeatureName(), "featureName", null, 1, 1, MoveElement.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(removeElementEClass, RemoveElement.class, "RemoveElement", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(forEClass, For.class, "For", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getFor_Expression(), theDescriptionPackage.getInterpretedExpression(), "expression", null, 1, 1, For.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getFor_IteratorName(), theEcorePackage.getEString(), "iteratorName", "i", 1, 1, For.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE,
-                !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(ifEClass, If.class, "If", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getIf_ConditionExpression(), theDescriptionPackage.getInterpretedExpression(), "conditionExpression", null, 0, 1, If.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(deleteViewEClass, DeleteView.class, "DeleteView", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(nameVariableEClass, NameVariable.class, "NameVariable", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(externalJavaActionParameterEClass, ExternalJavaActionParameter.class, "ExternalJavaActionParameter", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getExternalJavaActionParameter_Name(), theEcorePackage.getEString(), "name", null, 1, 1, ExternalJavaActionParameter.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getExternalJavaActionParameter_Value(), theDescriptionPackage.getInterpretedExpression(), "value", null, 0, 1, ExternalJavaActionParameter.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(toolFilterDescriptionEClass, ToolFilterDescription.class, "ToolFilterDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getToolFilterDescription_Precondition(), theDescriptionPackage.getInterpretedExpression(), "precondition", null, 0, 1, ToolFilterDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getToolFilterDescription_ElementsToListen(), theDescriptionPackage.getInterpretedExpression(), "elementsToListen", null, 0, 1, ToolFilterDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getToolFilterDescription_Listeners(), this.getFeatureChangeListener(), null, "listeners", null, 1, -1, ToolFilterDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(featureChangeListenerEClass, FeatureChangeListener.class, "FeatureChangeListener", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getFeatureChangeListener_DomainClass(), theDescriptionPackage.getTypeName(), "domainClass", null, 1, 1, FeatureChangeListener.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getFeatureChangeListener_FeatureName(), theDescriptionPackage.getFeatureName(), "featureName", null, 1, 1, FeatureChangeListener.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(caseEClass, Case.class, "Case", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getCase_ConditionExpression(), theDescriptionPackage.getInterpretedExpression(), "conditionExpression", null, 0, 1, Case.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(switchChildEClass, SwitchChild.class, "SwitchChild", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getSwitchChild_SubModelOperations(), this.getModelOperation(), null, "subModelOperations", null, 0, -1, SwitchChild.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(defaultEClass, Default.class, "Default", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(switchEClass, Switch.class, "Switch", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getSwitch_Cases(), this.getCase(), null, "cases", null, 1, -1, Switch.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE,
-                EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getSwitch_Default(), this.getDefault(), null, "default", null, 1, 1, Switch.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE,
-                EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEClass(toolEntryEClass, ToolEntry.class, "ToolEntry", EPackageImpl.IS_ABSTRACT, EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(abstractToolDescriptionEClass, AbstractToolDescription.class,
+                "AbstractToolDescription", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getAbstractToolDescription_Precondition(),
+                theDescriptionPackage.getInterpretedExpression(),
+                "precondition", "", 0, 1, AbstractToolDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(
+                getAbstractToolDescription_ForceRefresh(),
+                theEcorePackage.getEBoolean(),
+                "forceRefresh", "false", 0, 1, AbstractToolDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEReference(
+                getAbstractToolDescription_Filters(),
+                this.getToolFilterDescription(),
+                null,
+                "filters", null, 0, -1, AbstractToolDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getAbstractToolDescription_ElementsToSelect(),
+                theDescriptionPackage.getInterpretedExpression(),
+                "elementsToSelect", "", 0, 1, AbstractToolDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(
+                getAbstractToolDescription_InverseSelectionOrder(),
+                theEcorePackage.getEBoolean(),
+                "inverseSelectionOrder", "false", 0, 1, AbstractToolDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+
+        initEClass(mappingBasedToolDescriptionEClass, MappingBasedToolDescription.class,
+                "MappingBasedToolDescription", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(toolDescriptionEClass, ToolDescription.class, "ToolDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getToolDescription_IconPath(),
+                theDescriptionPackage.getImagePath(),
+                "iconPath", "", 0, 1, ToolDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEReference(
+                getToolDescription_Element(),
+                this.getElementVariable(),
+                null,
+                "element", null, 1, 1, ToolDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getToolDescription_ElementView(),
+                this.getElementViewVariable(),
+                null,
+                "elementView", null, 1, 1, ToolDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getToolDescription_InitialOperation(),
+                this.getInitialOperation(),
+                null,
+                "initialOperation", null, 1, 1, ToolDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(pasteDescriptionEClass, PasteDescription.class, "PasteDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getPasteDescription_Container(),
+                this.getDropContainerVariable(),
+                null,
+                "container", null, 1, 1, PasteDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getPasteDescription_ContainerView(),
+                this.getContainerViewVariable(),
+                null,
+                "containerView", null, 1, 1, PasteDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getPasteDescription_CopiedView(),
+                this.getElementViewVariable(),
+                null,
+                "copiedView", null, 1, 1, PasteDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getPasteDescription_CopiedElement(),
+                this.getElementVariable(),
+                null,
+                "copiedElement", null, 1, 1, PasteDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getPasteDescription_InitialOperation(),
+                this.getInitialOperation(),
+                null,
+                "initialOperation", null, 1, 1, PasteDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        addEOperation(pasteDescriptionEClass, theDescriptionPackage.getPasteTargetDescription(), "getContainers", 0, -1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(selectionWizardDescriptionEClass, SelectionWizardDescription.class,
+                "SelectionWizardDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getSelectionWizardDescription_Element(),
+                this.getElementSelectVariable(),
+                null,
+                "element", null, 1, 1, SelectionWizardDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getSelectionWizardDescription_ContainerView(),
+                this.getContainerViewVariable(),
+                null,
+                "containerView", null, 1, 1, SelectionWizardDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getSelectionWizardDescription_Container(),
+                this.getSelectContainerVariable(),
+                null,
+                "container", null, 1, 1, SelectionWizardDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getSelectionWizardDescription_InitialOperation(),
+                this.getInitialOperation(),
+                null,
+                "initialOperation", null, 1, 1, SelectionWizardDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getSelectionWizardDescription_IconPath(),
+                theDescriptionPackage.getImagePath(),
+                "iconPath", "/org.eclipse.sirius.ui/icons/full/obj16/SelectionWizardDescription.gif", 1, 1, SelectionWizardDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(
+                getSelectionWizardDescription_WindowTitle(),
+                theEcorePackage.getEString(),
+                "windowTitle", "Selection Wizard", 1, 1, SelectionWizardDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(
+                getSelectionWizardDescription_WindowImagePath(),
+                theDescriptionPackage.getImagePath(),
+                "windowImagePath", null, 0, 1, SelectionWizardDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(paneBasedSelectionWizardDescriptionEClass, PaneBasedSelectionWizardDescription.class,
+                "PaneBasedSelectionWizardDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getPaneBasedSelectionWizardDescription_Element(),
+                this.getElementSelectVariable(),
+                null,
+                "element", null, 1, 1, PaneBasedSelectionWizardDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getPaneBasedSelectionWizardDescription_ContainerView(),
+                this.getContainerViewVariable(),
+                null,
+                "containerView", null, 1, 1, PaneBasedSelectionWizardDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getPaneBasedSelectionWizardDescription_Container(),
+                this.getSelectContainerVariable(),
+                null,
+                "container", null, 1, 1, PaneBasedSelectionWizardDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getPaneBasedSelectionWizardDescription_InitialOperation(),
+                this.getInitialOperation(),
+                null,
+                "initialOperation", null, 1, 1, PaneBasedSelectionWizardDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getPaneBasedSelectionWizardDescription_IconPath(),
+                theDescriptionPackage.getImagePath(),
+                "iconPath", "/org.eclipse.sirius.ui/icons/full/obj16/PaneBasedSelectionWizardDescription.gif", 1, 1, PaneBasedSelectionWizardDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(
+                getPaneBasedSelectionWizardDescription_WindowTitle(),
+                theEcorePackage.getEString(),
+                "windowTitle", "Selection Wizard", 1, 1, PaneBasedSelectionWizardDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(
+                getPaneBasedSelectionWizardDescription_WindowImagePath(),
+                theDescriptionPackage.getImagePath(),
+                "windowImagePath", null, 0, 1, PaneBasedSelectionWizardDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getPaneBasedSelectionWizardDescription_Message(),
+                theEcorePackage.getEString(),
+                "message", null, 0, 1, PaneBasedSelectionWizardDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getPaneBasedSelectionWizardDescription_ChoiceOfValuesMessage(),
+                theEcorePackage.getEString(),
+                "choiceOfValuesMessage", "Choice of values", 0, 1, PaneBasedSelectionWizardDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(
+                getPaneBasedSelectionWizardDescription_CandidatesExpression(),
+                theDescriptionPackage.getInterpretedExpression(),
+                "candidatesExpression", null, 1, 1, PaneBasedSelectionWizardDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getPaneBasedSelectionWizardDescription_Tree(),
+                theEcorePackage.getEBoolean(),
+                "tree", null, 1, 1, PaneBasedSelectionWizardDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getPaneBasedSelectionWizardDescription_RootExpression(),
+                theDescriptionPackage.getInterpretedExpression(),
+                "rootExpression", null, 0, 1, PaneBasedSelectionWizardDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getPaneBasedSelectionWizardDescription_ChildrenExpression(),
+                theDescriptionPackage.getInterpretedExpression(),
+                "childrenExpression", null, 0, 1, PaneBasedSelectionWizardDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getPaneBasedSelectionWizardDescription_SelectedValuesMessage(),
+                theEcorePackage.getEString(),
+                "selectedValuesMessage", "Selected values", 0, 1, PaneBasedSelectionWizardDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(
+                getPaneBasedSelectionWizardDescription_PreSelectedCandidatesExpression(),
+                theDescriptionPackage.getInterpretedExpression(),
+                "preSelectedCandidatesExpression", null, 0, 1, PaneBasedSelectionWizardDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(representationCreationDescriptionEClass, RepresentationCreationDescription.class,
+                "RepresentationCreationDescription", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getRepresentationCreationDescription_TitleExpression(),
+                theDescriptionPackage.getInterpretedExpression(),
+                "titleExpression", "", 0, 1, RepresentationCreationDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(
+                getRepresentationCreationDescription_BrowseExpression(),
+                theDescriptionPackage.getInterpretedExpression(),
+                "browseExpression", null, 0, 1, RepresentationCreationDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getRepresentationCreationDescription_RepresentationDescription(),
+                theDescriptionPackage.getRepresentationDescription(),
+                null,
+                "representationDescription", null, 1, 1, RepresentationCreationDescription.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE, !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getRepresentationCreationDescription_InitialOperation(),
+                this.getInitialOperation(),
+                null,
+                "initialOperation", null, 0, 1, RepresentationCreationDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getRepresentationCreationDescription_ContainerViewVariable(),
+                this.getContainerViewVariable(),
+                null,
+                "containerViewVariable", null, 1, 1, RepresentationCreationDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getRepresentationCreationDescription_RepresentationNameVariable(),
+                this.getNameVariable(),
+                null,
+                "representationNameVariable", null, 1, 1, RepresentationCreationDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        addEOperation(representationCreationDescriptionEClass, theDescriptionPackage.getRepresentationElementMapping(), "getMappings", 1, -1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(representationNavigationDescriptionEClass, RepresentationNavigationDescription.class,
+                "RepresentationNavigationDescription", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getRepresentationNavigationDescription_BrowseExpression(),
+                theDescriptionPackage.getInterpretedExpression(),
+                "browseExpression", null, 0, 1, RepresentationNavigationDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getRepresentationNavigationDescription_NavigationNameExpression(),
+                theDescriptionPackage.getInterpretedExpression(),
+                "navigationNameExpression", null, 0, 1, RepresentationNavigationDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getRepresentationNavigationDescription_RepresentationDescription(),
+                theDescriptionPackage.getRepresentationDescription(),
+                null,
+                "representationDescription", null, 1, 1, RepresentationNavigationDescription.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE, !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getRepresentationNavigationDescription_ContainerViewVariable(),
+                this.getContainerViewVariable(),
+                null,
+                "containerViewVariable", null, 1, 1, RepresentationNavigationDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getRepresentationNavigationDescription_ContainerVariable(),
+                this.getElementSelectVariable(),
+                null,
+                "containerVariable", null, 1, 1, RepresentationNavigationDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getRepresentationNavigationDescription_RepresentationNameVariable(),
+                this.getNameVariable(),
+                null,
+                "representationNameVariable", null, 1, 1, RepresentationNavigationDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        addEOperation(representationNavigationDescriptionEClass, theDescriptionPackage.getRepresentationElementMapping(), "getMappings", 1, -1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(menuItemOrRefEClass, MenuItemOrRef.class, "MenuItemOrRef", EPackageImpl.IS_ABSTRACT, EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(menuItemDescriptionEClass, MenuItemDescription.class, "MenuItemDescription", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getMenuItemDescription_Icon(),
+                theDescriptionPackage.getImagePath(),
+                "icon", null, 0, 1, MenuItemDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(menuItemDescriptionReferenceEClass, MenuItemDescriptionReference.class,
+                "MenuItemDescriptionReference", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getMenuItemDescriptionReference_Item(),
+                this.getMenuItemDescription(),
+                null,
+                "item", null, 1, 1, MenuItemDescriptionReference.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(operationActionEClass, OperationAction.class, "OperationAction", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getOperationAction_View(),
+                this.getContainerViewVariable(),
+                null,
+                "view", null, 1, 1, OperationAction.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getOperationAction_InitialOperation(),
+                this.getInitialOperation(),
+                null,
+                "initialOperation", null, 1, 1, OperationAction.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(externalJavaActionEClass, ExternalJavaAction.class, "ExternalJavaAction", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getExternalJavaAction_Id(),
+                theEcorePackage.getEString(),
+                "id", null, 1, 1, ExternalJavaAction.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getExternalJavaAction_Parameters(),
+                this.getExternalJavaActionParameter(),
+                null,
+                "parameters", null, 0, -1, ExternalJavaAction.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(externalJavaActionCallEClass, ExternalJavaActionCall.class,
+                "ExternalJavaActionCall", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getExternalJavaActionCall_Action(),
+                this.getExternalJavaAction(),
+                null,
+                "action", null, 1, 1, ExternalJavaActionCall.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(popupMenuEClass, PopupMenu.class, "PopupMenu", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getPopupMenu_MenuItemDescription(),
+                this.getMenuItemDescription(),
+                null,
+                "menuItemDescription", null, 1, -1, PopupMenu.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(abstractVariableEClass, AbstractVariable.class, "AbstractVariable", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getAbstractVariable_Name(),
+                theEcorePackage.getEString(),
+                "name", null, 0, 1, AbstractVariable.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(variableContainerEClass, VariableContainer.class, "VariableContainer", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getVariableContainer_SubVariables(),
+                this.getSubVariable(),
+                null,
+                "subVariables", null, 0, -1, VariableContainer.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(acceleoVariableEClass, AcceleoVariable.class, "AcceleoVariable", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getAcceleoVariable_ComputationExpression(),
+                theDescriptionPackage.getInterpretedExpression(),
+                "computationExpression", null, 0, 1, AcceleoVariable.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(subVariableEClass, SubVariable.class, "SubVariable", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(dialogVariableEClass, DialogVariable.class, "DialogVariable", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getDialogVariable_DialogPrompt(),
+                theEcorePackage.getEString(),
+                "dialogPrompt", null, 0, 1, DialogVariable.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(elementDropVariableEClass, ElementDropVariable.class, "ElementDropVariable", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(elementSelectVariableEClass, ElementSelectVariable.class, "ElementSelectVariable", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(elementVariableEClass, ElementVariable.class, "ElementVariable", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(elementViewVariableEClass, ElementViewVariable.class, "ElementViewVariable", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(elementDeleteVariableEClass, ElementDeleteVariable.class, "ElementDeleteVariable", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(dropContainerVariableEClass, DropContainerVariable.class, "DropContainerVariable", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(selectContainerVariableEClass, SelectContainerVariable.class,
+                "SelectContainerVariable", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(containerViewVariableEClass, ContainerViewVariable.class, "ContainerViewVariable", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(selectModelElementVariableEClass, SelectModelElementVariable.class,
+                "SelectModelElementVariable", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(editMaskVariablesEClass, EditMaskVariables.class, "EditMaskVariables", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getEditMaskVariables_Mask(),
+                theEcorePackage.getEString(),
+                "mask", null, 0, 1, EditMaskVariables.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(containerModelOperationEClass, ContainerModelOperation.class,
+                "ContainerModelOperation", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getContainerModelOperation_SubModelOperations(),
+                this.getModelOperation(),
+                null,
+                "subModelOperations", null, 0, -1, ContainerModelOperation.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(modelOperationEClass, ModelOperation.class, "ModelOperation", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(initialNodeCreationOperationEClass, InitialNodeCreationOperation.class,
+                "InitialNodeCreationOperation", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getInitialNodeCreationOperation_FirstModelOperations(),
+                this.getModelOperation(),
+                null,
+                "firstModelOperations", null, 1, 1, InitialNodeCreationOperation.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(initialOperationEClass, InitialOperation.class, "InitialOperation", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getInitialOperation_FirstModelOperations(),
+                this.getModelOperation(),
+                null,
+                "firstModelOperations", null, 1, 1, InitialOperation.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(initEdgeCreationOperationEClass, InitEdgeCreationOperation.class,
+                "InitEdgeCreationOperation", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getInitEdgeCreationOperation_FirstModelOperations(),
+                this.getModelOperation(),
+                null,
+                "firstModelOperations", null, 1, 1, InitEdgeCreationOperation.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(initialContainerDropOperationEClass, InitialContainerDropOperation.class,
+                "InitialContainerDropOperation", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getInitialContainerDropOperation_FirstModelOperations(),
+                this.getModelOperation(),
+                null,
+                "firstModelOperations", null, 1, 1, InitialContainerDropOperation.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(createInstanceEClass, CreateInstance.class, "CreateInstance", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getCreateInstance_TypeName(),
+                theDescriptionPackage.getTypeName(),
+                "typeName", null, 0, 1, CreateInstance.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getCreateInstance_ReferenceName(),
+                theDescriptionPackage.getFeatureName(),
+                "referenceName", null, 1, 1, CreateInstance.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getCreateInstance_VariableName(),
+                theEcorePackage.getEString(),
+                "variableName", "instance", 0, 1, CreateInstance.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+
+        initEClass(changeContextEClass, ChangeContext.class, "ChangeContext", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getChangeContext_BrowseExpression(),
+                theDescriptionPackage.getInterpretedExpression(),
+                "browseExpression", null, 0, 1, ChangeContext.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(setValueEClass, SetValue.class, "SetValue", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getSetValue_FeatureName(),
+                theDescriptionPackage.getFeatureName(),
+                "featureName", null, 1, 1, SetValue.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getSetValue_ValueExpression(),
+                theDescriptionPackage.getInterpretedExpression(),
+                "valueExpression", null, 0, 1, SetValue.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(setObjectEClass, SetObject.class, "SetObject", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getSetObject_FeatureName(),
+                theDescriptionPackage.getFeatureName(),
+                "featureName", null, 1, 1, SetObject.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getSetObject_Object(),
+                theEcorePackage.getEObject(),
+                null,
+                "object", null, 0, 1, SetObject.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(unsetEClass, Unset.class, "Unset", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getUnset_FeatureName(),
+                theDescriptionPackage.getFeatureName(),
+                "featureName", "", 1, 1, Unset.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(
+                getUnset_ElementExpression(),
+                theDescriptionPackage.getInterpretedExpression(),
+                "elementExpression", null, 0, 1, Unset.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(moveElementEClass, MoveElement.class, "MoveElement", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getMoveElement_NewContainerExpression(),
+                theDescriptionPackage.getInterpretedExpression(),
+                "newContainerExpression", null, 1, 1, MoveElement.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getMoveElement_FeatureName(),
+                theDescriptionPackage.getFeatureName(),
+                "featureName", null, 1, 1, MoveElement.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(removeElementEClass, RemoveElement.class, "RemoveElement", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(forEClass, For.class, "For", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getFor_Expression(),
+                theDescriptionPackage.getInterpretedExpression(),
+                "expression", null, 1, 1, For.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getFor_IteratorName(),
+                theEcorePackage.getEString(),
+                "iteratorName", "i", 1, 1, For.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+
+        initEClass(ifEClass, If.class, "If", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getIf_ConditionExpression(),
+                theDescriptionPackage.getInterpretedExpression(),
+                "conditionExpression", null, 0, 1, If.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(deleteViewEClass, DeleteView.class, "DeleteView", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(nameVariableEClass, NameVariable.class, "NameVariable", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(externalJavaActionParameterEClass, ExternalJavaActionParameter.class,
+                "ExternalJavaActionParameter", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getExternalJavaActionParameter_Name(),
+                theEcorePackage.getEString(),
+                "name", null, 1, 1, ExternalJavaActionParameter.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getExternalJavaActionParameter_Value(),
+                theDescriptionPackage.getInterpretedExpression(),
+                "value", null, 0, 1, ExternalJavaActionParameter.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(toolFilterDescriptionEClass, ToolFilterDescription.class, "ToolFilterDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getToolFilterDescription_Precondition(),
+                theDescriptionPackage.getInterpretedExpression(),
+                "precondition", null, 0, 1, ToolFilterDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getToolFilterDescription_ElementsToListen(),
+                theDescriptionPackage.getInterpretedExpression(),
+                "elementsToListen", null, 0, 1, ToolFilterDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getToolFilterDescription_Listeners(),
+                this.getFeatureChangeListener(),
+                null,
+                "listeners", null, 1, -1, ToolFilterDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(featureChangeListenerEClass, FeatureChangeListener.class, "FeatureChangeListener", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getFeatureChangeListener_DomainClass(),
+                theDescriptionPackage.getTypeName(),
+                "domainClass", null, 1, 1, FeatureChangeListener.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getFeatureChangeListener_FeatureName(),
+                theDescriptionPackage.getFeatureName(),
+                "featureName", null, 1, 1, FeatureChangeListener.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(caseEClass, Case.class, "Case", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getCase_ConditionExpression(),
+                theDescriptionPackage.getInterpretedExpression(),
+                "conditionExpression", null, 0, 1, Case.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(switchChildEClass, SwitchChild.class, "SwitchChild", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getSwitchChild_SubModelOperations(),
+                this.getModelOperation(),
+                null,
+                "subModelOperations", null, 0, -1, SwitchChild.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(defaultEClass, Default.class, "Default", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(switchEClass, Switch.class, "Switch", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getSwitch_Cases(),
+                this.getCase(),
+                null,
+                "cases", null, 1, -1, Switch.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getSwitch_Default(),
+                this.getDefault(),
+                null,
+                "default", null, 1, 1, Switch.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
 
         // Initialize enums and add enum literals
-        initEEnum(dragSourceEEnum, DragSource.class, "DragSource");
+        initEEnum(dragSourceEEnum, DragSource.class, "DragSource"); //$NON-NLS-1$
         addEEnumLiteral(dragSourceEEnum, DragSource.DIAGRAM_LITERAL);
         addEEnumLiteral(dragSourceEEnum, DragSource.PROJECT_EXPLORER_LITERAL);
         addEEnumLiteral(dragSourceEEnum, DragSource.BOTH_LITERAL);
@@ -2783,29 +2948,51 @@ public class ToolPackageImpl extends EPackageImpl implements ToolPackage {
      * @generated
      */
     protected void createReturnTypeAnnotations() {
-        String source = "http://www.eclipse.org/sirius/interpreted/expression/returnType";
-        addAnnotation(getAbstractToolDescription_Precondition(), source, new String[] { "returnType", "a boolean." });
-        addAnnotation(getAbstractToolDescription_ElementsToSelect(), source, new String[] { "returnType", "a Collection<EObject>" });
-        addAnnotation(getAbstractToolDescription_InverseSelectionOrder(), source, new String[] { "returnType", "a boolean." });
-        addAnnotation(getPaneBasedSelectionWizardDescription_CandidatesExpression(), source, new String[] { "returnType", "a Collection<EObject> or an EObject." });
-        addAnnotation(getPaneBasedSelectionWizardDescription_RootExpression(), source, new String[] { "returnType", "a Collection<EObject> or an EObject." });
-        addAnnotation(getPaneBasedSelectionWizardDescription_ChildrenExpression(), source, new String[] { "returnType", "a Collection<EObject> or an EObject." });
-        addAnnotation(getPaneBasedSelectionWizardDescription_PreSelectedCandidatesExpression(), source, new String[] { "returnType", "a Collection<EObject> or an EObject." });
-        addAnnotation(getRepresentationCreationDescription_TitleExpression(), source, new String[] { "returnType", "a string." });
-        addAnnotation(getRepresentationCreationDescription_BrowseExpression(), source, new String[] { "returnType", "an EObject." });
-        addAnnotation(getRepresentationNavigationDescription_BrowseExpression(), source, new String[] { "returnType", "an EObject." });
-        addAnnotation(getRepresentationNavigationDescription_NavigationNameExpression(), source, new String[] { "returnType", "a string." });
-        addAnnotation(getAcceleoVariable_ComputationExpression(), source, new String[] { "returnType", "a Collection<Object> or an Object." });
-        addAnnotation(getChangeContext_BrowseExpression(), source, new String[] { "returnType", "an EObject." });
-        addAnnotation(getSetValue_ValueExpression(), source, new String[] { "returnType", "any type supported by the feature." });
-        addAnnotation(getUnset_ElementExpression(), source, new String[] { "returnType", "a Collection<EObject> or an EObject." });
-        addAnnotation(getMoveElement_NewContainerExpression(), source, new String[] { "returnType", "an EObject." });
-        addAnnotation(getFor_Expression(), source, new String[] { "returnType", "a Collection<EObject> or an EObject." });
-        addAnnotation(getIf_ConditionExpression(), source, new String[] { "returnType", "a boolean." });
-        addAnnotation(getExternalJavaActionParameter_Value(), source, new String[] { "returnType", "any type supported by the corresponding java parameter." });
-        addAnnotation(getToolFilterDescription_Precondition(), source, new String[] { "returnType", "a boolean." });
-        addAnnotation(getToolFilterDescription_ElementsToListen(), source, new String[] { "returnType", "a collection." });
-        addAnnotation(getCase_ConditionExpression(), source, new String[] { "returnType", "a boolean." });
+        String source = "http://www.eclipse.org/sirius/interpreted/expression/returnType"; //$NON-NLS-1$
+        addAnnotation(getAbstractToolDescription_Precondition(), source, new String[] { "returnType", "a boolean." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getAbstractToolDescription_ElementsToSelect(), source, new String[] { "returnType", "a Collection<EObject>" //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getAbstractToolDescription_InverseSelectionOrder(), source, new String[] { "returnType", "a boolean." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getPaneBasedSelectionWizardDescription_CandidatesExpression(), source, new String[] { "returnType", "a Collection<EObject> or an EObject." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getPaneBasedSelectionWizardDescription_RootExpression(), source, new String[] { "returnType", "a Collection<EObject> or an EObject." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getPaneBasedSelectionWizardDescription_ChildrenExpression(), source, new String[] { "returnType", "a Collection<EObject> or an EObject." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getPaneBasedSelectionWizardDescription_PreSelectedCandidatesExpression(), source, new String[] { "returnType", "a Collection<EObject> or an EObject." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getRepresentationCreationDescription_TitleExpression(), source, new String[] { "returnType", "a string." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getRepresentationCreationDescription_BrowseExpression(), source, new String[] { "returnType", "an EObject." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getRepresentationNavigationDescription_BrowseExpression(), source, new String[] { "returnType", "an EObject." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getRepresentationNavigationDescription_NavigationNameExpression(), source, new String[] { "returnType", "a string." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getAcceleoVariable_ComputationExpression(), source, new String[] { "returnType", "a Collection<Object> or an Object." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getChangeContext_BrowseExpression(), source, new String[] { "returnType", "an EObject." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getSetValue_ValueExpression(), source, new String[] { "returnType", "any type supported by the feature." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getUnset_ElementExpression(), source, new String[] { "returnType", "a Collection<EObject> or an EObject." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getMoveElement_NewContainerExpression(), source, new String[] { "returnType", "an EObject." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getFor_Expression(), source, new String[] { "returnType", "a Collection<EObject> or an EObject." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getIf_ConditionExpression(), source, new String[] { "returnType", "a boolean." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getExternalJavaActionParameter_Value(), source, new String[] { "returnType", "any type supported by the corresponding java parameter." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getToolFilterDescription_Precondition(), source, new String[] { "returnType", "a boolean." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getToolFilterDescription_ElementsToListen(), source, new String[] { "returnType", "a collection." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getCase_ConditionExpression(), source, new String[] { "returnType", "a boolean." //$NON-NLS-1$ //$NON-NLS-2$
+        });
     }
 
     /**
@@ -2816,22 +3003,34 @@ public class ToolPackageImpl extends EPackageImpl implements ToolPackage {
      * @generated
      */
     protected void createVariablesAnnotations() {
-        String source = "http://www.eclipse.org/sirius/interpreted/expression/variables";
-        addAnnotation(getAbstractToolDescription_Precondition(), source, new String[] { "container", "ecore.EObject | the container." });
-        addAnnotation(getToolDescription_Element(), source, new String[] { "type", "ecore.EObject" });
-        addAnnotation(getToolDescription_ElementView(), source, new String[] { "type", "ecore.EObject" });
-        addAnnotation(getPaneBasedSelectionWizardDescription_CandidatesExpression(), source, new String[] { "diagram", "diagram.DDiagram | the current DDiagram.", "containerView",
-            "viewpoint.DSemanticDecorator | the selected view.", "container", "ecore.EObject | the semantic element of containerView." });
-        addAnnotation(getPaneBasedSelectionWizardDescription_RootExpression(), source, new String[] { "diagram", "diagram.DDiagram | the current DDiagram.", "containerView",
-            "viewpoint.DSemanticDecorator | the selected view.", "container", "ecore.EObject | the semantic element of containerView." });
-        addAnnotation(getPaneBasedSelectionWizardDescription_ChildrenExpression(), source, new String[] { "diagram", "diagram.DDiagram | the current DDiagram.", "containerView",
-            "viewpoint.DSemanticDecorator | the selected view.", "container", "ecore.EObject | the semantic element of containerView." });
-        addAnnotation(getPaneBasedSelectionWizardDescription_PreSelectedCandidatesExpression(), source, new String[] { "diagram", "diagram.DDiagram | the current DDiagram.", "containerView",
-            "viewpoint.DSemanticDecorator | the selected view.", "container", "ecore.EObject | the semantic element of containerView." });
+        String source = "http://www.eclipse.org/sirius/interpreted/expression/variables"; //$NON-NLS-1$
+        addAnnotation(getAbstractToolDescription_Precondition(), source, new String[] { "container", "ecore.EObject | the container." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getToolDescription_Element(), source, new String[] { "type", "ecore.EObject" //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getToolDescription_ElementView(), source, new String[] { "type", "ecore.EObject" //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getPaneBasedSelectionWizardDescription_CandidatesExpression(), source, new String[] { "diagram", "diagram.DDiagram | the current DDiagram.", //$NON-NLS-1$ //$NON-NLS-2$
+            "containerView", "viewpoint.DSemanticDecorator | the selected view.", //$NON-NLS-1$ //$NON-NLS-2$
+            "container", "ecore.EObject | the semantic element of containerView." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getPaneBasedSelectionWizardDescription_RootExpression(), source, new String[] { "diagram", "diagram.DDiagram | the current DDiagram.", //$NON-NLS-1$ //$NON-NLS-2$
+            "containerView", "viewpoint.DSemanticDecorator | the selected view.", //$NON-NLS-1$ //$NON-NLS-2$
+            "container", "ecore.EObject | the semantic element of containerView." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getPaneBasedSelectionWizardDescription_ChildrenExpression(), source, new String[] { "diagram", "diagram.DDiagram | the current DDiagram.", //$NON-NLS-1$ //$NON-NLS-2$
+            "containerView", "viewpoint.DSemanticDecorator | the selected view.", //$NON-NLS-1$ //$NON-NLS-2$
+            "container", "ecore.EObject | the semantic element of containerView." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getPaneBasedSelectionWizardDescription_PreSelectedCandidatesExpression(), source, new String[] { "diagram", "diagram.DDiagram | the current DDiagram.", //$NON-NLS-1$ //$NON-NLS-2$
+            "containerView", "viewpoint.DSemanticDecorator | the selected view.", //$NON-NLS-1$ //$NON-NLS-2$
+            "container", "ecore.EObject | the semantic element of containerView." //$NON-NLS-1$ //$NON-NLS-2$
+        });
         addAnnotation(getRepresentationCreationDescription_TitleExpression(), source, new String[] {});
         addAnnotation(getRepresentationCreationDescription_BrowseExpression(), source, new String[] {});
         addAnnotation(getRepresentationNavigationDescription_BrowseExpression(), source, new String[] {});
-        addAnnotation(getRepresentationNavigationDescription_NavigationNameExpression(), source, new String[] { "name", "name of the targeted Representation." });
+        addAnnotation(getRepresentationNavigationDescription_NavigationNameExpression(), source, new String[] { "name", "name of the targeted Representation." //$NON-NLS-1$ //$NON-NLS-2$
+        });
         addAnnotation(getAcceleoVariable_ComputationExpression(), source, new String[] {});
         addAnnotation(getChangeContext_BrowseExpression(), source, new String[] {});
         addAnnotation(getSetValue_ValueExpression(), source, new String[] {});
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/UnsetImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/UnsetImpl.java
index b58ca44c7f..188859e19c 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/UnsetImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/UnsetImpl.java
@@ -224,9 +224,9 @@ public class UnsetImpl extends ContainerModelOperationImpl implements Unset {
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (featureName: ");
+        result.append(" (featureName: "); //$NON-NLS-1$
         result.append(featureName);
-        result.append(", elementExpression: ");
+        result.append(", elementExpression: "); //$NON-NLS-1$
         result.append(elementExpression);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/validation/impl/RuleAuditImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/validation/impl/RuleAuditImpl.java
index 995d4a2052..39965b9d9a 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/validation/impl/RuleAuditImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/validation/impl/RuleAuditImpl.java
@@ -168,7 +168,7 @@ public class RuleAuditImpl extends MinimalEObjectImpl.Container implements RuleA
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (auditExpression: ");
+        result.append(" (auditExpression: "); //$NON-NLS-1$
         result.append(auditExpression);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/validation/impl/SemanticValidationRuleImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/validation/impl/SemanticValidationRuleImpl.java
index 185a71267e..e11f29bb65 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/validation/impl/SemanticValidationRuleImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/validation/impl/SemanticValidationRuleImpl.java
@@ -165,7 +165,7 @@ public class SemanticValidationRuleImpl extends ValidationRuleImpl implements Se
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (targetClass: ");
+        result.append(" (targetClass: "); //$NON-NLS-1$
         result.append(targetClass);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/validation/impl/ValidationFactoryImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/validation/impl/ValidationFactoryImpl.java
index e667e937e7..d231bd85c2 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/validation/impl/ValidationFactoryImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/validation/impl/ValidationFactoryImpl.java
@@ -83,7 +83,7 @@ public class ValidationFactoryImpl extends EFactoryImpl implements ValidationFac
         case ValidationPackage.VALIDATION_FIX:
             return createValidationFix();
         default:
-            throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+            throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
         }
     }
 
@@ -98,7 +98,7 @@ public class ValidationFactoryImpl extends EFactoryImpl implements ValidationFac
         case ValidationPackage.ERROR_LEVEL:
             return createERROR_LEVELFromString(eDataType, initialValue);
         default:
-            throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+            throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
         }
     }
 
@@ -113,7 +113,7 @@ public class ValidationFactoryImpl extends EFactoryImpl implements ValidationFac
         case ValidationPackage.ERROR_LEVEL:
             return convertERROR_LEVELToString(eDataType, instanceValue);
         default:
-            throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+            throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
         }
     }
 
@@ -180,7 +180,7 @@ public class ValidationFactoryImpl extends EFactoryImpl implements ValidationFac
     public ERROR_LEVEL createERROR_LEVELFromString(EDataType eDataType, String initialValue) {
         ERROR_LEVEL result = ERROR_LEVEL.get(initialValue);
         if (result == null) {
-            throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+            throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
         }
         return result;
     }
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/validation/impl/ValidationFixImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/validation/impl/ValidationFixImpl.java
index 4021203311..13952e6efa 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/validation/impl/ValidationFixImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/validation/impl/ValidationFixImpl.java
@@ -289,7 +289,7 @@ public class ValidationFixImpl extends MinimalEObjectImpl.Container implements V
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (name: ");
+        result.append(" (name: "); //$NON-NLS-1$
         result.append(name);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/validation/impl/ValidationPackageImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/validation/impl/ValidationPackageImpl.java
index bda6555bec..83ef5e2400 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/validation/impl/ValidationPackageImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/validation/impl/ValidationPackageImpl.java
@@ -486,60 +486,86 @@ public class ValidationPackageImpl extends EPackageImpl implements ValidationPac
         viewValidationRuleEClass.getESuperTypes().add(this.getValidationRule());
 
         // Initialize classes and features; add operations and parameters
-        initEClass(validationSetEClass, ValidationSet.class, "ValidationSet", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getValidationSet_Name(), theEcorePackage.getEString(), "name", "", 0, 1, ValidationSet.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE,
-                !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getValidationSet_OwnedRules(), this.getValidationRule(), null, "ownedRules", null, 0, -1, ValidationSet.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getValidationSet_ReusedRules(), this.getValidationRule(), null, "reusedRules", null, 0, -1, ValidationSet.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getValidationSet_AllRules(), this.getValidationRule(), null, "allRules", null, 0, -1, ValidationSet.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE,
-                !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-
-        initEClass(validationRuleEClass, ValidationRule.class, "ValidationRule", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getValidationRule_Level(), this.getERROR_LEVEL(), "level", "INFO", 1, 1, ValidationRule.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getValidationRule_Message(), theDescriptionPackage.getInterpretedExpression(), "message", "The element has...", 0, 1, ValidationRule.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getValidationRule_Audits(), this.getRuleAudit(), null, "audits", null, 0, -1, ValidationRule.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getValidationRule_Fixes(), this.getValidationFix(), null, "fixes", null, 0, -1, ValidationRule.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-
-        EOperation op = addEOperation(validationRuleEClass, theEcorePackage.getEBoolean(), "checkRule", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-        addEParameter(op, theEcorePackage.getEObject(), "eObj", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-
-        op = addEOperation(validationRuleEClass, theEcorePackage.getEString(), "getMessage", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-        addEParameter(op, theEcorePackage.getEObject(), "eObj", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-
-        initEClass(semanticValidationRuleEClass, SemanticValidationRule.class, "SemanticValidationRule", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getSemanticValidationRule_TargetClass(), theDescriptionPackage.getTypeName(), "targetClass", null, 1, 1, SemanticValidationRule.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(viewValidationRuleEClass, ViewValidationRule.class, "ViewValidationRule", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getViewValidationRule_Targets(), theDescriptionPackage.getRepresentationElementMapping(), null, "targets", null, 0, -1, ViewValidationRule.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(ruleAuditEClass, RuleAudit.class, "RuleAudit", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getRuleAudit_AuditExpression(), theDescriptionPackage.getInterpretedExpression(), "auditExpression", null, 1, 1, RuleAudit.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(validationFixEClass, ValidationFix.class, "ValidationFix", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getValidationFix_Name(), theEcorePackage.getEString(), "name", null, 1, 1, ValidationFix.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getValidationFix_InitialOperation(), theToolPackage.getInitialOperation(), null, "initialOperation", null, 1, 1, ValidationFix.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEClass(validationSetEClass, ValidationSet.class, "ValidationSet", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getValidationSet_Name(),
+                theEcorePackage.getEString(),
+                "name", "", 0, 1, ValidationSet.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEReference(
+                getValidationSet_OwnedRules(),
+                this.getValidationRule(),
+                null,
+                "ownedRules", null, 0, -1, ValidationSet.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getValidationSet_ReusedRules(),
+                this.getValidationRule(),
+                null,
+                "reusedRules", null, 0, -1, ValidationSet.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getValidationSet_AllRules(),
+                this.getValidationRule(),
+                null,
+                "allRules", null, 0, -1, ValidationSet.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE, !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(validationRuleEClass, ValidationRule.class, "ValidationRule", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getValidationRule_Level(),
+                this.getERROR_LEVEL(),
+                "level", "INFO", 1, 1, ValidationRule.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(
+                getValidationRule_Message(),
+                theDescriptionPackage.getInterpretedExpression(),
+                "message", "The element has...", 0, 1, ValidationRule.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEReference(
+                getValidationRule_Audits(),
+                this.getRuleAudit(),
+                null,
+                "audits", null, 0, -1, ValidationRule.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getValidationRule_Fixes(),
+                this.getValidationFix(),
+                null,
+                "fixes", null, 0, -1, ValidationRule.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        EOperation op = addEOperation(validationRuleEClass, theEcorePackage.getEBoolean(), "checkRule", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        addEParameter(op, theEcorePackage.getEObject(), "eObj", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        op = addEOperation(validationRuleEClass, theEcorePackage.getEString(), "getMessage", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        addEParameter(op, theEcorePackage.getEObject(), "eObj", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(semanticValidationRuleEClass, SemanticValidationRule.class,
+                "SemanticValidationRule", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getSemanticValidationRule_TargetClass(),
+                theDescriptionPackage.getTypeName(),
+                "targetClass", null, 1, 1, SemanticValidationRule.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(viewValidationRuleEClass, ViewValidationRule.class, "ViewValidationRule", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getViewValidationRule_Targets(),
+                theDescriptionPackage.getRepresentationElementMapping(),
+                null,
+                "targets", null, 0, -1, ViewValidationRule.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(ruleAuditEClass, RuleAudit.class, "RuleAudit", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getRuleAudit_AuditExpression(),
+                theDescriptionPackage.getInterpretedExpression(),
+                "auditExpression", null, 1, 1, RuleAudit.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(validationFixEClass, ValidationFix.class, "ValidationFix", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getValidationFix_Name(),
+                theEcorePackage.getEString(),
+                "name", null, 1, 1, ValidationFix.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getValidationFix_InitialOperation(),
+                theToolPackage.getInitialOperation(),
+                null,
+                "initialOperation", null, 1, 1, ValidationFix.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
 
         // Initialize enums and add enum literals
-        initEEnum(erroR_LEVELEEnum, org.eclipse.sirius.viewpoint.description.validation.ERROR_LEVEL.class, "ERROR_LEVEL");
+        initEEnum(erroR_LEVELEEnum, org.eclipse.sirius.viewpoint.description.validation.ERROR_LEVEL.class, "ERROR_LEVEL"); //$NON-NLS-1$
         addEEnumLiteral(erroR_LEVELEEnum, org.eclipse.sirius.viewpoint.description.validation.ERROR_LEVEL.INFO_LITERAL);
         addEEnumLiteral(erroR_LEVELEEnum, org.eclipse.sirius.viewpoint.description.validation.ERROR_LEVEL.WARNING_LITERAL);
         addEEnumLiteral(erroR_LEVELEEnum, org.eclipse.sirius.viewpoint.description.validation.ERROR_LEVEL.ERROR_LITERAL);
@@ -559,9 +585,11 @@ public class ValidationPackageImpl extends EPackageImpl implements ValidationPac
      * @generated
      */
     protected void createReturnTypeAnnotations() {
-        String source = "http://www.eclipse.org/sirius/interpreted/expression/returnType";
-        addAnnotation(getValidationRule_Message(), source, new String[] { "returnType", "a string." });
-        addAnnotation(getRuleAudit_AuditExpression(), source, new String[] { "returnType", "a boolean." });
+        String source = "http://www.eclipse.org/sirius/interpreted/expression/returnType"; //$NON-NLS-1$
+        addAnnotation(getValidationRule_Message(), source, new String[] { "returnType", "a string." //$NON-NLS-1$ //$NON-NLS-2$
+        });
+        addAnnotation(getRuleAudit_AuditExpression(), source, new String[] { "returnType", "a boolean." //$NON-NLS-1$ //$NON-NLS-2$
+        });
     }
 
     /**
@@ -572,7 +600,7 @@ public class ValidationPackageImpl extends EPackageImpl implements ValidationPac
      * @generated
      */
     protected void createVariablesAnnotations() {
-        String source = "http://www.eclipse.org/sirius/interpreted/expression/variables";
+        String source = "http://www.eclipse.org/sirius/interpreted/expression/variables"; //$NON-NLS-1$
         addAnnotation(getValidationRule_Message(), source, new String[] {});
         addAnnotation(getRuleAudit_AuditExpression(), source, new String[] {});
     }
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/validation/impl/ValidationRuleImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/validation/impl/ValidationRuleImpl.java
index ce8cb82175..b1a6505692 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/validation/impl/ValidationRuleImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/validation/impl/ValidationRuleImpl.java
@@ -349,9 +349,9 @@ public abstract class ValidationRuleImpl extends IdentifiedElementImpl implement
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (level: ");
+        result.append(" (level: "); //$NON-NLS-1$
         result.append(level);
-        result.append(", message: ");
+        result.append(", message: "); //$NON-NLS-1$
         result.append(message);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/validation/impl/ValidationSetImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/validation/impl/ValidationSetImpl.java
index f4c6bca079..5c0abceac4 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/validation/impl/ValidationSetImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/validation/impl/ValidationSetImpl.java
@@ -288,7 +288,7 @@ public class ValidationSetImpl extends DocumentedElementImpl implements Validati
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (name: ");
+        result.append(" (name: "); //$NON-NLS-1$
         result.append(name);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/BasicLabelStyleImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/BasicLabelStyleImpl.java
index 03afc37c51..ce96e0f7ff 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/BasicLabelStyleImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/BasicLabelStyleImpl.java
@@ -380,15 +380,15 @@ public class BasicLabelStyleImpl extends CustomizableImpl implements BasicLabelS
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (labelSize: ");
+        result.append(" (labelSize: "); //$NON-NLS-1$
         result.append(labelSize);
-        result.append(", labelFormat: ");
+        result.append(", labelFormat: "); //$NON-NLS-1$
         result.append(labelFormat);
-        result.append(", showIcon: ");
+        result.append(", showIcon: "); //$NON-NLS-1$
         result.append(showIcon);
-        result.append(", iconPath: ");
+        result.append(", iconPath: "); //$NON-NLS-1$
         result.append(iconPath);
-        result.append(", labelColor: ");
+        result.append(", labelColor: "); //$NON-NLS-1$
         result.append(labelColor);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/CustomizableImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/CustomizableImpl.java
index dbee2f696a..2f01b09e58 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/CustomizableImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/CustomizableImpl.java
@@ -150,7 +150,7 @@ public abstract class CustomizableImpl extends MinimalEObjectImpl.Container impl
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (customFeatures: ");
+        result.append(" (customFeatures: "); //$NON-NLS-1$
         result.append(customFeatures);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/DAnalysisCustomDataImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/DAnalysisCustomDataImpl.java
index e66f5c8065..b0dedc5a67 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/DAnalysisCustomDataImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/DAnalysisCustomDataImpl.java
@@ -286,7 +286,7 @@ public class DAnalysisCustomDataImpl extends MinimalEObjectImpl.Container implem
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (key: ");
+        result.append(" (key: "); //$NON-NLS-1$
         result.append(key);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/DAnalysisImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/DAnalysisImpl.java
index f585c2add8..c3067faf0f 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/DAnalysisImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/DAnalysisImpl.java
@@ -474,9 +474,9 @@ public class DAnalysisImpl extends MinimalEObjectImpl.Container implements DAnal
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (semanticResources: ");
+        result.append(" (semanticResources: "); //$NON-NLS-1$
         result.append(semanticResources);
-        result.append(", version: ");
+        result.append(", version: "); //$NON-NLS-1$
         result.append(version);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/DAnalysisSessionEObjectImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/DAnalysisSessionEObjectImpl.java
index ea625e2831..09072cc551 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/DAnalysisSessionEObjectImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/DAnalysisSessionEObjectImpl.java
@@ -385,13 +385,13 @@ public class DAnalysisSessionEObjectImpl extends MinimalEObjectImpl.Container im
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (open: ");
+        result.append(" (open: "); //$NON-NLS-1$
         result.append(open);
-        result.append(", resources: ");
+        result.append(", resources: "); //$NON-NLS-1$
         result.append(resources);
-        result.append(", controlledResources: ");
+        result.append(", controlledResources: "); //$NON-NLS-1$
         result.append(controlledResources);
-        result.append(", synchronizationStatus: ");
+        result.append(", synchronizationStatus: "); //$NON-NLS-1$
         result.append(synchronizationStatus);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/DFileImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/DFileImpl.java
index f100a663ee..7f9d6b3df1 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/DFileImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/DFileImpl.java
@@ -221,9 +221,9 @@ public class DFileImpl extends MinimalEObjectImpl.Container implements DFile {
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (name: ");
+        result.append(" (name: "); //$NON-NLS-1$
         result.append(name);
-        result.append(", path: ");
+        result.append(", path: "); //$NON-NLS-1$
         result.append(path);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/DRepresentationElementImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/DRepresentationElementImpl.java
index 464632c71f..f5fae14caf 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/DRepresentationElementImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/DRepresentationElementImpl.java
@@ -380,7 +380,7 @@ public abstract class DRepresentationElementImpl extends MinimalEObjectImpl.Cont
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (name: ");
+        result.append(" (name: "); //$NON-NLS-1$
         result.append(name);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/DRepresentationImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/DRepresentationImpl.java
index 2b93965cfe..4c2bd304de 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/DRepresentationImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/DRepresentationImpl.java
@@ -471,7 +471,7 @@ public abstract class DRepresentationImpl extends DocumentedElementImpl implemen
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (name: ");
+        result.append(" (name: "); //$NON-NLS-1$
         result.append(name);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/DResourceContainerImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/DResourceContainerImpl.java
index 8951c8ccf1..6dcfadb0d3 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/DResourceContainerImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/DResourceContainerImpl.java
@@ -281,9 +281,9 @@ public class DResourceContainerImpl extends MinimalEObjectImpl.Container impleme
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (name: ");
+        result.append(" (name: "); //$NON-NLS-1$
         result.append(name);
-        result.append(", path: ");
+        result.append(", path: "); //$NON-NLS-1$
         result.append(path);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/LabelStyleImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/LabelStyleImpl.java
index 5751916881..a41acd2d2d 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/LabelStyleImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/LabelStyleImpl.java
@@ -170,7 +170,7 @@ public class LabelStyleImpl extends BasicLabelStyleImpl implements LabelStyle {
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (labelAlignment: ");
+        result.append(" (labelAlignment: "); //$NON-NLS-1$
         result.append(labelAlignment);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/StyleImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/StyleImpl.java
index a82350ce24..6f839dc290 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/StyleImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/StyleImpl.java
@@ -269,7 +269,7 @@ public abstract class StyleImpl extends MinimalEObjectImpl.Container implements
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (customFeatures: ");
+        result.append(" (customFeatures: "); //$NON-NLS-1$
         result.append(customFeatures);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/UIStateImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/UIStateImpl.java
index 5090b0a14b..f70fcd83cc 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/UIStateImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/UIStateImpl.java
@@ -234,7 +234,7 @@ public class UIStateImpl extends MinimalEObjectImpl.Container implements UIState
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (inverseSelectionOrder: ");
+        result.append(" (inverseSelectionOrder: "); //$NON-NLS-1$
         result.append(inverseSelectionOrder);
         result.append(')');
         return result.toString();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/ViewpointFactoryImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/ViewpointFactoryImpl.java
index 1bb1100c8c..6d94b9f8ea 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/ViewpointFactoryImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/ViewpointFactoryImpl.java
@@ -123,7 +123,7 @@ public class ViewpointFactoryImpl extends EFactoryImpl implements ViewpointFacto
         case ViewpointPackage.UI_STATE:
             return createUIState();
         default:
-            throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+            throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
         }
     }
 
@@ -146,7 +146,7 @@ public class ViewpointFactoryImpl extends EFactoryImpl implements ViewpointFacto
         case ViewpointPackage.RESOURCE_DESCRIPTOR:
             return createResourceDescriptorFromString(eDataType, initialValue);
         default:
-            throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+            throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
         }
     }
 
@@ -169,7 +169,7 @@ public class ViewpointFactoryImpl extends EFactoryImpl implements ViewpointFacto
         case ViewpointPackage.RESOURCE_DESCRIPTOR:
             return convertResourceDescriptorToString(eDataType, instanceValue);
         default:
-            throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+            throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
         }
     }
 
@@ -357,7 +357,7 @@ public class ViewpointFactoryImpl extends EFactoryImpl implements ViewpointFacto
     public FontFormat createFontFormatFromString(EDataType eDataType, String initialValue) {
         FontFormat result = FontFormat.get(initialValue);
         if (result == null) {
-            throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+            throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
         }
         return result;
     }
@@ -380,7 +380,7 @@ public class ViewpointFactoryImpl extends EFactoryImpl implements ViewpointFacto
     public LabelAlignment createLabelAlignmentFromString(EDataType eDataType, String initialValue) {
         LabelAlignment result = LabelAlignment.get(initialValue);
         if (result == null) {
-            throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+            throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
         }
         return result;
     }
@@ -403,7 +403,7 @@ public class ViewpointFactoryImpl extends EFactoryImpl implements ViewpointFacto
     public SyncStatus createSyncStatusFromString(EDataType eDataType, String initialValue) {
         SyncStatus result = SyncStatus.get(initialValue);
         if (result == null) {
-            throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+            throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
         }
         return result;
     }
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/ViewpointPackageImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/ViewpointPackageImpl.java
index 6bd19fa31c..7279d3102b 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/ViewpointPackageImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/ViewpointPackageImpl.java
@@ -1335,200 +1335,291 @@ public class ViewpointPackageImpl extends EPackageImpl implements ViewpointPacka
         basicLabelStyleEClass.getESuperTypes().add(this.getCustomizable());
 
         // Initialize classes and features; add operations and parameters
-        initEClass(dAnalysisEClass, DAnalysis.class, "DAnalysis", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getDAnalysis_ReferencedAnalysis(), this.getDAnalysis(), null, "referencedAnalysis", null, 0, -1, DAnalysis.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEAttribute(getDAnalysis_SemanticResources(), this.getResourceDescriptor(), "semanticResources", null, 0, -1, DAnalysis.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getDAnalysis_Models(), theEcorePackage.getEObject(), null, "models", null, 0, -1, DAnalysis.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getDAnalysis_EAnnotations(), theDescriptionPackage.getDAnnotationEntry(), null, "eAnnotations", null, 0, -1, DAnalysis.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getDAnalysis_OwnedViews(), this.getDView(), null, "ownedViews", null, 0, -1, DAnalysis.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE,
-                EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getDAnalysis_SelectedViews(), this.getDView(), null, "selectedViews", null, 0, -1, DAnalysis.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getDAnalysis_OwnedFeatureExtensions(), this.getDFeatureExtension(), null, "ownedFeatureExtensions", null, 0, -1, DAnalysis.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getDAnalysis_Version(), theEcorePackage.getEString(), "version", null, 0, 1, DAnalysis.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE,
-                !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(dFeatureExtensionEClass, DFeatureExtension.class, "DFeatureExtension", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getDFeatureExtension_Description(), theDescriptionPackage.getFeatureExtensionDescription(), null, "description", null, 1, 1, DFeatureExtension.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(dStylizableEClass, DStylizable.class, "DStylizable", EPackageImpl.IS_ABSTRACT, EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        addEOperation(dStylizableEClass, this.getStyle(), "getStyle", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-
-        initEClass(dRefreshableEClass, DRefreshable.class, "DRefreshable", EPackageImpl.IS_ABSTRACT, EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        addEOperation(dRefreshableEClass, null, "refresh", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-
-        initEClass(dMappingBasedEClass, DMappingBased.class, "DMappingBased", EPackageImpl.IS_ABSTRACT, EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        addEOperation(dMappingBasedEClass, theDescriptionPackage.getRepresentationElementMapping(), "getMapping", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED);
-
-        initEClass(dRepresentationContainerEClass, DRepresentationContainer.class, "DRepresentationContainer", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getDRepresentationContainer_Models(), theEcorePackage.getEObject(), null, "models", null, 0, -1, DRepresentationContainer.class, EPackageImpl.IS_TRANSIENT,
-                EPackageImpl.IS_VOLATILE, !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(dSemanticDecoratorEClass, DSemanticDecorator.class, "DSemanticDecorator", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getDSemanticDecorator_Target(), theEcorePackage.getEObject(), null, "target", null, 1, 1, DSemanticDecorator.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-
-        initEClass(dRepresentationEClass, DRepresentation.class, "DRepresentation", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getDRepresentation_OwnedRepresentationElements(), this.getDRepresentationElement(), null, "ownedRepresentationElements", null, 0, -1, DRepresentation.class,
-                EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE, !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getDRepresentation_RepresentationElements(), this.getDRepresentationElement(), null, "representationElements", null, 0, -1, DRepresentation.class, EPackageImpl.IS_TRANSIENT,
-                EPackageImpl.IS_VOLATILE, !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getDRepresentation_Name(), theEcorePackage.getEString(), "name", "", 0, 1, DRepresentation.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getDRepresentation_OwnedAnnotationEntries(), theDescriptionPackage.getAnnotationEntry(), null, "ownedAnnotationEntries", null, 0, -1, DRepresentation.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getDRepresentation_UiState(), this.getUIState(), null, "uiState", null, 0, 1, DRepresentation.class, EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-
-        initEClass(dRepresentationElementEClass, DRepresentationElement.class, "DRepresentationElement", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getDRepresentationElement_Name(), theEcorePackage.getEString(), "name", "", 0, 1, DRepresentationElement.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getDRepresentationElement_SemanticElements(), theEcorePackage.getEObject(), null, "semanticElements", null, 0, -1, DRepresentationElement.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(dViewEClass, DView.class, "DView", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getDView_OwnedRepresentations(), this.getDRepresentation(), null, "ownedRepresentations", null, 0, -1, DView.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getDView_OwnedExtensions(), this.getMetaModelExtension(), null, "ownedExtensions", null, 0, 1, DView.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getDView_Viewpoint(), theDescriptionPackage.getViewpoint(), null, "viewpoint", null, 1, 1, DView.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-
-        initEClass(metaModelExtensionEClass, MetaModelExtension.class, "MetaModelExtension", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getMetaModelExtension_ExtensionGroup(), theEcorePackage.getEObject(), null, "extensionGroup", null, 1, 1, MetaModelExtension.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(decorationEClass, Decoration.class, "Decoration", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getDecoration_Description(), theDescriptionPackage.getDecorationDescription(), null, "description", null, 1, 1, Decoration.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(dAnalysisCustomDataEClass, DAnalysisCustomData.class, "DAnalysisCustomData", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getDAnalysisCustomData_Key(), theEcorePackage.getEString(), "key", null, 1, 1, DAnalysisCustomData.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getDAnalysisCustomData_Data(), theEcorePackage.getEObject(), null, "data", null, 1, 1, DAnalysisCustomData.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-
-        initEClass(labelStyleEClass, LabelStyle.class, "LabelStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getLabelStyle_LabelAlignment(), this.getLabelAlignment(), "labelAlignment", null, 0, 1, LabelStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(styleEClass, Style.class, "Style", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getStyle_Description(), theStylePackage.getStyleDescription(), null, "description", null, 0, 1, Style.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-
-        initEClass(dAnalysisSessionEObjectEClass, DAnalysisSessionEObject.class, "DAnalysisSessionEObject", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getDAnalysisSessionEObject_Open(), theEcorePackage.getEBoolean(), "open", null, 1, 1, DAnalysisSessionEObject.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getDAnalysisSessionEObject_Resources(), theEcorePackage.getEResource(), "resources", null, 0, -1, DAnalysisSessionEObject.class, EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getDAnalysisSessionEObject_ControlledResources(), theEcorePackage.getEResource(), "controlledResources", null, 0, -1, DAnalysisSessionEObject.class, EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getDAnalysisSessionEObject_ActivatedViewpoints(), theDescriptionPackage.getViewpoint(), null, "activatedViewpoints", null, 0, -1, DAnalysisSessionEObject.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getDAnalysisSessionEObject_Analyses(), this.getDAnalysis(), null, "analyses", null, 0, -1, DAnalysisSessionEObject.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEAttribute(getDAnalysisSessionEObject_SynchronizationStatus(), this.getSyncStatus(), "synchronizationStatus", "dirty", 1, 1, DAnalysisSessionEObject.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(sessionManagerEObjectEClass, SessionManagerEObject.class, "SessionManagerEObject", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getSessionManagerEObject_OwnedSessions(), this.getDAnalysisSessionEObject(), null, "ownedSessions", null, 0, -1, SessionManagerEObject.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(dResourceEClass, DResource.class, "DResource", EPackageImpl.IS_ABSTRACT, EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getDResource_Name(), theEcorePackage.getEString(), "name", null, 1, 1, DResource.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE,
-                !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getDResource_Path(), theEcorePackage.getEString(), "path", null, 1, 1, DResource.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE,
-                !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(dFileEClass, DFile.class, "DFile", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(dResourceContainerEClass, DResourceContainer.class, "DResourceContainer", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getDResourceContainer_Members(), this.getDResource(), null, "members", null, 0, -1, DResourceContainer.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-
-        initEClass(dProjectEClass, DProject.class, "DProject", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(dFolderEClass, DFolder.class, "DFolder", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(dModelEClass, DModel.class, "DModel", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(basicLabelStyleEClass, BasicLabelStyle.class, "BasicLabelStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getBasicLabelStyle_LabelSize(), theEcorePackage.getEInt(), "labelSize", "8", 0, 1, BasicLabelStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getBasicLabelStyle_LabelFormat(), this.getFontFormat(), "labelFormat", null, 0, 4, BasicLabelStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getBasicLabelStyle_ShowIcon(), theEcorePackage.getEBoolean(), "showIcon", "true", 0, 1, BasicLabelStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getBasicLabelStyle_IconPath(), theEcorePackage.getEString(), "iconPath", "", 0, 1, BasicLabelStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getBasicLabelStyle_LabelColor(), this.getRGBValues(), "labelColor", "0,0,0", 0, 1, BasicLabelStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(customizableEClass, Customizable.class, "Customizable", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getCustomizable_CustomFeatures(), theEcorePackage.getEString(), "customFeatures", null, 0, -1, Customizable.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(uiStateEClass, UIState.class, "UIState", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getUIState_InverseSelectionOrder(), theEcorePackage.getEBoolean(), "inverseSelectionOrder", "false", 0, 1, UIState.class, EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getUIState_ElementsToSelect(), theEcorePackage.getEObject(), null, "elementsToSelect", null, 0, -1, UIState.class, EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
+        initEClass(dAnalysisEClass, DAnalysis.class, "DAnalysis", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getDAnalysis_ReferencedAnalysis(),
+                this.getDAnalysis(),
+                null,
+                "referencedAnalysis", null, 0, -1, DAnalysis.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getDAnalysis_SemanticResources(),
+                this.getResourceDescriptor(),
+                "semanticResources", null, 0, -1, DAnalysis.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDAnalysis_Models(),
+                theEcorePackage.getEObject(),
+                null,
+                "models", null, 0, -1, DAnalysis.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDAnalysis_EAnnotations(),
+                theDescriptionPackage.getDAnnotationEntry(),
+                null,
+                "eAnnotations", null, 0, -1, DAnalysis.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDAnalysis_OwnedViews(),
+                this.getDView(),
+                null,
+                "ownedViews", null, 0, -1, DAnalysis.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDAnalysis_SelectedViews(),
+                this.getDView(),
+                null,
+                "selectedViews", null, 0, -1, DAnalysis.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDAnalysis_OwnedFeatureExtensions(),
+                this.getDFeatureExtension(),
+                null,
+                "ownedFeatureExtensions", null, 0, -1, DAnalysis.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getDAnalysis_Version(),
+                theEcorePackage.getEString(),
+                "version", null, 0, 1, DAnalysis.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(dFeatureExtensionEClass, DFeatureExtension.class, "DFeatureExtension", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getDFeatureExtension_Description(),
+                theDescriptionPackage.getFeatureExtensionDescription(),
+                null,
+                "description", null, 1, 1, DFeatureExtension.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(dStylizableEClass, DStylizable.class, "DStylizable", EPackageImpl.IS_ABSTRACT, EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        addEOperation(dStylizableEClass, this.getStyle(), "getStyle", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(dRefreshableEClass, DRefreshable.class, "DRefreshable", EPackageImpl.IS_ABSTRACT, EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        addEOperation(dRefreshableEClass, null, "refresh", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(dMappingBasedEClass, DMappingBased.class, "DMappingBased", EPackageImpl.IS_ABSTRACT, EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        addEOperation(dMappingBasedEClass, theDescriptionPackage.getRepresentationElementMapping(), "getMapping", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(dRepresentationContainerEClass, DRepresentationContainer.class,
+                "DRepresentationContainer", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getDRepresentationContainer_Models(),
+                theEcorePackage.getEObject(),
+                null,
+                "models", null, 0, -1, DRepresentationContainer.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE, !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(dSemanticDecoratorEClass, DSemanticDecorator.class, "DSemanticDecorator", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getDSemanticDecorator_Target(),
+                theEcorePackage.getEObject(),
+                null,
+                "target", null, 1, 1, DSemanticDecorator.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(dRepresentationEClass, DRepresentation.class, "DRepresentation", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getDRepresentation_OwnedRepresentationElements(),
+                this.getDRepresentationElement(),
+                null,
+                "ownedRepresentationElements", null, 0, -1, DRepresentation.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE, !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDRepresentation_RepresentationElements(),
+                this.getDRepresentationElement(),
+                null,
+                "representationElements", null, 0, -1, DRepresentation.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE, !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getDRepresentation_Name(),
+                theEcorePackage.getEString(),
+                "name", "", 0, 1, DRepresentation.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEReference(
+                getDRepresentation_OwnedAnnotationEntries(),
+                theDescriptionPackage.getAnnotationEntry(),
+                null,
+                "ownedAnnotationEntries", null, 0, -1, DRepresentation.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDRepresentation_UiState(),
+                this.getUIState(),
+                null,
+                "uiState", null, 0, 1, DRepresentation.class, EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(dRepresentationElementEClass, DRepresentationElement.class, "DRepresentationElement", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getDRepresentationElement_Name(),
+                theEcorePackage.getEString(),
+                "name", "", 0, 1, DRepresentationElement.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEReference(
+                getDRepresentationElement_SemanticElements(),
+                theEcorePackage.getEObject(),
+                null,
+                "semanticElements", null, 0, -1, DRepresentationElement.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(dViewEClass, DView.class, "DView", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getDView_OwnedRepresentations(),
+                this.getDRepresentation(),
+                null,
+                "ownedRepresentations", null, 0, -1, DView.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDView_OwnedExtensions(),
+                this.getMetaModelExtension(),
+                null,
+                "ownedExtensions", null, 0, 1, DView.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDView_Viewpoint(),
+                theDescriptionPackage.getViewpoint(),
+                null,
+                "viewpoint", null, 1, 1, DView.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(metaModelExtensionEClass, MetaModelExtension.class, "MetaModelExtension", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getMetaModelExtension_ExtensionGroup(),
+                theEcorePackage.getEObject(),
+                null,
+                "extensionGroup", null, 1, 1, MetaModelExtension.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(decorationEClass, Decoration.class, "Decoration", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getDecoration_Description(),
+                theDescriptionPackage.getDecorationDescription(),
+                null,
+                "description", null, 1, 1, Decoration.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(dAnalysisCustomDataEClass, DAnalysisCustomData.class, "DAnalysisCustomData", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getDAnalysisCustomData_Key(),
+                theEcorePackage.getEString(),
+                "key", null, 1, 1, DAnalysisCustomData.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDAnalysisCustomData_Data(),
+                theEcorePackage.getEObject(),
+                null,
+                "data", null, 1, 1, DAnalysisCustomData.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(labelStyleEClass, LabelStyle.class, "LabelStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getLabelStyle_LabelAlignment(),
+                this.getLabelAlignment(),
+                "labelAlignment", null, 0, 1, LabelStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(styleEClass, Style.class, "Style", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getStyle_Description(),
+                theStylePackage.getStyleDescription(),
+                null,
+                "description", null, 0, 1, Style.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(dAnalysisSessionEObjectEClass, DAnalysisSessionEObject.class,
+                "DAnalysisSessionEObject", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getDAnalysisSessionEObject_Open(),
+                theEcorePackage.getEBoolean(),
+                "open", null, 1, 1, DAnalysisSessionEObject.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getDAnalysisSessionEObject_Resources(),
+                theEcorePackage.getEResource(),
+                "resources", null, 0, -1, DAnalysisSessionEObject.class, EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getDAnalysisSessionEObject_ControlledResources(),
+                theEcorePackage.getEResource(),
+                "controlledResources", null, 0, -1, DAnalysisSessionEObject.class, EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDAnalysisSessionEObject_ActivatedViewpoints(),
+                theDescriptionPackage.getViewpoint(),
+                null,
+                "activatedViewpoints", null, 0, -1, DAnalysisSessionEObject.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getDAnalysisSessionEObject_Analyses(),
+                this.getDAnalysis(),
+                null,
+                "analyses", null, 0, -1, DAnalysisSessionEObject.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getDAnalysisSessionEObject_SynchronizationStatus(),
+                this.getSyncStatus(),
+                "synchronizationStatus", "dirty", 1, 1, DAnalysisSessionEObject.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+
+        initEClass(sessionManagerEObjectEClass, SessionManagerEObject.class, "SessionManagerEObject", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getSessionManagerEObject_OwnedSessions(),
+                this.getDAnalysisSessionEObject(),
+                null,
+                "ownedSessions", null, 0, -1, SessionManagerEObject.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(dResourceEClass, DResource.class, "DResource", EPackageImpl.IS_ABSTRACT, EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getDResource_Name(),
+                theEcorePackage.getEString(),
+                "name", null, 1, 1, DResource.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getDResource_Path(),
+                theEcorePackage.getEString(),
+                "path", null, 1, 1, DResource.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(dFileEClass, DFile.class, "DFile", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(dResourceContainerEClass, DResourceContainer.class, "DResourceContainer", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(
+                getDResourceContainer_Members(),
+                this.getDResource(),
+                null,
+                "members", null, 0, -1, DResourceContainer.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(dProjectEClass, DProject.class, "DProject", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(dFolderEClass, DFolder.class, "DFolder", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(dModelEClass, DModel.class, "DModel", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(basicLabelStyleEClass, BasicLabelStyle.class, "BasicLabelStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getBasicLabelStyle_LabelSize(),
+                theEcorePackage.getEInt(),
+                "labelSize", "8", 0, 1, BasicLabelStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(
+                getBasicLabelStyle_LabelFormat(),
+                this.getFontFormat(),
+                "labelFormat", null, 0, 4, BasicLabelStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(
+                getBasicLabelStyle_ShowIcon(),
+                theEcorePackage.getEBoolean(),
+                "showIcon", "true", 0, 1, BasicLabelStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(
+                getBasicLabelStyle_IconPath(),
+                theEcorePackage.getEString(),
+                "iconPath", "", 0, 1, BasicLabelStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(
+                getBasicLabelStyle_LabelColor(),
+                this.getRGBValues(),
+                "labelColor", "0,0,0", 0, 1, BasicLabelStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+
+        initEClass(customizableEClass, Customizable.class, "Customizable", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getCustomizable_CustomFeatures(),
+                theEcorePackage.getEString(),
+                "customFeatures", null, 0, -1, Customizable.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(uiStateEClass, UIState.class, "UIState", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getUIState_InverseSelectionOrder(),
+                theEcorePackage.getEBoolean(),
+                "inverseSelectionOrder", "false", 0, 1, UIState.class, EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEReference(
+                getUIState_ElementsToSelect(),
+                theEcorePackage.getEObject(),
+                null,
+                "elementsToSelect", null, 0, -1, UIState.class, EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
 
         // Initialize enums and add enum literals
-        initEEnum(fontFormatEEnum, FontFormat.class, "FontFormat");
+        initEEnum(fontFormatEEnum, FontFormat.class, "FontFormat"); //$NON-NLS-1$
         addEEnumLiteral(fontFormatEEnum, FontFormat.ITALIC_LITERAL);
         addEEnumLiteral(fontFormatEEnum, FontFormat.BOLD_LITERAL);
         addEEnumLiteral(fontFormatEEnum, FontFormat.UNDERLINE_LITERAL);
         addEEnumLiteral(fontFormatEEnum, FontFormat.STRIKE_THROUGH_LITERAL);
 
-        initEEnum(labelAlignmentEEnum, LabelAlignment.class, "LabelAlignment");
+        initEEnum(labelAlignmentEEnum, LabelAlignment.class, "LabelAlignment"); //$NON-NLS-1$
         addEEnumLiteral(labelAlignmentEEnum, LabelAlignment.CENTER);
         addEEnumLiteral(labelAlignmentEEnum, LabelAlignment.LEFT);
         addEEnumLiteral(labelAlignmentEEnum, LabelAlignment.RIGHT);
 
-        initEEnum(syncStatusEEnum, SyncStatus.class, "SyncStatus");
+        initEEnum(syncStatusEEnum, SyncStatus.class, "SyncStatus"); //$NON-NLS-1$
         addEEnumLiteral(syncStatusEEnum, SyncStatus.DIRTY);
         addEEnumLiteral(syncStatusEEnum, SyncStatus.SYNC);
 
         // Initialize data types
-        initEDataType(rgbValuesEDataType, RGBValues.class, "RGBValues", EPackageImpl.IS_SERIALIZABLE, !EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEDataType(resourceDescriptorEDataType, ResourceDescriptor.class, "ResourceDescriptor", EPackageImpl.IS_SERIALIZABLE, !EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
+        initEDataType(rgbValuesEDataType, RGBValues.class, "RGBValues", EPackageImpl.IS_SERIALIZABLE, !EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEDataType(resourceDescriptorEDataType, ResourceDescriptor.class, "ResourceDescriptor", EPackageImpl.IS_SERIALIZABLE, !EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
         // Create resource
         createResource(ViewpointPackage.eNS_URI);
@@ -1545,8 +1636,9 @@ public class ViewpointPackageImpl extends EPackageImpl implements ViewpointPacka
      * @generated
      */
     protected void createTagsAnnotations() {
-        String source = "Tags";
-        addAnnotation(this, source, new String[] { "deprecated", "Anything tagged as deprecated will disappear quite soon.\n\n", "to be renamed",
-        "Anything tagged \"to be renamed\" will be renamed, at least in the UI\n" });
+        String source = "Tags"; //$NON-NLS-1$
+        addAnnotation(this, source, new String[] { "deprecated", "Anything tagged as deprecated will disappear quite soon.\n\n", //$NON-NLS-1$ //$NON-NLS-2$
+                "to be renamed", "Anything tagged \"to be renamed\" will be renamed, at least in the UI\n" //$NON-NLS-1$ //$NON-NLS-2$
+        });
     }
 } // ViewpointPackageImpl