[470822] Add NON-NLS markers missed by EMF regen

Mark NON-NLS all technical/internal strings in src-gen folders which
were not handled by EMF's generation itself. This includes:
* *Package.{eNAME,eNS_URI,eNS_PREFIX};
* constructor parameters (name and literal) for all EEnum values;
* most default values (but not all);
* strings in @not-generated methods (ignored by EMF).

Some string literals in these src-gen folders are not marked NON-NLS,
because they will need to be properly externalized (this will be done as
part of #472057).

Note that now that they have been added, these markers are kept when
re-generating again, so this is a one-shot operation.

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

247 files changed, 522 insertions, 530 deletions

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 426482e7bb..2f2d899ecc 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
@@ -36,21 +36,21 @@ public interface LayoutdataPackage extends EPackage {
      * 
      * @generated
      */
-    String eNAME = "layoutdata";
+    String eNAME = "layoutdata"; //$NON-NLS-1$
 
     /**
      * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
      * @generated
      */
-    String eNS_URI = "http://www.eclipse.org/sirius/dsl/layoutdata/1.1.0";
+    String eNS_URI = "http://www.eclipse.org/sirius/dsl/layoutdata/1.1.0"; //$NON-NLS-1$
 
     /**
      * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
      * @generated
      */
-    String eNS_PREFIX = "layoutdata";
+    String eNS_PREFIX = "layoutdata"; //$NON-NLS-1$
 
     /**
      * The singleton instance of the package. <!-- begin-user-doc --> <!--
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 a39af605e9..a9b6b5dd24 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
@@ -420,16 +420,16 @@ public class NodeLayoutDataImpl extends AbstractLayoutDataImpl implements NodeLa
 
         StringBuffer result = new StringBuffer(super.toString());
         if (location != null) {
-            result.append(" (x: ");
+            result.append(" (x: "); //$NON-NLS-1$
             result.append(location.getX());
-            result.append(", y: ");
+            result.append(", y: "); //$NON-NLS-1$
             result.append(location.getY());
-            result.append(") ");
+            result.append(") "); //$NON-NLS-1$
         }
 
-        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.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 1bb0be284b..0f031759d9 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
@@ -72,7 +72,7 @@ public class BasicMessageMappingItemProvider extends MessageMappingItemProvider
     @Override
     public String getText(Object object) {
         String label = new IdentifiedElementQuery((BasicMessageMapping) object).getLabel();
-        return label == null || label.length() == 0 ? getString("_UI_BasicMessageMapping_type") : getString("_UI_BasicMessageMapping_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_BasicMessageMapping_type") : getString("_UI_BasicMessageMapping_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
     /**
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 49bc2c6dd4..b57aba88a4 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
@@ -73,7 +73,7 @@ public class CombinedFragmentMappingItemProvider extends FrameMappingItemProvide
     @Override
     public String getText(Object object) {
         String label = new IdentifiedElementQuery((CombinedFragmentMapping) object).getLabel();
-        return label == null || label.length() == 0 ? getString("_UI_CombinedFragmentMapping_type") : getString("_UI_CombinedFragmentMapping_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_CombinedFragmentMapping_type") : getString("_UI_CombinedFragmentMapping_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
     /**
@@ -138,7 +138,7 @@ 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), getFeaturePrefixText(childFeature), getTypeText(owner) });
+            return getString("_UI_CreateChild_text2", new Object[] { getTypeText(childObject), getFeaturePrefixText(childFeature), getTypeText(owner) }); //$NON-NLS-1$
         }
         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/CreationMessageMappingItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/CreationMessageMappingItemProvider.java
index 3e5d2288c2..f8938a9ac5 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
@@ -72,7 +72,7 @@ public class CreationMessageMappingItemProvider extends MessageMappingItemProvid
     @Override
     public String getText(Object object) {
         String label = new IdentifiedElementQuery((CreationMessageMapping) object).getLabel();
-        return label == null || label.length() == 0 ? getString("_UI_CreationMessageMapping_type") : getString("_UI_CreationMessageMapping_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_CreationMessageMapping_type") : getString("_UI_CreationMessageMapping_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
     /**
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 f9e3b2b76d..baf5715610 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
@@ -72,7 +72,7 @@ public class DestructionMessageMappingItemProvider extends MessageMappingItemPro
     @Override
     public String getText(Object object) {
         String label = new IdentifiedElementQuery((DestructionMessageMapping) object).getLabel();
-        return label == null || label.length() == 0 ? getString("_UI_DestructionMessageMapping_type") : getString("_UI_DestructionMessageMapping_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_DestructionMessageMapping_type") : getString("_UI_DestructionMessageMapping_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
     /**
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 d874950aa5..6774eaf1db 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
@@ -77,7 +77,7 @@ public class EndOfLifeMappingItemProvider extends NodeMappingItemProvider {
     @Override
     public String getText(Object object) {
         String label = new IdentifiedElementQuery((EndOfLifeMapping) object).getLabel();
-        return label == null || label.length() == 0 ? getString("_UI_EndOfLifeMapping_type") : getString("_UI_EndOfLifeMapping_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_EndOfLifeMapping_type") : getString("_UI_EndOfLifeMapping_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
     /**
@@ -143,7 +143,7 @@ public class EndOfLifeMappingItemProvider extends NodeMappingItemProvider {
         qualify = qualify && childObject instanceof EObject && org.eclipse.sirius.diagram.sequence.description.DescriptionPackage.eINSTANCE.equals(((EObject) childObject).eClass().getEPackage());
 
         if (qualify) {
-            return getString("_UI_CreateChild_text", new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+            return getString("_UI_CreateChild_text", new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) }); //$NON-NLS-1$
         }
         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/ExecutionMappingItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/ExecutionMappingItemProvider.java
index ac6b4e5f70..68c24ab68c 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
@@ -114,7 +114,7 @@ public class ExecutionMappingItemProvider extends NodeMappingItemProvider {
     @Override
     public String getText(Object object) {
         String label = new IdentifiedElementQuery((ExecutionMapping) object).getLabel();
-        return label == null || label.length() == 0 ? getString("_UI_ExecutionMapping_type") : getString("_UI_ExecutionMapping_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_ExecutionMapping_type") : getString("_UI_ExecutionMapping_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
     /**
@@ -192,7 +192,7 @@ public class ExecutionMappingItemProvider extends NodeMappingItemProvider {
         qualify = qualify && childObject instanceof EObject && DescriptionPackage.eINSTANCE.equals(((EObject) childObject).eClass().getEPackage());
 
         if (qualify) {
-            return getString("_UI_CreateChild_text", new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+            return getString("_UI_CreateChild_text", new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) }); //$NON-NLS-1$
         }
         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/FrameMappingItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/FrameMappingItemProvider.java
index 5b854b21fb..497a17c460 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
@@ -143,7 +143,7 @@ public class FrameMappingItemProvider extends ContainerMappingItemProvider {
     @Override
     public String getText(Object object) {
         String label = new IdentifiedElementQuery((FrameMapping) object).getLabel();
-        return label == null || label.length() == 0 ? getString("_UI_FrameMapping_type") : getString("_UI_FrameMapping_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_FrameMapping_type") : getString("_UI_FrameMapping_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
     /**
@@ -257,7 +257,7 @@ 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), getFeaturePrefixText(childFeature), getTypeText(owner) });
+            return getString("_UI_CreateChild_text2", new Object[] { getTypeText(childObject), getFeaturePrefixText(childFeature), getTypeText(owner) }); //$NON-NLS-1$
         }
         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 484941f7df..43c26f09f8 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
@@ -77,7 +77,7 @@ public class InstanceRoleMappingItemProvider extends NodeMappingItemProvider {
     @Override
     public String getText(Object object) {
         String label = new IdentifiedElementQuery((InstanceRoleMapping) object).getLabel();
-        return label == null || label.length() == 0 ? getString("_UI_InstanceRoleMapping_type") : getString("_UI_InstanceRoleMapping_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_InstanceRoleMapping_type") : getString("_UI_InstanceRoleMapping_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
     /**
@@ -143,7 +143,7 @@ public class InstanceRoleMappingItemProvider extends NodeMappingItemProvider {
         qualify = qualify && childObject instanceof EObject && org.eclipse.sirius.diagram.sequence.description.DescriptionPackage.eINSTANCE.equals(((EObject) childObject).eClass().getEPackage());
 
         if (qualify) {
-            return getString("_UI_CreateChild_text", new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+            return getString("_UI_CreateChild_text", new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) }); //$NON-NLS-1$
         }
         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/InteractionUseMappingItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/InteractionUseMappingItemProvider.java
index e9c88694d0..629593923a 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
@@ -73,7 +73,7 @@ public class InteractionUseMappingItemProvider extends FrameMappingItemProvider
     @Override
     public String getText(Object object) {
         String label = new IdentifiedElementQuery((InteractionUseMapping) object).getLabel();
-        return label == null || label.length() == 0 ? getString("_UI_InteractionUseMapping_type") : getString("_UI_InteractionUseMapping_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_InteractionUseMapping_type") : getString("_UI_InteractionUseMapping_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
     /**
@@ -138,7 +138,7 @@ 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), getFeaturePrefixText(childFeature), getTypeText(owner) });
+            return getString("_UI_CreateChild_text2", new Object[] { getTypeText(childObject), getFeaturePrefixText(childFeature), getTypeText(owner) }); //$NON-NLS-1$
         }
         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/MessageMappingItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/MessageMappingItemProvider.java
index 6fe50dbb39..99e3cd210d 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
@@ -97,7 +97,7 @@ public class MessageMappingItemProvider extends EdgeMappingItemProvider {
     @Override
     public String getText(Object object) {
         String label = new IdentifiedElementQuery((MessageMapping) object).getLabel();
-        return label == null || label.length() == 0 ? getString("_UI_MessageMapping_type") : getString("_UI_MessageMapping_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_MessageMapping_type") : getString("_UI_MessageMapping_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
     /**
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 c4f7aa9bb2..fda5b75933 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
@@ -76,7 +76,7 @@ public class ObservationPointMappingItemProvider extends NodeMappingItemProvider
     @Override
     public String getText(Object object) {
         String label = new IdentifiedElementQuery((ObservationPointMapping) object).getLabel();
-        return label == null || label.length() == 0 ? getString("_UI_ObservationPointMapping_type") : getString("_UI_ObservationPointMapping_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_ObservationPointMapping_type") : getString("_UI_ObservationPointMapping_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
     /**
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 38787983ab..1a808e9a6f 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
@@ -113,7 +113,7 @@ public class OperandMappingItemProvider extends ContainerMappingItemProvider {
     @Override
     public String getText(Object object) {
         String label = new IdentifiedElementQuery((OperandMapping) object).getLabel();
-        return label == null || label.length() == 0 ? getString("_UI_OperandMapping_type") : getString("_UI_OperandMapping_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_OperandMapping_type") : getString("_UI_OperandMapping_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
     /**
@@ -225,7 +225,7 @@ 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), getFeaturePrefixText(childFeature), getTypeText(owner) });
+            return getString("_UI_CreateChild_text2", new Object[] { getTypeText(childObject), getFeaturePrefixText(childFeature), getTypeText(owner) }); //$NON-NLS-1$
         }
         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 21d86dd371..f025fd5e65 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
@@ -93,7 +93,7 @@ public class ReturnMessageMappingItemProvider extends MessageMappingItemProvider
     @Override
     public String getText(Object object) {
         String label = new IdentifiedElementQuery((ReturnMessageMapping) object).getLabel();
-        return label == null || label.length() == 0 ? getString("_UI_ReturnMessageMapping_type") : getString("_UI_ReturnMessageMapping_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_ReturnMessageMapping_type") : getString("_UI_ReturnMessageMapping_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
     /**
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 ed90eb907e..e4da824d49 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
@@ -108,7 +108,7 @@ public class SequenceDiagramDescriptionItemProvider extends DiagramDescriptionIt
     @Override
     public String getText(Object object) {
         final String label = new IdentifiedElementQuery((SequenceDiagramDescription) object).getLabel();
-        return label == null || label.length() == 0 ? getString("_UI_SequenceDiagramDescription_type") : label;
+        return label == null || label.length() == 0 ? getString("_UI_SequenceDiagramDescription_type") : label; //$NON-NLS-1$
     }
 
     /**
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 2c6c8dbb9e..128a113da4 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
@@ -114,7 +114,7 @@ public class StateMappingItemProvider extends NodeMappingItemProvider {
     @Override
     public String getText(Object object) {
         String label = new IdentifiedElementQuery((StateMapping) object).getLabel();
-        return label == null || label.length() == 0 ? getString("_UI_StateMapping_type") : getString("_UI_StateMapping_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_StateMapping_type") : getString("_UI_StateMapping_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
     /**
@@ -192,7 +192,7 @@ public class StateMappingItemProvider extends NodeMappingItemProvider {
         qualify = qualify && childObject instanceof EObject && DescriptionPackage.eINSTANCE.equals(((EObject) childObject).eClass().getEPackage());
 
         if (qualify) {
-            return getString("_UI_CreateChild_text", new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+            return getString("_UI_CreateChild_text", new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) }); //$NON-NLS-1$
         }
         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/CombinedFragmentCreationToolItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/CombinedFragmentCreationToolItemProvider.java
index 8a2b72794b..95a6720cf1 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
@@ -114,7 +114,7 @@ public class CombinedFragmentCreationToolItemProvider extends ContainerCreationD
     @Override
     public String getText(Object object) {
         String label = new IdentifiedElementQuery((CombinedFragmentCreationTool) object).getLabel();
-        return label == null || label.length() == 0 ? getString("_UI_CombinedFragmentCreationTool_type") : getString("_UI_CombinedFragmentCreationTool_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_CombinedFragmentCreationTool_type") : getString("_UI_CombinedFragmentCreationTool_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
     /**
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 d477807cee..df115b6348 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
@@ -113,7 +113,7 @@ public class ExecutionCreationToolItemProvider extends NodeCreationDescriptionIt
     @Override
     public String getText(Object object) {
         String label = new IdentifiedElementQuery((ExecutionCreationTool) object).getLabel();
-        return label == null || label.length() == 0 ? getString("_UI_ExecutionCreationTool_type") : getString("_UI_ExecutionCreationTool_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_ExecutionCreationTool_type") : getString("_UI_ExecutionCreationTool_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
     /**
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 bb0fdd03f8..e4c609a7ae 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
@@ -112,7 +112,7 @@ public class InstanceRoleCreationToolItemProvider extends NodeCreationDescriptio
     @Override
     public String getText(Object object) {
         String label = new IdentifiedElementQuery((InstanceRoleCreationTool) object).getLabel();
-        return label == null || label.length() == 0 ? getString("_UI_InstanceRoleCreationTool_type") : getString("_UI_InstanceRoleCreationTool_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_InstanceRoleCreationTool_type") : getString("_UI_InstanceRoleCreationTool_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
     /**
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 0d2b796747..833d25fddd 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
@@ -129,7 +129,7 @@ public class InstanceRoleReorderToolItemProvider extends AbstractToolDescription
     @Override
     public String getText(Object object) {
         String label = new IdentifiedElementQuery((InstanceRoleReorderTool) object).getLabel();
-        return label == null || label.length() == 0 ? getString("_UI_InstanceRoleReorderTool_type") : getString("_UI_InstanceRoleReorderTool_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_InstanceRoleReorderTool_type") : getString("_UI_InstanceRoleReorderTool_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
     /**
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 1666444d7b..7d7005fd48 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
@@ -114,7 +114,7 @@ public class InteractionUseCreationToolItemProvider extends ContainerCreationDes
     @Override
     public String getText(Object object) {
         String label = new IdentifiedElementQuery((InteractionUseCreationTool) object).getLabel();
-        return label == null || label.length() == 0 ? getString("_UI_InteractionUseCreationTool_type") : getString("_UI_InteractionUseCreationTool_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_InteractionUseCreationTool_type") : getString("_UI_InteractionUseCreationTool_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
     /**
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 2ec29224fb..df22a3a958 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
@@ -75,7 +75,7 @@ public class LifelineCreationToolItemProvider extends ContainerCreationDescripti
     @Override
     public String getText(Object object) {
         String label = new IdentifiedElementQuery((LifelineCreationTool) object).getLabel();
-        return label == null || label.length() == 0 ? getString("_UI_LifelineCreationTool_type") : getString("_UI_LifelineCreationTool_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_LifelineCreationTool_type") : getString("_UI_LifelineCreationTool_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
     /**
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 6312707502..cb816ba28e 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
@@ -122,9 +122,9 @@ public class MessageCreationToolItemProvider extends SequenceDiagramToolDescript
      */
     protected void addPreconditionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_EdgeCreationDescription_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_EdgeCreationDescription_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"), null)); //$NON-NLS-1$
     }
 
     /**
@@ -301,7 +301,7 @@ public class MessageCreationToolItemProvider extends SequenceDiagramToolDescript
     @Override
     public String getText(Object object) {
         String label = new IdentifiedElementQuery((MessageCreationTool) object).getLabel();
-        return label == null || label.length() == 0 ? getString("_UI_MessageCreationTool_type") : getString("_UI_MessageCreationTool_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_MessageCreationTool_type") : getString("_UI_MessageCreationTool_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
     /**
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 f771f379e6..3575d081b9 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
@@ -113,7 +113,7 @@ public class ObservationPointCreationToolItemProvider extends NodeCreationDescri
     @Override
     public String getText(Object object) {
         String label = new IdentifiedElementQuery((ObservationPointCreationTool) object).getLabel();
-        return label == null || label.length() == 0 ? getString("_UI_ObservationPointCreationTool_type") : getString("_UI_ObservationPointCreationTool_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_ObservationPointCreationTool_type") : getString("_UI_ObservationPointCreationTool_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
     /**
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 dd2449e407..0b2d5952c1 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
@@ -113,7 +113,7 @@ public class OperandCreationToolItemProvider extends ContainerCreationDescriptio
     @Override
     public String getText(Object object) {
         String label = new IdentifiedElementQuery((OperandCreationTool) object).getLabel();
-        return label == null || label.length() == 0 ? getString("_UI_OperandCreationTool_type") : getString("_UI_OperandCreationTool_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_OperandCreationTool_type") : getString("_UI_OperandCreationTool_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
     /**
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 cff435ef0a..bd760c7390 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
@@ -133,7 +133,7 @@ public class ReorderToolItemProvider extends AbstractToolDescriptionItemProvider
     @Override
     public String getText(Object object) {
         String label = new IdentifiedElementQuery((ReorderTool) object).getLabel();
-        return label == null || label.length() == 0 ? getString("_UI_ReorderTool_type") : getString("_UI_ReorderTool_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_ReorderTool_type") : getString("_UI_ReorderTool_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
     /**
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 253ab899cc..9c5fbd5c83 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
@@ -113,7 +113,7 @@ public class StateCreationToolItemProvider extends NodeCreationDescriptionItemPr
     @Override
     public String getText(Object object) {
         String label = new IdentifiedElementQuery((StateCreationTool) object).getLabel();
-        return label == null || label.length() == 0 ? getString("_UI_StateCreationTool_type") : getString("_UI_StateCreationTool_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_StateCreationTool_type") : getString("_UI_StateCreationTool_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
     /**
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 f0050120b0..849de6e1c1 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
@@ -113,7 +113,7 @@ public class SequenceDDiagramItemProvider extends DSemanticDiagramItemProvider {
     @Override
     public String getText(Object object) {
         String label = ((SequenceDDiagram) object).getName();
-        return label == null || label.length() == 0 ? getString("_UI_SequenceDDiagram_type") : label;
+        return label == null || label.length() == 0 ? getString("_UI_SequenceDDiagram_type") : label; //$NON-NLS-1$
     }
 
     /**
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 7d3508ca66..16e0c5b749 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
@@ -88,7 +88,7 @@ public class TBasicMessageMappingItemProvider extends TSourceTargetMessageMappin
     @Override
     public String getText(Object object) {
         String label = ((TBasicMessageMapping) object).getName();
-        return label == null || label.length() == 0 ? getString("_UI_TBasicMessageMapping_type") : label;
+        return label == null || label.length() == 0 ? getString("_UI_TBasicMessageMapping_type") : label; //$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 149c34a391..76bc1bc806 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
@@ -124,7 +124,7 @@ public class TConditionalExecutionStyleItemProvider extends TTransformerItemProv
     @Override
     public String getText(Object object) {
         String label = ((TConditionalExecutionStyle) object).getPredicateExpression();
-        return label == null || label.length() == 0 ? getString("_UI_TConditionalExecutionStyle_type") : label;
+        return label == null || label.length() == 0 ? getString("_UI_TConditionalExecutionStyle_type") : label; //$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 cf8af690a7..6304eb31bb 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
@@ -124,7 +124,7 @@ public class TConditionalLifelineStyleItemProvider extends TTransformerItemProvi
     @Override
     public String getText(Object object) {
         String label = ((TConditionalLifelineStyle) object).getPredicateExpression();
-        return label == null || label.length() == 0 ? getString("_UI_TConditionalLifelineStyle_type") : label;
+        return label == null || label.length() == 0 ? getString("_UI_TConditionalLifelineStyle_type") : label; //$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 e97f6e8e8c..3123e7a83f 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
@@ -124,7 +124,7 @@ public class TConditionalMessageStyleItemProvider extends TTransformerItemProvid
     @Override
     public String getText(Object object) {
         String label = ((TConditionalMessageStyle) object).getPredicateExpression();
-        return label == null || label.length() == 0 ? getString("_UI_TConditionalMessageStyle_type") : label;
+        return label == null || label.length() == 0 ? getString("_UI_TConditionalMessageStyle_type") : label; //$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 7b72181c6f..7978c40dc9 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
@@ -88,7 +88,7 @@ public class TCreationMessageMappingItemProvider extends TSourceTargetMessageMap
     @Override
     public String getText(Object object) {
         String label = ((TCreationMessageMapping) object).getName();
-        return label == null || label.length() == 0 ? getString("_UI_TCreationMessageMapping_type") : label;
+        return label == null || label.length() == 0 ? getString("_UI_TCreationMessageMapping_type") : label; //$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 bb18854b45..f3e739e937 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
@@ -87,7 +87,7 @@ public class TDestructionMessageMappingItemProvider extends TSourceTargetMessage
     @Override
     public String getText(Object object) {
         String label = ((TDestructionMessageMapping) object).getName();
-        return label == null || label.length() == 0 ? getString("_UI_TDestructionMessageMapping_type") : label;
+        return label == null || label.length() == 0 ? getString("_UI_TDestructionMessageMapping_type") : label; //$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 14dfe2f760..dc9d7b71e4 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
@@ -157,7 +157,7 @@ public class TExecutionMappingItemProvider extends TAbstractMappingItemProvider
     @Override
     public String getText(Object object) {
         String label = ((TExecutionMapping) object).getName();
-        return label == null || label.length() == 0 ? getString("_UI_TExecutionMapping_type") : label;
+        return label == null || label.length() == 0 ? getString("_UI_TExecutionMapping_type") : label; //$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 09a4c6dc3c..a68e1a2d19 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
@@ -122,7 +122,7 @@ public class TExecutionStyleItemProvider extends TTransformerItemProvider {
     @Override
     public String getText(Object object) {
         String label = ((TExecutionStyle) object).getBorderSizeComputationExpression();
-        return label == null || label.length() == 0 ? getString("_UI_TExecutionStyle_type") : label;
+        return label == null || label.length() == 0 ? getString("_UI_TExecutionStyle_type") : label; //$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 c2b9816c6c..3af48cd1b8 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
@@ -130,7 +130,7 @@ public class TLifelineMappingItemProvider extends TAbstractMappingItemProvider {
     @Override
     public String getText(Object object) {
         String label = ((TLifelineMapping) object).getName();
-        return label == null || label.length() == 0 ? getString("_UI_TLifelineMapping_type") : label;
+        return label == null || label.length() == 0 ? getString("_UI_TLifelineMapping_type") : label; //$NON-NLS-1$
     }
 
     /**
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 71ce125900..db34155002 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
@@ -107,7 +107,7 @@ public class TLifelineStyleItemProvider extends TTransformerItemProvider {
     @Override
     public String getText(Object object) {
         String label = ((TLifelineStyle) object).getLifelineWidthComputationExpression();
-        return label == null || label.length() == 0 ? getString("_UI_TLifelineStyle_type") : label;
+        return label == null || label.length() == 0 ? getString("_UI_TLifelineStyle_type") : label; //$NON-NLS-1$
     }
 
     /**
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 4923dd93b2..b925e7030e 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
@@ -152,7 +152,7 @@ public class TMessageStyleItemProvider extends TTransformerItemProvider {
     public String getText(Object object) {
         LineStyle labelValue = ((TMessageStyle) object).getLineStyle();
         String label = labelValue == null ? null : labelValue.toString();
-        return label == null || label.length() == 0 ? getString("_UI_TMessageStyle_type") : label;
+        return label == null || label.length() == 0 ? getString("_UI_TMessageStyle_type") : label; //$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 34e972404d..9a9af751a7 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
@@ -107,7 +107,7 @@ public class TReturnMessageMappingItemProvider extends TMessageMappingItemProvid
     @Override
     public String getText(Object object) {
         String label = ((TReturnMessageMapping) object).getName();
-        return label == null || label.length() == 0 ? getString("_UI_TReturnMessageMapping_type") : label;
+        return label == null || label.length() == 0 ? getString("_UI_TReturnMessageMapping_type") : label; //$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 ab364ba417..09fa21cb5d 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
@@ -146,7 +146,7 @@ public class TSequenceDiagramItemProvider extends RepresentationTemplateItemProv
     @Override
     public String getText(Object object) {
         String label = ((TSequenceDiagram) object).getName();
-        return label == null || label.length() == 0 ? getString("_UI_TSequenceDiagram_type") : label;
+        return label == null || label.length() == 0 ? getString("_UI_TSequenceDiagram_type") : label; //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/SequencePackage.java b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/SequencePackage.java
index 0d8c0311a6..290333836d 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/SequencePackage.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/SequencePackage.java
@@ -36,21 +36,21 @@ public interface SequencePackage extends EPackage {
      * 
      * @generated
      */
-    String eNAME = "sequence";
+    String eNAME = "sequence"; //$NON-NLS-1$
 
     /**
      * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
      * @generated
      */
-    String eNS_URI = "http://www.eclipse.org/sirius/diagram/sequence/2.0.0";
+    String eNS_URI = "http://www.eclipse.org/sirius/diagram/sequence/2.0.0"; //$NON-NLS-1$
 
     /**
      * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
      * @generated
      */
-    String eNS_PREFIX = "sequence";
+    String eNS_PREFIX = "sequence"; //$NON-NLS-1$
 
     /**
      * The singleton instance of the package. <!-- begin-user-doc --> <!--
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/DescriptionPackage.java b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/DescriptionPackage.java
index 33fdd24a20..b890e4f5d8 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/DescriptionPackage.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/DescriptionPackage.java
@@ -36,21 +36,21 @@ public interface DescriptionPackage extends EPackage {
      * 
      * @generated
      */
-    String eNAME = "description";
+    String eNAME = "description"; //$NON-NLS-1$
 
     /**
      * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
      * @generated
      */
-    String eNS_URI = "http://www.eclipse.org/sirius/diagram/sequence/description/2.0.0";
+    String eNS_URI = "http://www.eclipse.org/sirius/diagram/sequence/description/2.0.0"; //$NON-NLS-1$
 
     /**
      * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
      * @generated
      */
-    String eNS_PREFIX = "description";
+    String eNS_PREFIX = "description"; //$NON-NLS-1$
 
     /**
      * The singleton instance of the package. <!-- begin-user-doc --> <!--
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/ToolPackage.java b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/ToolPackage.java
index c95db1cdef..75b159fa2e 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/ToolPackage.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/ToolPackage.java
@@ -35,21 +35,21 @@ public interface ToolPackage extends EPackage {
      * 
      * @generated
      */
-    String eNAME = "tool";
+    String eNAME = "tool"; //$NON-NLS-1$
 
     /**
      * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
      * @generated
      */
-    String eNS_URI = "http://www.eclipse.org/sirius/diagram/sequence/description/tool/2.0.0";
+    String eNS_URI = "http://www.eclipse.org/sirius/diagram/sequence/description/tool/2.0.0"; //$NON-NLS-1$
 
     /**
      * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
      * @generated
      */
-    String eNS_PREFIX = "tool";
+    String eNS_PREFIX = "tool"; //$NON-NLS-1$
 
     /**
      * The singleton instance of the package. <!-- begin-user-doc --> <!--
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 49c815e183..b512b596a0 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
@@ -124,7 +124,7 @@ public class MessageCreationToolImpl extends SequenceDiagramToolDescriptionImpl
      * @generated
      * @ordered
      */
-    protected static final String DOCUMENTATION_EDEFAULT = "";
+    protected static final String DOCUMENTATION_EDEFAULT = ""; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getDocumentation()
@@ -145,7 +145,7 @@ public class MessageCreationToolImpl extends SequenceDiagramToolDescriptionImpl
      * @generated
      * @ordered
      */
-    protected static final String NAME_EDEFAULT = "";
+    protected static final String NAME_EDEFAULT = ""; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
@@ -186,7 +186,7 @@ public class MessageCreationToolImpl extends SequenceDiagramToolDescriptionImpl
      * @generated
      * @ordered
      */
-    protected static final String PRECONDITION_EDEFAULT = "";
+    protected static final String PRECONDITION_EDEFAULT = ""; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getPrecondition() <em>Precondition</em>}
@@ -238,7 +238,7 @@ public class MessageCreationToolImpl extends SequenceDiagramToolDescriptionImpl
      * @generated
      * @ordered
      */
-    protected static final String ELEMENTS_TO_SELECT_EDEFAULT = "";
+    protected static final String ELEMENTS_TO_SELECT_EDEFAULT = ""; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getElementsToSelect()
@@ -347,7 +347,7 @@ public class MessageCreationToolImpl extends SequenceDiagramToolDescriptionImpl
      * @generated
      * @ordered
      */
-    protected static final String ICON_PATH_EDEFAULT = "";
+    protected static final String ICON_PATH_EDEFAULT = ""; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getIconPath() <em>Icon Path</em>}'
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/ordering/OrderingPackage.java b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/ordering/OrderingPackage.java
index a57c272df0..f23dcf5fe2 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/ordering/OrderingPackage.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/ordering/OrderingPackage.java
@@ -36,21 +36,21 @@ public interface OrderingPackage extends EPackage {
      * 
      * @generated
      */
-    String eNAME = "ordering";
+    String eNAME = "ordering"; //$NON-NLS-1$
 
     /**
      * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
      * @generated
      */
-    String eNS_URI = "http://www.eclipse.org/sirius/diagram/sequence/ordering/2.0.0";
+    String eNS_URI = "http://www.eclipse.org/sirius/diagram/sequence/ordering/2.0.0"; //$NON-NLS-1$
 
     /**
      * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
      * @generated
      */
-    String eNS_PREFIX = "ordering";
+    String eNS_PREFIX = "ordering"; //$NON-NLS-1$
 
     /**
      * The singleton instance of the package. <!-- begin-user-doc --> <!--
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/template/TemplatePackage.java b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/template/TemplatePackage.java
index 68ed4e43cb..c08f6ef212 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/template/TemplatePackage.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/template/TemplatePackage.java
@@ -37,21 +37,21 @@ public interface TemplatePackage extends EPackage {
      * 
      * @generated
      */
-    String eNAME = "template";
+    String eNAME = "template"; //$NON-NLS-1$
 
     /**
      * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
      * @generated
      */
-    String eNS_URI = "http://www.eclipse.org/sirius/diagram/sequence/template/2.0.0";
+    String eNS_URI = "http://www.eclipse.org/sirius/diagram/sequence/template/2.0.0"; //$NON-NLS-1$
 
     /**
      * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
      * @generated
      */
-    String eNS_PREFIX = "template";
+    String eNS_PREFIX = "template"; //$NON-NLS-1$
 
     /**
      * The singleton instance of the package. <!-- begin-user-doc --> <!--
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 a3c79bc9ba..177a1fd0cd 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
@@ -48,7 +48,7 @@ public class TExecutionStyleImpl extends TTransformerImpl implements TExecutionS
      * @generated
      * @ordered
      */
-    protected static final String BORDER_SIZE_COMPUTATION_EXPRESSION_EDEFAULT = "1";
+    protected static final String BORDER_SIZE_COMPUTATION_EXPRESSION_EDEFAULT = "1"; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getBorderSizeComputationExpression()
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 270aa29571..acc8e09ee1 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
@@ -46,7 +46,7 @@ public class TLifelineStyleImpl extends TTransformerImpl implements TLifelineSty
      * @generated
      * @ordered
      */
-    protected static final String LIFELINE_WIDTH_COMPUTATION_EXPRESSION_EDEFAULT = "0";
+    protected static final String LIFELINE_WIDTH_COMPUTATION_EXPRESSION_EDEFAULT = "0"; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getLifelineWidthComputationExpression()
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 70a9c9bf44..a2057332af 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
@@ -126,7 +126,7 @@ public class TMessageStyleImpl extends TTransformerImpl implements TMessageStyle
      * @generated
      * @ordered
      */
-    protected static final String LABEL_EXPRESSION_EDEFAULT = "feature:name";
+    protected static final String LABEL_EXPRESSION_EDEFAULT = "feature:name"; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getLabelExpression()
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/AlignmentKind.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/AlignmentKind.java
index ebeb1dc117..1f019fcdbf 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/AlignmentKind.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/AlignmentKind.java
@@ -76,7 +76,7 @@ public enum AlignmentKind implements Enumerator {
      * @generated
      * @ordered
      */
-    VERTICAL_LITERAL(0, "VERTICAL", "VERTICAL"),
+    VERTICAL_LITERAL(0, "VERTICAL", "VERTICAL"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>HORIZONTAL</b></em>' literal object. <!-- begin-user-doc -->
@@ -86,7 +86,7 @@ public enum AlignmentKind implements Enumerator {
      * @generated
      * @ordered
      */
-    HORIZONTAL_LITERAL(1, "HORIZONTAL", "HORIZONTAL"),
+    HORIZONTAL_LITERAL(1, "HORIZONTAL", "HORIZONTAL"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>SQUARE</b></em>' literal object. <!-- begin-user-doc --> <!--
@@ -96,7 +96,7 @@ public enum AlignmentKind implements Enumerator {
      * @generated
      * @ordered
      */
-    SQUARE_LITERAL(2, "SQUARE", "SQUARE");
+    SQUARE_LITERAL(2, "SQUARE", "SQUARE"); //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>VERTICAL</b></em>' literal value. <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/ArrangeConstraint.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/ArrangeConstraint.java
index 2a5f4e9ad8..735109067b 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/ArrangeConstraint.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/ArrangeConstraint.java
@@ -35,7 +35,7 @@ public enum ArrangeConstraint implements Enumerator {
      * @generated
      * @ordered
      */
-    KEEP_LOCATION(0, "KEEP_LOCATION", "KEEP_LOCATION"),
+    KEEP_LOCATION(0, "KEEP_LOCATION", "KEEP_LOCATION"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>KEEP SIZE</b></em>' literal object. <!-- begin-user-doc -->
@@ -45,7 +45,7 @@ public enum ArrangeConstraint implements Enumerator {
      * @generated
      * @ordered
      */
-    KEEP_SIZE(1, "KEEP_SIZE", "KEEP_SIZE"),
+    KEEP_SIZE(1, "KEEP_SIZE", "KEEP_SIZE"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>KEEP RATIO</b></em>' literal object. <!-- begin-user-doc -->
@@ -55,7 +55,7 @@ public enum ArrangeConstraint implements Enumerator {
      * @generated
      * @ordered
      */
-    KEEP_RATIO(2, "KEEP_RATIO", "KEEP_RATIO");
+    KEEP_RATIO(2, "KEEP_RATIO", "KEEP_RATIO"); //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>KEEP LOCATION</b></em>' literal value. <!-- begin-user-doc
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/BackgroundStyle.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/BackgroundStyle.java
index e288ae6f65..eee7cb655f 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/BackgroundStyle.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/BackgroundStyle.java
@@ -36,7 +36,7 @@ public enum BackgroundStyle implements Enumerator {
      * @generated
      * @ordered
      */
-    GRADIENT_LEFT_TO_RIGHT_LITERAL(0, "GradientLeftToRight", "GradientLeftToRight"),
+    GRADIENT_LEFT_TO_RIGHT_LITERAL(0, "GradientLeftToRight", "GradientLeftToRight"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>Liquid</b></em>' literal object. <!-- begin-user-doc --> <!--
@@ -46,7 +46,7 @@ public enum BackgroundStyle implements Enumerator {
      * @generated
      * @ordered
      */
-    LIQUID_LITERAL(1, "Liquid", "Liquid"),
+    LIQUID_LITERAL(1, "Liquid", "Liquid"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>Gradient Top To Bottom</b></em>' literal object. <!--
@@ -56,7 +56,7 @@ public enum BackgroundStyle implements Enumerator {
      * @generated
      * @ordered
      */
-    GRADIENT_TOP_TO_BOTTOM_LITERAL(3, "GradientTopToBottom", "GradientTopToBottom");
+    GRADIENT_TOP_TO_BOTTOM_LITERAL(3, "GradientTopToBottom", "GradientTopToBottom"); //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>Gradient Left To Right</b></em>' literal value. <!--
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/BundledImageShape.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/BundledImageShape.java
index 014acbafab..cd31c5f019 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/BundledImageShape.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/BundledImageShape.java
@@ -36,7 +36,7 @@ public enum BundledImageShape implements Enumerator {
      * @generated
      * @ordered
      */
-    SQUARE_LITERAL(0, "square", "square"),
+    SQUARE_LITERAL(0, "square", "square"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>Stroke</b></em>' literal object. <!-- begin-user-doc --> <!--
@@ -46,7 +46,7 @@ public enum BundledImageShape implements Enumerator {
      * @generated
      * @ordered
      */
-    STROKE_LITERAL(1, "stroke", "stroke"),
+    STROKE_LITERAL(1, "stroke", "stroke"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>Triangle</b></em>' literal object. <!-- begin-user-doc -->
@@ -56,7 +56,7 @@ public enum BundledImageShape implements Enumerator {
      * @generated
      * @ordered
      */
-    TRIANGLE_LITERAL(3, "triangle", "triangle"),
+    TRIANGLE_LITERAL(3, "triangle", "triangle"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>Dot</b></em>' literal object. <!-- begin-user-doc --> <!--
@@ -66,7 +66,7 @@ public enum BundledImageShape implements Enumerator {
      * @generated
      * @ordered
      */
-    DOT_LITERAL(4, "dot", "dot"),
+    DOT_LITERAL(4, "dot", "dot"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>Ring</b></em>' literal object. <!-- begin-user-doc --> <!--
@@ -76,7 +76,7 @@ public enum BundledImageShape implements Enumerator {
      * @generated
      * @ordered
      */
-    RING_LITERAL(5, "ring", "ring");
+    RING_LITERAL(5, "ring", "ring"); //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>Square</b></em>' literal value. <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/ContainerLayout.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/ContainerLayout.java
index d9cc9dd174..dcad594504 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/ContainerLayout.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/ContainerLayout.java
@@ -35,7 +35,7 @@ public enum ContainerLayout implements Enumerator {
      * @generated
      * @ordered
      */
-    FREE_FORM(0, "FreeForm", "FreeForm"),
+    FREE_FORM(0, "FreeForm", "FreeForm"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>List</b></em>' literal object. <!-- begin-user-doc --> <!--
@@ -45,7 +45,7 @@ public enum ContainerLayout implements Enumerator {
      * @generated
      * @ordered
      */
-    LIST(1, "List", "List"),
+    LIST(1, "List", "List"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>Horizontal Stack</b></em>' literal object. <!--
@@ -55,7 +55,7 @@ public enum ContainerLayout implements Enumerator {
      * @generated
      * @ordered
      */
-    HORIZONTAL_STACK(2, "HorizontalStack", "HorizontalStack"),
+    HORIZONTAL_STACK(2, "HorizontalStack", "HorizontalStack"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>Vertical Stack</b></em>' literal object. <!-- begin-user-doc
@@ -65,7 +65,7 @@ public enum ContainerLayout implements Enumerator {
      * @generated
      * @ordered
      */
-    VERTICAL_STACK(3, "VerticalStack", "VerticalStack");
+    VERTICAL_STACK(3, "VerticalStack", "VerticalStack"); //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>Free Form</b></em>' literal value. <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/ContainerShape.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/ContainerShape.java
index 892e67964c..b0869276e7 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/ContainerShape.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/ContainerShape.java
@@ -35,7 +35,7 @@ public enum ContainerShape implements Enumerator {
      * @generated
      * @ordered
      */
-    PARALLELOGRAM_LITERAL(0, "parallelogram", "parallelogram");
+    PARALLELOGRAM_LITERAL(0, "parallelogram", "parallelogram"); //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>Parallelogram</b></em>' literal value. <!-- begin-user-doc
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/DiagramPackage.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/DiagramPackage.java
index c80a812de1..ffab50088c 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/DiagramPackage.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/DiagramPackage.java
@@ -39,21 +39,21 @@ public interface DiagramPackage extends EPackage {
      * 
      * @generated
      */
-    String eNAME = "diagram";
+    String eNAME = "diagram"; //$NON-NLS-1$
 
     /**
      * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
      * @generated
      */
-    String eNS_URI = "http://www.eclipse.org/sirius/diagram/1.1.0";
+    String eNS_URI = "http://www.eclipse.org/sirius/diagram/1.1.0"; //$NON-NLS-1$
 
     /**
      * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
      * @generated
      */
-    String eNS_PREFIX = "diagram";
+    String eNS_PREFIX = "diagram"; //$NON-NLS-1$
 
     /**
      * The singleton instance of the package. <!-- begin-user-doc --> <!--
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/EdgeArrows.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/EdgeArrows.java
index 14f86700f2..cfbc57ecd1 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/EdgeArrows.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/EdgeArrows.java
@@ -36,7 +36,7 @@ public enum EdgeArrows implements Enumerator {
      * @generated
      * @ordered
      */
-    NO_DECORATION_LITERAL(0, "NoDecoration", "NoDecoration"),
+    NO_DECORATION_LITERAL(0, "NoDecoration", "NoDecoration"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>Output Arrow</b></em>' literal object. <!-- begin-user-doc
@@ -46,7 +46,7 @@ public enum EdgeArrows implements Enumerator {
      * @generated
      * @ordered
      */
-    OUTPUT_ARROW_LITERAL(1, "OutputArrow", "OutputArrow"),
+    OUTPUT_ARROW_LITERAL(1, "OutputArrow", "OutputArrow"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>Input Arrow</b></em>' literal object. <!-- begin-user-doc -->
@@ -56,7 +56,7 @@ public enum EdgeArrows implements Enumerator {
      * @generated
      * @ordered
      */
-    INPUT_ARROW_LITERAL(2, "InputArrow", "InputArrow"),
+    INPUT_ARROW_LITERAL(2, "InputArrow", "InputArrow"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>Output Closed Arrow</b></em>' literal object. <!--
@@ -66,7 +66,7 @@ public enum EdgeArrows implements Enumerator {
      * @generated
      * @ordered
      */
-    OUTPUT_CLOSED_ARROW_LITERAL(3, "OutputClosedArrow", "OutputClosedArrow"),
+    OUTPUT_CLOSED_ARROW_LITERAL(3, "OutputClosedArrow", "OutputClosedArrow"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>Input Closed Arrow</b></em>' literal object. <!--
@@ -76,7 +76,7 @@ public enum EdgeArrows implements Enumerator {
      * @generated
      * @ordered
      */
-    INPUT_CLOSED_ARROW_LITERAL(4, "InputClosedArrow", "InputClosedArrow"),
+    INPUT_CLOSED_ARROW_LITERAL(4, "InputClosedArrow", "InputClosedArrow"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>Output Fill Closed Arrow</b></em>' literal object. <!--
@@ -86,7 +86,7 @@ public enum EdgeArrows implements Enumerator {
      * @generated
      * @ordered
      */
-    OUTPUT_FILL_CLOSED_ARROW_LITERAL(5, "OutputFillClosedArrow", "OutputFillClosedArrow"),
+    OUTPUT_FILL_CLOSED_ARROW_LITERAL(5, "OutputFillClosedArrow", "OutputFillClosedArrow"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>Input Fill Closed Arrow</b></em>' literal object. <!--
@@ -96,7 +96,7 @@ public enum EdgeArrows implements Enumerator {
      * @generated
      * @ordered
      */
-    INPUT_FILL_CLOSED_ARROW_LITERAL(6, "InputFillClosedArrow", "InputFillClosedArrow"),
+    INPUT_FILL_CLOSED_ARROW_LITERAL(6, "InputFillClosedArrow", "InputFillClosedArrow"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>Diamond</b></em>' literal object. <!-- begin-user-doc -->
@@ -106,7 +106,7 @@ public enum EdgeArrows implements Enumerator {
      * @generated
      * @ordered
      */
-    DIAMOND_LITERAL(7, "Diamond", "Diamond"),
+    DIAMOND_LITERAL(7, "Diamond", "Diamond"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>Fill Diamond</b></em>' literal object. <!-- begin-user-doc
@@ -116,7 +116,7 @@ public enum EdgeArrows implements Enumerator {
      * @generated
      * @ordered
      */
-    FILL_DIAMOND_LITERAL(8, "FillDiamond", "FillDiamond"),
+    FILL_DIAMOND_LITERAL(8, "FillDiamond", "FillDiamond"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>Input Arrow With Diamond</b></em>' literal object. <!--
@@ -126,7 +126,7 @@ public enum EdgeArrows implements Enumerator {
      * @generated
      * @ordered
      */
-    INPUT_ARROW_WITH_DIAMOND_LITERAL(9, "InputArrowWithDiamond", "InputArrowWithDiamond"),
+    INPUT_ARROW_WITH_DIAMOND_LITERAL(9, "InputArrowWithDiamond", "InputArrowWithDiamond"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>Input Arrow With Fill Diamond</b></em>' literal object. <!--
@@ -136,7 +136,7 @@ public enum EdgeArrows implements Enumerator {
      * @generated
      * @ordered
      */
-    INPUT_ARROW_WITH_FILL_DIAMOND_LITERAL(10, "InputArrowWithFillDiamond", "InputArrowWithFillDiamond");
+    INPUT_ARROW_WITH_FILL_DIAMOND_LITERAL(10, "InputArrowWithFillDiamond", "InputArrowWithFillDiamond"); //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>No Decoration</b></em>' literal value. <!-- begin-user-doc
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/EdgeRouting.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/EdgeRouting.java
index 984162d302..2fc8558df7 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/EdgeRouting.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/EdgeRouting.java
@@ -36,7 +36,7 @@ public enum EdgeRouting implements Enumerator {
      * @generated
      * @ordered
      */
-    STRAIGHT_LITERAL(0, "straight", "straight"),
+    STRAIGHT_LITERAL(0, "straight", "straight"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>Manhattan</b></em>' literal object. <!-- begin-user-doc -->
@@ -46,7 +46,7 @@ public enum EdgeRouting implements Enumerator {
      * @generated
      * @ordered
      */
-    MANHATTAN_LITERAL(1, "manhattan", "manhattan"),
+    MANHATTAN_LITERAL(1, "manhattan", "manhattan"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>Tree</b></em>' literal object. <!-- begin-user-doc --> <!--
@@ -56,7 +56,7 @@ public enum EdgeRouting implements Enumerator {
      * @generated
      * @ordered
      */
-    TREE_LITERAL(2, "tree", "tree");
+    TREE_LITERAL(2, "tree", "tree"); //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>Straight</b></em>' literal value. <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/LabelPosition.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/LabelPosition.java
index d585783ec1..06cf8dfc56 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/LabelPosition.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/LabelPosition.java
@@ -36,7 +36,7 @@ public enum LabelPosition implements Enumerator {
      * @generated
      * @ordered
      */
-    BORDER_LITERAL(0, "border", "border"),
+    BORDER_LITERAL(0, "border", "border"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>Node</b></em>' literal object. <!-- begin-user-doc --> <!--
@@ -46,7 +46,7 @@ public enum LabelPosition implements Enumerator {
      * @generated
      * @ordered
      */
-    NODE_LITERAL(1, "node", "node");
+    NODE_LITERAL(1, "node", "node"); //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>Border</b></em>' literal value. <!-- begin-user-doc --> <!--
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/LineStyle.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/LineStyle.java
index 337bb8e30d..268153dedd 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/LineStyle.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/LineStyle.java
@@ -36,7 +36,7 @@ public enum LineStyle implements Enumerator {
      * @generated
      * @ordered
      */
-    SOLID_LITERAL(0, "solid", "solid"),
+    SOLID_LITERAL(0, "solid", "solid"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>Dash</b></em>' literal object. <!-- begin-user-doc --> <!--
@@ -46,7 +46,7 @@ public enum LineStyle implements Enumerator {
      * @generated
      * @ordered
      */
-    DASH_LITERAL(1, "dash", "dash"),
+    DASH_LITERAL(1, "dash", "dash"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>Dot</b></em>' literal object. <!-- begin-user-doc --> <!--
@@ -56,7 +56,7 @@ public enum LineStyle implements Enumerator {
      * @generated
      * @ordered
      */
-    DOT_LITERAL(2, "dot", "dot"),
+    DOT_LITERAL(2, "dot", "dot"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>Dash dot</b></em>' literal object. <!-- begin-user-doc -->
@@ -66,7 +66,7 @@ public enum LineStyle implements Enumerator {
      * @generated
      * @ordered
      */
-    DASH_DOT_LITERAL(3, "dash_dot", "dash_dot");
+    DASH_DOT_LITERAL(3, "dash_dot", "dash_dot"); //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>Solid</b></em>' literal value. <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/ResizeKind.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/ResizeKind.java
index 05dbe964c8..21a96db2da 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/ResizeKind.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/ResizeKind.java
@@ -35,7 +35,7 @@ public enum ResizeKind implements Enumerator {
      * @generated
      * @ordered
      */
-    NONE_LITERAL(0, "NONE", "NONE"),
+    NONE_LITERAL(0, "NONE", "NONE"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>NSEW</b></em>' literal object. <!-- begin-user-doc --> <!--
@@ -45,7 +45,7 @@ public enum ResizeKind implements Enumerator {
      * @generated
      * @ordered
      */
-    NSEW_LITERAL(1, "NSEW", "NSEW"),
+    NSEW_LITERAL(1, "NSEW", "NSEW"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>NORTH SOUTH</b></em>' literal object. <!-- begin-user-doc -->
@@ -55,7 +55,7 @@ public enum ResizeKind implements Enumerator {
      * @generated
      * @ordered
      */
-    NORTH_SOUTH_LITERAL(2, "NORTH_SOUTH", "NORTH_SOUTH"),
+    NORTH_SOUTH_LITERAL(2, "NORTH_SOUTH", "NORTH_SOUTH"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>EAST WEST</b></em>' literal object. <!-- begin-user-doc -->
@@ -65,7 +65,7 @@ public enum ResizeKind implements Enumerator {
      * @generated
      * @ordered
      */
-    EAST_WEST_LITERAL(3, "EAST_WEST", "EAST_WEST");
+    EAST_WEST_LITERAL(3, "EAST_WEST", "EAST_WEST"); //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>NONE</b></em>' literal value. <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/CenteringStyle.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/CenteringStyle.java
index 424868a18f..4d1bfbcd61 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/CenteringStyle.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/CenteringStyle.java
@@ -35,7 +35,7 @@ public enum CenteringStyle implements Enumerator {
      * @generated
      * @ordered
      */
-    NONE(0, "None", "None"),
+    NONE(0, "None", "None"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>Both</b></em>' literal object. <!-- begin-user-doc --> <!--
@@ -45,7 +45,7 @@ public enum CenteringStyle implements Enumerator {
      * @generated
      * @ordered
      */
-    BOTH(1, "Both", "Both"),
+    BOTH(1, "Both", "Both"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>Source</b></em>' literal object. <!-- begin-user-doc --> <!--
@@ -55,7 +55,7 @@ public enum CenteringStyle implements Enumerator {
      * @generated
      * @ordered
      */
-    SOURCE(2, "Source", "Source"),
+    SOURCE(2, "Source", "Source"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>Target</b></em>' literal object. <!-- begin-user-doc --> <!--
@@ -65,7 +65,7 @@ public enum CenteringStyle implements Enumerator {
      * @generated
      * @ordered
      */
-    TARGET(3, "Target", "Target");
+    TARGET(3, "Target", "Target"); //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>None</b></em>' literal value. <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/DescriptionPackage.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/DescriptionPackage.java
index 3e419d53e3..06655b8384 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/DescriptionPackage.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/DescriptionPackage.java
@@ -38,21 +38,21 @@ public interface DescriptionPackage extends EPackage {
      * 
      * @generated
      */
-    String eNAME = "description";
+    String eNAME = "description"; //$NON-NLS-1$
 
     /**
      * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
      * @generated
      */
-    String eNS_URI = "http://www.eclipse.org/sirius/diagram/description/1.1.0";
+    String eNS_URI = "http://www.eclipse.org/sirius/diagram/description/1.1.0"; //$NON-NLS-1$
 
     /**
      * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
      * @generated
      */
-    String eNS_PREFIX = "description";
+    String eNS_PREFIX = "description"; //$NON-NLS-1$
 
     /**
      * The singleton instance of the package. <!-- begin-user-doc --> <!--
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/FoldingStyle.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/FoldingStyle.java
index d0a9a316c2..67cc593745 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/FoldingStyle.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/FoldingStyle.java
@@ -35,7 +35,7 @@ public enum FoldingStyle implements Enumerator {
      * @generated
      * @ordered
      */
-    NONE_LITERAL(0, "NONE", "NONE"),
+    NONE_LITERAL(0, "NONE", "NONE"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>SOURCE</b></em>' literal object. <!-- begin-user-doc --> <!--
@@ -45,7 +45,7 @@ public enum FoldingStyle implements Enumerator {
      * @generated
      * @ordered
      */
-    SOURCE_LITERAL(1, "SOURCE", "SOURCE"),
+    SOURCE_LITERAL(1, "SOURCE", "SOURCE"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>TARGET</b></em>' literal object. <!-- begin-user-doc --> <!--
@@ -55,7 +55,7 @@ public enum FoldingStyle implements Enumerator {
      * @generated
      * @ordered
      */
-    TARGET_LITERAL(2, "TARGET", "TARGET");
+    TARGET_LITERAL(2, "TARGET", "TARGET"); //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>NONE</b></em>' literal value. <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/LayoutDirection.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/LayoutDirection.java
index 4b25cebdd0..85215d7ecb 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/LayoutDirection.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/LayoutDirection.java
@@ -35,7 +35,7 @@ public enum LayoutDirection implements Enumerator {
      * @generated
      * @ordered
      */
-    TOP_TO_BOTTOM(0, "TopToBottom", "topToBottom"),
+    TOP_TO_BOTTOM(0, "TopToBottom", "topToBottom"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>Left To Right</b></em>' literal object. <!-- begin-user-doc
@@ -45,7 +45,7 @@ public enum LayoutDirection implements Enumerator {
      * @generated
      * @ordered
      */
-    LEFT_TO_RIGHT(1, "LeftToRight", "LeftToRight"),
+    LEFT_TO_RIGHT(1, "LeftToRight", "LeftToRight"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>Bottom To Top</b></em>' literal object. <!-- begin-user-doc
@@ -55,7 +55,7 @@ public enum LayoutDirection implements Enumerator {
      * @generated
      * @ordered
      */
-    BOTTOM_TO_TOP(2, "BottomToTop", "bottomToTop");
+    BOTTOM_TO_TOP(2, "BottomToTop", "bottomToTop"); //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>Top To Bottom</b></em>' literal value. <!-- begin-user-doc
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/concern/ConcernPackage.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/concern/ConcernPackage.java
index d40872741d..31d4038bd7 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/concern/ConcernPackage.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/concern/ConcernPackage.java
@@ -37,21 +37,21 @@ public interface ConcernPackage extends EPackage {
      * 
      * @generated
      */
-    String eNAME = "concern";
+    String eNAME = "concern"; //$NON-NLS-1$
 
     /**
      * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
      * @generated
      */
-    String eNS_URI = "http://www.eclipse.org/sirius/diagram/description/concern/1.1.0";
+    String eNS_URI = "http://www.eclipse.org/sirius/diagram/description/concern/1.1.0"; //$NON-NLS-1$
 
     /**
      * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
      * @generated
      */
-    String eNS_PREFIX = "concern";
+    String eNS_PREFIX = "concern"; //$NON-NLS-1$
 
     /**
      * The singleton instance of the package. <!-- begin-user-doc --> <!--
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 ba42d3365f..d885eb157f 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
@@ -62,7 +62,7 @@ public class ConcernDescriptionImpl extends DocumentedElementImpl implements Con
      * @generated
      * @ordered
      */
-    protected static final String NAME_EDEFAULT = "";
+    protected static final String NAME_EDEFAULT = ""; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/filter/FilterKind.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/filter/FilterKind.java
index cc421f2b3b..9132cc1724 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/filter/FilterKind.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/filter/FilterKind.java
@@ -35,7 +35,7 @@ public enum FilterKind implements Enumerator {
      * @generated
      * @ordered
      */
-    HIDE_LITERAL(0, "HIDE", "HIDE"),
+    HIDE_LITERAL(0, "HIDE", "HIDE"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>COLLAPSE</b></em>' literal object. <!-- begin-user-doc -->
@@ -45,7 +45,7 @@ public enum FilterKind implements Enumerator {
      * @generated
      * @ordered
      */
-    COLLAPSE_LITERAL(1, "COLLAPSE", "COLLAPSE");
+    COLLAPSE_LITERAL(1, "COLLAPSE", "COLLAPSE"); //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>HIDE</b></em>' literal value. <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/filter/FilterPackage.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/filter/FilterPackage.java
index b6d0e17137..e65fbaab85 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/filter/FilterPackage.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/filter/FilterPackage.java
@@ -39,21 +39,21 @@ public interface FilterPackage extends EPackage {
      * 
      * @generated
      */
-    String eNAME = "filter";
+    String eNAME = "filter"; //$NON-NLS-1$
 
     /**
      * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
      * @generated
      */
-    String eNS_URI = "http://www.eclipse.org/sirius/diagram/description/filter/1.1.0";
+    String eNS_URI = "http://www.eclipse.org/sirius/diagram/description/filter/1.1.0"; //$NON-NLS-1$
 
     /**
      * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
      * @generated
      */
-    String eNS_PREFIX = "filter";
+    String eNS_PREFIX = "filter"; //$NON-NLS-1$
 
     /**
      * The singleton instance of the package. <!-- begin-user-doc --> <!--
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 d0aea497f4..acbb502138 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
@@ -47,7 +47,7 @@ public abstract class FilterDescriptionImpl extends DocumentedElementImpl implem
      * @generated
      * @ordered
      */
-    protected static final String NAME_EDEFAULT = "";
+    protected static final String NAME_EDEFAULT = ""; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
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 961367866d..2a50fef348 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
@@ -64,7 +64,7 @@ public class VariableFilterImpl extends FilterImpl implements VariableFilter {
      * @generated
      * @ordered
      */
-    protected static final String SEMANTIC_CONDITION_EXPRESSION_EDEFAULT = "";
+    protected static final String SEMANTIC_CONDITION_EXPRESSION_EDEFAULT = ""; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getSemanticConditionExpression()
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 13d182ae40..925c61149b 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
@@ -63,7 +63,7 @@ public abstract class AbstractNodeMappingImpl extends DiagramElementMappingImpl
      * @generated
      * @ordered
      */
-    protected static final String DOCUMENTATION_EDEFAULT = "";
+    protected static final String DOCUMENTATION_EDEFAULT = ""; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getDocumentation()
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 548595d85b..36fcb2b7e6 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
@@ -175,7 +175,7 @@ public class DiagramDescriptionImpl extends DragAndDropTargetDescriptionImpl imp
      * @generated
      * @ordered
      */
-    protected static final String DOCUMENTATION_EDEFAULT = "";
+    protected static final String DOCUMENTATION_EDEFAULT = ""; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getDocumentation()
@@ -197,7 +197,7 @@ public class DiagramDescriptionImpl extends DragAndDropTargetDescriptionImpl imp
      * @generated
      * @ordered
      */
-    protected static final String END_USER_DOCUMENTATION_EDEFAULT = "";
+    protected static final String END_USER_DOCUMENTATION_EDEFAULT = ""; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getEndUserDocumentation()
@@ -218,7 +218,7 @@ public class DiagramDescriptionImpl extends DragAndDropTargetDescriptionImpl imp
      * @generated
      * @ordered
      */
-    protected static final String NAME_EDEFAULT = "";
+    protected static final String NAME_EDEFAULT = ""; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
@@ -259,7 +259,7 @@ public class DiagramDescriptionImpl extends DragAndDropTargetDescriptionImpl imp
      * @generated
      * @ordered
      */
-    protected static final String TITLE_EXPRESSION_EDEFAULT = "";
+    protected static final String TITLE_EXPRESSION_EDEFAULT = ""; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getTitleExpression()
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 4a84bc14f0..f38d2210d8 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
@@ -91,7 +91,7 @@ public abstract class DiagramElementMappingImpl extends RepresentationElementMap
      * @generated
      * @ordered
      */
-    protected static final String PRECONDITION_EXPRESSION_EDEFAULT = "";
+    protected static final String PRECONDITION_EXPRESSION_EDEFAULT = ""; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getPreconditionExpression()
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 ef1bb16405..95f7010a55 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
@@ -180,7 +180,7 @@ public class DiagramImportDescriptionImpl extends DocumentedElementImpl implemen
      * @generated
      * @ordered
      */
-    protected static final String END_USER_DOCUMENTATION_EDEFAULT = "";
+    protected static final String END_USER_DOCUMENTATION_EDEFAULT = ""; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getEndUserDocumentation()
@@ -201,7 +201,7 @@ public class DiagramImportDescriptionImpl extends DocumentedElementImpl implemen
      * @generated
      * @ordered
      */
-    protected static final String NAME_EDEFAULT = "";
+    protected static final String NAME_EDEFAULT = ""; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
@@ -242,7 +242,7 @@ public class DiagramImportDescriptionImpl extends DocumentedElementImpl implemen
      * @generated
      * @ordered
      */
-    protected static final String TITLE_EXPRESSION_EDEFAULT = "";
+    protected static final String TITLE_EXPRESSION_EDEFAULT = ""; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getTitleExpression()
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 ad37b1e175..5ff24ab0cc 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
@@ -97,7 +97,7 @@ public class EdgeMappingImpl extends DiagramElementMappingImpl implements EdgeMa
      * @generated
      * @ordered
      */
-    protected static final String DOCUMENTATION_EDEFAULT = "";
+    protected static final String DOCUMENTATION_EDEFAULT = ""; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getDocumentation()
@@ -141,7 +141,7 @@ public class EdgeMappingImpl extends DiagramElementMappingImpl implements EdgeMa
      * @generated
      * @ordered
      */
-    protected static final String TARGET_FINDER_EXPRESSION_EDEFAULT = "";
+    protected static final String TARGET_FINDER_EXPRESSION_EDEFAULT = ""; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getTargetFinderExpression()
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 08f67dafb6..0a7a83ef9e 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
@@ -65,7 +65,7 @@ public class EdgeMappingImportImpl extends DocumentedElementImpl implements Edge
      * @generated
      * @ordered
      */
-    protected static final String NAME_EDEFAULT = "";
+    protected static final String NAME_EDEFAULT = ""; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
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 9b6bd50e95..2d6b504c9b 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
@@ -99,7 +99,7 @@ public class LayerImpl extends DocumentedElementImpl implements Layer {
      * @generated
      * @ordered
      */
-    protected static final String END_USER_DOCUMENTATION_EDEFAULT = "";
+    protected static final String END_USER_DOCUMENTATION_EDEFAULT = ""; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getEndUserDocumentation()
@@ -120,7 +120,7 @@ public class LayerImpl extends DocumentedElementImpl implements Layer {
      * @generated
      * @ordered
      */
-    protected static final String NAME_EDEFAULT = "";
+    protected static final String NAME_EDEFAULT = ""; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/StylePackage.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/StylePackage.java
index 17f363f3ae..2a869dc6b5 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/StylePackage.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/StylePackage.java
@@ -37,21 +37,21 @@ public interface StylePackage extends EPackage {
      * 
      * @generated
      */
-    String eNAME = "style";
+    String eNAME = "style"; //$NON-NLS-1$
 
     /**
      * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
      * @generated
      */
-    String eNS_URI = "http://www.eclipse.org/sirius/diagram/description/style/1.1.0";
+    String eNS_URI = "http://www.eclipse.org/sirius/diagram/description/style/1.1.0"; //$NON-NLS-1$
 
     /**
      * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
      * @generated
      */
-    String eNS_PREFIX = "style";
+    String eNS_PREFIX = "style"; //$NON-NLS-1$
 
     /**
      * The singleton instance of the package. <!-- begin-user-doc --> <!--
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 6ccacf1b3b..c200dd83e1 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
@@ -51,7 +51,7 @@ public class BorderedStyleDescriptionImpl extends MinimalEObjectImpl.Container i
      * @generated
      * @ordered
      */
-    protected static final String BORDER_SIZE_COMPUTATION_EXPRESSION_EDEFAULT = "0";
+    protected static final String BORDER_SIZE_COMPUTATION_EXPRESSION_EDEFAULT = "0"; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getBorderSizeComputationExpression()
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 1c208b8d47..cb0f734729 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
@@ -92,7 +92,7 @@ public abstract class ContainerStyleDescriptionImpl extends RoundedCornerStyleDe
      * @generated
      * @ordered
      */
-    protected static final String BORDER_SIZE_COMPUTATION_EXPRESSION_EDEFAULT = "0";
+    protected static final String BORDER_SIZE_COMPUTATION_EXPRESSION_EDEFAULT = "0"; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getBorderSizeComputationExpression()
@@ -196,7 +196,7 @@ public abstract class ContainerStyleDescriptionImpl extends RoundedCornerStyleDe
      * @generated
      * @ordered
      */
-    protected static final String LABEL_EXPRESSION_EDEFAULT = "feature:name";
+    protected static final String LABEL_EXPRESSION_EDEFAULT = "feature:name"; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getLabelExpression()
@@ -227,7 +227,7 @@ public abstract class ContainerStyleDescriptionImpl extends RoundedCornerStyleDe
      * @generated
      * @ordered
      */
-    protected static final String ICON_PATH_EDEFAULT = "";
+    protected static final String ICON_PATH_EDEFAULT = ""; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getIconPath() <em>Icon Path</em>}'
@@ -270,7 +270,7 @@ public abstract class ContainerStyleDescriptionImpl extends RoundedCornerStyleDe
      * @generated
      * @ordered
      */
-    protected static final String TOOLTIP_EXPRESSION_EDEFAULT = "";
+    protected static final String TOOLTIP_EXPRESSION_EDEFAULT = ""; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getTooltipExpression()
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 ac0b2b473a..529c3a4350 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
@@ -57,7 +57,7 @@ public class DotDescriptionImpl extends NodeStyleDescriptionImpl implements DotD
      * @generated
      * @ordered
      */
-    protected static final String STROKE_SIZE_COMPUTATION_EXPRESSION_EDEFAULT = "2";
+    protected static final String STROKE_SIZE_COMPUTATION_EXPRESSION_EDEFAULT = "2"; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getStrokeSizeComputationExpression()
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 1ea00ba2ae..6023e4cd56 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
@@ -164,7 +164,7 @@ public class EdgeStyleDescriptionImpl extends MinimalEObjectImpl.Container imple
      * @generated
      * @ordered
      */
-    protected static final String SIZE_COMPUTATION_EXPRESSION_EDEFAULT = "1";
+    protected static final String SIZE_COMPUTATION_EXPRESSION_EDEFAULT = "1"; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getSizeComputationExpression()
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 85a16a4a23..4430b5b911 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
@@ -60,7 +60,7 @@ public class EllipseNodeDescriptionImpl extends NodeStyleDescriptionImpl impleme
      * @generated
      * @ordered
      */
-    protected static final String HORIZONTAL_DIAMETER_COMPUTATION_EXPRESSION_EDEFAULT = "0";
+    protected static final String HORIZONTAL_DIAMETER_COMPUTATION_EXPRESSION_EDEFAULT = "0"; //$NON-NLS-1$
 
     /**
      * The cached value of the '
@@ -84,7 +84,7 @@ public class EllipseNodeDescriptionImpl extends NodeStyleDescriptionImpl impleme
      * @generated
      * @ordered
      */
-    protected static final String VERTICAL_DIAMETER_COMPUTATION_EXPRESSION_EDEFAULT = "0";
+    protected static final String VERTICAL_DIAMETER_COMPUTATION_EXPRESSION_EDEFAULT = "0"; //$NON-NLS-1$
 
     /**
      * The cached value of the '
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 a897ec4c0d..da6d62e7ee 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
@@ -61,7 +61,7 @@ public class FlatContainerStyleDescriptionImpl extends ContainerStyleDescription
      * @generated
      * @ordered
      */
-    protected static final String WIDTH_COMPUTATION_EXPRESSION_EDEFAULT = "-1";
+    protected static final String WIDTH_COMPUTATION_EXPRESSION_EDEFAULT = "-1"; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getWidthComputationExpression()
@@ -83,7 +83,7 @@ public class FlatContainerStyleDescriptionImpl extends ContainerStyleDescription
      * @generated
      * @ordered
      */
-    protected static final String HEIGHT_COMPUTATION_EXPRESSION_EDEFAULT = "-1";
+    protected static final String HEIGHT_COMPUTATION_EXPRESSION_EDEFAULT = "-1"; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getHeightComputationExpression()
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 4bf1966df3..65e8cc9652 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
@@ -59,7 +59,7 @@ public class GaugeSectionDescriptionImpl extends MinimalEObjectImpl.Container im
      * @generated
      * @ordered
      */
-    protected static final String MIN_VALUE_EXPRESSION_EDEFAULT = "0";
+    protected static final String MIN_VALUE_EXPRESSION_EDEFAULT = "0"; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getMinValueExpression()
@@ -81,7 +81,7 @@ public class GaugeSectionDescriptionImpl extends MinimalEObjectImpl.Container im
      * @generated
      * @ordered
      */
-    protected static final String MAX_VALUE_EXPRESSION_EDEFAULT = "0";
+    protected static final String MAX_VALUE_EXPRESSION_EDEFAULT = "0"; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getMaxValueExpression()
@@ -103,7 +103,7 @@ public class GaugeSectionDescriptionImpl extends MinimalEObjectImpl.Container im
      * @generated
      * @ordered
      */
-    protected static final String VALUE_EXPRESSION_EDEFAULT = "0";
+    protected static final String VALUE_EXPRESSION_EDEFAULT = "0"; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getValueExpression()
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 d09a716ca4..69e0186bdc 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
@@ -101,7 +101,7 @@ public abstract class NodeStyleDescriptionImpl extends MinimalEObjectImpl.Contai
      * @generated
      * @ordered
      */
-    protected static final String BORDER_SIZE_COMPUTATION_EXPRESSION_EDEFAULT = "0";
+    protected static final String BORDER_SIZE_COMPUTATION_EXPRESSION_EDEFAULT = "0"; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getBorderSizeComputationExpression()
@@ -205,7 +205,7 @@ public abstract class NodeStyleDescriptionImpl extends MinimalEObjectImpl.Contai
      * @generated
      * @ordered
      */
-    protected static final String LABEL_EXPRESSION_EDEFAULT = "feature:name";
+    protected static final String LABEL_EXPRESSION_EDEFAULT = "feature:name"; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getLabelExpression()
@@ -236,7 +236,7 @@ public abstract class NodeStyleDescriptionImpl extends MinimalEObjectImpl.Contai
      * @generated
      * @ordered
      */
-    protected static final String ICON_PATH_EDEFAULT = "";
+    protected static final String ICON_PATH_EDEFAULT = ""; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getIconPath() <em>Icon Path</em>}'
@@ -279,7 +279,7 @@ public abstract class NodeStyleDescriptionImpl extends MinimalEObjectImpl.Contai
      * @generated
      * @ordered
      */
-    protected static final String TOOLTIP_EXPRESSION_EDEFAULT = "";
+    protected static final String TOOLTIP_EXPRESSION_EDEFAULT = ""; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getTooltipExpression()
@@ -323,7 +323,7 @@ public abstract class NodeStyleDescriptionImpl extends MinimalEObjectImpl.Contai
      * @generated
      * @ordered
      */
-    protected static final String SIZE_COMPUTATION_EXPRESSION_EDEFAULT = "3";
+    protected static final String SIZE_COMPUTATION_EXPRESSION_EDEFAULT = "3"; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getSizeComputationExpression()
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 872f14799c..e7ff49b2dc 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
@@ -54,7 +54,7 @@ public class ShapeContainerStyleDescriptionImpl extends ContainerStyleDescriptio
      * @generated
      * @ordered
      */
-    protected static final String WIDTH_COMPUTATION_EXPRESSION_EDEFAULT = "-1";
+    protected static final String WIDTH_COMPUTATION_EXPRESSION_EDEFAULT = "-1"; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getWidthComputationExpression()
@@ -76,7 +76,7 @@ public class ShapeContainerStyleDescriptionImpl extends ContainerStyleDescriptio
      * @generated
      * @ordered
      */
-    protected static final String HEIGHT_COMPUTATION_EXPRESSION_EDEFAULT = "-1";
+    protected static final String HEIGHT_COMPUTATION_EXPRESSION_EDEFAULT = "-1"; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getHeightComputationExpression()
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 1cba50b6b0..7a0eed965f 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
@@ -46,7 +46,7 @@ public abstract class SizeComputationContainerStyleDescriptionImpl extends Minim
      * @generated
      * @ordered
      */
-    protected static final String WIDTH_COMPUTATION_EXPRESSION_EDEFAULT = "-1";
+    protected static final String WIDTH_COMPUTATION_EXPRESSION_EDEFAULT = "-1"; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getWidthComputationExpression()
@@ -68,7 +68,7 @@ public abstract class SizeComputationContainerStyleDescriptionImpl extends Minim
      * @generated
      * @ordered
      */
-    protected static final String HEIGHT_COMPUTATION_EXPRESSION_EDEFAULT = "-1";
+    protected static final String HEIGHT_COMPUTATION_EXPRESSION_EDEFAULT = "-1"; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getHeightComputationExpression()
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/ReconnectionKind.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/ReconnectionKind.java
index f66fec938a..10b060b1be 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/ReconnectionKind.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/ReconnectionKind.java
@@ -35,7 +35,7 @@ public enum ReconnectionKind implements Enumerator {
      * @generated
      * @ordered
      */
-    RECONNECT_TARGET_LITERAL(0, "RECONNECT_TARGET", "RECONNECT_TARGET"),
+    RECONNECT_TARGET_LITERAL(0, "RECONNECT_TARGET", "RECONNECT_TARGET"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>RECONNECT SOURCE</b></em>' literal object. <!--
@@ -45,7 +45,7 @@ public enum ReconnectionKind implements Enumerator {
      * @generated
      * @ordered
      */
-    RECONNECT_SOURCE_LITERAL(1, "RECONNECT_SOURCE", "RECONNECT_SOURCE"),
+    RECONNECT_SOURCE_LITERAL(1, "RECONNECT_SOURCE", "RECONNECT_SOURCE"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>RECONNECT BOTH</b></em>' literal object. <!-- begin-user-doc
@@ -55,7 +55,7 @@ public enum ReconnectionKind implements Enumerator {
      * @generated
      * @ordered
      */
-    RECONNECT_BOTH_LITERAL(2, "RECONNECT_BOTH", "RECONNECT_BOTH");
+    RECONNECT_BOTH_LITERAL(2, "RECONNECT_BOTH", "RECONNECT_BOTH"); //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>RECONNECT TARGET</b></em>' literal value. <!-- begin-user-doc
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/ToolPackage.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/ToolPackage.java
index 1528543e0d..08162f7c18 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/ToolPackage.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/ToolPackage.java
@@ -39,21 +39,21 @@ public interface ToolPackage extends EPackage {
      * 
      * @generated
      */
-    String eNAME = "tool";
+    String eNAME = "tool"; //$NON-NLS-1$
 
     /**
      * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
      * @generated
      */
-    String eNS_URI = "http://www.eclipse.org/sirius/diagram/description/tool/1.1.0";
+    String eNS_URI = "http://www.eclipse.org/sirius/diagram/description/tool/1.1.0"; //$NON-NLS-1$
 
     /**
      * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
      * @generated
      */
-    String eNS_PREFIX = "tool";
+    String eNS_PREFIX = "tool"; //$NON-NLS-1$
 
     /**
      * The singleton instance of the package. <!-- begin-user-doc --> <!--
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 33e82e29fe..1d49c0ca6c 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
@@ -47,7 +47,7 @@ public class BehaviorToolImpl extends AbstractToolDescriptionImpl implements Beh
      * @generated
      * @ordered
      */
-    protected static final String DOMAIN_CLASS_EDEFAULT = "EObject";
+    protected static final String DOMAIN_CLASS_EDEFAULT = "EObject"; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getDomainClass() <em>Domain Class</em>}'
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 4a87a971ba..87b6030a4e 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
@@ -110,7 +110,7 @@ public class ContainerCreationDescriptionImpl extends MappingBasedToolDescriptio
      * @generated
      * @ordered
      */
-    protected static final String ICON_PATH_EDEFAULT = "";
+    protected static final String ICON_PATH_EDEFAULT = ""; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getIconPath() <em>Icon Path</em>}'
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 a11c9a82cc..f414a34c5a 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
@@ -60,7 +60,7 @@ public class CreateViewImpl extends ContainerModelOperationImpl implements Creat
      * @generated
      * @ordered
      */
-    protected static final String CONTAINER_VIEW_EXPRESSION_EDEFAULT = "";
+    protected static final String CONTAINER_VIEW_EXPRESSION_EDEFAULT = ""; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getContainerViewExpression()
@@ -82,7 +82,7 @@ public class CreateViewImpl extends ContainerModelOperationImpl implements Creat
      * @generated
      * @ordered
      */
-    protected static final String VARIABLE_NAME_EDEFAULT = "createdView";
+    protected static final String VARIABLE_NAME_EDEFAULT = "createdView"; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getVariableName()
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 67e92ed524..ab516acd60 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
@@ -149,7 +149,7 @@ public class EdgeCreationDescriptionImpl extends MappingBasedToolDescriptionImpl
      * @generated
      * @ordered
      */
-    protected static final String ICON_PATH_EDEFAULT = "";
+    protected static final String ICON_PATH_EDEFAULT = ""; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getIconPath() <em>Icon Path</em>}'
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 ad00581d46..80f37d1d17 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
@@ -110,7 +110,7 @@ public class NodeCreationDescriptionImpl extends MappingBasedToolDescriptionImpl
      * @generated
      * @ordered
      */
-    protected static final String ICON_PATH_EDEFAULT = "";
+    protected static final String ICON_PATH_EDEFAULT = ""; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getIconPath() <em>Icon Path</em>}'
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 145ef273cb..a705603662 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
@@ -238,9 +238,9 @@ public class ToolFactoryImpl extends EFactoryImpl implements ToolFactory {
     public NodeCreationDescription createNodeCreationDescription() {
         NodeCreationDescriptionImpl nodeCreationDescription = new NodeCreationDescriptionImpl();
         NodeCreationVariable defaultVariable = createNodeCreationVariable();
-        defaultVariable.setName("container");
+        defaultVariable.setName("container"); //$NON-NLS-1$
         ContainerViewVariable containerViewVariable = org.eclipse.sirius.viewpoint.description.tool.ToolFactory.eINSTANCE.createContainerViewVariable();
-        containerViewVariable.setName("containerView");
+        containerViewVariable.setName("containerView"); //$NON-NLS-1$
         nodeCreationDescription.setVariable(defaultVariable);
         nodeCreationDescription.setViewVariable(containerViewVariable);
         InitialNodeCreationOperation init = org.eclipse.sirius.viewpoint.description.tool.ToolFactory.eINSTANCE.createInitialNodeCreationOperation();
@@ -258,16 +258,16 @@ public class ToolFactoryImpl extends EFactoryImpl implements ToolFactory {
         EdgeCreationDescriptionImpl edgeCreationDescription = new EdgeCreationDescriptionSpec();
 
         SourceEdgeCreationVariable sourceVariable = createSourceEdgeCreationVariable();
-        sourceVariable.setName("source");
+        sourceVariable.setName("source"); //$NON-NLS-1$
 
         TargetEdgeCreationVariable targetVariable = createTargetEdgeCreationVariable();
-        targetVariable.setName("target");
+        targetVariable.setName("target"); //$NON-NLS-1$
 
         SourceEdgeViewCreationVariable sourceEdgeViewVariable = createSourceEdgeViewCreationVariable();
-        sourceEdgeViewVariable.setName("sourceView");
+        sourceEdgeViewVariable.setName("sourceView"); //$NON-NLS-1$
 
         TargetEdgeViewCreationVariable targetEdgeViewVariable = createTargetEdgeViewCreationVariable();
-        targetEdgeViewVariable.setName("targetView");
+        targetEdgeViewVariable.setName("targetView"); //$NON-NLS-1$
 
         edgeCreationDescription.setSourceVariable(sourceVariable);
         edgeCreationDescription.setTargetVariable(targetVariable);
@@ -289,9 +289,9 @@ public class ToolFactoryImpl extends EFactoryImpl implements ToolFactory {
     public ContainerCreationDescription createContainerCreationDescription() {
         ContainerCreationDescriptionImpl containerCreationDescription = new ContainerCreationDescriptionImpl();
         NodeCreationVariable defaultVariable = createNodeCreationVariable();
-        defaultVariable.setName("container");
+        defaultVariable.setName("container"); //$NON-NLS-1$
         ContainerViewVariable containerViewVariable = org.eclipse.sirius.viewpoint.description.tool.ToolFactory.eINSTANCE.createContainerViewVariable();
-        containerViewVariable.setName("containerView");
+        containerViewVariable.setName("containerView"); //$NON-NLS-1$
         containerCreationDescription.setVariable(defaultVariable);
         containerCreationDescription.setViewVariable(containerViewVariable);
         InitialNodeCreationOperation init = org.eclipse.sirius.viewpoint.description.tool.ToolFactory.eINSTANCE.createInitialNodeCreationOperation();
@@ -308,13 +308,13 @@ public class ToolFactoryImpl extends EFactoryImpl implements ToolFactory {
     public DeleteElementDescription createDeleteElementDescription() {
         DeleteElementDescriptionImpl deleteElementDescription = new DeleteElementDescriptionSpec();
         ElementDeleteVariable elementDeleteVariable = org.eclipse.sirius.viewpoint.description.tool.ToolFactory.eINSTANCE.createElementDeleteVariable();
-        elementDeleteVariable.setName("element");
+        elementDeleteVariable.setName("element"); //$NON-NLS-1$
         deleteElementDescription.setElement(elementDeleteVariable);
         ContainerViewVariable containerViewVariable = org.eclipse.sirius.viewpoint.description.tool.ToolFactory.eINSTANCE.createContainerViewVariable();
-        containerViewVariable.setName("containerView");
+        containerViewVariable.setName("containerView"); //$NON-NLS-1$
         deleteElementDescription.setContainerView(containerViewVariable);
         ElementDeleteVariable elementDeleteVariable2 = org.eclipse.sirius.viewpoint.description.tool.ToolFactory.eINSTANCE.createElementDeleteVariable();
-        elementDeleteVariable2.setName("elementView");
+        elementDeleteVariable2.setName("elementView"); //$NON-NLS-1$
         deleteElementDescription.setElementView(elementDeleteVariable2);
         InitialOperation init = org.eclipse.sirius.viewpoint.description.tool.ToolFactory.eINSTANCE.createInitialOperation();
         deleteElementDescription.setInitialOperation(init);
@@ -330,10 +330,10 @@ public class ToolFactoryImpl extends EFactoryImpl implements ToolFactory {
     public DoubleClickDescription createDoubleClickDescription() {
         DoubleClickDescriptionImpl doubleClickDescription = new DoubleClickDescriptionImpl();
         ElementDoubleClickVariable elementDoubleClickVariable = createElementDoubleClickVariable();
-        elementDoubleClickVariable.setName("element");
+        elementDoubleClickVariable.setName("element"); //$NON-NLS-1$
         doubleClickDescription.setElement(elementDoubleClickVariable);
         ElementDoubleClickVariable elementViewDoubleClickVariable = createElementDoubleClickVariable();
-        elementViewDoubleClickVariable.setName("elementView");
+        elementViewDoubleClickVariable.setName("elementView"); //$NON-NLS-1$
         doubleClickDescription.setElementView(elementViewDoubleClickVariable);
         InitialOperation init = org.eclipse.sirius.viewpoint.description.tool.ToolFactory.eINSTANCE.createInitialOperation();
         doubleClickDescription.setInitialOperation(init);
@@ -371,22 +371,22 @@ public class ToolFactoryImpl extends EFactoryImpl implements ToolFactory {
     public ReconnectEdgeDescription createReconnectEdgeDescription() {
         ReconnectEdgeDescriptionImpl reconnectEdgeDescription = new ReconnectEdgeDescriptionSpec();
         ElementSelectVariable elementSelectVariable = org.eclipse.sirius.viewpoint.description.tool.ToolFactory.eINSTANCE.createElementSelectVariable();
-        elementSelectVariable.setName("element");
+        elementSelectVariable.setName("element"); //$NON-NLS-1$
         reconnectEdgeDescription.setElement(elementSelectVariable);
         SourceEdgeCreationVariable sourceEdgeCreationVariable = createSourceEdgeCreationVariable();
-        sourceEdgeCreationVariable.setName("source");
+        sourceEdgeCreationVariable.setName("source"); //$NON-NLS-1$
         reconnectEdgeDescription.setSource(sourceEdgeCreationVariable);
         SourceEdgeViewCreationVariable sourceEdgeViewCreationVariable = createSourceEdgeViewCreationVariable();
-        sourceEdgeViewCreationVariable.setName("sourceView");
+        sourceEdgeViewCreationVariable.setName("sourceView"); //$NON-NLS-1$
         reconnectEdgeDescription.setSourceView(sourceEdgeViewCreationVariable);
         TargetEdgeCreationVariable targetEdgeCreationVariable = createTargetEdgeCreationVariable();
-        targetEdgeCreationVariable.setName("target");
+        targetEdgeCreationVariable.setName("target"); //$NON-NLS-1$
         reconnectEdgeDescription.setTarget(targetEdgeCreationVariable);
         TargetEdgeViewCreationVariable targetEdgeViewCreationVariable = createTargetEdgeViewCreationVariable();
-        targetEdgeViewCreationVariable.setName("targetView");
+        targetEdgeViewCreationVariable.setName("targetView"); //$NON-NLS-1$
         reconnectEdgeDescription.setTargetView(targetEdgeViewCreationVariable);
         ElementSelectVariable edgeVariable = org.eclipse.sirius.viewpoint.description.tool.ToolFactory.eINSTANCE.createElementSelectVariable();
-        edgeVariable.setName("edgeView");
+        edgeVariable.setName("edgeView"); //$NON-NLS-1$
         reconnectEdgeDescription.setEdgeView(edgeVariable);
         InitialOperation initialOperation = org.eclipse.sirius.viewpoint.description.tool.ToolFactory.eINSTANCE.createInitialOperation();
         reconnectEdgeDescription.setInitialOperation(initialOperation);
@@ -540,10 +540,10 @@ public class ToolFactoryImpl extends EFactoryImpl implements ToolFactory {
     public DiagramCreationDescription createDiagramCreationDescription() {
         DiagramCreationDescriptionImpl diagramCreationDescription = new DiagramCreationDescriptionSpec();
         ContainerViewVariable containerViewVariable = org.eclipse.sirius.viewpoint.description.tool.ToolFactory.eINSTANCE.createContainerViewVariable();
-        containerViewVariable.setName("containerView");
+        containerViewVariable.setName("containerView"); //$NON-NLS-1$
         diagramCreationDescription.setContainerViewVariable(containerViewVariable);
         NameVariable diagramNameVariable = org.eclipse.sirius.viewpoint.description.tool.ToolFactory.eINSTANCE.createNameVariable();
-        diagramNameVariable.setName("diagramName");
+        diagramNameVariable.setName("diagramName"); //$NON-NLS-1$
         diagramCreationDescription.setRepresentationNameVariable(diagramNameVariable);
         InitialOperation init = org.eclipse.sirius.viewpoint.description.tool.ToolFactory.eINSTANCE.createInitialOperation();
         diagramCreationDescription.setInitialOperation(init);
@@ -559,13 +559,13 @@ public class ToolFactoryImpl extends EFactoryImpl implements ToolFactory {
     public DiagramNavigationDescription createDiagramNavigationDescription() {
         DiagramNavigationDescriptionImpl diagramNavigationDescription = new DiagramNavigationDescriptionSpec();
         ContainerViewVariable containerViewVariable = org.eclipse.sirius.viewpoint.description.tool.ToolFactory.eINSTANCE.createContainerViewVariable();
-        containerViewVariable.setName("containerView");
+        containerViewVariable.setName("containerView"); //$NON-NLS-1$
         diagramNavigationDescription.setContainerViewVariable(containerViewVariable);
         ElementSelectVariable containerVariable = org.eclipse.sirius.viewpoint.description.tool.ToolFactory.eINSTANCE.createElementSelectVariable();
-        containerVariable.setName("container");
+        containerVariable.setName("container"); //$NON-NLS-1$
         diagramNavigationDescription.setContainerVariable(containerVariable);
         NameVariable diagramNameVariable = org.eclipse.sirius.viewpoint.description.tool.ToolFactory.eINSTANCE.createNameVariable();
-        diagramNameVariable.setName("diagramName");
+        diagramNameVariable.setName("diagramName"); //$NON-NLS-1$
         diagramNavigationDescription.setRepresentationNameVariable(diagramNameVariable);
         return diagramNavigationDescription;
     }
@@ -579,13 +579,13 @@ public class ToolFactoryImpl extends EFactoryImpl implements ToolFactory {
     public ContainerDropDescription createContainerDropDescription() {
         ContainerDropDescriptionImpl containerDropDescription = new ContainerDropDescriptionSpec();
         DropContainerVariable oldContainerVariable = org.eclipse.sirius.viewpoint.description.tool.ToolFactory.eINSTANCE.createDropContainerVariable();
-        oldContainerVariable.setName("oldSemanticContainer");
+        oldContainerVariable.setName("oldSemanticContainer"); //$NON-NLS-1$
         DropContainerVariable newContainerVariable = org.eclipse.sirius.viewpoint.description.tool.ToolFactory.eINSTANCE.createDropContainerVariable();
-        newContainerVariable.setName("newSemanticContainer");
+        newContainerVariable.setName("newSemanticContainer"); //$NON-NLS-1$
         ElementDropVariable elementDropVariable = org.eclipse.sirius.viewpoint.description.tool.ToolFactory.eINSTANCE.createElementDropVariable();
-        elementDropVariable.setName("element");
+        elementDropVariable.setName("element"); //$NON-NLS-1$
         ContainerViewVariable containerViewVariable = org.eclipse.sirius.viewpoint.description.tool.ToolFactory.eINSTANCE.createContainerViewVariable();
-        containerViewVariable.setName("newContainerView");
+        containerViewVariable.setName("newContainerView"); //$NON-NLS-1$
 
         containerDropDescription.setElement(elementDropVariable);
         containerDropDescription.setNewContainer(newContainerVariable);
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 9c7dc5d170..2f24db0c9c 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
@@ -57,7 +57,7 @@ public class ToolGroupImpl extends DocumentedElementImpl implements ToolGroup {
      * @generated
      * @ordered
      */
-    protected static final String NAME_EDEFAULT = "";
+    protected static final String NAME_EDEFAULT = ""; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
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 4f5be2136b..667881a198 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
@@ -75,7 +75,7 @@ public class ToolSectionImpl extends DocumentedElementImpl implements ToolSectio
      * @generated
      * @ordered
      */
-    protected static final String NAME_EDEFAULT = "";
+    protected static final String NAME_EDEFAULT = ""; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
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 3f3cc1d602..2d9253adf7 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
@@ -73,7 +73,7 @@ public class BorderedStyleImpl extends StyleImpl implements BorderedStyle {
      * @generated
      * @ordered
      */
-    protected static final String BORDER_SIZE_COMPUTATION_EXPRESSION_EDEFAULT = "0";
+    protected static final String BORDER_SIZE_COMPUTATION_EXPRESSION_EDEFAULT = "0"; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getBorderSizeComputationExpression()
@@ -94,7 +94,7 @@ public class BorderedStyleImpl extends StyleImpl implements BorderedStyle {
      * @generated
      * @ordered
      */
-    protected static final RGBValues BORDER_COLOR_EDEFAULT = (RGBValues) ViewpointFactory.eINSTANCE.createFromString(ViewpointPackage.eINSTANCE.getRGBValues(), "0,0,0");
+    protected static final RGBValues BORDER_COLOR_EDEFAULT = (RGBValues) ViewpointFactory.eINSTANCE.createFromString(ViewpointPackage.eINSTANCE.getRGBValues(), "0,0,0"); //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getBorderColor() <em>Border Color</em>}'
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 d19b0f7aaf..f79bd1eba9 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
@@ -65,7 +65,7 @@ public class BundledImageImpl extends NodeStyleImpl implements BundledImage {
      * @generated
      * @ordered
      */
-    protected static final RGBValues COLOR_EDEFAULT = (RGBValues) ViewpointFactory.eINSTANCE.createFromString(ViewpointPackage.eINSTANCE.getRGBValues(), "0,0,0");
+    protected static final RGBValues COLOR_EDEFAULT = (RGBValues) ViewpointFactory.eINSTANCE.createFromString(ViewpointPackage.eINSTANCE.getRGBValues(), "0,0,0"); //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getColor() <em>Color</em>}' attribute.
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 627f6a5af5..e688f9a77a 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
@@ -94,7 +94,7 @@ public abstract class ContainerStyleImpl extends LabelStyleImpl implements Conta
      * @generated
      * @ordered
      */
-    protected static final String BORDER_SIZE_COMPUTATION_EXPRESSION_EDEFAULT = "0";
+    protected static final String BORDER_SIZE_COMPUTATION_EXPRESSION_EDEFAULT = "0"; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getBorderSizeComputationExpression()
@@ -115,7 +115,7 @@ public abstract class ContainerStyleImpl extends LabelStyleImpl implements Conta
      * @generated
      * @ordered
      */
-    protected static final RGBValues BORDER_COLOR_EDEFAULT = (RGBValues) ViewpointFactory.eINSTANCE.createFromString(ViewpointPackage.eINSTANCE.getRGBValues(), "0,0,0");
+    protected static final RGBValues BORDER_COLOR_EDEFAULT = (RGBValues) ViewpointFactory.eINSTANCE.createFromString(ViewpointPackage.eINSTANCE.getRGBValues(), "0,0,0"); //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getBorderColor() <em>Border Color</em>}'
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 479e8b3b65..7057880bd9 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
@@ -259,7 +259,7 @@ public class DEdgeImpl extends DDiagramElementImpl implements DEdge {
      * @generated
      * @ordered
      */
-    protected static final String BEGIN_LABEL_EDEFAULT = "";
+    protected static final String BEGIN_LABEL_EDEFAULT = ""; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getBeginLabel() <em>Begin Label</em>}'
@@ -279,7 +279,7 @@ public class DEdgeImpl extends DDiagramElementImpl implements DEdge {
      * @generated
      * @ordered
      */
-    protected static final String END_LABEL_EDEFAULT = "";
+    protected static final String END_LABEL_EDEFAULT = ""; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getEndLabel() <em>End Label</em>}'
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 7812692469..bdf73ff0a4 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
@@ -46,7 +46,7 @@ public class DotImpl extends NodeStyleImpl implements Dot {
      * @generated
      * @ordered
      */
-    protected static final String STROKE_SIZE_COMPUTATION_EXPRESSION_EDEFAULT = "2";
+    protected static final String STROKE_SIZE_COMPUTATION_EXPRESSION_EDEFAULT = "2"; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getStrokeSizeComputationExpression()
@@ -68,7 +68,7 @@ public class DotImpl extends NodeStyleImpl implements Dot {
      * @generated
      * @ordered
      */
-    protected static final RGBValues BACKGROUND_COLOR_EDEFAULT = (RGBValues) ViewpointFactory.eINSTANCE.createFromString(ViewpointPackage.eINSTANCE.getRGBValues(), "136,136,136");
+    protected static final RGBValues BACKGROUND_COLOR_EDEFAULT = (RGBValues) ViewpointFactory.eINSTANCE.createFromString(ViewpointPackage.eINSTANCE.getRGBValues(), "136,136,136"); //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getBackgroundColor()
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 c87af9cfd4..ceb23cc79e 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
@@ -250,7 +250,7 @@ public class EdgeStyleImpl extends StyleImpl implements EdgeStyle {
      * @generated
      * @ordered
      */
-    protected static final RGBValues STROKE_COLOR_EDEFAULT = (RGBValues) ViewpointFactory.eINSTANCE.createFromString(ViewpointPackage.eINSTANCE.getRGBValues(), "136,136,136");
+    protected static final RGBValues STROKE_COLOR_EDEFAULT = (RGBValues) ViewpointFactory.eINSTANCE.createFromString(ViewpointPackage.eINSTANCE.getRGBValues(), "136,136,136"); //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getStrokeColor() <em>Stroke Color</em>}'
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 25974e788d..0396e8e920 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
@@ -90,7 +90,7 @@ public class EllipseImpl extends NodeStyleImpl implements Ellipse {
      * @generated
      * @ordered
      */
-    protected static final RGBValues COLOR_EDEFAULT = (RGBValues) ViewpointFactory.eINSTANCE.createFromString(ViewpointPackage.eINSTANCE.getRGBValues(), "136,136,136");
+    protected static final RGBValues COLOR_EDEFAULT = (RGBValues) ViewpointFactory.eINSTANCE.createFromString(ViewpointPackage.eINSTANCE.getRGBValues(), "136,136,136"); //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getColor() <em>Color</em>}' attribute.
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 8c525d97d8..f4c23b336b 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
@@ -73,7 +73,7 @@ public class FlatContainerStyleImpl extends ContainerStyleImpl implements FlatCo
      * @generated
      * @ordered
      */
-    protected static final RGBValues BACKGROUND_COLOR_EDEFAULT = (RGBValues) ViewpointFactory.eINSTANCE.createFromString(ViewpointPackage.eINSTANCE.getRGBValues(), "255,255,255");
+    protected static final RGBValues BACKGROUND_COLOR_EDEFAULT = (RGBValues) ViewpointFactory.eINSTANCE.createFromString(ViewpointPackage.eINSTANCE.getRGBValues(), "255,255,255"); //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getBackgroundColor()
@@ -95,7 +95,7 @@ public class FlatContainerStyleImpl extends ContainerStyleImpl implements FlatCo
      * @generated
      * @ordered
      */
-    protected static final RGBValues FOREGROUND_COLOR_EDEFAULT = (RGBValues) ViewpointFactory.eINSTANCE.createFromString(ViewpointPackage.eINSTANCE.getRGBValues(), "209,209,209");
+    protected static final RGBValues FOREGROUND_COLOR_EDEFAULT = (RGBValues) ViewpointFactory.eINSTANCE.createFromString(ViewpointPackage.eINSTANCE.getRGBValues(), "209,209,209"); //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getForegroundColor()
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 7782b86e80..8611a0b6a5 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
@@ -136,7 +136,7 @@ public class GaugeSectionImpl extends CustomizableImpl implements GaugeSection {
      * @generated
      * @ordered
      */
-    protected static final RGBValues BACKGROUND_COLOR_EDEFAULT = (RGBValues) ViewpointFactory.eINSTANCE.createFromString(ViewpointPackage.eINSTANCE.getRGBValues(), "0,0,0");
+    protected static final RGBValues BACKGROUND_COLOR_EDEFAULT = (RGBValues) ViewpointFactory.eINSTANCE.createFromString(ViewpointPackage.eINSTANCE.getRGBValues(), "0,0,0"); //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getBackgroundColor()
@@ -158,7 +158,7 @@ public class GaugeSectionImpl extends CustomizableImpl implements GaugeSection {
      * @generated
      * @ordered
      */
-    protected static final RGBValues FOREGROUND_COLOR_EDEFAULT = (RGBValues) ViewpointFactory.eINSTANCE.createFromString(ViewpointPackage.eINSTANCE.getRGBValues(), "138,226,52");
+    protected static final RGBValues FOREGROUND_COLOR_EDEFAULT = (RGBValues) ViewpointFactory.eINSTANCE.createFromString(ViewpointPackage.eINSTANCE.getRGBValues(), "138,226,52"); //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getForegroundColor()
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 e6be677c79..0dfe2b8b2c 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
@@ -86,7 +86,7 @@ public class LozengeImpl extends NodeStyleImpl implements Lozenge {
      * @generated
      * @ordered
      */
-    protected static final RGBValues COLOR_EDEFAULT = (RGBValues) ViewpointFactory.eINSTANCE.createFromString(ViewpointPackage.eINSTANCE.getRGBValues(), "136,136,136");
+    protected static final RGBValues COLOR_EDEFAULT = (RGBValues) ViewpointFactory.eINSTANCE.createFromString(ViewpointPackage.eINSTANCE.getRGBValues(), "136,136,136"); //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getColor() <em>Color</em>}' attribute.
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 8763b96b25..283e83f3f1 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
@@ -96,7 +96,7 @@ public abstract class NodeStyleImpl extends LabelStyleImpl implements NodeStyle
      * @generated
      * @ordered
      */
-    protected static final String BORDER_SIZE_COMPUTATION_EXPRESSION_EDEFAULT = "0";
+    protected static final String BORDER_SIZE_COMPUTATION_EXPRESSION_EDEFAULT = "0"; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getBorderSizeComputationExpression()
@@ -117,7 +117,7 @@ public abstract class NodeStyleImpl extends LabelStyleImpl implements NodeStyle
      * @generated
      * @ordered
      */
-    protected static final RGBValues BORDER_COLOR_EDEFAULT = (RGBValues) ViewpointFactory.eINSTANCE.createFromString(ViewpointPackage.eINSTANCE.getRGBValues(), "0,0,0");
+    protected static final RGBValues BORDER_COLOR_EDEFAULT = (RGBValues) ViewpointFactory.eINSTANCE.createFromString(ViewpointPackage.eINSTANCE.getRGBValues(), "0,0,0"); //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getBorderColor() <em>Border Color</em>}'
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 4527b08397..89268fc6fa 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
@@ -41,7 +41,7 @@ public class NoteImpl extends NodeStyleImpl implements Note {
      * @generated
      * @ordered
      */
-    protected static final RGBValues COLOR_EDEFAULT = (RGBValues) ViewpointFactory.eINSTANCE.createFromString(ViewpointPackage.eINSTANCE.getRGBValues(), "252,233,79");
+    protected static final RGBValues COLOR_EDEFAULT = (RGBValues) ViewpointFactory.eINSTANCE.createFromString(ViewpointPackage.eINSTANCE.getRGBValues(), "252,233,79"); //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getColor() <em>Color</em>}' attribute.
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 2de9b0e3d3..72265be94d 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
@@ -67,7 +67,7 @@ public class ShapeContainerStyleImpl extends ContainerStyleImpl implements Shape
      * @generated
      * @ordered
      */
-    protected static final RGBValues BACKGROUND_COLOR_EDEFAULT = (RGBValues) ViewpointFactory.eINSTANCE.createFromString(ViewpointPackage.eINSTANCE.getRGBValues(), "209,209,209");
+    protected static final RGBValues BACKGROUND_COLOR_EDEFAULT = (RGBValues) ViewpointFactory.eINSTANCE.createFromString(ViewpointPackage.eINSTANCE.getRGBValues(), "209,209,209"); //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getBackgroundColor()
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 62a059b034..2b8a25b183 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
@@ -86,7 +86,7 @@ public class SquareImpl extends NodeStyleImpl implements Square {
      * @generated
      * @ordered
      */
-    protected static final RGBValues COLOR_EDEFAULT = (RGBValues) ViewpointFactory.eINSTANCE.createFromString(ViewpointPackage.eINSTANCE.getRGBValues(), "136,136,136");
+    protected static final RGBValues COLOR_EDEFAULT = (RGBValues) ViewpointFactory.eINSTANCE.createFromString(ViewpointPackage.eINSTANCE.getRGBValues(), "136,136,136"); //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getColor() <em>Color</em>}' attribute.
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 34bb2c880c..08c983cc14 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
@@ -107,7 +107,7 @@ public class ColumnMappingItemProvider extends TableMappingItemProvider {
     @Override
     public String getText(Object object) {
         String label = new IdentifiedElementQuery((ColumnMapping) object).getLabel();
-        return StringUtil.isEmpty(label) ? getString("_UI_ColumnMapping_type") : getString("_UI_ColumnMapping_type") + " " + label;
+        return StringUtil.isEmpty(label) ? getString("_UI_ColumnMapping_type") : getString("_UI_ColumnMapping_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
     /**
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 59bf3afad7..17a2a4853d 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
@@ -217,7 +217,7 @@ public class CreateCellToolItemProvider extends TableToolItemProvider {
     @Override
     public String getText(Object object) {
         String label = new IdentifiedElementQuery((CreateCellTool) object).getLabel();
-        return StringUtil.isEmpty(label) ? getString("_UI_CreateCellTool_type") : getString("_UI_CreateCellTool_type") + " " + label;
+        return StringUtil.isEmpty(label) ? getString("_UI_CreateCellTool_type") : getString("_UI_CreateCellTool_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
     /**
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 b6826ecf74..55bb260920 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
@@ -73,7 +73,7 @@ public class CreateColumnToolItemProvider extends CreateToolItemProvider {
     @Override
     public String getText(Object object) {
         String label = new IdentifiedElementQuery((CreateColumnTool) object).getLabel();
-        return StringUtil.isEmpty(label) ? getString("_UI_CreateColumnTool_type") : getString("_UI_CreateColumnTool_type") + " " + label;
+        return StringUtil.isEmpty(label) ? getString("_UI_CreateColumnTool_type") : getString("_UI_CreateColumnTool_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
     /**
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 d3956ac2da..c93daaa8d5 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
@@ -90,7 +90,7 @@ public class CreateCrossColumnToolItemProvider extends CreateToolItemProvider {
     @Override
     public String getText(Object object) {
         String label = new IdentifiedElementQuery((CreateCrossColumnTool) object).getLabel();
-        return StringUtil.isEmpty(label) ? getString("_UI_CreateCrossColumnTool_type") : getString("_UI_CreateCrossColumnTool_type") + " " + label;
+        return StringUtil.isEmpty(label) ? getString("_UI_CreateCrossColumnTool_type") : getString("_UI_CreateCrossColumnTool_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
     /**
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 6aa73fbc4e..05d3ee87f2 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
@@ -90,7 +90,7 @@ public class CreateLineToolItemProvider extends CreateToolItemProvider {
     @Override
     public String getText(Object object) {
         String label = new IdentifiedElementQuery((CreateLineTool) object).getLabel();
-        return StringUtil.isEmpty(label) ? getString("_UI_CreateLineTool_type") : getString("_UI_CreateLineTool_type") + " " + label;
+        return StringUtil.isEmpty(label) ? getString("_UI_CreateLineTool_type") : getString("_UI_CreateLineTool_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
     /**
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 d40d069779..ffd1308144 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
@@ -122,7 +122,7 @@ public class CreateToolItemProvider extends AbstractToolDescriptionItemProvider
     @Override
     public String getText(Object object) {
         String label = new IdentifiedElementQuery((CreateTool) object).getLabel();
-        return StringUtil.isEmpty(label) ? getString("_UI_CreateTool_type") : getString("_UI_CreateTool_type") + " " + label;
+        return StringUtil.isEmpty(label) ? getString("_UI_CreateTool_type") : getString("_UI_CreateTool_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
     /**
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 cf8c87b273..8a249b31cf 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
@@ -114,7 +114,7 @@ public class CrossTableDescriptionItemProvider extends TableDescriptionItemProvi
     @Override
     public String getText(Object object) {
         String label = new IdentifiedElementQuery((CrossTableDescription) object).getLabel();
-        return label == null || label.length() == 0 ? getString("_UI_CrossTableDescription_type") : label;
+        return label == null || label.length() == 0 ? getString("_UI_CrossTableDescription_type") : label; //$NON-NLS-1$
     }
 
     /**
@@ -154,7 +154,7 @@ public class CrossTableDescriptionItemProvider extends TableDescriptionItemProvi
 
         IntersectionMapping newIntersection = DescriptionFactory.eINSTANCE.createIntersectionMapping();
 
-        newIntersection.setLabelExpression("X");
+        newIntersection.setLabelExpression("X"); //$NON-NLS-1$
 
         newChildDescriptors.add(createChildParameter(DescriptionPackage.Literals.CROSS_TABLE_DESCRIPTION__INTERSECTION, newIntersection));
 
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 b5f07178be..e105f8735f 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
@@ -73,7 +73,7 @@ public class DeleteColumnToolItemProvider extends DeleteToolItemProvider {
     @Override
     public String getText(Object object) {
         String label = new IdentifiedElementQuery((DeleteColumnTool) object).getLabel();
-        return StringUtil.isEmpty(label) ? getString("_UI_DeleteColumnTool_type") : getString("_UI_DeleteColumnTool_type") + " " + label;
+        return StringUtil.isEmpty(label) ? getString("_UI_DeleteColumnTool_type") : getString("_UI_DeleteColumnTool_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
     /**
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 dc71c0742d..9ccdd046ab 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
@@ -73,7 +73,7 @@ public class DeleteLineToolItemProvider extends DeleteToolItemProvider {
     @Override
     public String getText(Object object) {
         String label = new IdentifiedElementQuery((DeleteLineTool) object).getLabel();
-        return StringUtil.isEmpty(label) ? getString("_UI_DeleteLineTool_type") : getString("_UI_DeleteLineTool_type") + " " + label;
+        return StringUtil.isEmpty(label) ? getString("_UI_DeleteLineTool_type") : getString("_UI_DeleteLineTool_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
     /**
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 31251c6c76..c5dc9a61a0 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
@@ -122,7 +122,7 @@ public class DeleteToolItemProvider extends AbstractToolDescriptionItemProvider
     @Override
     public String getText(Object object) {
         String label = new IdentifiedElementQuery((DeleteTool) object).getLabel();
-        return StringUtil.isEmpty(label) ? getString("_UI_DeleteTool_type") : getString("_UI_DeleteTool_type") + " " + label;
+        return StringUtil.isEmpty(label) ? getString("_UI_DeleteTool_type") : getString("_UI_DeleteTool_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
     /**
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 fc16eac229..649e0b205a 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
@@ -112,7 +112,7 @@ public class EditionTableDescriptionItemProvider extends TableDescriptionItemPro
     @Override
     public String getText(Object object) {
         String label = new IdentifiedElementQuery((EditionTableDescription) object).getLabel();
-        return label == null || label.length() == 0 ? getString("_UI_EditionTableDescription_type") : label;
+        return label == null || label.length() == 0 ? getString("_UI_EditionTableDescription_type") : label; //$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 7d9c2a82d8..78bf81aa7b 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
@@ -153,7 +153,7 @@ public class ElementColumnMappingItemProvider extends ColumnMappingItemProvider
     @Override
     public String getText(Object object) {
         String label = new IdentifiedElementQuery((ElementColumnMapping) object).getLabel();
-        return label == null || label.length() == 0 ? getString("_UI_ElementColumnMapping_type") : label;
+        return label == null || label.length() == 0 ? getString("_UI_ElementColumnMapping_type") : label; //$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 a880d86194..1c9a4eba52 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
@@ -186,7 +186,7 @@ public class FeatureColumnMappingItemProvider extends ColumnMappingItemProvider
     @Override
     public String getText(Object object) {
         String label = new IdentifiedElementQuery((FeatureColumnMapping) object).getLabel();
-        return label == null || label.length() == 0 ? getString("_UI_FeatureColumnMapping_type") : label;
+        return label == null || label.length() == 0 ? getString("_UI_FeatureColumnMapping_type") : label; //$NON-NLS-1$
     }
 
     /**
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 3f5f8c174f..9d2a59ccb8 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
@@ -293,7 +293,7 @@ public class IntersectionMappingItemProvider extends TableMappingItemProvider {
     @Override
     public String getText(Object object) {
         String label = new IdentifiedElementQuery((IntersectionMapping) object).getLabel();
-        return label == null || label.length() == 0 ? getString("_UI_IntersectionMapping_type") : label;
+        return label == null || label.length() == 0 ? getString("_UI_IntersectionMapping_type") : label; //$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 c994ff1e5e..17589a255c 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
@@ -196,7 +196,7 @@ public class LineMappingItemProvider extends TableMappingItemProvider {
     @Override
     public String getText(Object object) {
         String label = new IdentifiedElementQuery((LineMapping) object).getLabel();
-        return label == null || label.length() == 0 ? getString("_UI_LineMapping_type") : label;
+        return label == null || label.length() == 0 ? getString("_UI_LineMapping_type") : label; //$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 7b3e5a6731..630fb60baa 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
@@ -93,7 +93,7 @@ public class TableCreationDescriptionItemProvider extends RepresentationCreation
     @Override
     public String getText(Object object) {
         String label = new IdentifiedElementQuery((TableCreationDescription) object).getLabel();
-        return StringUtil.isEmpty(label) ? getString("_UI_TableCreationDescription_type") : getString("_UI_TableCreationDescription_type") + " " + label;
+        return StringUtil.isEmpty(label) ? getString("_UI_TableCreationDescription_type") : getString("_UI_TableCreationDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
     /**
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 47436dbb80..9010803c24 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
@@ -279,7 +279,7 @@ public class TableDescriptionItemProvider extends DocumentedElementItemProvider
     @Override
     public String getText(final Object object) {
         final String label = new IdentifiedElementQuery((TableDescription) object).getLabel();
-        return label == null || label.length() == 0 ? getString("_UI_TableDescription_type") : label;
+        return label == null || label.length() == 0 ? getString("_UI_TableDescription_type") : label; //$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 cecb40b733..06cdad9444 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
@@ -95,7 +95,7 @@ public class TableMappingItemProvider extends RepresentationElementMappingItemPr
     @Override
     public String getText(Object object) {
         String label = new IdentifiedElementQuery((TableMapping) object).getLabel();
-        return StringUtil.isEmpty(label) ? getString("_UI_TableMapping_type") : getString("_UI_TableMapping_type") + " " + label;
+        return StringUtil.isEmpty(label) ? getString("_UI_TableMapping_type") : getString("_UI_TableMapping_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
     /**
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 3c4f7a8c13..6431a66509 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
@@ -93,7 +93,7 @@ public class TableNavigationDescriptionItemProvider extends RepresentationNaviga
     @Override
     public String getText(Object object) {
         String label = new IdentifiedElementQuery((TableNavigationDescription) object).getLabel();
-        return StringUtil.isEmpty(label) ? getString("_UI_TableNavigationDescription_type") : getString("_UI_TableNavigationDescription_type") + " " + label;
+        return StringUtil.isEmpty(label) ? getString("_UI_TableNavigationDescription_type") : getString("_UI_TableNavigationDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
     /**
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 e6d5ca4177..f5ffd304a7 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
@@ -129,7 +129,7 @@ public class TableVariableItemProvider extends AbstractVariableItemProvider {
     @Override
     public String getText(Object object) {
         String label = ((TableVariable) object).getName();
-        return label == null || label.length() == 0 ? getString("_UI_TableVariable_type") : label;
+        return label == null || label.length() == 0 ? getString("_UI_TableVariable_type") : label; //$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 e88f106d6f..eb1241afa0 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
@@ -145,9 +145,9 @@ public class DTableItemProvider extends DRepresentationItemProvider {
     @Override
     public Object getImage(final Object object) {
         if (object instanceof DTable && ((DTable) object).getDescription() instanceof CrossTableDescription) {
-            return overlayImage(object, getResourceLocator().getImage("full/obj16/CrossTableDescription"));
+            return overlayImage(object, getResourceLocator().getImage("full/obj16/CrossTableDescription")); //$NON-NLS-1$
         }
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/DTable"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/DTable")); //$NON-NLS-1$
     }
 
     /**
@@ -159,7 +159,7 @@ public class DTableItemProvider extends DRepresentationItemProvider {
     @Override
     public String getText(final Object object) {
         final String label = ((DTable) object).getName();
-        return label == null || label.length() == 0 ? getString("_UI_DTable_type") : label;
+        return label == null || label.length() == 0 ? getString("_UI_DTable_type") : label; //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/provider/TableUIPlugin.java b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/provider/TableUIPlugin.java
index 7ecc5a1772..bd482ec1d9 100644
--- a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/provider/TableUIPlugin.java
+++ b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/provider/TableUIPlugin.java
@@ -221,7 +221,7 @@ public final class TableUIPlugin extends EMFPlugin {
                 URL url;
                 try {
                     // We try to create an image descriptor for the given path
-                    url = new URL("platform:/resource" + p.makeAbsolute().toString());
+                    url = new URL("platform:/resource" + p.makeAbsolute().toString()); //$NON-NLS-1$
                     return ImageDescriptor.createFromURL(url);
                 } catch (MalformedURLException e) {
                     // nothing to do, we will try to create the Image Descriptor
diff --git a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/TablePackage.java b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/TablePackage.java
index 0714e4f03e..5f26fc3989 100644
--- a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/TablePackage.java
+++ b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/TablePackage.java
@@ -37,21 +37,21 @@ public interface TablePackage extends EPackage {
      * 
      * @generated
      */
-    String eNAME = "table";
+    String eNAME = "table"; //$NON-NLS-1$
 
     /**
      * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
      * @generated
      */
-    String eNS_URI = "http://www.eclipse.org/sirius/table/1.1.0";
+    String eNS_URI = "http://www.eclipse.org/sirius/table/1.1.0"; //$NON-NLS-1$
 
     /**
      * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
      * @generated
      */
-    String eNS_PREFIX = "table";
+    String eNS_PREFIX = "table"; //$NON-NLS-1$
 
     /**
      * The singleton instance of the package. <!-- begin-user-doc --> <!--
diff --git a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/DescriptionPackage.java b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/DescriptionPackage.java
index acb87af2af..1d16b2c098 100644
--- a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/DescriptionPackage.java
+++ b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/DescriptionPackage.java
@@ -37,21 +37,21 @@ public interface DescriptionPackage extends EPackage {
      * 
      * @generated
      */
-    String eNAME = "description";
+    String eNAME = "description"; //$NON-NLS-1$
 
     /**
      * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
      * @generated
      */
-    String eNS_URI = "http://www.eclipse.org/sirius/table/description/1.1.0";
+    String eNS_URI = "http://www.eclipse.org/sirius/table/description/1.1.0"; //$NON-NLS-1$
 
     /**
      * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
      * @generated
      */
-    String eNS_PREFIX = "description";
+    String eNS_PREFIX = "description"; //$NON-NLS-1$
 
     /**
      * The singleton instance of the package. <!-- begin-user-doc --> <!--
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 8adf2a6191..3741cd14ac 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
@@ -83,7 +83,7 @@ public class CreateCellToolImpl extends TableToolImpl implements CreateCellTool
      * @generated
      * @ordered
      */
-    protected static final String DOCUMENTATION_EDEFAULT = "";
+    protected static final String DOCUMENTATION_EDEFAULT = ""; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getDocumentation()
@@ -104,7 +104,7 @@ public class CreateCellToolImpl extends TableToolImpl implements CreateCellTool
      * @generated
      * @ordered
      */
-    protected static final String NAME_EDEFAULT = "";
+    protected static final String NAME_EDEFAULT = ""; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
@@ -145,7 +145,7 @@ public class CreateCellToolImpl extends TableToolImpl implements CreateCellTool
      * @generated
      * @ordered
      */
-    protected static final String PRECONDITION_EDEFAULT = "";
+    protected static final String PRECONDITION_EDEFAULT = ""; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getPrecondition() <em>Precondition</em>}
@@ -197,7 +197,7 @@ public class CreateCellToolImpl extends TableToolImpl implements CreateCellTool
      * @generated
      * @ordered
      */
-    protected static final String ELEMENTS_TO_SELECT_EDEFAULT = "";
+    protected static final String ELEMENTS_TO_SELECT_EDEFAULT = ""; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getElementsToSelect()
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 d5f324776e..b79c00440f 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
@@ -123,7 +123,7 @@ public abstract class TableDescriptionImpl extends DocumentedElementImpl impleme
      * @generated
      * @ordered
      */
-    protected static final String END_USER_DOCUMENTATION_EDEFAULT = "";
+    protected static final String END_USER_DOCUMENTATION_EDEFAULT = ""; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getEndUserDocumentation()
@@ -144,7 +144,7 @@ public abstract class TableDescriptionImpl extends DocumentedElementImpl impleme
      * @generated
      * @ordered
      */
-    protected static final String NAME_EDEFAULT = "";
+    protected static final String NAME_EDEFAULT = ""; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
@@ -185,7 +185,7 @@ public abstract class TableDescriptionImpl extends DocumentedElementImpl impleme
      * @generated
      * @ordered
      */
-    protected static final String TITLE_EXPRESSION_EDEFAULT = "";
+    protected static final String TITLE_EXPRESSION_EDEFAULT = ""; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getTitleExpression()
@@ -261,7 +261,7 @@ public abstract class TableDescriptionImpl extends DocumentedElementImpl impleme
      * @generated
      * @ordered
      */
-    protected static final String PRECONDITION_EXPRESSION_EDEFAULT = "";
+    protected static final String PRECONDITION_EXPRESSION_EDEFAULT = ""; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getPreconditionExpression()
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 e16f2c31c7..99491f03a1 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
@@ -82,7 +82,7 @@ public class DCellImpl extends DSemanticDecoratorImpl implements DCell {
      * @generated
      * @ordered
      */
-    protected static final String NAME_EDEFAULT = "";
+    protected static final String NAME_EDEFAULT = ""; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
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 7a540a54d7..c664b9cfce 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
@@ -88,7 +88,7 @@ public class DLineImpl extends LineContainerImpl implements DLine {
      * @generated
      * @ordered
      */
-    protected static final String NAME_EDEFAULT = "";
+    protected static final String NAME_EDEFAULT = ""; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
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 dd2cb893b6..8571640b94 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
@@ -139,7 +139,7 @@ public class DTableElementStyleImpl extends MinimalEObjectImpl.Container impleme
      * @generated
      * @ordered
      */
-    protected static final RGBValues FOREGROUND_COLOR_EDEFAULT = (RGBValues) ViewpointFactory.eINSTANCE.createFromString(ViewpointPackage.eINSTANCE.getRGBValues(), "0,0,0");
+    protected static final RGBValues FOREGROUND_COLOR_EDEFAULT = (RGBValues) ViewpointFactory.eINSTANCE.createFromString(ViewpointPackage.eINSTANCE.getRGBValues(), "0,0,0"); //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getForegroundColor()
@@ -161,7 +161,7 @@ public class DTableElementStyleImpl extends MinimalEObjectImpl.Container impleme
      * @generated
      * @ordered
      */
-    protected static final RGBValues BACKGROUND_COLOR_EDEFAULT = (RGBValues) ViewpointFactory.eINSTANCE.createFromString(ViewpointPackage.eINSTANCE.getRGBValues(), "255,255,255");
+    protected static final RGBValues BACKGROUND_COLOR_EDEFAULT = (RGBValues) ViewpointFactory.eINSTANCE.createFromString(ViewpointPackage.eINSTANCE.getRGBValues(), "255,255,255"); //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getBackgroundColor()
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 68bb833839..b46a7355c3 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
@@ -94,7 +94,7 @@ public class DTargetColumnImpl extends DSemanticDecoratorImpl implements DTarget
      * @generated
      * @ordered
      */
-    protected static final String NAME_EDEFAULT = "";
+    protected static final String NAME_EDEFAULT = ""; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
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 b177a89bbe..115c2c3502 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
@@ -93,7 +93,7 @@ public class TreeCreationDescriptionItemProvider extends RepresentationCreationD
     @Override
     public String getText(Object object) {
         String label = new IdentifiedElementQuery((TreeCreationDescription) object).getLabel();
-        return StringUtil.isEmpty(label) ? getString("_UI_TreeCreationDescription_type") : getString("_UI_TreeCreationDescription_type") + " " + label;
+        return StringUtil.isEmpty(label) ? getString("_UI_TreeCreationDescription_type") : getString("_UI_TreeCreationDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
     /**
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 efbc6413fd..4ad1276136 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
@@ -265,7 +265,7 @@ public class TreeDescriptionItemProvider extends DocumentedElementItemProvider {
     @Override
     public String getText(Object object) {
         final String label = new IdentifiedElementQuery((TreeDescription) object).getLabel();
-        return StringUtil.isEmpty(label) ? getString("_UI_TreeDescription_type") : label;
+        return StringUtil.isEmpty(label) ? getString("_UI_TreeDescription_type") : label; //$NON-NLS-1$
     }
 
     /**
@@ -315,7 +315,7 @@ public class TreeDescriptionItemProvider extends DocumentedElementItemProvider {
 
         TreeItemMapping newItemMapping = DescriptionFactory.eINSTANCE.createTreeItemMapping();
         newItemMapping.setDefaultStyle(DescriptionFactory.eINSTANCE.createTreeItemStyleDescription());
-        newItemMapping.setSemanticCandidatesExpression("feature:eAllContents");
+        newItemMapping.setSemanticCandidatesExpression("feature:eAllContents"); //$NON-NLS-1$
 
         newChildDescriptors.add(createChildParameter(org.eclipse.sirius.tree.description.DescriptionPackage.Literals.TREE_ITEM_MAPPING_CONTAINER__SUB_ITEM_MAPPINGS, newItemMapping));
 
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 0a5aaff390..82e62acac2 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
@@ -143,7 +143,7 @@ public class TreeItemContainerDropToolItemProvider extends MappingBasedToolDescr
     @Override
     public String getText(Object object) {
         String label = new IdentifiedElementQuery((TreeItemContainerDropTool) object).getLabel();
-        return StringUtil.isEmpty(label) ? getString("_UI_TreeItemContainerDropTool_type") : getString("_UI_TreeItemContainerDropTool_type") + " " + label;
+        return StringUtil.isEmpty(label) ? getString("_UI_TreeItemContainerDropTool_type") : getString("_UI_TreeItemContainerDropTool_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
     /**
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 f77f329f1e..5bfc7ac0bb 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
@@ -90,7 +90,7 @@ public class TreeItemCreationToolItemProvider extends TreeItemToolItemProvider {
     @Override
     public String getText(Object object) {
         String label = new IdentifiedElementQuery((TreeItemCreationTool) object).getLabel();
-        return StringUtil.isEmpty(label) ? getString("_UI_TreeItemCreationTool_type") : getString("_UI_TreeItemCreationTool_type") + " " + label;
+        return StringUtil.isEmpty(label) ? getString("_UI_TreeItemCreationTool_type") : getString("_UI_TreeItemCreationTool_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
     /**
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 d191988db6..80a5deae75 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
@@ -73,7 +73,7 @@ public class TreeItemDeletionToolItemProvider extends TreeItemToolItemProvider {
     @Override
     public String getText(Object object) {
         String label = new IdentifiedElementQuery((TreeItemDeletionTool) object).getLabel();
-        return StringUtil.isEmpty(label) ? getString("_UI_TreeItemDeletionTool_type") : getString("_UI_TreeItemDeletionTool_type") + " " + label;
+        return StringUtil.isEmpty(label) ? getString("_UI_TreeItemDeletionTool_type") : getString("_UI_TreeItemDeletionTool_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
     /**
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 bb0cf3a189..672b0f1e4d 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
@@ -159,7 +159,7 @@ public class TreeItemDragToolItemProvider extends MappingBasedToolDescriptionIte
     @Override
     public String getText(Object object) {
         String label = new IdentifiedElementQuery((TreeItemDragTool) object).getLabel();
-        return StringUtil.isEmpty(label) ? getString("_UI_TreeItemDragTool_type") : getString("_UI_TreeItemDragTool_type") + " " + label;
+        return StringUtil.isEmpty(label) ? getString("_UI_TreeItemDragTool_type") : getString("_UI_TreeItemDragTool_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
     /**
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 12d68eec3c..8afca34ff6 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
@@ -116,7 +116,7 @@ public class TreeItemEditionToolItemProvider extends TreeItemToolItemProvider {
     @Override
     public String getText(Object object) {
         String label = new IdentifiedElementQuery((TreeItemEditionTool) object).getLabel();
-        return StringUtil.isEmpty(label) ? getString("_UI_TreeItemEditionTool_type") : getString("_UI_TreeItemEditionTool_type") + " " + label;
+        return StringUtil.isEmpty(label) ? getString("_UI_TreeItemEditionTool_type") : getString("_UI_TreeItemEditionTool_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
     /**
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 f6ba0ecc63..a83af99abe 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
@@ -204,7 +204,7 @@ public class TreeItemMappingItemProvider extends TreeMappingItemProvider {
     @Override
     public String getText(Object object) {
         String label = new IdentifiedElementQuery((TreeMapping) object).getLabel();
-        return label == null || label.length() == 0 ? getString("_UI_TreeMapping_type") : label;
+        return label == null || label.length() == 0 ? getString("_UI_TreeMapping_type") : label; //$NON-NLS-1$
     }
 
     /**
@@ -259,7 +259,7 @@ public class TreeItemMappingItemProvider extends TreeMappingItemProvider {
 
         TreeItemMapping newItemMapping = DescriptionFactory.eINSTANCE.createTreeItemMapping();
         newItemMapping.setDefaultStyle(DescriptionFactory.eINSTANCE.createTreeItemStyleDescription());
-        newItemMapping.setSemanticCandidatesExpression("feature:eAllContents");
+        newItemMapping.setSemanticCandidatesExpression("feature:eAllContents"); //$NON-NLS-1$
 
         newChildDescriptors.add(createChildParameter(DescriptionPackage.Literals.TREE_ITEM_MAPPING_CONTAINER__SUB_ITEM_MAPPINGS, newItemMapping));
 
diff --git a/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeItemToolItemProvider.java b/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeItemToolItemProvider.java
index ed5e6e477d..7f8f550b21 100644
--- a/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeItemToolItemProvider.java
+++ b/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeItemToolItemProvider.java
@@ -110,7 +110,7 @@ public class TreeItemToolItemProvider extends AbstractToolDescriptionItemProvide
     @Override
     public String getText(Object object) {
         String label = new IdentifiedElementQuery((TreeItemTool) object).getLabel();
-        return StringUtil.isEmpty(label) ? getString("_UI_TreeItemTool_type") : getString("_UI_TreeItemTool_type") + " " + label;
+        return StringUtil.isEmpty(label) ? getString("_UI_TreeItemTool_type") : getString("_UI_TreeItemTool_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
     /**
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 66fdbc4c71..a53e6add27 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
@@ -95,7 +95,7 @@ public class TreeMappingItemProvider extends RepresentationElementMappingItemPro
     @Override
     public String getText(Object object) {
         String label = new IdentifiedElementQuery((TreeMapping) object).getLabel();
-        return StringUtil.isEmpty(label) ? getString("_UI_TreeMapping_type") : getString("_UI_TreeMapping_type") + " " + label;
+        return StringUtil.isEmpty(label) ? getString("_UI_TreeMapping_type") : getString("_UI_TreeMapping_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
     /**
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 7e14289956..6c686567e8 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
@@ -93,7 +93,7 @@ public class TreeNavigationDescriptionItemProvider extends RepresentationNavigat
     @Override
     public String getText(Object object) {
         String label = new IdentifiedElementQuery((TreeNavigationDescription) object).getLabel();
-        return StringUtil.isEmpty(label) ? getString("_UI_TreeNavigationDescription_type") : getString("_UI_TreeNavigationDescription_type") + " " + label;
+        return StringUtil.isEmpty(label) ? getString("_UI_TreeNavigationDescription_type") : getString("_UI_TreeNavigationDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
     /**
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 97ab71de6b..4fba8fd777 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
@@ -113,7 +113,7 @@ public class TreePopupMenuItemProvider extends AbstractToolDescriptionItemProvid
     @Override
     public String getText(Object object) {
         String label = new IdentifiedElementQuery((TreePopupMenu) object).getLabel();
-        return StringUtil.isEmpty(label) ? getString("_UI_TreePopupMenu_type") : getString("_UI_TreePopupMenu_type") + " " + label;
+        return StringUtil.isEmpty(label) ? getString("_UI_TreePopupMenu_type") : getString("_UI_TreePopupMenu_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
     /**
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 0fd4308f4a..dafc6270d5 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
@@ -130,7 +130,7 @@ public class TreeVariableItemProvider extends AbstractVariableItemProvider {
     @Override
     public String getText(Object object) {
         String label = ((TreeVariable) object).getName();
-        return StringUtil.isEmpty(label) ? getString("_UI_TreeVariable_type") : getString("_UI_TreeVariable_type") + " " + label;
+        return StringUtil.isEmpty(label) ? getString("_UI_TreeVariable_type") : getString("_UI_TreeVariable_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/provider/DTreeElementUpdaterItemProvider.java b/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/provider/DTreeElementUpdaterItemProvider.java
index fc4b60be12..fc41b23ca8 100644
--- a/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/provider/DTreeElementUpdaterItemProvider.java
+++ b/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/provider/DTreeElementUpdaterItemProvider.java
@@ -67,7 +67,7 @@ public class DTreeElementUpdaterItemProvider extends ItemProviderAdapter impleme
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/DTreeElementUpdater"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/DTreeElementUpdater")); //$NON-NLS-1$
     }
 
     /**
@@ -78,7 +78,7 @@ public class DTreeElementUpdaterItemProvider extends ItemProviderAdapter impleme
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_DTreeElementUpdater_type");
+        return getString("_UI_DTreeElementUpdater_type"); //$NON-NLS-1$
     }
 
     /**
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 0654b80d52..a049dcb69d 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
@@ -153,7 +153,7 @@ public class DTreeItemProvider extends DRepresentationItemProvider {
     @Override
     public String getText(Object object) {
         final String label = ((DTree) object).getName();
-        return label == null || label.length() == 0 ? getString("_UI_DTree_type") : label;
+        return label == null || label.length() == 0 ? getString("_UI_DTree_type") : label; //$NON-NLS-1$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/ui/provider/TreeUIPlugin.java b/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/ui/provider/TreeUIPlugin.java
index 8b3186a2ca..ef6ba5d5bc 100644
--- a/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/ui/provider/TreeUIPlugin.java
+++ b/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/ui/provider/TreeUIPlugin.java
@@ -147,7 +147,7 @@ public final class TreeUIPlugin extends EMFPlugin {
             URL url;
             try {
                 // We try to create an image descriptor for the given path
-                url = new URL("platform:/resource" + p.makeAbsolute().toString());
+                url = new URL("platform:/resource" + p.makeAbsolute().toString()); //$NON-NLS-1$
                 return ImageDescriptor.createFromURL(url);
             } catch (MalformedURLException e) {
                 // nothing to do, we will try to create the Image Descriptor
diff --git a/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/TreePackage.java b/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/TreePackage.java
index 9ef93aac94..0a574bcb2c 100644
--- a/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/TreePackage.java
+++ b/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/TreePackage.java
@@ -37,21 +37,21 @@ public interface TreePackage extends EPackage {
      * 
      * @generated
      */
-    String eNAME = "tree";
+    String eNAME = "tree"; //$NON-NLS-1$
 
     /**
      * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
      * @generated
      */
-    String eNS_URI = "http://www.eclipse.org/sirius/tree/1.0.0";
+    String eNS_URI = "http://www.eclipse.org/sirius/tree/1.0.0"; //$NON-NLS-1$
 
     /**
      * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
      * @generated
      */
-    String eNS_PREFIX = "tree";
+    String eNS_PREFIX = "tree"; //$NON-NLS-1$
 
     /**
      * The singleton instance of the package. <!-- begin-user-doc --> <!--
diff --git a/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/description/DescriptionPackage.java b/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/description/DescriptionPackage.java
index d80e552e2a..b26e330155 100644
--- a/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/description/DescriptionPackage.java
+++ b/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/description/DescriptionPackage.java
@@ -39,21 +39,21 @@ public interface DescriptionPackage extends EPackage {
      * 
      * @generated
      */
-    String eNAME = "description";
+    String eNAME = "description"; //$NON-NLS-1$
 
     /**
      * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
      * @generated
      */
-    String eNS_URI = "http://www.eclipse.org/sirius/tree/description/1.0.0";
+    String eNS_URI = "http://www.eclipse.org/sirius/tree/description/1.0.0"; //$NON-NLS-1$
 
     /**
      * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
      * @generated
      */
-    String eNS_PREFIX = "description";
+    String eNS_PREFIX = "description"; //$NON-NLS-1$
 
     /**
      * The singleton instance of the package. <!-- begin-user-doc --> <!--
diff --git a/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/description/TreeDragSource.java b/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/description/TreeDragSource.java
index 34a5afd489..6ae486e6e9 100644
--- a/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/description/TreeDragSource.java
+++ b/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/description/TreeDragSource.java
@@ -34,7 +34,7 @@ public enum TreeDragSource implements Enumerator {
      * @generated
      * @ordered
      */
-    TREE(1, "TREE", "TREE"),
+    TREE(1, "TREE", "TREE"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>PROJECT EXPLORER</b></em>' literal object. <!--
@@ -44,7 +44,7 @@ public enum TreeDragSource implements Enumerator {
      * @generated
      * @ordered
      */
-    PROJECT_EXPLORER(2, "PROJECT_EXPLORER", "PROJECT_EXPLORER"),
+    PROJECT_EXPLORER(2, "PROJECT_EXPLORER", "PROJECT_EXPLORER"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>BOTH</b></em>' literal object. <!-- begin-user-doc --> <!--
@@ -54,7 +54,7 @@ public enum TreeDragSource implements Enumerator {
      * @generated
      * @ordered
      */
-    BOTH(3, "BOTH", "BOTH");
+    BOTH(3, "BOTH", "BOTH"); //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>TREE</b></em>' literal value. <!-- begin-user-doc -->
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 9c1f80c661..ce3d16607c 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
@@ -97,7 +97,7 @@ public class TreeDescriptionImpl extends DocumentedElementImpl implements TreeDe
      * @generated
      * @ordered
      */
-    protected static final String END_USER_DOCUMENTATION_EDEFAULT = "";
+    protected static final String END_USER_DOCUMENTATION_EDEFAULT = ""; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getEndUserDocumentation()
@@ -118,7 +118,7 @@ public class TreeDescriptionImpl extends DocumentedElementImpl implements TreeDe
      * @generated
      * @ordered
      */
-    protected static final String NAME_EDEFAULT = "";
+    protected static final String NAME_EDEFAULT = ""; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
@@ -159,7 +159,7 @@ public class TreeDescriptionImpl extends DocumentedElementImpl implements TreeDe
      * @generated
      * @ordered
      */
-    protected static final String TITLE_EXPRESSION_EDEFAULT = "";
+    protected static final String TITLE_EXPRESSION_EDEFAULT = ""; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getTitleExpression()
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 71b73579c5..c04792748b 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
@@ -124,7 +124,7 @@ public class TreeItemStyleDescriptionImpl extends MinimalEObjectImpl.Container i
      * @generated
      * @ordered
      */
-    protected static final String LABEL_EXPRESSION_EDEFAULT = "feature:name";
+    protected static final String LABEL_EXPRESSION_EDEFAULT = "feature:name"; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getLabelExpression()
@@ -155,7 +155,7 @@ public class TreeItemStyleDescriptionImpl extends MinimalEObjectImpl.Container i
      * @generated
      * @ordered
      */
-    protected static final String ICON_PATH_EDEFAULT = "";
+    protected static final String ICON_PATH_EDEFAULT = ""; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getIconPath() <em>Icon Path</em>}'
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 1097428eee..b6c8225369 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
@@ -75,7 +75,7 @@ public class DTreeItemImpl extends DTreeItemContainerImpl implements DTreeItem {
      * @generated
      * @ordered
      */
-    protected static final String NAME_EDEFAULT = "";
+    protected static final String NAME_EDEFAULT = ""; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
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 412ce02598..596c81948e 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
@@ -113,7 +113,7 @@ public class TreeItemStyleImpl extends StyleImpl implements TreeItemStyle {
      * @generated
      * @ordered
      */
-    protected static final String ICON_PATH_EDEFAULT = "";
+    protected static final String ICON_PATH_EDEFAULT = ""; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getIconPath() <em>Icon Path</em>}'
@@ -133,7 +133,7 @@ public class TreeItemStyleImpl extends StyleImpl implements TreeItemStyle {
      * @generated
      * @ordered
      */
-    protected static final RGBValues LABEL_COLOR_EDEFAULT = (RGBValues) ViewpointFactory.eINSTANCE.createFromString(ViewpointPackage.eINSTANCE.getRGBValues(), "0,0,0");
+    protected static final RGBValues LABEL_COLOR_EDEFAULT = (RGBValues) ViewpointFactory.eINSTANCE.createFromString(ViewpointPackage.eINSTANCE.getRGBValues(), "0,0,0"); //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getLabelColor() <em>Label Color</em>}'
@@ -176,7 +176,7 @@ public class TreeItemStyleImpl extends StyleImpl implements TreeItemStyle {
      * @generated
      * @ordered
      */
-    protected static final RGBValues BACKGROUND_COLOR_EDEFAULT = (RGBValues) ViewpointFactory.eINSTANCE.createFromString(ViewpointPackage.eINSTANCE.getRGBValues(), "255,255,255");
+    protected static final RGBValues BACKGROUND_COLOR_EDEFAULT = (RGBValues) ViewpointFactory.eINSTANCE.createFromString(ViewpointPackage.eINSTANCE.getRGBValues(), "255,255,255"); //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getBackgroundColor()
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 2dfda0e2ac..50c5e5df5e 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
@@ -70,10 +70,10 @@ public class AddFeatureContributionItemProvider extends FeatureContributionItemP
      */
     @Override
     public String getText(Object object) {
-        String result = getString("_UI_AddFeatureContribution_type");
+        String result = getString("_UI_AddFeatureContribution_type"); //$NON-NLS-1$
         if (object instanceof AddFeatureContribution) {
             AddFeatureContribution afc = (AddFeatureContribution) object;
-            result += " target." + featureString(afc.getTargetFeature()) + " += source." + featureString(afc.getSourceFeature());
+            result += " target." + featureString(afc.getTargetFeature()) + " += source." + featureString(afc.getSourceFeature()); //$NON-NLS-1$ //$NON-NLS-2$
         }
         return result;
     }
@@ -82,7 +82,7 @@ public class AddFeatureContributionItemProvider extends FeatureContributionItemP
         if (feature != null) {
             return feature.getName();
         } else {
-            return "[unset]";
+            return "[unset]"; //$NON-NLS-1$
         }
     }
 
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 1ae838d3bf..081fd1771f 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
@@ -70,10 +70,10 @@ public class ClearFeatureContributionItemProvider extends FeatureContributionIte
      */
     @Override
     public String getText(Object object) {
-        String result = getString("_UI_ClearFeatureContribution_type");
+        String result = getString("_UI_ClearFeatureContribution_type"); //$NON-NLS-1$
         if (object instanceof ClearFeatureContribution) {
             ClearFeatureContribution cfc = (ClearFeatureContribution) object;
-            result += " target." + featureString(cfc.getTargetFeature());
+            result += " target." + featureString(cfc.getTargetFeature()); //$NON-NLS-1$
         }
         return result;
     }
@@ -82,7 +82,7 @@ public class ClearFeatureContributionItemProvider extends FeatureContributionIte
         if (feature != null) {
             return feature.getName();
         } else {
-            return "[unset]";
+            return "[unset]"; //$NON-NLS-1$
         }
     }
 
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 faa7d81de4..7ff783e248 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
@@ -106,16 +106,16 @@ public class ComputedEObjectReferenceItemProvider extends ItemProviderAdapter im
      */
     @Override
     public String getText(Object object) {
-        String result = getString("_UI_ComputedEObjectReference_type");
+        String result = getString("_UI_ComputedEObjectReference_type"); //$NON-NLS-1$
         if (object instanceof ComputedEObjectReference) {
             ComputedEObjectReference ref = (ComputedEObjectReference) object;
             if (ref.eContainer() != null && ref.eContainingFeature() == ContributionPackage.eINSTANCE.getContribution_Source()) {
-                result = "Source " + result;
+                result = "Source " + result; //$NON-NLS-1$
             } else if (ref.eContainer() != null && ref.eContainingFeature() == ContributionPackage.eINSTANCE.getContribution_Target()) {
-                result = "Target " + result;
+                result = "Target " + result; //$NON-NLS-1$
             }
             if (!StringUtil.isEmpty(ref.getValueExpression())) {
-                result = result + " to: " + ref.getValueExpression();
+                result = result + " to: " + ref.getValueExpression(); //$NON-NLS-1$
             }
         }
         return result;
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 f9cfeff7ef..fce0be379c 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
@@ -92,7 +92,7 @@ public class ContributionItemProvider extends ItemProviderAdapter implements IEd
 
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/Contribution"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/Contribution")); //$NON-NLS-1$
     }
 
     /**
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 f5878a067f..42e8aea694 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
@@ -104,20 +104,20 @@ public class DirectEObjectReferenceItemProvider extends ItemProviderAdapter impl
      */
     @Override
     public String getText(Object object) {
-        String result = getString("_UI_DirectEObjectReference_type");
+        String result = getString("_UI_DirectEObjectReference_type"); //$NON-NLS-1$
         if (object instanceof DirectEObjectReference) {
             DirectEObjectReference ref = (DirectEObjectReference) object;
             if (ref.eContainer() != null && ref.eContainingFeature() == ContributionPackage.eINSTANCE.getContribution_Source()) {
-                result = "Source " + result;
+                result = "Source " + result; //$NON-NLS-1$
             } else if (ref.eContainer() != null && ref.eContainingFeature() == ContributionPackage.eINSTANCE.getContribution_Target()) {
-                result = "Target " + result;
+                result = "Target " + result; //$NON-NLS-1$
             }
             if (ref.getValue() == null) {
-                result += " [unset]";
+                result += " [unset]"; //$NON-NLS-1$
             } else {
                 AdapterFactory ipaf = SiriusEditPlugin.getPlugin().getItemProvidersAdapterFactory();
-                result += " to: " + ((IItemLabelProvider) ipaf.adapt(ref.getValue(), IItemLabelProvider.class)).getText(ref.getValue());
-                result += " (" + ref.getValue().eClass().getName() + ")";
+                result += " to: " + ((IItemLabelProvider) ipaf.adapt(ref.getValue(), IItemLabelProvider.class)).getText(ref.getValue()); //$NON-NLS-1$
+                result += " (" + ref.getValue().eClass().getName() + ")"; //$NON-NLS-1$ //$NON-NLS-2$
             }
         }
         return result;
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 d9fff55402..fce99b563d 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
@@ -70,10 +70,10 @@ public class IgnoreFeatureContributionItemProvider extends FeatureContributionIt
      */
     @Override
     public String getText(Object object) {
-        String result = getString("_UI_IgnoreFeatureContribution_type");
+        String result = getString("_UI_IgnoreFeatureContribution_type"); //$NON-NLS-1$
         if (object instanceof IgnoreFeatureContribution) {
             IgnoreFeatureContribution ifc = (IgnoreFeatureContribution) object;
-            result += " " + featureString(ifc.getTargetFeature());
+            result += " " + featureString(ifc.getTargetFeature()); //$NON-NLS-1$
         }
         return result;
     }
@@ -82,7 +82,7 @@ public class IgnoreFeatureContributionItemProvider extends FeatureContributionIt
         if (feature != null) {
             return feature.getName();
         } else {
-            return "[unset]";
+            return "[unset]"; //$NON-NLS-1$
         }
     }
 
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 70b0821d7c..6df1983afa 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
@@ -70,10 +70,10 @@ public class RemoveFeatureContributionItemProvider extends FeatureContributionIt
      */
     @Override
     public String getText(Object object) {
-        String result = getString("_UI_RemoveFeatureContribution_type");
+        String result = getString("_UI_RemoveFeatureContribution_type"); //$NON-NLS-1$
         if (object instanceof RemoveFeatureContribution) {
             RemoveFeatureContribution rfc = (RemoveFeatureContribution) object;
-            result += " target." + featureString(rfc.getTargetFeature()) + " -= source." + featureString(rfc.getSourceFeature());
+            result += " target." + featureString(rfc.getTargetFeature()) + " -= source." + featureString(rfc.getSourceFeature()); //$NON-NLS-1$ //$NON-NLS-2$
         }
         return result;
     }
@@ -82,7 +82,7 @@ public class RemoveFeatureContributionItemProvider extends FeatureContributionIt
         if (feature != null) {
             return feature.getName();
         } else {
-            return "[unset]";
+            return "[unset]"; //$NON-NLS-1$
         }
     }
 
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 255b329401..20eb99786a 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
@@ -70,10 +70,10 @@ public class ResetFeatureContributionItemProvider extends FeatureContributionIte
      */
     @Override
     public String getText(Object object) {
-        String result = getString("_UI_ResetFeatureContribution_type");
+        String result = getString("_UI_ResetFeatureContribution_type"); //$NON-NLS-1$
         if (object instanceof ResetFeatureContribution) {
             ResetFeatureContribution rfc = (ResetFeatureContribution) object;
-            result += " target." + featureString(rfc.getTargetFeature());
+            result += " target." + featureString(rfc.getTargetFeature()); //$NON-NLS-1$
         }
         return result;
     }
@@ -82,7 +82,7 @@ public class ResetFeatureContributionItemProvider extends FeatureContributionIte
         if (feature != null) {
             return feature.getName();
         } else {
-            return "[unset]";
+            return "[unset]"; //$NON-NLS-1$
         }
     }
 
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 2411750d02..1b72516720 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
@@ -70,10 +70,10 @@ public class SetFeatureContributionItemProvider extends FeatureContributionItemP
      */
     @Override
     public String getText(Object object) {
-        String result = getString("_UI_SetFeatureContribution_type");
+        String result = getString("_UI_SetFeatureContribution_type"); //$NON-NLS-1$
         if (object instanceof SetFeatureContribution) {
             SetFeatureContribution sfc = (SetFeatureContribution) object;
-            result += " target." + featureString(sfc.getTargetFeature()) + " = source." + featureString(sfc.getSourceFeature());
+            result += " target." + featureString(sfc.getTargetFeature()) + " = source." + featureString(sfc.getSourceFeature()); //$NON-NLS-1$ //$NON-NLS-2$
         }
         return result;
     }
@@ -82,7 +82,7 @@ public class SetFeatureContributionItemProvider extends FeatureContributionItemP
         if (feature != null) {
             return feature.getName();
         } else {
-            return "[unset]";
+            return "[unset]"; //$NON-NLS-1$
         }
     }
 
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 1469cc2f80..61845f7a03 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
@@ -140,7 +140,7 @@ public class GroupItemProvider extends DModelElementItemProvider {
     @Override
     public String getText(Object object) {
         String label = ((Group) object).getName();
-        return label == null || label.length() == 0 ? getString("_UI_Group_type") : label;
+        return label == null || label.length() == 0 ? getString("_UI_Group_type") : label; //$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 163ebc6a73..e68d1b2be4 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
@@ -117,7 +117,7 @@ IItemPropertySource {
     @Override
     public String getText(Object object) {
         String label = new IdentifiedElementQuery((IdentifiedElement) object).getLabel();
-        return StringUtil.isEmpty(label) ? getString("_UI_IdentifiedElement_type") : getString("_UI_IdentifiedElement_type") + " " + label;
+        return StringUtil.isEmpty(label) ? getString("_UI_IdentifiedElement_type") : getString("_UI_IdentifiedElement_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
     /**
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 7c37583d87..f27dc80ad6 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
@@ -176,7 +176,7 @@ public class InterpolatedColorItemProvider extends ColorDescriptionItemProvider
     @Override
     public String getText(Object object) {
         String label = ((InterpolatedColor) object).getName();
-        return label == null || label.length() == 0 ? getString("_UI_InterpolatedColor_type") : label;
+        return label == null || label.length() == 0 ? getString("_UI_InterpolatedColor_type") : label; //$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 20a0ea706a..6c39424669 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
@@ -100,7 +100,7 @@ IItemPropertySource {
     @Override
     public String getText(Object object) {
         String label = ((JavaExtension) object).getQualifiedClassName();
-        return label == null || label.length() == 0 ? getString("_UI_JavaExtension_type") : label;
+        return label == null || label.length() == 0 ? getString("_UI_JavaExtension_type") : label; //$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 0309e49b02..fb0186a703 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
@@ -94,7 +94,7 @@ public class RepresentationElementMappingItemProvider extends IdentifiedElementI
     @Override
     public String getText(Object object) {
         String label = new IdentifiedElementQuery((RepresentationElementMapping) object).getLabel();
-        return label == null || label.length() == 0 ? getString("_UI_RepresentationElementMapping_type") : getString("_UI_RepresentationElementMapping_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_RepresentationElementMapping_type") : getString("_UI_RepresentationElementMapping_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
     /**
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 353789de4f..5fd092acfe 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
@@ -89,7 +89,7 @@ public class SystemColorItemProvider extends FixedColorItemProvider {
     @Override
     public String getText(Object object) {
         String label = ((SystemColor) object).getName();
-        return label == null || label.length() == 0 ? getString("_UI_SystemColor_type") : label;
+        return label == null || label.length() == 0 ? getString("_UI_SystemColor_type") : label; //$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 48b7dedfb4..6ae8a13d38 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
@@ -97,7 +97,7 @@ public class UserColorItemProvider extends ItemProviderAdapter implements IEditi
     @Override
     public String getText(Object object) {
         String label = ((UserColor) object).getName();
-        return label == null || label.length() == 0 ? getString("_UI_UserColor_type") : label;
+        return label == null || label.length() == 0 ? getString("_UI_UserColor_type") : label; //$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 887e1fcc7c..5ca580c1aa 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
@@ -136,7 +136,7 @@ IItemPropertySource {
     @Override
     public String getText(Object object) {
         String label = ((UserColorsPalette) object).getName();
-        return label == null || label.length() == 0 ? getString("_UI_UserColorsPalette_type") : label;
+        return label == null || label.length() == 0 ? getString("_UI_UserColorsPalette_type") : label; //$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 22c85d0b7b..b71a5885c8 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
@@ -90,7 +90,7 @@ public class UserFixedColorItemProvider extends FixedColorItemProvider {
     @Override
     public String getText(Object object) {
         String label = ((UserFixedColor) object).getName();
-        return label == null || label.length() == 0 ? getString("_UI_UserFixedColor_type") : label;
+        return label == null || label.length() == 0 ? getString("_UI_UserFixedColor_type") : label; //$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 4bc3622bda..f3a4f3ab0b 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
@@ -236,7 +236,7 @@ public class ViewpointItemProvider extends DocumentedElementItemProvider {
                 return optionImageURL.get();
             }
         }
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/Sirius"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/Sirius")); //$NON-NLS-1$
     }
 
     /**
@@ -248,7 +248,7 @@ public class ViewpointItemProvider extends DocumentedElementItemProvider {
     @Override
     public String getText(Object object) {
         String label = new IdentifiedElementQuery((Viewpoint) object).getLabel();
-        return label == null || label.length() == 0 ? getString("_UI_Viewpoint_type") : label;
+        return label == null || label.length() == 0 ? getString("_UI_Viewpoint_type") : label; //$NON-NLS-1$
     }
 
     /**
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 573ec35457..bece5ed860 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
@@ -141,15 +141,7 @@ IItemPropertySource {
     @Override
     public String getText(Object object) {
         String label = ((LabelBorderStyleDescription) object).getName();
-        return label == null || label.length() == 0 ? getString("_UI_LabelBorderStyleDescription_type") : /*
-         * getString
-         * (
-         * "_UI_LabelBorderStyleDescription_type"
-         * )
-         * +
-         * " "
-         * +
-         */label;
+        return label == null || label.length() == 0 ? getString("_UI_LabelBorderStyleDescription_type") : label; //$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 c291c2bc63..ac65f14e3e 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
@@ -92,8 +92,8 @@ public class LabelStyleDescriptionItemProvider extends BasicLabelStyleDescriptio
     @Override
     public String getText(Object object) {
         LabelStyleDescription labelStyleDescription = (LabelStyleDescription) object;
-        return getString("_UI_LabelStyleDescription_type") + " " + labelStyleDescription.getLabelAlignment().getName() + " " + labelStyleDescription.getLabelFormat() + " "
-        + labelStyleDescription.getLabelSize();
+        return getString("_UI_LabelStyleDescription_type") + " " + labelStyleDescription.getLabelAlignment().getName() + " " + labelStyleDescription.getLabelFormat() + " " //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+                + labelStyleDescription.getLabelSize();
     }
 
     /**
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 ffb2db3ba6..c0db01fbaf 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
@@ -192,7 +192,7 @@ public class AbstractToolDescriptionItemProvider extends DocumentedElementItemPr
     @Override
     public String getText(Object object) {
         String label = new IdentifiedElementQuery((AbstractToolDescription) object).getLabel();
-        return StringUtil.isEmpty(label) ? getString("_UI_AbstractToolDescription_type") : getString("_UI_AbstractToolDescription_type") + " " + label;
+        return StringUtil.isEmpty(label) ? getString("_UI_AbstractToolDescription_type") : getString("_UI_AbstractToolDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
     /**
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 5fe094198a..b5e3a743a2 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
@@ -127,7 +127,7 @@ public class ExternalJavaActionCallItemProvider extends MenuItemDescriptionItemP
     @Override
     public String getText(Object object) {
         String label = new IdentifiedElementQuery((ExternalJavaActionCall) object).getLabel();
-        return StringUtil.isEmpty(label) ? getString("_UI_ExternalJavaActionCall_type") : getString("_UI_ExternalJavaActionCall_type") + " " + label;
+        return StringUtil.isEmpty(label) ? getString("_UI_ExternalJavaActionCall_type") : getString("_UI_ExternalJavaActionCall_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
     /**
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 90a477c07a..c075441fe4 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
@@ -129,7 +129,7 @@ public class ExternalJavaActionItemProvider extends MenuItemDescriptionItemProvi
     @Override
     public String getText(Object object) {
         String label = new IdentifiedElementQuery((ExternalJavaAction) object).getLabel();
-        return StringUtil.isEmpty(label) ? getString("_UI_ExternalJavaAction_type") : getString("_UI_ExternalJavaAction_type") + " " + label;
+        return StringUtil.isEmpty(label) ? getString("_UI_ExternalJavaAction_type") : getString("_UI_ExternalJavaAction_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/MappingBasedToolDescriptionItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/MappingBasedToolDescriptionItemProvider.java
index ac4dd56c41..1eea39464c 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/MappingBasedToolDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/MappingBasedToolDescriptionItemProvider.java
@@ -63,7 +63,7 @@ public class MappingBasedToolDescriptionItemProvider extends AbstractToolDescrip
     @Override
     public String getText(Object object) {
         String label = new IdentifiedElementQuery((MappingBasedToolDescription) object).getLabel();
-        return StringUtil.isEmpty(label) ? getString("_UI_MappingBasedToolDescription_type") : getString("_UI_MappingBasedToolDescription_type") + " " + label;
+        return StringUtil.isEmpty(label) ? getString("_UI_MappingBasedToolDescription_type") : getString("_UI_MappingBasedToolDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
     /**
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 60ffafd4dc..d9ec5a12d0 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
@@ -82,7 +82,7 @@ public class MenuItemDescriptionItemProvider extends AbstractToolDescriptionItem
     @Override
     public String getText(Object object) {
         String label = new IdentifiedElementQuery((MenuItemDescription) object).getLabel();
-        return StringUtil.isEmpty(label) ? getString("_UI_MenuItemDescription_type") : getString("_UI_MenuItemDescription_type") + " " + label;
+        return StringUtil.isEmpty(label) ? getString("_UI_MenuItemDescription_type") : getString("_UI_MenuItemDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
     /**
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 44bb0e2987..67bdd5c62a 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
@@ -112,7 +112,7 @@ public class OperationActionItemProvider extends MenuItemDescriptionItemProvider
     @Override
     public String getText(Object object) {
         String label = new IdentifiedElementQuery((OperationAction) object).getLabel();
-        return StringUtil.isEmpty(label) ? getString("_UI_OperationAction_type") : getString("_UI_OperationAction_type") + " " + label;
+        return StringUtil.isEmpty(label) ? getString("_UI_OperationAction_type") : getString("_UI_OperationAction_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
     /**
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 2a04144624..1b574f36fe 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
@@ -295,7 +295,7 @@ public class PaneBasedSelectionWizardDescriptionItemProvider extends AbstractToo
     @Override
     public String getText(Object object) {
         String label = new IdentifiedElementQuery((PaneBasedSelectionWizardDescription) object).getLabel();
-        return StringUtil.isEmpty(label) ? getString("_UI_PaneBasedSelectionWizardDescription_type") : getString("_UI_PaneBasedSelectionWizardDescription_type") + " " + label;
+        return StringUtil.isEmpty(label) ? getString("_UI_PaneBasedSelectionWizardDescription_type") : getString("_UI_PaneBasedSelectionWizardDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
     /**
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 4873f83e6b..7540a1acde 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
@@ -115,7 +115,7 @@ public class PasteDescriptionItemProvider extends MappingBasedToolDescriptionIte
     @Override
     public String getText(Object object) {
         String label = new IdentifiedElementQuery((PasteDescription) object).getLabel();
-        return StringUtil.isEmpty(label) ? getString("_UI_PasteDescription_type") : getString("_UI_PasteDescription_type") + " " + label;
+        return StringUtil.isEmpty(label) ? getString("_UI_PasteDescription_type") : getString("_UI_PasteDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
     /**
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 84927099a3..4b314a47b6 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
@@ -110,7 +110,7 @@ public class PopupMenuItemProvider extends AbstractToolDescriptionItemProvider {
     @Override
     public String getText(Object object) {
         String label = new IdentifiedElementQuery((PopupMenu) object).getLabel();
-        return label == null || label.length() == 0 ? getString("_UI_PopupMenu_type") : getString("_UI_PopupMenu_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_PopupMenu_type") : getString("_UI_PopupMenu_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
     /**
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 0ff0f03d84..814e1dd03d 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
@@ -148,7 +148,7 @@ public class RepresentationCreationDescriptionItemProvider extends AbstractToolD
     @Override
     public String getText(Object object) {
         String label = new IdentifiedElementQuery((RepresentationCreationDescription) object).getLabel();
-        return StringUtil.isEmpty(label) ? getString("_UI_RepresentationCreationDescription_type") : getString("_UI_RepresentationCreationDescription_type") + " " + label;
+        return StringUtil.isEmpty(label) ? getString("_UI_RepresentationCreationDescription_type") : getString("_UI_RepresentationCreationDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
     /**
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 d92c8a7761..475764cd16 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
@@ -152,7 +152,7 @@ public class RepresentationNavigationDescriptionItemProvider extends AbstractToo
     @Override
     public String getText(Object object) {
         String label = new IdentifiedElementQuery((RepresentationNavigationDescription) object).getLabel();
-        return StringUtil.isEmpty(label) ? getString("_UI_RepresentationNavigationDescription_type") : getString("_UI_RepresentationNavigationDescription_type") + " " + label;
+        return StringUtil.isEmpty(label) ? getString("_UI_RepresentationNavigationDescription_type") : getString("_UI_RepresentationNavigationDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
     /**
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 2174ccb0c0..c9bdd34d3d 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
@@ -252,7 +252,7 @@ public class SelectionWizardDescriptionItemProvider extends AbstractToolDescript
     @Override
     public String getText(Object object) {
         String label = new IdentifiedElementQuery((SelectionWizardDescription) object).getLabel();
-        return StringUtil.isEmpty(label) ? getString("_UI_SelectionWizardDescription_type") : getString("_UI_SelectionWizardDescription_type") + " " + label;
+        return StringUtil.isEmpty(label) ? getString("_UI_SelectionWizardDescription_type") : getString("_UI_SelectionWizardDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
     /**
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 d0794252df..a674eae97b 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
@@ -130,7 +130,7 @@ public class ToolDescriptionItemProvider extends MappingBasedToolDescriptionItem
     @Override
     public String getText(Object object) {
         String label = new IdentifiedElementQuery((ToolDescription) object).getLabel();
-        return StringUtil.isEmpty(label) ? getString("_UI_ToolDescription_type") : getString("_UI_ToolDescription_type") + " " + label;
+        return StringUtil.isEmpty(label) ? getString("_UI_ToolDescription_type") : getString("_UI_ToolDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
     /**
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 f0e456164a..dee90e14b4 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
@@ -93,7 +93,7 @@ public class SemanticValidationRuleItemProvider extends ValidationRuleItemProvid
     public String getText(Object object) {
         IdentifiedElementQuery query = new IdentifiedElementQuery((SemanticValidationRule) object);
         String label = query.getLabel();
-        return label == null || label.length() == 0 ? getString("_UI_SemanticValidationRule_type") : getString("_UI_SemanticValidationRule_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_SemanticValidationRule_type") : getString("_UI_SemanticValidationRule_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
     /**
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 d7f76d9610..2be2e69a36 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
@@ -135,7 +135,7 @@ public class ValidationRuleItemProvider extends IdentifiedElementItemProvider {
     public String getText(Object object) {
         IdentifiedElementQuery query = new IdentifiedElementQuery((SemanticValidationRule) object);
         String label = query.getLabel();
-        return label == null || label.length() == 0 ? getString("_UI_ValidationRule_type") : getString("_UI_ValidationRule_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_ValidationRule_type") : getString("_UI_ValidationRule_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
     /**
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 d3e7ce0d05..d5f222ddae 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
@@ -91,7 +91,7 @@ public class ViewValidationRuleItemProvider extends ValidationRuleItemProvider {
     public String getText(Object object) {
         IdentifiedElementQuery query = new IdentifiedElementQuery((SemanticValidationRule) object);
         String label = query.getLabel();
-        return label == null || label.length() == 0 ? getString("_UI_ViewValidationRule_type") : getString("_UI_ViewValidationRule_type") + " " + label;
+        return label == null || label.length() == 0 ? getString("_UI_ViewValidationRule_type") : getString("_UI_ViewValidationRule_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
     /**
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 8c98310142..dbee71d0c6 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
@@ -173,7 +173,7 @@ IItemPropertySource {
         }
 
         DAnalysisSessionEObject dAnalysisSessionEObject = (DAnalysisSessionEObject) object;
-        return getString("_UI_DAnalysisSessionEObject_type") + " " + dAnalysisSessionEObject.isOpen();
+        return getString("_UI_DAnalysisSessionEObject_type") + " " + dAnalysisSessionEObject.isOpen(); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/SiriusEditPlugin.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/SiriusEditPlugin.java
index bd640fe586..b861672376 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/SiriusEditPlugin.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/SiriusEditPlugin.java
@@ -80,7 +80,7 @@ public final class SiriusEditPlugin extends EMFPlugin {
      */
     public static final SiriusEditPlugin INSTANCE = new SiriusEditPlugin();
 
-    public static final String ID = "org.eclipse.sirius.ui";
+    public static final String ID = "org.eclipse.sirius.ui"; //$NON-NLS-1$
 
     /**
      * Keep track of the singleton. <!-- begin-user-doc --> <!-- end-user-doc
@@ -108,7 +108,7 @@ public final class SiriusEditPlugin extends EMFPlugin {
      */
     @Override
     public ResourceLocator getPluginResourceLocator() {
-        final List<ResourceLocator> overridingLocator = EclipseUtil.getExtensionPlugins(ResourceLocator.class, "org.eclipse.sirius.ui.resourcelocator", "class");
+        final List<ResourceLocator> overridingLocator = EclipseUtil.getExtensionPlugins(ResourceLocator.class, "org.eclipse.sirius.ui.resourcelocator", "class"); //$NON-NLS-1$ //$NON-NLS-2$
         if (overridingLocator.size() > 0) {
             return overridingLocator.get(0);
         }
@@ -214,7 +214,7 @@ public final class SiriusEditPlugin extends EMFPlugin {
             try {
                 // Just a call to load all plugins that provide a specific
                 // resource locator (can be usefull as for automaticall test).
-                EclipseUtil.getExtensionPlugins(ResourceLocator.class, "org.eclipse.sirius.ui.resourcelocator", "class");
+                EclipseUtil.getExtensionPlugins(ResourceLocator.class, "org.eclipse.sirius.ui.resourcelocator", "class"); //$NON-NLS-1$ //$NON-NLS-2$
             } finally {
                 // Do nothing
             }
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 82b3e5008f..b5a0cbd34e 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
@@ -37,21 +37,21 @@ public interface ContributionPackage extends EPackage {
      *
      * @generated
      */
-    String eNAME = "contribution";
+    String eNAME = "contribution"; //$NON-NLS-1$
 
     /**
      * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
      * @generated
      */
-    String eNS_URI = "http://www.eclipse.org/sirius/description/contribution/1.0.0";
+    String eNS_URI = "http://www.eclipse.org/sirius/description/contribution/1.0.0"; //$NON-NLS-1$
 
     /**
      * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
      * @generated
      */
-    String eNS_PREFIX = "contribution";
+    String eNS_PREFIX = "contribution"; //$NON-NLS-1$
 
     /**
      * The singleton instance of the package. <!-- begin-user-doc --> <!--
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/FontFormat.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/FontFormat.java
index 466eeb68cb..a6d7f47510 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/FontFormat.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/FontFormat.java
@@ -36,7 +36,7 @@ public enum FontFormat implements Enumerator {
      * @generated
      * @ordered
      */
-    ITALIC_LITERAL(0, "italic", "italic"),
+    ITALIC_LITERAL(0, "italic", "italic"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>Bold</b></em>' literal object. <!-- begin-user-doc --> <!--
@@ -46,7 +46,7 @@ public enum FontFormat implements Enumerator {
      * @generated
      * @ordered
      */
-    BOLD_LITERAL(1, "bold", "bold"),
+    BOLD_LITERAL(1, "bold", "bold"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>Underline</b></em>' literal object. <!-- begin-user-doc -->
@@ -56,7 +56,7 @@ public enum FontFormat implements Enumerator {
      * @generated
      * @ordered
      */
-    UNDERLINE_LITERAL(2, "underline", "underline"),
+    UNDERLINE_LITERAL(2, "underline", "underline"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>Strike through</b></em>' literal object. <!-- begin-user-doc
@@ -66,7 +66,7 @@ public enum FontFormat implements Enumerator {
      * @generated
      * @ordered
      */
-    STRIKE_THROUGH_LITERAL(3, "strike_through", "strike_through");
+    STRIKE_THROUGH_LITERAL(3, "strike_through", "strike_through"); //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>Italic</b></em>' literal value. <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/LabelAlignment.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/LabelAlignment.java
index c10ca63995..1e9ba1e7ae 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/LabelAlignment.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/LabelAlignment.java
@@ -35,7 +35,7 @@ public enum LabelAlignment implements Enumerator {
      * @generated
      * @ordered
      */
-    CENTER(0, "CENTER", "CENTER"),
+    CENTER(0, "CENTER", "CENTER"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>LEFT</b></em>' literal object. <!-- begin-user-doc --> <!--
@@ -45,7 +45,7 @@ public enum LabelAlignment implements Enumerator {
      * @generated
      * @ordered
      */
-    LEFT(1, "LEFT", "LEFT"),
+    LEFT(1, "LEFT", "LEFT"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>RIGHT</b></em>' literal object. <!-- begin-user-doc --> <!--
@@ -55,7 +55,7 @@ public enum LabelAlignment implements Enumerator {
      * @generated
      * @ordered
      */
-    RIGHT(2, "RIGHT", "RIGHT");
+    RIGHT(2, "RIGHT", "RIGHT"); //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>CENTER</b></em>' literal value. <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/SyncStatus.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/SyncStatus.java
index 85d39dc19e..3519d0c9e6 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/SyncStatus.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/SyncStatus.java
@@ -35,7 +35,7 @@ public enum SyncStatus implements Enumerator {
      * @generated
      * @ordered
      */
-    DIRTY(0, "dirty", "dirty"),
+    DIRTY(0, "dirty", "dirty"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>Sync</b></em>' literal object. <!-- begin-user-doc --> <!--
@@ -45,7 +45,7 @@ public enum SyncStatus implements Enumerator {
      * @generated
      * @ordered
      */
-    SYNC(1, "sync", "sync");
+    SYNC(1, "sync", "sync"); //$NON-NLS-1$
 
     /**
      * The '<em><b>Dirty</b></em>' literal value. <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/ViewpointPackage.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/ViewpointPackage.java
index ca3982b6f2..fd7048066f 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/ViewpointPackage.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/ViewpointPackage.java
@@ -41,21 +41,21 @@ public interface ViewpointPackage extends EPackage {
      * 
      * @generated
      */
-    String eNAME = "viewpoint";
+    String eNAME = "viewpoint"; //$NON-NLS-1$
 
     /**
      * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
      * @generated
      */
-    String eNS_URI = "http://www.eclipse.org/sirius/1.1.0";
+    String eNS_URI = "http://www.eclipse.org/sirius/1.1.0"; //$NON-NLS-1$
 
     /**
      * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
      * @generated
      */
-    String eNS_PREFIX = "viewpoint";
+    String eNS_PREFIX = "viewpoint"; //$NON-NLS-1$
 
     /**
      * The singleton instance of the package. <!-- begin-user-doc --> <!--
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/DescriptionPackage.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/DescriptionPackage.java
index 526905af22..65a600f4d1 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/DescriptionPackage.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/DescriptionPackage.java
@@ -39,21 +39,21 @@ public interface DescriptionPackage extends EPackage {
      * 
      * @generated
      */
-    String eNAME = "description";
+    String eNAME = "description"; //$NON-NLS-1$
 
     /**
      * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
      * @generated
      */
-    String eNS_URI = "http://www.eclipse.org/sirius/description/1.1.0";
+    String eNS_URI = "http://www.eclipse.org/sirius/description/1.1.0"; //$NON-NLS-1$
 
     /**
      * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
      * @generated
      */
-    String eNS_PREFIX = "description";
+    String eNS_PREFIX = "description"; //$NON-NLS-1$
 
     /**
      * The singleton instance of the package. <!-- begin-user-doc --> <!--
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/Position.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/Position.java
index 72b0472b43..62e74e0380 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/Position.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/Position.java
@@ -35,7 +35,7 @@ public enum Position implements Enumerator {
      * @generated
      * @ordered
      */
-    NORTH_LITERAL(0, "NORTH", "NORTH"),
+    NORTH_LITERAL(0, "NORTH", "NORTH"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>WEST</b></em>' literal object. <!-- begin-user-doc --> <!--
@@ -45,7 +45,7 @@ public enum Position implements Enumerator {
      * @generated
      * @ordered
      */
-    WEST_LITERAL(1, "WEST", "WEST"),
+    WEST_LITERAL(1, "WEST", "WEST"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>SOUTH</b></em>' literal object. <!-- begin-user-doc --> <!--
@@ -55,7 +55,7 @@ public enum Position implements Enumerator {
      * @generated
      * @ordered
      */
-    SOUTH_LITERAL(2, "SOUTH", "SOUTH"),
+    SOUTH_LITERAL(2, "SOUTH", "SOUTH"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>EAST</b></em>' literal object. <!-- begin-user-doc --> <!--
@@ -65,7 +65,7 @@ public enum Position implements Enumerator {
      * @generated
      * @ordered
      */
-    EAST_LITERAL(3, "EAST", "EAST"),
+    EAST_LITERAL(3, "EAST", "EAST"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>NORTH WEST</b></em>' literal object. <!-- begin-user-doc -->
@@ -75,7 +75,7 @@ public enum Position implements Enumerator {
      * @generated
      * @ordered
      */
-    NORTH_WEST_LITERAL(4, "NORTH_WEST", "NORTH_WEST"),
+    NORTH_WEST_LITERAL(4, "NORTH_WEST", "NORTH_WEST"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>NORTH EAST</b></em>' literal object. <!-- begin-user-doc -->
@@ -85,7 +85,7 @@ public enum Position implements Enumerator {
      * @generated
      * @ordered
      */
-    NORTH_EAST_LITERAL(5, "NORTH_EAST", "NORTH_EAST"),
+    NORTH_EAST_LITERAL(5, "NORTH_EAST", "NORTH_EAST"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>SOUTH WEST</b></em>' literal object. <!-- begin-user-doc -->
@@ -95,7 +95,7 @@ public enum Position implements Enumerator {
      * @generated
      * @ordered
      */
-    SOUTH_WEST_LITERAL(6, "SOUTH_WEST", "SOUTH_WEST"),
+    SOUTH_WEST_LITERAL(6, "SOUTH_WEST", "SOUTH_WEST"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>SOUTH EAST</b></em>' literal object. <!-- begin-user-doc -->
@@ -105,7 +105,7 @@ public enum Position implements Enumerator {
      * @generated
      * @ordered
      */
-    SOUTH_EAST_LITERAL(7, "SOUTH_EAST", "SOUTH_EAST"),
+    SOUTH_EAST_LITERAL(7, "SOUTH_EAST", "SOUTH_EAST"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>CENTER</b></em>' literal object. <!-- begin-user-doc --> <!--
@@ -115,7 +115,7 @@ public enum Position implements Enumerator {
      * @generated
      * @ordered
      */
-    CENTER_LITERAL(8, "CENTER", "CENTER");
+    CENTER_LITERAL(8, "CENTER", "CENTER"); //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>NORTH</b></em>' literal value. <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/SystemColors.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/SystemColors.java
index 7ed9a3d8de..fe09b2d648 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/SystemColors.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/SystemColors.java
@@ -36,7 +36,7 @@ public enum SystemColors implements Enumerator {
      * @generated
      * @ordered
      */
-    BLACK_LITERAL(0, "black", "black"),
+    BLACK_LITERAL(0, "black", "black"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>Blue</b></em>' literal object. <!-- begin-user-doc --> <!--
@@ -46,7 +46,7 @@ public enum SystemColors implements Enumerator {
      * @generated
      * @ordered
      */
-    BLUE_LITERAL(1, "blue", "blue"),
+    BLUE_LITERAL(1, "blue", "blue"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>Red</b></em>' literal object. <!-- begin-user-doc --> <!--
@@ -56,7 +56,7 @@ public enum SystemColors implements Enumerator {
      * @generated
      * @ordered
      */
-    RED_LITERAL(2, "red", "red"),
+    RED_LITERAL(2, "red", "red"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>Green</b></em>' literal object. <!-- begin-user-doc --> <!--
@@ -66,7 +66,7 @@ public enum SystemColors implements Enumerator {
      * @generated
      * @ordered
      */
-    GREEN_LITERAL(3, "green", "green"),
+    GREEN_LITERAL(3, "green", "green"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>Yellow</b></em>' literal object. <!-- begin-user-doc --> <!--
@@ -76,7 +76,7 @@ public enum SystemColors implements Enumerator {
      * @generated
      * @ordered
      */
-    YELLOW_LITERAL(4, "yellow", "yellow"),
+    YELLOW_LITERAL(4, "yellow", "yellow"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>Purple</b></em>' literal object. <!-- begin-user-doc --> <!--
@@ -86,7 +86,7 @@ public enum SystemColors implements Enumerator {
      * @generated
      * @ordered
      */
-    PURPLE_LITERAL(5, "purple", "purple"),
+    PURPLE_LITERAL(5, "purple", "purple"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>Orange</b></em>' literal object. <!-- begin-user-doc --> <!--
@@ -96,7 +96,7 @@ public enum SystemColors implements Enumerator {
      * @generated
      * @ordered
      */
-    ORANGE_LITERAL(6, "orange", "orange"),
+    ORANGE_LITERAL(6, "orange", "orange"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>Chocolate</b></em>' literal object. <!-- begin-user-doc -->
@@ -106,7 +106,7 @@ public enum SystemColors implements Enumerator {
      * @generated
      * @ordered
      */
-    CHOCOLATE_LITERAL(7, "chocolate", "chocolate"),
+    CHOCOLATE_LITERAL(7, "chocolate", "chocolate"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>Gray</b></em>' literal object. <!-- begin-user-doc --> <!--
@@ -116,7 +116,7 @@ public enum SystemColors implements Enumerator {
      * @generated
      * @ordered
      */
-    GRAY_LITERAL(8, "gray", "gray"),
+    GRAY_LITERAL(8, "gray", "gray"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>White</b></em>' literal object. <!-- begin-user-doc --> <!--
@@ -126,7 +126,7 @@ public enum SystemColors implements Enumerator {
      * @generated
      * @ordered
      */
-    WHITE_LITERAL(9, "white", "white"),
+    WHITE_LITERAL(9, "white", "white"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>Dark blue</b></em>' literal object. <!-- begin-user-doc -->
@@ -136,7 +136,7 @@ public enum SystemColors implements Enumerator {
      * @generated
      * @ordered
      */
-    DARK_BLUE_LITERAL(11, "dark_blue", "dark_blue"),
+    DARK_BLUE_LITERAL(11, "dark_blue", "dark_blue"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>Dark red</b></em>' literal object. <!-- begin-user-doc -->
@@ -146,7 +146,7 @@ public enum SystemColors implements Enumerator {
      * @generated
      * @ordered
      */
-    DARK_RED_LITERAL(12, "dark_red", "dark_red"),
+    DARK_RED_LITERAL(12, "dark_red", "dark_red"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>Dark green</b></em>' literal object. <!-- begin-user-doc -->
@@ -156,7 +156,7 @@ public enum SystemColors implements Enumerator {
      * @generated
      * @ordered
      */
-    DARK_GREEN_LITERAL(13, "dark_green", "dark_green"),
+    DARK_GREEN_LITERAL(13, "dark_green", "dark_green"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>Dark yellow</b></em>' literal object. <!-- begin-user-doc -->
@@ -166,7 +166,7 @@ public enum SystemColors implements Enumerator {
      * @generated
      * @ordered
      */
-    DARK_YELLOW_LITERAL(14, "dark_yellow", "dark_yellow"),
+    DARK_YELLOW_LITERAL(14, "dark_yellow", "dark_yellow"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>Dark purple</b></em>' literal object. <!-- begin-user-doc -->
@@ -176,7 +176,7 @@ public enum SystemColors implements Enumerator {
      * @generated
      * @ordered
      */
-    DARK_PURPLE_LITERAL(15, "dark_purple", "dark_purple"),
+    DARK_PURPLE_LITERAL(15, "dark_purple", "dark_purple"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>Dark orange</b></em>' literal object. <!-- begin-user-doc -->
@@ -186,7 +186,7 @@ public enum SystemColors implements Enumerator {
      * @generated
      * @ordered
      */
-    DARK_ORANGE_LITERAL(16, "dark_orange", "dark_orange"),
+    DARK_ORANGE_LITERAL(16, "dark_orange", "dark_orange"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>Dark chocolate</b></em>' literal object. <!-- begin-user-doc
@@ -196,7 +196,7 @@ public enum SystemColors implements Enumerator {
      * @generated
      * @ordered
      */
-    DARK_CHOCOLATE_LITERAL(17, "dark_chocolate", "dark_chocolate"),
+    DARK_CHOCOLATE_LITERAL(17, "dark_chocolate", "dark_chocolate"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>Dark gray</b></em>' literal object. <!-- begin-user-doc -->
@@ -206,7 +206,7 @@ public enum SystemColors implements Enumerator {
      * @generated
      * @ordered
      */
-    DARK_GRAY_LITERAL(18, "dark_gray", "dark_gray"),
+    DARK_GRAY_LITERAL(18, "dark_gray", "dark_gray"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>Light blue</b></em>' literal object. <!-- begin-user-doc -->
@@ -216,7 +216,7 @@ public enum SystemColors implements Enumerator {
      * @generated
      * @ordered
      */
-    LIGHT_BLUE_LITERAL(21, "light_blue", "light_blue"),
+    LIGHT_BLUE_LITERAL(21, "light_blue", "light_blue"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>Light red</b></em>' literal object. <!-- begin-user-doc -->
@@ -226,7 +226,7 @@ public enum SystemColors implements Enumerator {
      * @generated
      * @ordered
      */
-    LIGHT_RED_LITERAL(22, "light_red", "light_red"),
+    LIGHT_RED_LITERAL(22, "light_red", "light_red"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>Light green</b></em>' literal object. <!-- begin-user-doc -->
@@ -236,7 +236,7 @@ public enum SystemColors implements Enumerator {
      * @generated
      * @ordered
      */
-    LIGHT_GREEN_LITERAL(23, "light_green", "light_green"),
+    LIGHT_GREEN_LITERAL(23, "light_green", "light_green"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>Light yellow</b></em>' literal object. <!-- begin-user-doc
@@ -246,7 +246,7 @@ public enum SystemColors implements Enumerator {
      * @generated
      * @ordered
      */
-    LIGHT_YELLOW_LITERAL(24, "light_yellow", "light_yellow"),
+    LIGHT_YELLOW_LITERAL(24, "light_yellow", "light_yellow"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>Light purple</b></em>' literal object. <!-- begin-user-doc
@@ -256,7 +256,7 @@ public enum SystemColors implements Enumerator {
      * @generated
      * @ordered
      */
-    LIGHT_PURPLE_LITERAL(25, "light_purple", "light_purple"),
+    LIGHT_PURPLE_LITERAL(25, "light_purple", "light_purple"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>Light orange</b></em>' literal object. <!-- begin-user-doc
@@ -266,7 +266,7 @@ public enum SystemColors implements Enumerator {
      * @generated
      * @ordered
      */
-    LIGHT_ORANGE_LITERAL(26, "light_orange", "light_orange"),
+    LIGHT_ORANGE_LITERAL(26, "light_orange", "light_orange"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>Light chocolate</b></em>' literal object. <!-- begin-user-doc
@@ -276,7 +276,7 @@ public enum SystemColors implements Enumerator {
      * @generated
      * @ordered
      */
-    LIGHT_CHOCOLATE_LITERAL(27, "light_chocolate", "light_chocolate"),
+    LIGHT_CHOCOLATE_LITERAL(27, "light_chocolate", "light_chocolate"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>Light gray</b></em>' literal object. <!-- begin-user-doc -->
@@ -286,7 +286,7 @@ public enum SystemColors implements Enumerator {
      * @generated
      * @ordered
      */
-    LIGHT_GRAY_LITERAL(28, "light_gray", "light_gray");
+    LIGHT_GRAY_LITERAL(28, "light_gray", "light_gray"); //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>Black</b></em>' literal value. <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/audit/AuditPackage.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/audit/AuditPackage.java
index 4518408933..7368a484cf 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/audit/AuditPackage.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/audit/AuditPackage.java
@@ -36,21 +36,21 @@ public interface AuditPackage extends EPackage {
      * 
      * @generated
      */
-    String eNAME = "audit";
+    String eNAME = "audit"; //$NON-NLS-1$
 
     /**
      * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
      * @generated
      */
-    String eNS_URI = "http://www.eclipse.org/sirius/description/audit/1.1.0";
+    String eNS_URI = "http://www.eclipse.org/sirius/description/audit/1.1.0"; //$NON-NLS-1$
 
     /**
      * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
      * @generated
      */
-    String eNS_PREFIX = "audit";
+    String eNS_PREFIX = "audit"; //$NON-NLS-1$
 
     /**
      * The singleton instance of the package. <!-- begin-user-doc --> <!--
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 dd703bbe27..edbc21ca6a 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
@@ -47,7 +47,7 @@ public class ColorStepImpl extends MinimalEObjectImpl.Container implements Color
      * @generated
      * @ordered
      */
-    protected static final String ASSOCIATED_VALUE_EDEFAULT = "";
+    protected static final String ASSOCIATED_VALUE_EDEFAULT = ""; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getAssociatedValue()
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 d45a495bc1..f7106cde3e 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
@@ -46,7 +46,7 @@ public class ComputedColorImpl extends UserColorImpl implements ComputedColor {
      * @generated
      * @ordered
      */
-    protected static final String RED_EDEFAULT = "";
+    protected static final String RED_EDEFAULT = ""; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getRed() <em>Red</em>}' attribute. <!--
@@ -66,7 +66,7 @@ public class ComputedColorImpl extends UserColorImpl implements ComputedColor {
      * @generated
      * @ordered
      */
-    protected static final String GREEN_EDEFAULT = "";
+    protected static final String GREEN_EDEFAULT = ""; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getGreen() <em>Green</em>}' attribute.
@@ -86,7 +86,7 @@ public class ComputedColorImpl extends UserColorImpl implements ComputedColor {
      * @generated
      * @ordered
      */
-    protected static final String BLUE_EDEFAULT = "";
+    protected static final String BLUE_EDEFAULT = ""; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getBlue() <em>Blue</em>}' attribute.
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/DModelElementImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/DModelElementImpl.java
index 6846d6be7c..0dd13094d9 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/DModelElementImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/DModelElementImpl.java
@@ -192,7 +192,7 @@ public abstract class DModelElementImpl extends MinimalEObjectImpl.Container imp
                     }
                 }
                 name = DModelElementImpl.eEncodeValue(name);
-                return count > 0 ? name + "." + count : name;
+                return count > 0 ? name + "." + count : name; //$NON-NLS-1$
             }
         } else if (eObject instanceof DAnnotation) {
             DAnnotation eAnnotation = (DAnnotation) eObject;
@@ -238,7 +238,7 @@ public abstract class DModelElementImpl extends MinimalEObjectImpl.Container imp
                 if (firstCharacter == '%') {
                     // Find the closing '%'
                     //
-                    int index = uriFragmentSegment.lastIndexOf("%");
+                    int index = uriFragmentSegment.lastIndexOf("%"); //$NON-NLS-1$
                     if (index != -1) {
                         // Decode all encoded characters.
                         //
@@ -270,7 +270,7 @@ public abstract class DModelElementImpl extends MinimalEObjectImpl.Container imp
                 } else {
                     // Look for trailing count.
                     //
-                    int index = uriFragmentSegment.lastIndexOf(".");
+                    int index = uriFragmentSegment.lastIndexOf("."); //$NON-NLS-1$
                     String name = index == -1 ? uriFragmentSegment : uriFragmentSegment.substring(0, index);
                     int count = 0;
                     if (index != -1) {
@@ -304,9 +304,9 @@ public abstract class DModelElementImpl extends MinimalEObjectImpl.Container imp
         return super.eObjectForURIFragmentSegment(uriFragmentSegment);
     }
 
-    private static final String[] ESCAPE = { "%00", "%01", "%02", "%03", "%04", "%05", "%06", "%07", "%08", "%09", "%0A", "%0B", "%0C", "%0D", "%0E", "%0F", "%10", "%11", "%12", "%13", "%14", "%15",
-        "%16", "%17", "%18", "%19", "%1A", "%1B", "%1C", "%1D", "%1E", "%1F", "%20", null, "%22", "%23", null, "%25", "%26", "%27", null, null, null, null, "%2C", null, null, "%2F", null, null,
-        null, null, null, null, null, null, null, null, "%3A", null, "%3C", null, "%3E", null, };
+    private static final String[] ESCAPE = { "%00", "%01", "%02", "%03", "%04", "%05", "%06", "%07", "%08", "%09", "%0A", "%0B", "%0C", "%0D", "%0E", "%0F", "%10", "%11", "%12", "%13", "%14", "%15", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$ //$NON-NLS-12$ //$NON-NLS-13$ //$NON-NLS-14$ //$NON-NLS-15$ //$NON-NLS-16$ //$NON-NLS-17$ //$NON-NLS-18$ //$NON-NLS-19$ //$NON-NLS-20$ //$NON-NLS-21$ //$NON-NLS-22$
+        "%16", "%17", "%18", "%19", "%1A", "%1B", "%1C", "%1D", "%1E", "%1F", "%20", null, "%22", "%23", null, "%25", "%26", "%27", null, null, null, null, "%2C", null, null, "%2F", null, null, //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$ //$NON-NLS-12$ //$NON-NLS-13$ //$NON-NLS-14$ //$NON-NLS-15$ //$NON-NLS-16$ //$NON-NLS-17$ //$NON-NLS-18$
+        null, null, null, null, null, null, null, null, "%3A", null, "%3C", null, "%3E", null, }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 
     /**
      * Returns the encoded value or the original, if no encoding was needed.
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 20ed01e900..cb736afa17 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
@@ -220,7 +220,7 @@ public class DescriptionFactoryImpl extends EFactoryImpl implements DescriptionF
 
     private SytemColorsPalette forgeSystemPaletteProxy() {
         final EObject environment = EcoreUtil.create(DescriptionPackage.eINSTANCE.getSytemColorsPalette());
-        URI paletteURI = URI.createURI(SiriusUtil.VIEWPOINT_ENVIRONMENT_RESOURCE_URI + "#/0/@systemColors");
+        URI paletteURI = URI.createURI(SiriusUtil.VIEWPOINT_ENVIRONMENT_RESOURCE_URI + "#/0/@systemColors"); //$NON-NLS-1$
         ((InternalEObject) environment).eSetProxyURI(paletteURI);
         return ((SytemColorsPalette) environment);
     }
@@ -376,7 +376,7 @@ public class DescriptionFactoryImpl extends EFactoryImpl implements DescriptionF
     @Override
     public ColorStep createColorStep() {
         ColorStepImpl colorStep = new ColorStepImpl();
-        FixedColor defaultColor = EnvironmentSystemColorFactory.getDefault().getSystemColorDescription("black");
+        FixedColor defaultColor = EnvironmentSystemColorFactory.getDefault().getSystemColorDescription("black"); //$NON-NLS-1$
         colorStep.setAssociatedColor(defaultColor);
         return colorStep;
     }
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 3b9a12b3af..edf35a68db 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
@@ -42,7 +42,7 @@ public abstract class DocumentedElementImpl extends MinimalEObjectImpl.Container
      * @generated
      * @ordered
      */
-    protected static final String DOCUMENTATION_EDEFAULT = "";
+    protected static final String DOCUMENTATION_EDEFAULT = ""; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getDocumentation()
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 8827f3a1ca..e847ea73d7 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
@@ -42,7 +42,7 @@ public abstract class EndUserDocumentedElementImpl extends MinimalEObjectImpl.Co
      * @generated
      * @ordered
      */
-    protected static final String END_USER_DOCUMENTATION_EDEFAULT = "";
+    protected static final String END_USER_DOCUMENTATION_EDEFAULT = ""; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getEndUserDocumentation()
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 cb17d9cacd..d592b6f0bc 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
@@ -66,7 +66,7 @@ public class GroupImpl extends DModelElementImpl implements Group {
      * @generated
      * @ordered
      */
-    protected static final String DOCUMENTATION_EDEFAULT = "";
+    protected static final String DOCUMENTATION_EDEFAULT = ""; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getDocumentation()
@@ -87,7 +87,7 @@ public class GroupImpl extends DModelElementImpl implements Group {
      * @generated
      * @ordered
      */
-    protected static final String NAME_EDEFAULT = "";
+    protected static final String NAME_EDEFAULT = ""; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
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 ce2f9a61de..b8dac8ce48 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
@@ -44,7 +44,7 @@ public class IdentifiedElementImpl extends MinimalEObjectImpl.Container implemen
      * @generated
      * @ordered
      */
-    protected static final String NAME_EDEFAULT = "";
+    protected static final String NAME_EDEFAULT = ""; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
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 570d964526..03cd9024de 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
@@ -82,7 +82,7 @@ public class InterpolatedColorImpl extends ColorDescriptionImpl implements Inter
      * @generated
      * @ordered
      */
-    protected static final String COLOR_VALUE_COMPUTATION_EXPRESSION_EDEFAULT = "1";
+    protected static final String COLOR_VALUE_COMPUTATION_EXPRESSION_EDEFAULT = "1"; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getColorValueComputationExpression()
@@ -104,7 +104,7 @@ public class InterpolatedColorImpl extends ColorDescriptionImpl implements Inter
      * @generated
      * @ordered
      */
-    protected static final String MIN_VALUE_COMPUTATION_EXPRESSION_EDEFAULT = "0";
+    protected static final String MIN_VALUE_COMPUTATION_EXPRESSION_EDEFAULT = "0"; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getMinValueComputationExpression()
@@ -126,7 +126,7 @@ public class InterpolatedColorImpl extends ColorDescriptionImpl implements Inter
      * @generated
      * @ordered
      */
-    protected static final String MAX_VALUE_COMPUTATION_EXPRESSION_EDEFAULT = "10";
+    protected static final String MAX_VALUE_COMPUTATION_EXPRESSION_EDEFAULT = "10"; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getMaxValueComputationExpression()
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 5ae1369b10..90dad55aa6 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
@@ -103,7 +103,7 @@ public class ViewpointImpl extends DocumentedElementImpl implements Viewpoint {
      * @generated
      * @ordered
      */
-    protected static final String END_USER_DOCUMENTATION_EDEFAULT = "";
+    protected static final String END_USER_DOCUMENTATION_EDEFAULT = ""; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getEndUserDocumentation()
@@ -124,7 +124,7 @@ public class ViewpointImpl extends DocumentedElementImpl implements Viewpoint {
      * @generated
      * @ordered
      */
-    protected static final String NAME_EDEFAULT = "";
+    protected static final String NAME_EDEFAULT = ""; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
@@ -165,7 +165,7 @@ public class ViewpointImpl extends DocumentedElementImpl implements Viewpoint {
      * @generated
      * @ordered
      */
-    protected static final String MODEL_FILE_EXTENSION_EDEFAULT = "*";
+    protected static final String MODEL_FILE_EXTENSION_EDEFAULT = "*"; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getModelFileExtension()
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/style/StylePackage.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/style/StylePackage.java
index 6f447f3acc..9bdc51113e 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/style/StylePackage.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/style/StylePackage.java
@@ -37,21 +37,21 @@ public interface StylePackage extends EPackage {
      * 
      * @generated
      */
-    String eNAME = "style";
+    String eNAME = "style"; //$NON-NLS-1$
 
     /**
      * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
      * @generated
      */
-    String eNS_URI = "http://www.eclipse.org/sirius/description/style/1.1.0";
+    String eNS_URI = "http://www.eclipse.org/sirius/description/style/1.1.0"; //$NON-NLS-1$
 
     /**
      * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
      * @generated
      */
-    String eNS_PREFIX = "style";
+    String eNS_PREFIX = "style"; //$NON-NLS-1$
 
     /**
      * The singleton instance of the package. <!-- begin-user-doc --> <!--
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 003db90ae9..d66ba9b333 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
@@ -115,7 +115,7 @@ public class BasicLabelStyleDescriptionImpl extends MinimalEObjectImpl.Container
      * @generated
      * @ordered
      */
-    protected static final String LABEL_EXPRESSION_EDEFAULT = "feature:name";
+    protected static final String LABEL_EXPRESSION_EDEFAULT = "feature:name"; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getLabelExpression()
@@ -146,7 +146,7 @@ public class BasicLabelStyleDescriptionImpl extends MinimalEObjectImpl.Container
      * @generated
      * @ordered
      */
-    protected static final String ICON_PATH_EDEFAULT = "";
+    protected static final String ICON_PATH_EDEFAULT = ""; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getIconPath() <em>Icon Path</em>}'
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 96a008c0da..9d7d2e3ba5 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
@@ -42,7 +42,7 @@ public class TooltipStyleDescriptionImpl extends MinimalEObjectImpl.Container im
      * @generated
      * @ordered
      */
-    protected static final String TOOLTIP_EXPRESSION_EDEFAULT = "";
+    protected static final String TOOLTIP_EXPRESSION_EDEFAULT = ""; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getTooltipExpression()
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/DragSource.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/DragSource.java
index 0902d9422a..69b503286c 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/DragSource.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/DragSource.java
@@ -35,7 +35,7 @@ public enum DragSource implements Enumerator {
      * @generated
      * @ordered
      */
-    DIAGRAM_LITERAL(1, "DIAGRAM", "DIAGRAM"),
+    DIAGRAM_LITERAL(1, "DIAGRAM", "DIAGRAM"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>PROJECT EXPLORER</b></em>' literal object. <!--
@@ -45,7 +45,7 @@ public enum DragSource implements Enumerator {
      * @generated
      * @ordered
      */
-    PROJECT_EXPLORER_LITERAL(2, "PROJECT_EXPLORER", "PROJECT_EXPLORER"),
+    PROJECT_EXPLORER_LITERAL(2, "PROJECT_EXPLORER", "PROJECT_EXPLORER"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>BOTH</b></em>' literal object. <!-- begin-user-doc --> <!--
@@ -55,7 +55,7 @@ public enum DragSource implements Enumerator {
      * @generated
      * @ordered
      */
-    BOTH_LITERAL(3, "BOTH", "BOTH");
+    BOTH_LITERAL(3, "BOTH", "BOTH"); //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>DIAGRAM</b></em>' literal value. <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/ToolPackage.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/ToolPackage.java
index c7a6b7dc74..a3aeeb11cd 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/ToolPackage.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/ToolPackage.java
@@ -39,21 +39,21 @@ public interface ToolPackage extends EPackage {
      * 
      * @generated
      */
-    String eNAME = "tool";
+    String eNAME = "tool"; //$NON-NLS-1$
 
     /**
      * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
      * @generated
      */
-    String eNS_URI = "http://www.eclipse.org/sirius/description/tool/1.1.0";
+    String eNS_URI = "http://www.eclipse.org/sirius/description/tool/1.1.0"; //$NON-NLS-1$
 
     /**
      * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
      * @generated
      */
-    String eNS_PREFIX = "tool";
+    String eNS_PREFIX = "tool"; //$NON-NLS-1$
 
     /**
      * The singleton instance of the package. <!-- begin-user-doc --> <!--
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 cf278feff7..ccbf0abfa0 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
@@ -69,7 +69,7 @@ public abstract class AbstractToolDescriptionImpl extends DocumentedElementImpl
      * @generated
      * @ordered
      */
-    protected static final String NAME_EDEFAULT = "";
+    protected static final String NAME_EDEFAULT = ""; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
@@ -110,7 +110,7 @@ public abstract class AbstractToolDescriptionImpl extends DocumentedElementImpl
      * @generated
      * @ordered
      */
-    protected static final String PRECONDITION_EDEFAULT = "";
+    protected static final String PRECONDITION_EDEFAULT = ""; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getPrecondition() <em>Precondition</em>}
@@ -162,7 +162,7 @@ public abstract class AbstractToolDescriptionImpl extends DocumentedElementImpl
      * @generated
      * @ordered
      */
-    protected static final String ELEMENTS_TO_SELECT_EDEFAULT = "";
+    protected static final String ELEMENTS_TO_SELECT_EDEFAULT = ""; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getElementsToSelect()
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 76fc1980f6..49c44fd28d 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
@@ -89,7 +89,7 @@ public class CreateInstanceImpl extends ContainerModelOperationImpl implements C
      * @generated
      * @ordered
      */
-    protected static final String VARIABLE_NAME_EDEFAULT = "instance";
+    protected static final String VARIABLE_NAME_EDEFAULT = "instance"; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getVariableName()
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 04a0d6ddae..fec1bcf26f 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
@@ -64,7 +64,7 @@ public class ForImpl extends ContainerModelOperationImpl implements For {
      * @generated
      * @ordered
      */
-    protected static final String ITERATOR_NAME_EDEFAULT = "i";
+    protected static final String ITERATOR_NAME_EDEFAULT = "i"; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getIteratorName()
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 00a9f2a4aa..b3cacf38d8 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
@@ -131,7 +131,7 @@ public class PaneBasedSelectionWizardDescriptionImpl extends AbstractToolDescrip
      * @generated
      * @ordered
      */
-    protected static final String ICON_PATH_EDEFAULT = "/org.eclipse.sirius.ui/icons/full/obj16/PaneBasedSelectionWizardDescription.gif";
+    protected static final String ICON_PATH_EDEFAULT = "/org.eclipse.sirius.ui/icons/full/obj16/PaneBasedSelectionWizardDescription.gif"; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getIconPath() <em>Icon Path</em>}'
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 32397777e9..15f0deeca0 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
@@ -64,7 +64,7 @@ public abstract class RepresentationCreationDescriptionImpl extends AbstractTool
      * @generated
      * @ordered
      */
-    protected static final String TITLE_EXPRESSION_EDEFAULT = "";
+    protected static final String TITLE_EXPRESSION_EDEFAULT = ""; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getTitleExpression()
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 97118411b1..51d757f590 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
@@ -252,7 +252,7 @@ public class SelectionWizardDescriptionImpl extends AbstractToolDescriptionImpl
      * @generated
      * @ordered
      */
-    protected static final String ICON_PATH_EDEFAULT = "/org.eclipse.sirius.ui/icons/full/obj16/SelectionWizardDescription.gif";
+    protected static final String ICON_PATH_EDEFAULT = "/org.eclipse.sirius.ui/icons/full/obj16/SelectionWizardDescription.gif"; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getIconPath() <em>Icon Path</em>}'
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 ebc1bcf8c4..be1596784b 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
@@ -54,7 +54,7 @@ public class ToolDescriptionImpl extends MappingBasedToolDescriptionImpl impleme
      * @generated
      * @ordered
      */
-    protected static final String ICON_PATH_EDEFAULT = "";
+    protected static final String ICON_PATH_EDEFAULT = ""; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getIconPath() <em>Icon Path</em>}'
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 84b442c659..2c1b8f3f54 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
@@ -233,10 +233,10 @@ public class ToolFactoryImpl extends EFactoryImpl implements ToolFactory {
     public ToolDescription createToolDescription() {
         ToolDescriptionImpl toolDescription = new ToolDescriptionImpl();
         ElementVariable elementVar = createElementVariable();
-        elementVar.setName("element");
+        elementVar.setName("element"); //$NON-NLS-1$
         toolDescription.setElement(elementVar);
         ElementViewVariable elementViewVar = createElementViewVariable();
-        elementViewVar.setName("elementView");
+        elementViewVar.setName("elementView"); //$NON-NLS-1$
         toolDescription.setElementView(elementViewVar);
         toolDescription.setInitialOperation(this.createInitialOperation());
         return toolDescription;
@@ -283,11 +283,11 @@ public class ToolFactoryImpl extends EFactoryImpl implements ToolFactory {
     public SelectionWizardDescription createSelectionWizardDescription() {
         SelectionWizardDescriptionImpl selectionWizardDescription = new SelectionWizardDescriptionImpl();
         ElementSelectVariable elementSelectVariable = this.createElementSelectVariable();
-        elementSelectVariable.setName("element");
+        elementSelectVariable.setName("element"); //$NON-NLS-1$
         ContainerViewVariable containerViewVariable = this.createContainerViewVariable();
-        containerViewVariable.setName("containerView");
+        containerViewVariable.setName("containerView"); //$NON-NLS-1$
         SelectContainerVariable selectContainerVariable = this.createSelectContainerVariable();
-        selectContainerVariable.setName("container");
+        selectContainerVariable.setName("container"); //$NON-NLS-1$
         selectionWizardDescription.setElement(elementSelectVariable);
         selectionWizardDescription.setContainer(selectContainerVariable);
         selectionWizardDescription.setContainerView(containerViewVariable);
@@ -305,11 +305,11 @@ public class ToolFactoryImpl extends EFactoryImpl implements ToolFactory {
     public PaneBasedSelectionWizardDescription createPaneBasedSelectionWizardDescription() {
         PaneBasedSelectionWizardDescriptionImpl paneBasedSelectionWizardDescription = new PaneBasedSelectionWizardDescriptionImpl();
         ElementSelectVariable elementSelectVariable = this.createElementSelectVariable();
-        elementSelectVariable.setName("element");
+        elementSelectVariable.setName("element"); //$NON-NLS-1$
         ContainerViewVariable containerViewVariable = this.createContainerViewVariable();
-        containerViewVariable.setName("containerView");
+        containerViewVariable.setName("containerView"); //$NON-NLS-1$
         SelectContainerVariable selectContainerVariable = this.createSelectContainerVariable();
-        selectContainerVariable.setName("container");
+        selectContainerVariable.setName("container"); //$NON-NLS-1$
         paneBasedSelectionWizardDescription.setElement(elementSelectVariable);
         paneBasedSelectionWizardDescription.setContainer(selectContainerVariable);
         paneBasedSelectionWizardDescription.setContainerView(containerViewVariable);
@@ -338,7 +338,7 @@ public class ToolFactoryImpl extends EFactoryImpl implements ToolFactory {
     public OperationAction createOperationAction() {
         OperationActionImpl operationAction = new OperationActionImpl();
         ContainerViewVariable containerViewVariable = this.createContainerViewVariable();
-        containerViewVariable.setName("views");
+        containerViewVariable.setName("views"); //$NON-NLS-1$
         InitialOperation initalOperation = this.createInitialOperation();
         operationAction.setView(containerViewVariable);
         operationAction.setInitialOperation(initalOperation);
@@ -496,7 +496,7 @@ public class ToolFactoryImpl extends EFactoryImpl implements ToolFactory {
     @Override
     public EditMaskVariables createEditMaskVariables() {
         EditMaskVariablesImpl editMaskVariables = new EditMaskVariablesImpl();
-        editMaskVariables.setMask("{0}");
+        editMaskVariables.setMask("{0}"); //$NON-NLS-1$
         return editMaskVariables;
     }
 
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 188859e19c..62c1e471e1 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
@@ -43,7 +43,7 @@ public class UnsetImpl extends ContainerModelOperationImpl implements Unset {
      * @generated
      * @ordered
      */
-    protected static final String FEATURE_NAME_EDEFAULT = "";
+    protected static final String FEATURE_NAME_EDEFAULT = ""; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getFeatureName() <em>Feature Name</em>}'
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/util/DescriptionResourceImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/util/DescriptionResourceImpl.java
index aa99b4a4a4..8a1f1d9e11 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/util/DescriptionResourceImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/util/DescriptionResourceImpl.java
@@ -41,7 +41,7 @@ public class DescriptionResourceImpl extends XMIResourceImpl {
      * resources proxy resolution. Default is false. This option is considered
      * only for odesign in plugin.
      */
-    public static final String OPTION_USE_URI_FRAGMENT_AS_ID = "SIRIUS_USE_URI_FRAGMENT_AS_ID";
+    public static final String OPTION_USE_URI_FRAGMENT_AS_ID = "SIRIUS_USE_URI_FRAGMENT_AS_ID"; //$NON-NLS-1$
 
     private boolean useURIFragmentAsId;
 
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/validation/ERROR_LEVEL.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/validation/ERROR_LEVEL.java
index 56361c46f7..eba4fc5521 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/validation/ERROR_LEVEL.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/validation/ERROR_LEVEL.java
@@ -36,7 +36,7 @@ public enum ERROR_LEVEL implements Enumerator {
      * @generated
      * @ordered
      */
-    INFO_LITERAL(0, "INFO", "INFO"),
+    INFO_LITERAL(0, "INFO", "INFO"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>WARNING</b></em>' literal object. <!-- begin-user-doc -->
@@ -46,7 +46,7 @@ public enum ERROR_LEVEL implements Enumerator {
      * @generated
      * @ordered
      */
-    WARNING_LITERAL(1, "WARNING", "WARNING"),
+    WARNING_LITERAL(1, "WARNING", "WARNING"), //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>ERROR</b></em>' literal object. <!-- begin-user-doc --> <!--
@@ -56,7 +56,7 @@ public enum ERROR_LEVEL implements Enumerator {
      * @generated
      * @ordered
      */
-    ERROR_LITERAL(3, "ERROR", "ERROR");
+    ERROR_LITERAL(3, "ERROR", "ERROR"); //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * The '<em><b>INFO</b></em>' literal value. <!-- begin-user-doc --> <!--
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/validation/ValidationPackage.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/validation/ValidationPackage.java
index d39839d626..f543e73f11 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/validation/ValidationPackage.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/validation/ValidationPackage.java
@@ -39,21 +39,21 @@ public interface ValidationPackage extends EPackage {
      * 
      * @generated
      */
-    String eNAME = "validation";
+    String eNAME = "validation"; //$NON-NLS-1$
 
     /**
      * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
      * @generated
      */
-    String eNS_URI = "http://www.eclipse.org/sirius/description/validation/1.1.0";
+    String eNS_URI = "http://www.eclipse.org/sirius/description/validation/1.1.0"; //$NON-NLS-1$
 
     /**
      * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
      * @generated
      */
-    String eNS_PREFIX = "validation";
+    String eNS_PREFIX = "validation"; //$NON-NLS-1$
 
     /**
      * The singleton instance of the package. <!-- begin-user-doc --> <!--
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 5c0abceac4..9905d4fb64 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
@@ -59,7 +59,7 @@ public class ValidationSetImpl extends DocumentedElementImpl implements Validati
      * @generated
      * @ordered
      */
-    protected static final String NAME_EDEFAULT = "";
+    protected static final String NAME_EDEFAULT = ""; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
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 ce96e0f7ff..2f2f90beba 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
@@ -108,7 +108,7 @@ public class BasicLabelStyleImpl extends CustomizableImpl implements BasicLabelS
      * @generated
      * @ordered
      */
-    protected static final String ICON_PATH_EDEFAULT = "";
+    protected static final String ICON_PATH_EDEFAULT = ""; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getIconPath() <em>Icon Path</em>}'
@@ -128,7 +128,7 @@ public class BasicLabelStyleImpl extends CustomizableImpl implements BasicLabelS
      * @generated
      * @ordered
      */
-    protected static final RGBValues LABEL_COLOR_EDEFAULT = (RGBValues) ViewpointFactory.eINSTANCE.createFromString(ViewpointPackage.eINSTANCE.getRGBValues(), "0,0,0");
+    protected static final RGBValues LABEL_COLOR_EDEFAULT = (RGBValues) ViewpointFactory.eINSTANCE.createFromString(ViewpointPackage.eINSTANCE.getRGBValues(), "0,0,0"); //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getLabelColor() <em>Label Color</em>}'
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 f5fae14caf..a9293e0edd 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
@@ -68,7 +68,7 @@ public abstract class DRepresentationElementImpl extends MinimalEObjectImpl.Cont
      * @generated
      * @ordered
      */
-    protected static final String NAME_EDEFAULT = "";
+    protected static final String NAME_EDEFAULT = ""; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
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 4c2bd304de..62d3d96962 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
@@ -79,7 +79,7 @@ public abstract class DRepresentationImpl extends DocumentedElementImpl implemen
      * @generated
      * @ordered
      */
-    protected static final String NAME_EDEFAULT = "";
+    protected static final String NAME_EDEFAULT = ""; //$NON-NLS-1$
 
     /**
      * The cached value of the '{@link #getName() <em>Name</em>}' attribute.