[460706] Add ImagePath as a new DataType in the metamodel

The DataType of properties for image paths were only recognized as
String objects, but this type was not precise enough to differentiate
them from other String properties. Changing the DataType of these
properties to ImagePath will help to recognize them (needed in the next
commit).
Also modify the constraint for validating image paths to make it in a
single class.
Moreover, in QuickOutlineControl, the attributes to search in were
indicated directly via the datatypes, but, with this change in the
metamodel, it would not be correct anymore. So, to fix this (and avoid
further fixes when modifying another DataTypes whose correspond to
String objects), the condition now tests the instance type of the
attributes.

Bug: 460706
Change-Id: I0b2a6acf0db41da1527a411d3ee337335d5a8722
Signed-off-by: Benjamin Grouhan <benjamin.grouhan@obeo.fr>

18 files changed, 125 insertions, 145 deletions

diff --git a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/dialog/quickoutline/QuickOutlineControl.java b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/dialog/quickoutline/QuickOutlineControl.java
index 8c5c817b8c..71f0fae645 100644
--- a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/dialog/quickoutline/QuickOutlineControl.java
+++ b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/dialog/quickoutline/QuickOutlineControl.java
@@ -14,9 +14,7 @@ package org.eclipse.sirius.common.ui.tools.api.dialog.quickoutline;
 import java.util.ArrayList;
 
 import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EDataType;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EcorePackage;
 import org.eclipse.jface.bindings.Trigger;
 import org.eclipse.jface.bindings.keys.IKeyLookup;
 import org.eclipse.jface.bindings.keys.KeyLookupFactory;
@@ -133,9 +131,7 @@ public class QuickOutlineControl extends PopupDialog implements IInformationCont
                 EObject eObj = (EObject) element;
                 boolean match;
                 for (EAttribute attribute : eObj.eClass().getEAllAttributes()) {
-                    EDataType dataType = attribute.getEAttributeType();
-                    if ((dataType == EcorePackage.eINSTANCE.getEString() || dataType.getName().equals("TypeName") || dataType.getName().equals("InterpretedExpression"))
-                            && eObj.eGet(attribute) != null) {
+                    if (attribute.getEAttributeType().getInstanceClass() == String.class && eObj.eGet(attribute) != null) {
                         match = wordMatches(eObj.eGet(attribute).toString());
                         if (match) {
                             // add match in the label provider so that the label
diff --git a/plugins/org.eclipse.sirius.diagram/model/diagram.ecore b/plugins/org.eclipse.sirius.diagram/model/diagram.ecore
index ac8c581a81..d0773b8153 100644
--- a/plugins/org.eclipse.sirius.diagram/model/diagram.ecore
+++ b/plugins/org.eclipse.sirius.diagram/model/diagram.ecore
@@ -1730,7 +1730,7 @@
       <eStructuralFeatures xsi:type="ecore:EReference" name="decorationDescriptionsSet"
           eType="ecore:EClass ../../org.eclipse.sirius/model/viewpoint.ecore#//description/DecorationDescriptionsSet"
           containment="true"/>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="icon" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString">
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="icon" eType="ecore:EDataType ../../org.eclipse.sirius/model/viewpoint.ecore#//description/ImagePath">
         <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
           <details key="documentation" value="image path to use as an icon for the layer"/>
         </eAnnotations>
@@ -2098,7 +2098,7 @@
           <details key="documentation" value="A custom image that is present in the user workspace."/>
         </eAnnotations>
         <eStructuralFeatures xsi:type="ecore:EAttribute" name="workspacePath" lowerBound="1"
-            eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString">
+            eType="ecore:EDataType ../../org.eclipse.sirius/model/viewpoint.ecore#//description/ImagePath">
           <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
             <details key="documentation" value="The path of the image to use in the form of /myProjectID/path/to/image.png,  if the image is not found in the workspace it will be looked for in the plugins."/>
           </eAnnotations>
@@ -2216,7 +2216,7 @@
         <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
           <details key="documentation" value="A tool section enclosed some tools."/>
         </eAnnotations>
-        <eStructuralFeatures xsi:type="ecore:EAttribute" name="icon" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString">
+        <eStructuralFeatures xsi:type="ecore:EAttribute" name="icon" eType="ecore:EDataType ../../org.eclipse.sirius/model/viewpoint.ecore#//description/ImagePath">
           <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
             <details key="documentation" value="image path used for presenting the section with this icon in the palette"/>
           </eAnnotations>
@@ -2300,7 +2300,7 @@
             <details key="documentation" value="The first operation to execute."/>
           </eAnnotations>
         </eStructuralFeatures>
-        <eStructuralFeatures xsi:type="ecore:EAttribute" name="iconPath" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"
+        <eStructuralFeatures xsi:type="ecore:EAttribute" name="iconPath" eType="ecore:EDataType ../../org.eclipse.sirius/model/viewpoint.ecore#//description/ImagePath"
             defaultValueLiteral="">
           <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
             <details key="documentation" value="The path of the icon to display in the palette. If unset, the icon corresponding to the semantic element associated with the mapping will be displayed."/>
@@ -2380,7 +2380,7 @@
             <details key="documentation" value="The first operation."/>
           </eAnnotations>
         </eStructuralFeatures>
-        <eStructuralFeatures xsi:type="ecore:EAttribute" name="iconPath" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"
+        <eStructuralFeatures xsi:type="ecore:EAttribute" name="iconPath" eType="ecore:EDataType ../../org.eclipse.sirius/model/viewpoint.ecore#//description/ImagePath"
             defaultValueLiteral="">
           <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
             <details key="documentation" value="The path of the icon to display in the palette. If unset, the icon corresponding to the semantic element associated with the mapping will be displayed."/>
@@ -2446,7 +2446,7 @@
             <details key="documentation" value="The first operation."/>
           </eAnnotations>
         </eStructuralFeatures>
-        <eStructuralFeatures xsi:type="ecore:EAttribute" name="iconPath" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"
+        <eStructuralFeatures xsi:type="ecore:EAttribute" name="iconPath" eType="ecore:EDataType ../../org.eclipse.sirius/model/viewpoint.ecore#//description/ImagePath"
             defaultValueLiteral="">
           <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
             <details key="documentation" value="The path of the icon to display in the palette. If unset, the icon corresponding to the semantic element associated with the mapping will be displayed."/>
diff --git a/plugins/org.eclipse.sirius.diagram/plugin.xml b/plugins/org.eclipse.sirius.diagram/plugin.xml
index 0491a7097d..4a7484cc68 100644
--- a/plugins/org.eclipse.sirius.diagram/plugin.xml
+++ b/plugins/org.eclipse.sirius.diagram/plugin.xml
@@ -417,21 +417,6 @@
                </message>
             </constraint>
             <constraint
-                  lang="Java"
-                  class="org.eclipse.sirius.diagram.tools.internal.validation.description.constraints.ValidDiagramImageConstraint"
-                  severity="ERROR"
-                  mode="Batch"
-                  name="Valid Diagram Images"
-                  id="org.eclipse.sirius.diagram.constraints.ValidDiagramImage"
-                  statusCode="1">
-               <description>
-                  Invalid Diagram Image
-               </description>
-               <message>
-                  {0}
-               </message>
-            </constraint>
-            <constraint
                   class="org.eclipse.sirius.diagram.tools.internal.validation.description.constraints.BlankCandidatesExpressionWithRecursiveMappingConstraint"
                   id="org.eclipse.sirius.diagram.constraints.BlankCandidatesExpressionWithRecursiveMapping"
                   lang="Java"
diff --git a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/validation/description/constraints/ValidDiagramImageConstraint.java b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/validation/description/constraints/ValidDiagramImageConstraint.java
deleted file mode 100644
index 94442acf9a..0000000000
--- a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/validation/description/constraints/ValidDiagramImageConstraint.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015 Obeo.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Obeo - initial API and implementation
- *******************************************************************************/
-package org.eclipse.sirius.diagram.tools.internal.validation.description.constraints;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.sirius.diagram.description.DescriptionPackage;
-import org.eclipse.sirius.diagram.description.style.StylePackage;
-import org.eclipse.sirius.diagram.description.tool.ToolPackage;
-import org.eclipse.sirius.tools.internal.validation.description.constraints.AbstractValidImageConstraint;
-
-/**
- * Validate the images referenced in diagrams.
- * 
- * @author bgrouhan
- * 
- */
-public class ValidDiagramImageConstraint extends AbstractValidImageConstraint {
-    private static final EAttribute[] PATH_ATTRIBUTES = { DescriptionPackage.eINSTANCE.getLayer_Icon(), StylePackage.eINSTANCE.getWorkspaceImageDescription_WorkspacePath(),
-            ToolPackage.eINSTANCE.getContainerCreationDescription_IconPath(), ToolPackage.eINSTANCE.getEdgeCreationDescription_IconPath(), ToolPackage.eINSTANCE.getNodeCreationDescription_IconPath(),
-            ToolPackage.eINSTANCE.getToolSection_Icon(), };
-
-    @Override
-    public EAttribute[] getImagePathAttributes() {
-        return PATH_ATTRIBUTES;
-    }
-}
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/impl/DescriptionPackageImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/impl/DescriptionPackageImpl.java
index f3f3c26e82..19070fb565 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/impl/DescriptionPackageImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/impl/DescriptionPackageImpl.java
@@ -2151,7 +2151,7 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
         initEReference(getLayer_DecorationDescriptionsSet(), theDescriptionPackage_1.getDecorationDescriptionsSet(), null, "decorationDescriptionsSet", null, 0, 1, Layer.class,
                 !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
                 EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getLayer_Icon(), theEcorePackage.getEString(), "icon", null, 0, 1, Layer.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE,
+        initEAttribute(getLayer_Icon(), theDescriptionPackage_1.getImagePath(), "icon", null, 0, 1, Layer.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE,
                 !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
         initEReference(getLayer_AllEdgeMappings(), this.getEdgeMapping(), null, "allEdgeMappings", null, 0, -1, Layer.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE,
                 !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED,
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/impl/StylePackageImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/impl/StylePackageImpl.java
index ead4266394..3a348f9ba1 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/impl/StylePackageImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/impl/StylePackageImpl.java
@@ -1439,7 +1439,7 @@ public class StylePackageImpl extends EPackageImpl implements StylePackage {
 
         initEClass(workspaceImageDescriptionEClass, WorkspaceImageDescription.class, "WorkspaceImageDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
                 EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getWorkspaceImageDescription_WorkspacePath(), theEcorePackage.getEString(), "workspacePath", null, 1, 1, WorkspaceImageDescription.class, !EPackageImpl.IS_TRANSIENT,
+        initEAttribute(getWorkspaceImageDescription_WorkspacePath(), theDescriptionPackage_1.getImagePath(), "workspacePath", null, 1, 1, WorkspaceImageDescription.class, !EPackageImpl.IS_TRANSIENT,
                 !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
 
         initEClass(edgeStyleDescriptionEClass, EdgeStyleDescription.class, "EdgeStyleDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/ToolPackageImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/ToolPackageImpl.java
index 4058244cc8..a4d3df3a98 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/ToolPackageImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/ToolPackageImpl.java
@@ -1557,11 +1557,11 @@ public class ToolPackageImpl extends EPackageImpl implements ToolPackage {
         // Obtain other dependent packages
         org.eclipse.sirius.viewpoint.description.DescriptionPackage theDescriptionPackage_1 = (org.eclipse.sirius.viewpoint.description.DescriptionPackage) EPackage.Registry.INSTANCE
                 .getEPackage(org.eclipse.sirius.viewpoint.description.DescriptionPackage.eNS_URI);
-        EcorePackage theEcorePackage = (EcorePackage) EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
         org.eclipse.sirius.viewpoint.description.tool.ToolPackage theToolPackage_1 = (org.eclipse.sirius.viewpoint.description.tool.ToolPackage) EPackage.Registry.INSTANCE
                 .getEPackage(org.eclipse.sirius.viewpoint.description.tool.ToolPackage.eNS_URI);
         DescriptionPackage theDescriptionPackage = (DescriptionPackage) EPackage.Registry.INSTANCE.getEPackage(DescriptionPackage.eNS_URI);
         DiagramPackage theDiagramPackage = (DiagramPackage) EPackage.Registry.INSTANCE.getEPackage(DiagramPackage.eNS_URI);
+        EcorePackage theEcorePackage = (EcorePackage) EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
 
         // Create type parameters
 
@@ -1601,8 +1601,8 @@ public class ToolPackageImpl extends EPackageImpl implements ToolPackage {
 
         // Initialize classes and features; add operations and parameters
         initEClass(toolSectionEClass, ToolSection.class, "ToolSection", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getToolSection_Icon(), theEcorePackage.getEString(), "icon", null, 0, 1, ToolSection.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE,
-                !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEAttribute(getToolSection_Icon(), theDescriptionPackage_1.getImagePath(), "icon", null, 0, 1, ToolSection.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
+                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
         initEReference(getToolSection_OwnedTools(), theToolPackage_1.getToolEntry(), null, "ownedTools", null, 0, -1, ToolSection.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
                 EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
                 EPackageImpl.IS_ORDERED);
@@ -1648,8 +1648,8 @@ public class ToolPackageImpl extends EPackageImpl implements ToolPackage {
         initEReference(getNodeCreationDescription_InitialOperation(), theToolPackage_1.getInitialNodeCreationOperation(), null, "initialOperation", null, 1, 1, NodeCreationDescription.class,
                 !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
                 EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getNodeCreationDescription_IconPath(), theEcorePackage.getEString(), "iconPath", "", 0, 1, NodeCreationDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEAttribute(getNodeCreationDescription_IconPath(), theDescriptionPackage_1.getImagePath(), "iconPath", "", 0, 1, NodeCreationDescription.class, !EPackageImpl.IS_TRANSIENT,
+                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
         initEReference(getNodeCreationDescription_ExtraMappings(), theDescriptionPackage.getAbstractNodeMapping(), null, "extraMappings", null, 0, -1, NodeCreationDescription.class,
                 !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
                 EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
@@ -1674,8 +1674,8 @@ public class ToolPackageImpl extends EPackageImpl implements ToolPackage {
         initEReference(getEdgeCreationDescription_InitialOperation(), theToolPackage_1.getInitEdgeCreationOperation(), null, "initialOperation", null, 1, 1, EdgeCreationDescription.class,
                 !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
                 EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getEdgeCreationDescription_IconPath(), theEcorePackage.getEString(), "iconPath", "", 0, 1, EdgeCreationDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEAttribute(getEdgeCreationDescription_IconPath(), theDescriptionPackage_1.getImagePath(), "iconPath", "", 0, 1, EdgeCreationDescription.class, !EPackageImpl.IS_TRANSIENT,
+                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
         initEReference(getEdgeCreationDescription_ExtraSourceMappings(), theDescriptionPackage.getDiagramElementMapping(), null, "extraSourceMappings", null, 0, -1, EdgeCreationDescription.class,
                 !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
                 EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
@@ -1705,7 +1705,7 @@ public class ToolPackageImpl extends EPackageImpl implements ToolPackage {
         initEReference(getContainerCreationDescription_InitialOperation(), theToolPackage_1.getInitialNodeCreationOperation(), null, "initialOperation", null, 1, 1,
                 ContainerCreationDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES,
                 !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getContainerCreationDescription_IconPath(), theEcorePackage.getEString(), "iconPath", "", 0, 1, ContainerCreationDescription.class, !EPackageImpl.IS_TRANSIENT,
+        initEAttribute(getContainerCreationDescription_IconPath(), theDescriptionPackage_1.getImagePath(), "iconPath", "", 0, 1, ContainerCreationDescription.class, !EPackageImpl.IS_TRANSIENT,
                 !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
         initEReference(getContainerCreationDescription_ExtraMappings(), theDescriptionPackage.getAbstractNodeMapping(), null, "extraMappings", null, 0, -1, ContainerCreationDescription.class,
                 !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
diff --git a/plugins/org.eclipse.sirius/model/viewpoint.ecore b/plugins/org.eclipse.sirius/model/viewpoint.ecore
index 4cee4c2c14..99fe17f8e6 100644
--- a/plugins/org.eclipse.sirius/model/viewpoint.ecore
+++ b/plugins/org.eclipse.sirius/model/viewpoint.ecore
@@ -312,7 +312,7 @@
           eType="#//description/MetamodelExtensionSetting" containment="true"/>
       <eStructuralFeatures xsi:type="ecore:EReference" name="ownedFeatureExtensions"
           upperBound="-1" eType="#//description/FeatureExtensionDescription" containment="true"/>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="icon" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString">
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="icon" eType="#//description/ImagePath">
         <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
           <details key="documentation" value="image path to use as an icon for the viewpoint "/>
         </eAnnotations>
@@ -476,6 +476,7 @@
     <eClassifiers xsi:type="ecore:EDataType" name="TypeName" instanceClassName="java.lang.String"/>
     <eClassifiers xsi:type="ecore:EDataType" name="InterpretedExpression" instanceClassName="java.lang.String"/>
     <eClassifiers xsi:type="ecore:EDataType" name="FeatureName" instanceClassName="java.lang.String"/>
+    <eClassifiers xsi:type="ecore:EDataType" name="ImagePath" instanceClassName="java.lang.String"/>
     <eClassifiers xsi:type="ecore:EClass" name="PasteTargetDescription" abstract="true">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="A PasteTargetDescription is a Description or Mapping that can have many PasteTools."/>
@@ -498,7 +499,7 @@
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="position" lowerBound="1"
           eType="#//description/Position" defaultValueLiteral="SOUTH_WEST"/>
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="decoratorPath" lowerBound="1"
-          eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString">
+          eType="#//description/ImagePath">
         <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
           <details key="documentation" value="The path of the icon of the decoration."/>
         </eAnnotations>
@@ -885,7 +886,7 @@
         </eStructuralFeatures>
         <eStructuralFeatures xsi:type="ecore:EReference" name="labelColor" lowerBound="1"
             eType="#//description/ColorDescription"/>
-        <eStructuralFeatures xsi:type="ecore:EAttribute" name="iconPath" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"
+        <eStructuralFeatures xsi:type="ecore:EAttribute" name="iconPath" eType="#//description/ImagePath"
             defaultValueLiteral="">
           <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
             <details key="documentation" value="The path of the icon to display on the element. If unset, the icon corresponding to the semantic element will be displayed."/>
@@ -970,7 +971,7 @@
         </eAnnotations>
       </eClassifiers>
       <eClassifiers xsi:type="ecore:EClass" name="ToolDescription" eSuperTypes="#//description/tool/MappingBasedToolDescription">
-        <eStructuralFeatures xsi:type="ecore:EAttribute" name="iconPath" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"
+        <eStructuralFeatures xsi:type="ecore:EAttribute" name="iconPath" eType="#//description/ImagePath"
             defaultValueLiteral="">
           <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
             <details key="documentation" value="The path of the icon to display in the palette. If unset, the icon corresponding to the semantic element associated with the mapping will be displayed."/>
@@ -1052,8 +1053,7 @@
         <eStructuralFeatures xsi:type="ecore:EReference" name="initialOperation" lowerBound="1"
             eType="#//description/tool/InitialOperation" containment="true"/>
         <eStructuralFeatures xsi:type="ecore:EAttribute" name="iconPath" lowerBound="1"
-            eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"
-            defaultValueLiteral="/org.eclipse.sirius.ui/icons/full/obj16/SelectionWizardDescription.gif"/>
+            eType="#//description/ImagePath" defaultValueLiteral="/org.eclipse.sirius.ui/icons/full/obj16/SelectionWizardDescription.gif"/>
         <eStructuralFeatures xsi:type="ecore:EAttribute" name="windowTitle" lowerBound="1"
             eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"
             defaultValueLiteral="Selection Wizard">
@@ -1061,7 +1061,7 @@
             <details key="documentation" value="Title of the dialog."/>
           </eAnnotations>
         </eStructuralFeatures>
-        <eStructuralFeatures xsi:type="ecore:EAttribute" name="windowImagePath" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+        <eStructuralFeatures xsi:type="ecore:EAttribute" name="windowImagePath" eType="#//description/ImagePath"/>
       </eClassifiers>
       <eClassifiers xsi:type="ecore:EClass" name="PaneBasedSelectionWizardDescription"
           eSuperTypes="#//description/tool/AbstractToolDescription">
@@ -1074,8 +1074,7 @@
         <eStructuralFeatures xsi:type="ecore:EReference" name="initialOperation" lowerBound="1"
             eType="#//description/tool/InitialOperation" containment="true"/>
         <eStructuralFeatures xsi:type="ecore:EAttribute" name="iconPath" lowerBound="1"
-            eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"
-            defaultValueLiteral="/org.eclipse.sirius.ui/icons/full/obj16/PaneBasedSelectionWizardDescription.gif"/>
+            eType="#//description/ImagePath" defaultValueLiteral="/org.eclipse.sirius.ui/icons/full/obj16/PaneBasedSelectionWizardDescription.gif"/>
         <eStructuralFeatures xsi:type="ecore:EAttribute" name="windowTitle" lowerBound="1"
             eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"
             defaultValueLiteral="Selection Wizard">
@@ -1083,7 +1082,7 @@
             <details key="documentation" value="Title of the dialog."/>
           </eAnnotations>
         </eStructuralFeatures>
-        <eStructuralFeatures xsi:type="ecore:EAttribute" name="windowImagePath" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+        <eStructuralFeatures xsi:type="ecore:EAttribute" name="windowImagePath" eType="#//description/ImagePath"/>
         <eStructuralFeatures xsi:type="ecore:EAttribute" name="message" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
         <eStructuralFeatures xsi:type="ecore:EAttribute" name="choiceOfValuesMessage"
             eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"
@@ -1232,7 +1231,7 @@
       <eClassifiers xsi:type="ecore:EClass" name="MenuItemOrRef" abstract="true" interface="true"/>
       <eClassifiers xsi:type="ecore:EClass" name="MenuItemDescription" abstract="true"
           eSuperTypes="#//description/tool/AbstractToolDescription #//description/tool/MenuItemOrRef">
-        <eStructuralFeatures xsi:type="ecore:EAttribute" name="icon" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+        <eStructuralFeatures xsi:type="ecore:EAttribute" name="icon" eType="#//description/ImagePath"/>
       </eClassifiers>
       <eClassifiers xsi:type="ecore:EClass" name="MenuItemDescriptionReference" eSuperTypes="#//description/tool/MenuItemOrRef">
         <eStructuralFeatures xsi:type="ecore:EReference" name="item" lowerBound="1"
diff --git a/plugins/org.eclipse.sirius/plugin.xml b/plugins/org.eclipse.sirius/plugin.xml
index 10f33a8b58..bf0480091d 100644
--- a/plugins/org.eclipse.sirius/plugin.xml
+++ b/plugins/org.eclipse.sirius/plugin.xml
@@ -140,7 +140,7 @@
                </message>
             </constraint>
             <constraint
-                  class="org.eclipse.sirius.tools.internal.validation.description.constraints.ValidImagePathConstraint"
+                  class="org.eclipse.sirius.tools.internal.validation.description.constraints.ValidImageConstraint"
                   id="org.eclipse.sirius.constraints.ValidImagePathConstraint"
                   lang="Java"
                   mode="Batch"
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 906ed55d96..e315e5806b 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
@@ -2173,6 +2173,16 @@ public interface DescriptionPackage extends EPackage {
     int FEATURE_NAME = 47;
 
     /**
+     * The meta object id for the '<em>Image Path</em>' data type. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @see java.lang.String
+     * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getImagePath()
+     * @generated
+     */
+    int IMAGE_PATH = 48;
+
+    /**
      * The meta object id for the '<em>URI</em>' data type. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
      * 
@@ -2180,7 +2190,7 @@ public interface DescriptionPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getURI()
      * @generated
      */
-    int URI = 48;
+    int URI = 49;
 
     /**
      * Returns the meta object for class '
@@ -3885,6 +3895,17 @@ public interface DescriptionPackage extends EPackage {
     EDataType getFeatureName();
 
     /**
+     * Returns the meta object for data type '{@link java.lang.String
+     * <em>Image Path</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @return the meta object for data type '<em>Image Path</em>'.
+     * @see java.lang.String
+     * @model instanceClass="java.lang.String"
+     * @generated
+     */
+    EDataType getImagePath();
+
+    /**
      * Returns the meta object for data type '
      * {@link org.eclipse.emf.common.util.URI <em>URI</em>}'. <!--
      * begin-user-doc --> <!-- end-user-doc -->
@@ -5228,6 +5249,16 @@ public interface DescriptionPackage extends EPackage {
         EDataType FEATURE_NAME = DescriptionPackage.eINSTANCE.getFeatureName();
 
         /**
+         * The meta object literal for the '<em>Image Path</em>' data type. <!--
+         * begin-user-doc --> <!-- end-user-doc -->
+         * 
+         * @see java.lang.String
+         * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getImagePath()
+         * @generated
+         */
+        EDataType IMAGE_PATH = DescriptionPackage.eINSTANCE.getImagePath();
+
+        /**
          * The meta object literal for the '<em>URI</em>' data type. <!--
          * begin-user-doc --> <!-- end-user-doc -->
          *
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 fb88f27662..3704c9b5cc 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
@@ -170,6 +170,8 @@ public class DescriptionFactoryImpl extends EFactoryImpl implements DescriptionF
             return createInterpretedExpressionFromString(eDataType, initialValue);
         case DescriptionPackage.FEATURE_NAME:
             return createFeatureNameFromString(eDataType, initialValue);
+        case DescriptionPackage.IMAGE_PATH:
+            return createImagePathFromString(eDataType, initialValue);
         case DescriptionPackage.URI:
             return createURIFromString(eDataType, initialValue);
         default:
@@ -195,6 +197,8 @@ public class DescriptionFactoryImpl extends EFactoryImpl implements DescriptionF
             return convertInterpretedExpressionToString(eDataType, instanceValue);
         case DescriptionPackage.FEATURE_NAME:
             return convertFeatureNameToString(eDataType, instanceValue);
+        case DescriptionPackage.IMAGE_PATH:
+            return convertImagePathToString(eDataType, instanceValue);
         case DescriptionPackage.URI:
             return convertURIToString(eDataType, instanceValue);
         default:
@@ -576,6 +580,24 @@ public class DescriptionFactoryImpl extends EFactoryImpl implements DescriptionF
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    public String createImagePathFromString(EDataType eDataType, String initialValue) {
+        return (String) super.createFromString(eDataType, initialValue);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    public String convertImagePathToString(EDataType eDataType, Object instanceValue) {
+        return super.convertToString(eDataType, instanceValue);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      *
      * @not-generated
      */
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/DescriptionPackageImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/DescriptionPackageImpl.java
index 1dfe7bebff..5047e949eb 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/DescriptionPackageImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/DescriptionPackageImpl.java
@@ -426,6 +426,13 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
      * 
      * @generated
      */
+    private EDataType imagePathEDataType = null;
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
     private EDataType uriEDataType = null;
 
     /**
@@ -1895,6 +1902,16 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
      * @generated
      */
     @Override
+    public EDataType getImagePath() {
+        return imagePathEDataType;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
     public EDataType getURI() {
         return uriEDataType;
     }
@@ -2113,6 +2130,7 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
         typeNameEDataType = createEDataType(DescriptionPackage.TYPE_NAME);
         interpretedExpressionEDataType = createEDataType(DescriptionPackage.INTERPRETED_EXPRESSION);
         featureNameEDataType = createEDataType(DescriptionPackage.FEATURE_NAME);
+        imagePathEDataType = createEDataType(DescriptionPackage.IMAGE_PATH);
         uriEDataType = createEDataType(DescriptionPackage.URI);
     }
 
@@ -2228,7 +2246,7 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
         initEReference(getViewpoint_OwnedFeatureExtensions(), this.getFeatureExtensionDescription(), null, "ownedFeatureExtensions", null, 0, -1, Viewpoint.class, !EPackageImpl.IS_TRANSIENT,
                 !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
                 !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getViewpoint_Icon(), theEcorePackage.getEString(), "icon", null, 0, 1, Viewpoint.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE,
+        initEAttribute(getViewpoint_Icon(), this.getImagePath(), "icon", null, 0, 1, Viewpoint.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE,
                 !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
         initEReference(getViewpoint_OwnedTemplates(), this.getRepresentationTemplate(), null, "ownedTemplates", null, 0, -1, Viewpoint.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
                 EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
@@ -2356,8 +2374,8 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
                 EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
         initEAttribute(getDecorationDescription_Position(), this.getPosition(), "position", "SOUTH_WEST", 1, 1, DecorationDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
                 EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getDecorationDescription_DecoratorPath(), theEcorePackage.getEString(), "decoratorPath", null, 1, 1, DecorationDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEAttribute(getDecorationDescription_DecoratorPath(), this.getImagePath(), "decoratorPath", null, 1, 1, DecorationDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
+                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
         initEAttribute(getDecorationDescription_PreconditionExpression(), this.getInterpretedExpression(), "preconditionExpression", null, 0, 1, DecorationDescription.class,
                 !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
                 EPackageImpl.IS_ORDERED);
@@ -2571,6 +2589,7 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
         initEDataType(typeNameEDataType, String.class, "TypeName", EPackageImpl.IS_SERIALIZABLE, !EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
         initEDataType(interpretedExpressionEDataType, String.class, "InterpretedExpression", EPackageImpl.IS_SERIALIZABLE, !EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
         initEDataType(featureNameEDataType, String.class, "FeatureName", EPackageImpl.IS_SERIALIZABLE, !EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
+        initEDataType(imagePathEDataType, String.class, "ImagePath", EPackageImpl.IS_SERIALIZABLE, !EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
         initEDataType(uriEDataType, org.eclipse.emf.common.util.URI.class, "URI", EPackageImpl.IS_SERIALIZABLE, !EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
 
         // Create annotations
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/style/impl/StylePackageImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/style/impl/StylePackageImpl.java
index c880bf6f85..3b5238c0b0 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/style/impl/StylePackageImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/style/impl/StylePackageImpl.java
@@ -477,7 +477,7 @@ public class StylePackageImpl extends EPackageImpl implements StylePackage {
         initEReference(getBasicLabelStyleDescription_LabelColor(), theDescriptionPackage.getColorDescription(), null, "labelColor", null, 1, 1, BasicLabelStyleDescription.class,
                 !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
                 EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getBasicLabelStyleDescription_IconPath(), theEcorePackage.getEString(), "iconPath", "", 0, 1, BasicLabelStyleDescription.class, !EPackageImpl.IS_TRANSIENT,
+        initEAttribute(getBasicLabelStyleDescription_IconPath(), theDescriptionPackage.getImagePath(), "iconPath", "", 0, 1, BasicLabelStyleDescription.class, !EPackageImpl.IS_TRANSIENT,
                 !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
 
         initEClass(labelStyleDescriptionEClass, LabelStyleDescription.class, "LabelStyleDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/PaneBasedSelectionWizardDescription.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/PaneBasedSelectionWizardDescription.java
index abffd140d2..d779a7e44a 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/PaneBasedSelectionWizardDescription.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/PaneBasedSelectionWizardDescription.java
@@ -212,6 +212,7 @@ public interface PaneBasedSelectionWizardDescription extends AbstractToolDescrip
      * @see org.eclipse.sirius.viewpoint.description.tool.ToolPackage#getPaneBasedSelectionWizardDescription_IconPath()
      * @model default=
      *        "/org.eclipse.sirius.ui/icons/full/obj16/PaneBasedSelectionWizardDescription.gif"
+     *        dataType="org.eclipse.sirius.viewpoint.description.ImagePath"
      *        required="true"
      * @generated
      */
@@ -269,7 +270,7 @@ public interface PaneBasedSelectionWizardDescription extends AbstractToolDescrip
      * @return the value of the '<em>Window Image Path</em>' attribute.
      * @see #setWindowImagePath(String)
      * @see org.eclipse.sirius.viewpoint.description.tool.ToolPackage#getPaneBasedSelectionWizardDescription_WindowImagePath()
-     * @model
+     * @model dataType="org.eclipse.sirius.viewpoint.description.ImagePath"
      * @generated
      */
     String getWindowImagePath();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/SelectionWizardDescription.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/SelectionWizardDescription.java
index da455159e6..565331303b 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/SelectionWizardDescription.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/SelectionWizardDescription.java
@@ -189,6 +189,7 @@ public interface SelectionWizardDescription extends AbstractToolDescription, Sel
      * @see org.eclipse.sirius.viewpoint.description.tool.ToolPackage#getSelectionWizardDescription_IconPath()
      * @model default=
      *        "/org.eclipse.sirius.ui/icons/full/obj16/SelectionWizardDescription.gif"
+     *        dataType="org.eclipse.sirius.viewpoint.description.ImagePath"
      *        required="true"
      * @generated
      */
@@ -246,7 +247,7 @@ public interface SelectionWizardDescription extends AbstractToolDescription, Sel
      * @return the value of the '<em>Window Image Path</em>' attribute.
      * @see #setWindowImagePath(String)
      * @see org.eclipse.sirius.viewpoint.description.tool.ToolPackage#getSelectionWizardDescription_WindowImagePath()
-     * @model
+     * @model dataType="org.eclipse.sirius.viewpoint.description.ImagePath"
      * @generated
      */
     String getWindowImagePath();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/ToolPackageImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/ToolPackageImpl.java
index 254b1abe33..24f539343d 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/ToolPackageImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/ToolPackageImpl.java
@@ -2381,7 +2381,7 @@ public class ToolPackageImpl extends EPackageImpl implements ToolPackage {
                 EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
 
         initEClass(toolDescriptionEClass, ToolDescription.class, "ToolDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getToolDescription_IconPath(), theEcorePackage.getEString(), "iconPath", "", 0, 1, ToolDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
+        initEAttribute(getToolDescription_IconPath(), theDescriptionPackage.getImagePath(), "iconPath", "", 0, 1, ToolDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
                 EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
         initEReference(getToolDescription_Element(), this.getElementVariable(), null, "element", null, 1, 1, ToolDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
                 EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
@@ -2426,14 +2426,15 @@ public class ToolPackageImpl extends EPackageImpl implements ToolPackage {
         initEReference(getSelectionWizardDescription_InitialOperation(), this.getInitialOperation(), null, "initialOperation", null, 1, 1, SelectionWizardDescription.class,
                 !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
                 EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getSelectionWizardDescription_IconPath(), theEcorePackage.getEString(), "iconPath", "/org.eclipse.sirius.ui/icons/full/obj16/SelectionWizardDescription.gif", 1, 1,
+        initEAttribute(getSelectionWizardDescription_IconPath(), theDescriptionPackage.getImagePath(), "iconPath", "/org.eclipse.sirius.ui/icons/full/obj16/SelectionWizardDescription.gif", 1, 1,
                 SelectionWizardDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID,
                 EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
         initEAttribute(getSelectionWizardDescription_WindowTitle(), theEcorePackage.getEString(), "windowTitle", "Selection Wizard", 1, 1, SelectionWizardDescription.class,
                 !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
                 EPackageImpl.IS_ORDERED);
-        initEAttribute(getSelectionWizardDescription_WindowImagePath(), theEcorePackage.getEString(), "windowImagePath", null, 0, 1, SelectionWizardDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEAttribute(getSelectionWizardDescription_WindowImagePath(), theDescriptionPackage.getImagePath(), "windowImagePath", null, 0, 1, SelectionWizardDescription.class,
+                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
+                EPackageImpl.IS_ORDERED);
 
         initEClass(paneBasedSelectionWizardDescriptionEClass, PaneBasedSelectionWizardDescription.class, "PaneBasedSelectionWizardDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
                 EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
@@ -2449,13 +2450,13 @@ public class ToolPackageImpl extends EPackageImpl implements ToolPackage {
         initEReference(getPaneBasedSelectionWizardDescription_InitialOperation(), this.getInitialOperation(), null, "initialOperation", null, 1, 1, PaneBasedSelectionWizardDescription.class,
                 !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
                 EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getPaneBasedSelectionWizardDescription_IconPath(), theEcorePackage.getEString(), "iconPath", "/org.eclipse.sirius.ui/icons/full/obj16/PaneBasedSelectionWizardDescription.gif",
-                1, 1, PaneBasedSelectionWizardDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEAttribute(getPaneBasedSelectionWizardDescription_IconPath(), theDescriptionPackage.getImagePath(), "iconPath",
+                "/org.eclipse.sirius.ui/icons/full/obj16/PaneBasedSelectionWizardDescription.gif", 1, 1, PaneBasedSelectionWizardDescription.class, !EPackageImpl.IS_TRANSIENT,
+                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
         initEAttribute(getPaneBasedSelectionWizardDescription_WindowTitle(), theEcorePackage.getEString(), "windowTitle", "Selection Wizard", 1, 1, PaneBasedSelectionWizardDescription.class,
                 !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
                 EPackageImpl.IS_ORDERED);
-        initEAttribute(getPaneBasedSelectionWizardDescription_WindowImagePath(), theEcorePackage.getEString(), "windowImagePath", null, 0, 1, PaneBasedSelectionWizardDescription.class,
+        initEAttribute(getPaneBasedSelectionWizardDescription_WindowImagePath(), theDescriptionPackage.getImagePath(), "windowImagePath", null, 0, 1, PaneBasedSelectionWizardDescription.class,
                 !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
                 EPackageImpl.IS_ORDERED);
         initEAttribute(getPaneBasedSelectionWizardDescription_Message(), theEcorePackage.getEString(), "message", null, 0, 1, PaneBasedSelectionWizardDescription.class, !EPackageImpl.IS_TRANSIENT,
@@ -2530,7 +2531,7 @@ public class ToolPackageImpl extends EPackageImpl implements ToolPackage {
         initEClass(menuItemOrRefEClass, MenuItemOrRef.class, "MenuItemOrRef", EPackageImpl.IS_ABSTRACT, EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
 
         initEClass(menuItemDescriptionEClass, MenuItemDescription.class, "MenuItemDescription", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getMenuItemDescription_Icon(), theEcorePackage.getEString(), "icon", null, 0, 1, MenuItemDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
+        initEAttribute(getMenuItemDescription_Icon(), theDescriptionPackage.getImagePath(), "icon", null, 0, 1, MenuItemDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
                 EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
 
         initEClass(menuItemDescriptionReferenceEClass, MenuItemDescriptionReference.class, "MenuItemDescriptionReference", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/internal/validation/description/constraints/AbstractValidImageConstraint.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/internal/validation/description/constraints/ValidImageConstraint.java
index 8a470d8897..9cc5addaf1 100644
--- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/internal/validation/description/constraints/AbstractValidImageConstraint.java
+++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/internal/validation/description/constraints/ValidImageConstraint.java
@@ -15,6 +15,7 @@ import java.util.Collection;
 
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Path;
+import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EObject;
@@ -26,15 +27,16 @@ import org.eclipse.emf.validation.model.ConstraintStatus;
 import org.eclipse.sirius.common.tools.api.resource.ImageFileFormat;
 import org.eclipse.sirius.common.tools.api.util.StringUtil;
 import org.eclipse.sirius.tools.internal.validation.AbstractConstraint;
+import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
 
 import com.google.common.collect.Lists;
 
 /**
- * Abstract Constraint to validate image references.
+ * Constraint to validate image references.
  * 
  * @author bgrouhan
  */
-public abstract class AbstractValidImageConstraint extends AbstractConstraint {
+public class ValidImageConstraint extends AbstractConstraint {
 
     @Override
     public IStatus validate(IValidationContext ctx) {
@@ -43,11 +45,11 @@ public abstract class AbstractValidImageConstraint extends AbstractConstraint {
         if (ctx.getEventType() == EMFEventType.NULL) {
             EObject eObj = ctx.getTarget();
             String path = "";
-            EAttribute[] attrs = getImagePathAttributes();
             ArrayList<IStatus> statuses = new ArrayList<IStatus>();
             ResourceSet rs = eObj.eResource().getResourceSet();
+            EList<EAttribute> attrs = eObj.eClass().getEAllAttributes();
             for (EAttribute attr : attrs) {
-                if (attr.getEContainingClass().isInstance(eObj)) {
+                if (attr.getEAttributeType() == DescriptionPackage.eINSTANCE.getImagePath()) {
                     path = (String) eObj.eGet(attr);
                     statuses.add(validateImagePath(ctx, rs, path));
                 }
@@ -59,14 +61,6 @@ public abstract class AbstractValidImageConstraint extends AbstractConstraint {
         return status;
     }
 
-    /**
-     * Method to get all the EAttributes corresponding to image paths in the
-     * package.
-     * 
-     * @return An array of the EAttributes.
-     */
-    public abstract EAttribute[] getImagePathAttributes();
-
     private IStatus validateImagePath(IValidationContext ctx, ResourceSet rs, String path) {
         Collection<IStatus> failures = Lists.newArrayList();
         // when path is empty, success (even when a path is needed, because
diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/internal/validation/description/constraints/ValidImagePathConstraint.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/internal/validation/description/constraints/ValidImagePathConstraint.java
deleted file mode 100644
index 68b8493d71..0000000000
--- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/internal/validation/description/constraints/ValidImagePathConstraint.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015 Obeo.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Obeo - initial API and implementation
- *******************************************************************************/
-package org.eclipse.sirius.tools.internal.validation.description.constraints;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
-import org.eclipse.sirius.viewpoint.description.style.StylePackage;
-import org.eclipse.sirius.viewpoint.description.tool.ToolPackage;
-
-/**
- * Validate image references.
- * 
- * @author bgrouhan
- *
- */
-public class ValidImagePathConstraint extends AbstractValidImageConstraint {
-    private static final EAttribute[] PATHS_ATTRIBUTES = { DescriptionPackage.eINSTANCE.getViewpoint_Icon(), DescriptionPackage.eINSTANCE.getDecorationDescription_DecoratorPath(),
-            StylePackage.eINSTANCE.getBasicLabelStyleDescription_IconPath(), ToolPackage.eINSTANCE.getMenuItemDescription_Icon(),
-            ToolPackage.eINSTANCE.getPaneBasedSelectionWizardDescription_IconPath(), ToolPackage.eINSTANCE.getPaneBasedSelectionWizardDescription_WindowImagePath(),
-            ToolPackage.eINSTANCE.getSelectionWizardDescription_IconPath(), ToolPackage.eINSTANCE.getSelectionWizardDescription_WindowImagePath(), ToolPackage.eINSTANCE.getToolDescription_IconPath(), };
-
-    @Override
-    public EAttribute[] getImagePathAttributes() {
-        return PATHS_ATTRIBUTES;
-    }
-
-}