Bug 550568: [AF] The diagrams and tables icons of disabled viewpoint

should be grayed - Add grayed icon into the architecture framework - Create the grayed icons for diagrams and tables - Manage the view prototype display in: - Model Explorer - Welcome page - Table of views - Properties views Change-Id: I3301e9d17cb12c5ca59f2175b5cb0b86e6733917 Signed-off-by: Nicolas FAUVERGUE <nicolas.fauvergue@cea.fr>
author: Nicolas FAUVERGUE 2019-08-30 14:49:46 +0000
committer: Patrick Tessier 2019-09-18 07:54:48 +0000
commit: 2ec299164d14b33e605d71058237016125e0ee72 (patch)
tree: 23cfac79363c2851169cb13da40d6e68a5b64558
parent: 8fd2a0edd4ab3a6b26bf4c87cecf0ef6cf9e9e7e (diff)
download: org.eclipse.papyrus-2ec299164d14b33e605d71058237016125e0ee72.tar.gz
org.eclipse.papyrus-2ec299164d14b33e605d71058237016125e0ee72.tar.xz
org.eclipse.papyrus-2ec299164d14b33e605d71058237016125e0ee72.zip
137 files changed, 1209 insertions, 262 deletions
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/META-INF/MANIFEST.MF b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/META-INF/MANIFEST.MF
index d0cce2cd0b1..6739e2b44a2 100644
--- a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/META-INF/MANIFEST.MF
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.papyrus.infra.architecture.representation.edit;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.2.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.papyrus.infra.architecture.representation.provider.RepresentationEditPlugin$Implementation
 Bundle-Vendor: %providerName
@@ -11,9 +11,9 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.papyrus.infra.architecture.representation.provider
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
  org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
- org.eclipse.papyrus.infra.core.architecture;bundle-version="[1.0.0,3.0.0)";visibility:=reexport,
- org.eclipse.papyrus.infra.architecture.representation;bundle-version="[1.0.0,3.0.0)";visibility:=reexport,
- org.eclipse.papyrus.infra.core.architecture.edit;bundle-version="[1.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.core.architecture;bundle-version="[2.1.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.architecture.representation;bundle-version="[2.1.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.core.architecture.edit;bundle-version="[2.1.0,3.0.0)";visibility:=reexport,
  org.eclipse.papyrus.infra.constraints;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
  org.eclipse.papyrus.infra.constraints.edit;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
  org.eclipse.papyrus.infra.types;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/pom.xml b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/pom.xml
index bf55790303a..063c05db745 100644
--- a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/pom.xml
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/pom.xml
@@ -8,6 +8,6 @@
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.architecture.representation.edit</artifactId>
-	<version>1.1.0-SNAPSHOT</version>
+	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/src-gen/org/eclipse/papyrus/infra/architecture/representation/provider/RepresentationItemProviderAdapterFactory.java b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/src-gen/org/eclipse/papyrus/infra/architecture/representation/provider/RepresentationItemProviderAdapterFactory.java
index 2ef7a1051ee..069240f0b49 100644
--- a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/src-gen/org/eclipse/papyrus/infra/architecture/representation/provider/RepresentationItemProviderAdapterFactory.java
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/src-gen/org/eclipse/papyrus/infra/architecture/representation/provider/RepresentationItemProviderAdapterFactory.java
@@ -194,6 +194,7 @@ public class RepresentationItemProviderAdapterFactory extends RepresentationAdap
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public ComposeableAdapterFactory getRootAdapterFactory() {
 		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
 	}
@@ -204,6 +205,7 @@ public class RepresentationItemProviderAdapterFactory extends RepresentationAdap
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
 		this.parentAdapterFactory = parentAdapterFactory;
 	}
@@ -279,6 +281,7 @@ public class RepresentationItemProviderAdapterFactory extends RepresentationAdap
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void addListener(INotifyChangedListener notifyChangedListener) {
 		changeNotifier.addListener(notifyChangedListener);
 	}
@@ -289,6 +292,7 @@ public class RepresentationItemProviderAdapterFactory extends RepresentationAdap
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void removeListener(INotifyChangedListener notifyChangedListener) {
 		changeNotifier.removeListener(notifyChangedListener);
 	}
@@ -299,6 +303,7 @@ public class RepresentationItemProviderAdapterFactory extends RepresentationAdap
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void fireNotifyChanged(Notification notification) {
 		changeNotifier.fireNotifyChanged(notification);
 
@@ -313,6 +318,7 @@ public class RepresentationItemProviderAdapterFactory extends RepresentationAdap
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void dispose() {
 		if (modelRuleItemProvider != null) modelRuleItemProvider.dispose();
 		if (owningRuleItemProvider != null) owningRuleItemProvider.dispose();
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/src-gen/org/eclipse/papyrus/infra/architecture/representation/provider/RootAutoSelectItemProvider.java b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/src-gen/org/eclipse/papyrus/infra/architecture/representation/provider/RootAutoSelectItemProvider.java
index 6559b5cacd1..05d3ee243d9 100644
--- a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/src-gen/org/eclipse/papyrus/infra/architecture/representation/provider/RootAutoSelectItemProvider.java
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/src-gen/org/eclipse/papyrus/infra/architecture/representation/provider/RootAutoSelectItemProvider.java
@@ -128,7 +128,6 @@ public class RootAutoSelectItemProvider
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-		super.notifyChanged(notification);
 	}
 
 	/**
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/META-INF/MANIFEST.MF b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/META-INF/MANIFEST.MF
index ecb457e5622..4aeabcc997f 100644
--- a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/META-INF/MANIFEST.MF
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.papyrus.infra.architecture.representation;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -14,6 +14,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
  org.eclipse.papyrus.infra.constraints;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
  org.eclipse.papyrus.infra.types;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.papyrus.infra.core.architecture;bundle-version="[1.0.0,3.0.0)";visibility:=reexport
+ org.eclipse.papyrus.infra.core.architecture;bundle-version="[2.1.0,3.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.papyrus.infra.architecture.representation
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/pom.xml b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/pom.xml
index 19c6cf37da5..ce3c575c50d 100644
--- a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/pom.xml
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/pom.xml
@@ -8,6 +8,6 @@
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.architecture.representation</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
+	<version>2.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/ModelAutoCreate.java b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/ModelAutoCreate.java
index 5b0d0d8da41..dcfe060e0b6 100644
--- a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/ModelAutoCreate.java
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/ModelAutoCreate.java
@@ -57,7 +57,6 @@ public interface ModelAutoCreate extends EObject {
 	 * @see #setFeature(EReference)
 	 * @see org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage#getModelAutoCreate_Feature()
 	 * @model required="true"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel propertyDescription='A reference in the origin type that will contain the newly created model element with this representation kind.'"
 	 * @generated
 	 */
 	EReference getFeature();
@@ -86,7 +85,6 @@ public interface ModelAutoCreate extends EObject {
 	 * @return the value of the '<em>Origin</em>' reference.
 	 * @see org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage#getModelAutoCreate_Origin()
 	 * @model required="true" transient="true" changeable="false" volatile="true" derived="true"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel propertyDescription='The type (from the language\'s metamodel) that will own the newly created model element'"
 	 * @generated
 	 */
 	EClass getOrigin();
@@ -106,7 +104,6 @@ public interface ModelAutoCreate extends EObject {
 	 * @see #setCreationType(String)
 	 * @see org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage#getModelAutoCreate_CreationType()
 	 * @model required="true"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel propertyDescription='The element type (from the element type registry) that will used to created the new model element.'"
 	 * @generated
 	 */
 	String getCreationType();
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/ModelRule.java b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/ModelRule.java
index 0193fe87dcb..27e2bc3f85d 100644
--- a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/ModelRule.java
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/ModelRule.java
@@ -58,7 +58,7 @@ public interface ModelRule extends Rule, DisplayUnit {
 	 * @return the value of the '<em>Element</em>' reference.
 	 * @see #setElement(EClass)
 	 * @see org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage#getModelRule_Element()
-	 * @model annotation="http://www.eclipse.org/emf/2002/GenModel propertyDescription='The type (from the language\'s metamodel) that a model element must have for a representation of this kind to apply to.'"
+	 * @model
 	 * @generated
 	 */
 	EClass getElement();
@@ -87,7 +87,7 @@ public interface ModelRule extends Rule, DisplayUnit {
 	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Stereotypes</em>' reference list.
 	 * @see org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage#getModelRule_Stereotypes()
-	 * @model annotation="http://www.eclipse.org/emf/2002/GenModel propertyDescription='The set of stereotypes (from the language\'s profiles) that a model element must have for a representation of this kind to apply to.'"
+	 * @model
 	 * @generated
 	 */
 	EList<EClass> getStereotypes();
@@ -108,7 +108,6 @@ public interface ModelRule extends Rule, DisplayUnit {
 	 * @see #setMultiplicity(int)
 	 * @see org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage#getModelRule_Multiplicity()
 	 * @model default="-1" required="true"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel propertyDescription='The maximum number of representations of this kind that a model element can have. -1 represents an unbounded number.'"
 	 * @generated
 	 */
 	int getMultiplicity();
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/OwningRule.java b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/OwningRule.java
index 1a74132a98d..7b454afd044 100644
--- a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/OwningRule.java
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/OwningRule.java
@@ -58,7 +58,7 @@ public interface OwningRule extends Rule {
 	 * @return the value of the '<em>Element</em>' reference.
 	 * @see #setElement(EClass)
 	 * @see org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage#getOwningRule_Element()
-	 * @model annotation="http://www.eclipse.org/emf/2002/GenModel propertyDescription='The type (from the language\'s metamodel) that a model element must have to own a representation of this kind.'"
+	 * @model
 	 * @generated
 	 */
 	EClass getElement();
@@ -87,7 +87,7 @@ public interface OwningRule extends Rule {
 	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Stereotypes</em>' reference list.
 	 * @see org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage#getOwningRule_Stereotypes()
-	 * @model annotation="http://www.eclipse.org/emf/2002/GenModel propertyDescription='The set of stereotypes (from the language\'s profiles) that a model element must have to own a representation of this kind.'"
+	 * @model
 	 * @generated
 	 */
 	EList<EClass> getStereotypes();
@@ -108,7 +108,6 @@ public interface OwningRule extends Rule {
 	 * @see #setMultiplicity(int)
 	 * @see org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage#getOwningRule_Multiplicity()
 	 * @model default="-1" required="true"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel propertyDescription='The maximum number of representations of this kind that a model element can own. -1 represents an unbounded number.'"
 	 * @generated
 	 */
 	int getMultiplicity();
@@ -138,7 +137,6 @@ public interface OwningRule extends Rule {
 	 * @return the value of the '<em>New Model Path</em>' containment reference list.
 	 * @see org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage#getOwningRule_NewModelPath()
 	 * @model containment="true"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel propertyDescription='The settings of auto creating model elements with this representation kind'"
 	 * @generated
 	 */
 	EList<ModelAutoCreate> getNewModelPath();
@@ -158,7 +156,6 @@ public interface OwningRule extends Rule {
 	 * @return the value of the '<em>Select Diagram Root</em>' containment reference list.
 	 * @see org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage#getOwningRule_SelectDiagramRoot()
 	 * @model containment="true"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel propertyDescription='The settings of selecting a model element that is the root of this representation kind'"
 	 * @generated
 	 */
 	EList<RootAutoSelect> getSelectDiagramRoot();
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/PapyrusRepresentationKind.java b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/PapyrusRepresentationKind.java
index 3b70570463d..32e06381eba 100644
--- a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/PapyrusRepresentationKind.java
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/PapyrusRepresentationKind.java
@@ -57,7 +57,7 @@ public interface PapyrusRepresentationKind extends RepresentationKind {
 	 * @return the value of the '<em>Parent</em>' reference.
 	 * @see #setParent(PapyrusRepresentationKind)
 	 * @see org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage#getPapyrusRepresentationKind_Parent()
-	 * @model annotation="http://www.eclipse.org/emf/2002/GenModel propertyCategory='Representation Kind' propertyDescription='The parent representation kind from which this representation kind inherits'"
+	 * @model
 	 * @generated
 	 */
 	PapyrusRepresentationKind getParent();
@@ -83,7 +83,6 @@ public interface PapyrusRepresentationKind extends RepresentationKind {
 	 * @return the value of the '<em>Model Rules</em>' containment reference list.
 	 * @see org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage#getPapyrusRepresentationKind_ModelRules()
 	 * @model containment="true" required="true"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel propertyCategory='Representation Kind' propertyDescription='The set of rules that determine which model elements can be the semantic element behind this diagram'"
 	 * @generated
 	 */
 	EList<ModelRule> getModelRules();
@@ -99,7 +98,6 @@ public interface PapyrusRepresentationKind extends RepresentationKind {
 	 * @return the value of the '<em>Owning Rules</em>' containment reference list.
 	 * @see org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage#getPapyrusRepresentationKind_OwningRules()
 	 * @model containment="true" required="true"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel propertyCategory='Representation Kind' propertyDescription='The set of rules that determine which elements can be the syntactic owner of this diagram'"
 	 * @generated
 	 */
 	EList<OwningRule> getOwningRules();
@@ -119,7 +117,6 @@ public interface PapyrusRepresentationKind extends RepresentationKind {
 	 * @see #setImplementationID(String)
 	 * @see org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage#getPapyrusRepresentationKind_ImplementationID()
 	 * @model required="true"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel propertyCategory='Representation Kind' propertyDescription='The id of the underlying implementation of this representation kind'"
 	 * @generated
 	 */
 	String getImplementationID();
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/RepresentationPackage.java b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/RepresentationPackage.java
index a81ccf4e397..27f49f3b223 100644
--- a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/RepresentationPackage.java
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/RepresentationPackage.java
@@ -87,7 +87,6 @@ public interface RepresentationPackage extends EPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
-	 * @since 2.0
 	 */
 	int PAPYRUS_REPRESENTATION_KIND__ID = ArchitecturePackage.REPRESENTATION_KIND__ID;
 
@@ -146,6 +145,15 @@ public interface RepresentationPackage extends EPackage {
 	int PAPYRUS_REPRESENTATION_KIND__CONCERNS = ArchitecturePackage.REPRESENTATION_KIND__CONCERNS;
 
 	/**
+	 * The feature id for the '<em><b>Grayed Icon</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_REPRESENTATION_KIND__GRAYED_ICON = ArchitecturePackage.REPRESENTATION_KIND__GRAYED_ICON;
+
+	/**
 	 * The feature id for the '<em><b>Parent</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/RootAutoSelect.java b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/RootAutoSelect.java
index 6653d095f8f..1a72996e32e 100644
--- a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/RootAutoSelect.java
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/RootAutoSelect.java
@@ -54,7 +54,6 @@ public interface RootAutoSelect extends EObject {
 	 * @see #setFeature(EReference)
 	 * @see org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage#getRootAutoSelect_Feature()
 	 * @model required="true"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel propertyDescription='A reference from the newly created element type that is used to get the root of a representation of this kind'"
 	 * @generated
 	 */
 	EReference getFeature();
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/Rule.java b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/Rule.java
index ef1ebfb429c..443d958fb2e 100644
--- a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/Rule.java
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/Rule.java
@@ -54,7 +54,6 @@ public interface Rule extends EObject {
 	 * @see #setPermit(boolean)
 	 * @see org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage#getRule_Permit()
 	 * @model default="true" required="true"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel propertyDescription='Whether the rule permits or forbids the action it represents'"
 	 * @generated
 	 */
 	boolean isPermit();
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/impl/ModelAutoCreateImpl.java b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/impl/ModelAutoCreateImpl.java
index dd0bb61dd52..aaca2381705 100644
--- a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/impl/ModelAutoCreateImpl.java
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/impl/ModelAutoCreateImpl.java
@@ -96,6 +96,7 @@ public class ModelAutoCreateImpl extends MinimalEObjectImpl.Container implements
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getFeature() {
 		if (feature != null && feature.eIsProxy()) {
 			InternalEObject oldFeature = (InternalEObject)feature;
@@ -122,6 +123,7 @@ public class ModelAutoCreateImpl extends MinimalEObjectImpl.Container implements
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setFeature(EReference newFeature) {
 		EReference oldFeature = feature;
 		feature = newFeature;
@@ -134,6 +136,7 @@ public class ModelAutoCreateImpl extends MinimalEObjectImpl.Container implements
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getOrigin() {
 		EClass origin = basicGetOrigin();
 		return origin != null && origin.eIsProxy() ? (EClass)eResolveProxy((InternalEObject)origin) : origin;
@@ -156,6 +159,7 @@ public class ModelAutoCreateImpl extends MinimalEObjectImpl.Container implements
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getCreationType() {
 		return creationType;
 	}
@@ -165,6 +169,7 @@ public class ModelAutoCreateImpl extends MinimalEObjectImpl.Container implements
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setCreationType(String newCreationType) {
 		String oldCreationType = creationType;
 		creationType = newCreationType;
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/impl/ModelRuleImpl.java b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/impl/ModelRuleImpl.java
index 2549069156e..a009db9f848 100644
--- a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/impl/ModelRuleImpl.java
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/impl/ModelRuleImpl.java
@@ -148,6 +148,7 @@ public class ModelRuleImpl extends RuleImpl implements ModelRule {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<ConstraintDescriptor> getConstraints() {
 		if (constraints == null) {
 			constraints = new EObjectContainmentWithInverseEList<ConstraintDescriptor>(ConstraintDescriptor.class, this, RepresentationPackage.MODEL_RULE__CONSTRAINTS, ConstraintsPackage.CONSTRAINT_DESCRIPTOR__DISPLAY);
@@ -160,6 +161,7 @@ public class ModelRuleImpl extends RuleImpl implements ModelRule {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public int getElementMultiplicity() {
 		return elementMultiplicity;
 	}
@@ -169,6 +171,7 @@ public class ModelRuleImpl extends RuleImpl implements ModelRule {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setElementMultiplicity(int newElementMultiplicity) {
 		int oldElementMultiplicity = elementMultiplicity;
 		elementMultiplicity = newElementMultiplicity;
@@ -181,6 +184,7 @@ public class ModelRuleImpl extends RuleImpl implements ModelRule {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getElement() {
 		if (element != null && element.eIsProxy()) {
 			InternalEObject oldElement = (InternalEObject)element;
@@ -207,6 +211,7 @@ public class ModelRuleImpl extends RuleImpl implements ModelRule {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setElement(EClass newElement) {
 		EClass oldElement = element;
 		element = newElement;
@@ -219,6 +224,7 @@ public class ModelRuleImpl extends RuleImpl implements ModelRule {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<EClass> getStereotypes() {
 		if (stereotypes == null) {
 			stereotypes = new EObjectResolvingEList<EClass>(EClass.class, this, RepresentationPackage.MODEL_RULE__STEREOTYPES);
@@ -231,6 +237,7 @@ public class ModelRuleImpl extends RuleImpl implements ModelRule {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public int getMultiplicity() {
 		return multiplicity;
 	}
@@ -240,6 +247,7 @@ public class ModelRuleImpl extends RuleImpl implements ModelRule {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setMultiplicity(int newMultiplicity) {
 		int oldMultiplicity = multiplicity;
 		multiplicity = newMultiplicity;
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/impl/OwningRuleImpl.java b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/impl/OwningRuleImpl.java
index e3daeae99d0..6f4aa30df72 100644
--- a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/impl/OwningRuleImpl.java
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/impl/OwningRuleImpl.java
@@ -137,6 +137,7 @@ public class OwningRuleImpl extends RuleImpl implements OwningRule {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getElement() {
 		if (element != null && element.eIsProxy()) {
 			InternalEObject oldElement = (InternalEObject)element;
@@ -163,6 +164,7 @@ public class OwningRuleImpl extends RuleImpl implements OwningRule {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setElement(EClass newElement) {
 		EClass oldElement = element;
 		element = newElement;
@@ -175,6 +177,7 @@ public class OwningRuleImpl extends RuleImpl implements OwningRule {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<EClass> getStereotypes() {
 		if (stereotypes == null) {
 			stereotypes = new EObjectResolvingEList<EClass>(EClass.class, this, RepresentationPackage.OWNING_RULE__STEREOTYPES);
@@ -187,6 +190,7 @@ public class OwningRuleImpl extends RuleImpl implements OwningRule {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public int getMultiplicity() {
 		return multiplicity;
 	}
@@ -196,6 +200,7 @@ public class OwningRuleImpl extends RuleImpl implements OwningRule {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setMultiplicity(int newMultiplicity) {
 		int oldMultiplicity = multiplicity;
 		multiplicity = newMultiplicity;
@@ -208,6 +213,7 @@ public class OwningRuleImpl extends RuleImpl implements OwningRule {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<ModelAutoCreate> getNewModelPath() {
 		if (newModelPath == null) {
 			newModelPath = new EObjectContainmentEList<ModelAutoCreate>(ModelAutoCreate.class, this, RepresentationPackage.OWNING_RULE__NEW_MODEL_PATH);
@@ -220,6 +226,7 @@ public class OwningRuleImpl extends RuleImpl implements OwningRule {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<RootAutoSelect> getSelectDiagramRoot() {
 		if (selectDiagramRoot == null) {
 			selectDiagramRoot = new EObjectContainmentEList<RootAutoSelect>(RootAutoSelect.class, this, RepresentationPackage.OWNING_RULE__SELECT_DIAGRAM_ROOT);
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/impl/PapyrusRepresentationKindImpl.java b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/impl/PapyrusRepresentationKindImpl.java
index 574ac7d8f2b..8d3def71286 100644
--- a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/impl/PapyrusRepresentationKindImpl.java
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/impl/PapyrusRepresentationKindImpl.java
@@ -126,6 +126,7 @@ public abstract class PapyrusRepresentationKindImpl extends RepresentationKindIm
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public PapyrusRepresentationKind getParent() {
 		if (parent != null && parent.eIsProxy()) {
 			InternalEObject oldParent = (InternalEObject)parent;
@@ -152,6 +153,7 @@ public abstract class PapyrusRepresentationKindImpl extends RepresentationKindIm
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setParent(PapyrusRepresentationKind newParent) {
 		PapyrusRepresentationKind oldParent = parent;
 		parent = newParent;
@@ -164,6 +166,7 @@ public abstract class PapyrusRepresentationKindImpl extends RepresentationKindIm
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<ModelRule> getModelRules() {
 		if (modelRules == null) {
 			modelRules = new EObjectContainmentEList<ModelRule>(ModelRule.class, this, RepresentationPackage.PAPYRUS_REPRESENTATION_KIND__MODEL_RULES);
@@ -176,6 +179,7 @@ public abstract class PapyrusRepresentationKindImpl extends RepresentationKindIm
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<OwningRule> getOwningRules() {
 		if (owningRules == null) {
 			owningRules = new EObjectContainmentEList<OwningRule>(OwningRule.class, this, RepresentationPackage.PAPYRUS_REPRESENTATION_KIND__OWNING_RULES);
@@ -188,6 +192,7 @@ public abstract class PapyrusRepresentationKindImpl extends RepresentationKindIm
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getImplementationID() {
 		return implementationID;
 	}
@@ -197,6 +202,7 @@ public abstract class PapyrusRepresentationKindImpl extends RepresentationKindIm
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setImplementationID(String newImplementationID) {
 		String oldImplementationID = implementationID;
 		implementationID = newImplementationID;
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/impl/RepresentationFactoryImpl.java b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/impl/RepresentationFactoryImpl.java
index 48fd45a57f9..43938dfa68e 100644
--- a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/impl/RepresentationFactoryImpl.java
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/impl/RepresentationFactoryImpl.java
@@ -82,6 +82,7 @@ public class RepresentationFactoryImpl extends EFactoryImpl implements Represent
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public ModelRule createModelRule() {
 		ModelRuleImpl modelRule = new ModelRuleImpl();
 		return modelRule;
@@ -92,6 +93,7 @@ public class RepresentationFactoryImpl extends EFactoryImpl implements Represent
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public OwningRule createOwningRule() {
 		OwningRuleImpl owningRule = new OwningRuleImpl();
 		return owningRule;
@@ -102,6 +104,7 @@ public class RepresentationFactoryImpl extends EFactoryImpl implements Represent
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public ModelAutoCreate createModelAutoCreate() {
 		ModelAutoCreateImpl modelAutoCreate = new ModelAutoCreateImpl();
 		return modelAutoCreate;
@@ -112,6 +115,7 @@ public class RepresentationFactoryImpl extends EFactoryImpl implements Represent
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public RootAutoSelect createRootAutoSelect() {
 		RootAutoSelectImpl rootAutoSelect = new RootAutoSelectImpl();
 		return rootAutoSelect;
@@ -122,6 +126,7 @@ public class RepresentationFactoryImpl extends EFactoryImpl implements Represent
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public RepresentationPackage getRepresentationPackage() {
 		return (RepresentationPackage)getEPackage();
 	}
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/impl/RepresentationPackageImpl.java b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/impl/RepresentationPackageImpl.java
index bdfeac79785..92e44002efc 100644
--- a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/impl/RepresentationPackageImpl.java
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/impl/RepresentationPackageImpl.java
@@ -156,6 +156,7 @@ public class RepresentationPackageImpl extends EPackageImpl implements Represent
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getPapyrusRepresentationKind() {
 		return papyrusRepresentationKindEClass;
 	}
@@ -165,6 +166,7 @@ public class RepresentationPackageImpl extends EPackageImpl implements Represent
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getPapyrusRepresentationKind_Parent() {
 		return (EReference)papyrusRepresentationKindEClass.getEStructuralFeatures().get(0);
 	}
@@ -174,6 +176,7 @@ public class RepresentationPackageImpl extends EPackageImpl implements Represent
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getPapyrusRepresentationKind_ModelRules() {
 		return (EReference)papyrusRepresentationKindEClass.getEStructuralFeatures().get(1);
 	}
@@ -183,6 +186,7 @@ public class RepresentationPackageImpl extends EPackageImpl implements Represent
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getPapyrusRepresentationKind_OwningRules() {
 		return (EReference)papyrusRepresentationKindEClass.getEStructuralFeatures().get(2);
 	}
@@ -192,6 +196,7 @@ public class RepresentationPackageImpl extends EPackageImpl implements Represent
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getPapyrusRepresentationKind_ImplementationID() {
 		return (EAttribute)papyrusRepresentationKindEClass.getEStructuralFeatures().get(3);
 	}
@@ -201,6 +206,7 @@ public class RepresentationPackageImpl extends EPackageImpl implements Represent
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getRule() {
 		return ruleEClass;
 	}
@@ -210,6 +216,7 @@ public class RepresentationPackageImpl extends EPackageImpl implements Represent
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getRule_Permit() {
 		return (EAttribute)ruleEClass.getEStructuralFeatures().get(0);
 	}
@@ -219,6 +226,7 @@ public class RepresentationPackageImpl extends EPackageImpl implements Represent
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getModelRule() {
 		return modelRuleEClass;
 	}
@@ -228,6 +236,7 @@ public class RepresentationPackageImpl extends EPackageImpl implements Represent
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getModelRule_Element() {
 		return (EReference)modelRuleEClass.getEStructuralFeatures().get(0);
 	}
@@ -237,6 +246,7 @@ public class RepresentationPackageImpl extends EPackageImpl implements Represent
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getModelRule_Stereotypes() {
 		return (EReference)modelRuleEClass.getEStructuralFeatures().get(1);
 	}
@@ -246,6 +256,7 @@ public class RepresentationPackageImpl extends EPackageImpl implements Represent
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getModelRule_Multiplicity() {
 		return (EAttribute)modelRuleEClass.getEStructuralFeatures().get(2);
 	}
@@ -255,6 +266,7 @@ public class RepresentationPackageImpl extends EPackageImpl implements Represent
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getOwningRule() {
 		return owningRuleEClass;
 	}
@@ -264,6 +276,7 @@ public class RepresentationPackageImpl extends EPackageImpl implements Represent
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getOwningRule_Element() {
 		return (EReference)owningRuleEClass.getEStructuralFeatures().get(0);
 	}
@@ -273,6 +286,7 @@ public class RepresentationPackageImpl extends EPackageImpl implements Represent
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getOwningRule_Stereotypes() {
 		return (EReference)owningRuleEClass.getEStructuralFeatures().get(1);
 	}
@@ -282,6 +296,7 @@ public class RepresentationPackageImpl extends EPackageImpl implements Represent
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getOwningRule_Multiplicity() {
 		return (EAttribute)owningRuleEClass.getEStructuralFeatures().get(2);
 	}
@@ -291,6 +306,7 @@ public class RepresentationPackageImpl extends EPackageImpl implements Represent
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getOwningRule_NewModelPath() {
 		return (EReference)owningRuleEClass.getEStructuralFeatures().get(3);
 	}
@@ -300,6 +316,7 @@ public class RepresentationPackageImpl extends EPackageImpl implements Represent
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getOwningRule_SelectDiagramRoot() {
 		return (EReference)owningRuleEClass.getEStructuralFeatures().get(4);
 	}
@@ -309,6 +326,7 @@ public class RepresentationPackageImpl extends EPackageImpl implements Represent
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getModelAutoCreate() {
 		return modelAutoCreateEClass;
 	}
@@ -318,6 +336,7 @@ public class RepresentationPackageImpl extends EPackageImpl implements Represent
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getModelAutoCreate_Feature() {
 		return (EReference)modelAutoCreateEClass.getEStructuralFeatures().get(0);
 	}
@@ -327,6 +346,7 @@ public class RepresentationPackageImpl extends EPackageImpl implements Represent
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getModelAutoCreate_Origin() {
 		return (EReference)modelAutoCreateEClass.getEStructuralFeatures().get(1);
 	}
@@ -336,6 +356,7 @@ public class RepresentationPackageImpl extends EPackageImpl implements Represent
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getModelAutoCreate_CreationType() {
 		return (EAttribute)modelAutoCreateEClass.getEStructuralFeatures().get(2);
 	}
@@ -345,6 +366,7 @@ public class RepresentationPackageImpl extends EPackageImpl implements Represent
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getRootAutoSelect() {
 		return rootAutoSelectEClass;
 	}
@@ -354,6 +376,7 @@ public class RepresentationPackageImpl extends EPackageImpl implements Represent
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getRootAutoSelect_Feature() {
 		return (EReference)rootAutoSelectEClass.getEStructuralFeatures().get(0);
 	}
@@ -363,6 +386,7 @@ public class RepresentationPackageImpl extends EPackageImpl implements Represent
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public RepresentationFactory getRepresentationFactory() {
 		return (RepresentationFactory)getEFactoryInstance();
 	}
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/impl/RootAutoSelectImpl.java b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/impl/RootAutoSelectImpl.java
index bcf6c5f9684..ab5036186d5 100644
--- a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/impl/RootAutoSelectImpl.java
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/impl/RootAutoSelectImpl.java
@@ -74,6 +74,7 @@ public class RootAutoSelectImpl extends MinimalEObjectImpl.Container implements
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getFeature() {
 		if (feature != null && feature.eIsProxy()) {
 			InternalEObject oldFeature = (InternalEObject)feature;
@@ -100,6 +101,7 @@ public class RootAutoSelectImpl extends MinimalEObjectImpl.Container implements
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setFeature(EReference newFeature) {
 		EReference oldFeature = feature;
 		feature = newFeature;
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/impl/RuleImpl.java b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/impl/RuleImpl.java
index de8deb706e9..9c2706b8913 100644
--- a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/impl/RuleImpl.java
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/impl/RuleImpl.java
@@ -82,6 +82,7 @@ public abstract class RuleImpl extends MinimalEObjectImpl.Container implements R
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public boolean isPermit() {
 		return permit;
 	}
@@ -91,6 +92,7 @@ public abstract class RuleImpl extends MinimalEObjectImpl.Container implements R
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setPermit(boolean newPermit) {
 		boolean oldPermit = permit;
 		permit = newPermit;
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/META-INF/MANIFEST.MF b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/META-INF/MANIFEST.MF
index 4ecc22f6243..cc19d98a13f 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/META-INF/MANIFEST.MF
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.papyrus.infra.core.architecture.edit;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.papyrus.infra.core.architecture.provider.ArchitectureEditPlugin$Implementation
 Bundle-Vendor: %providerName
@@ -11,7 +11,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.papyrus.infra.core.architecture.provider
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
  org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)",
- org.eclipse.papyrus.infra.core.architecture;bundle-version="[1.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.core.architecture;bundle-version="[2.1.0,3.0.0)",
  org.eclipse.papyrus.infra.types;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.papyrus.infra.types.edit;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.0.0,3.0.0)",
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/plugin.properties b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/plugin.properties
index 437bd272eb5..1d5176d716a 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/plugin.properties
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/plugin.properties
@@ -101,3 +101,5 @@ _UI_DescriptionLanguagePropertyCategory = Description Language
 _UI_RepresentationKindPropertyCategory = Representation Kind
 _UI_ViewpointPropertyCategory = Viewpoint
 _UI_ElementPropertyCategory = Element
+_UI_RepresentationKind_grayedIcon_feature = Grayed Icon
+_UI_RepresentationKind_grayedIcon_description = The icon of the element specified using a platform plugin URI
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/pom.xml b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/pom.xml
index 919a605cc8f..986617fce3e 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/pom.xml
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/pom.xml
@@ -8,6 +8,6 @@
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.core.architecture.edit</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
+	<version>2.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/ArchitectureFrameworkItemProvider.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/ArchitectureFrameworkItemProvider.java
index b5ddfd2f096..aad44afea01 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/ArchitectureFrameworkItemProvider.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/ArchitectureFrameworkItemProvider.java
@@ -92,7 +92,6 @@ public class ArchitectureFrameworkItemProvider extends ArchitectureContextItemPr
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-		super.notifyChanged(notification);
 	}
 
 	/**
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/ArchitectureItemProviderAdapterFactory.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/ArchitectureItemProviderAdapterFactory.java
index 63464d591bb..f0a556ed334 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/ArchitectureItemProviderAdapterFactory.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/ArchitectureItemProviderAdapterFactory.java
@@ -287,6 +287,7 @@ public class ArchitectureItemProviderAdapterFactory extends ArchitectureAdapterF
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public ComposeableAdapterFactory getRootAdapterFactory() {
 		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
 	}
@@ -297,6 +298,7 @@ public class ArchitectureItemProviderAdapterFactory extends ArchitectureAdapterF
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
 		this.parentAdapterFactory = parentAdapterFactory;
 	}
@@ -372,6 +374,7 @@ public class ArchitectureItemProviderAdapterFactory extends ArchitectureAdapterF
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void addListener(INotifyChangedListener notifyChangedListener) {
 		changeNotifier.addListener(notifyChangedListener);
 	}
@@ -382,6 +385,7 @@ public class ArchitectureItemProviderAdapterFactory extends ArchitectureAdapterF
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void removeListener(INotifyChangedListener notifyChangedListener) {
 		changeNotifier.removeListener(notifyChangedListener);
 	}
@@ -392,6 +396,7 @@ public class ArchitectureItemProviderAdapterFactory extends ArchitectureAdapterF
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void fireNotifyChanged(Notification notification) {
 		changeNotifier.fireNotifyChanged(notification);
 
@@ -406,6 +411,7 @@ public class ArchitectureItemProviderAdapterFactory extends ArchitectureAdapterF
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void dispose() {
 		if (architectureDomainItemProvider != null) architectureDomainItemProvider.dispose();
 		if (architectureDescriptionLanguageItemProvider != null) architectureDescriptionLanguageItemProvider.dispose();
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/ArchitectureViewpointItemProvider.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/ArchitectureViewpointItemProvider.java
index 91de0fff965..1a870bed225 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/ArchitectureViewpointItemProvider.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/ArchitectureViewpointItemProvider.java
@@ -141,7 +141,6 @@ public class ArchitectureViewpointItemProvider extends ADElementItemProvider {
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-		super.notifyChanged(notification);
 	}
 
 	/**
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/ConcernItemProvider.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/ConcernItemProvider.java
index ff039734fb9..e864c2ea910 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/ConcernItemProvider.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/ConcernItemProvider.java
@@ -93,7 +93,6 @@ public class ConcernItemProvider extends ADElementItemProvider {
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-		super.notifyChanged(notification);
 	}
 
 	/**
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/RepresentationKindItemProvider.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/RepresentationKindItemProvider.java
index 81a58cd9ddc..281e8a53679 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/RepresentationKindItemProvider.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/RepresentationKindItemProvider.java
@@ -24,6 +24,8 @@ import org.eclipse.emf.common.notify.Notification;
 
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
 import org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage;
 import org.eclipse.papyrus.infra.core.architecture.RepresentationKind;
 
@@ -56,6 +58,7 @@ public class RepresentationKindItemProvider extends ADElementItemProvider {
 			super.getPropertyDescriptors(object);
 
 			addConcernsPropertyDescriptor(object);
+			addGrayedIconPropertyDescriptor(object);
 		}
 		return itemPropertyDescriptors;
 	}
@@ -83,6 +86,28 @@ public class RepresentationKindItemProvider extends ADElementItemProvider {
 	}
 
 	/**
+	 * This adds a property descriptor for the Grayed Icon feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addGrayedIconPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_RepresentationKind_grayedIcon_feature"), //$NON-NLS-1$
+				 getString("_UI_RepresentationKind_grayedIcon_description"), //$NON-NLS-1$
+				 ArchitecturePackage.Literals.REPRESENTATION_KIND__GRAYED_ICON,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 getString("_UI_ElementPropertyCategory"), //$NON-NLS-1$
+				 null));
+	}
+
+	/**
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -107,6 +132,12 @@ public class RepresentationKindItemProvider extends ADElementItemProvider {
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
+
+		switch (notification.getFeatureID(RepresentationKind.class)) {
+			case ArchitecturePackage.REPRESENTATION_KIND__GRAYED_ICON:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
+		}
 		super.notifyChanged(notification);
 	}
 
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/StakeholderItemProvider.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/StakeholderItemProvider.java
index dae67331654..dddf3856b73 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/StakeholderItemProvider.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/StakeholderItemProvider.java
@@ -118,7 +118,6 @@ public class StakeholderItemProvider extends ADElementItemProvider {
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-		super.notifyChanged(notification);
 	}
 
 	/**
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/META-INF/MANIFEST.MF b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/META-INF/MANIFEST.MF
index 1234992563d..d12db774477 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/META-INF/MANIFEST.MF
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.papyrus.infra.core.architecture;singleton:=true
 Automatic-Module-Name: org.eclipse.papyrus.infra.core.architecture
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/model/Architecture.ecore b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/model/Architecture.ecore
index 13fa2e4a432..a0a5bfddfc4 100755
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/model/Architecture.ecore
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/model/Architecture.ecore
@@ -180,6 +180,13 @@
         <details key="propertyCategory" value="Representation Kind"/>
       </eAnnotations>
     </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="grayedIcon" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="The icon of the element specified using a platform plugin URI"/>
+        <details key="propertyDescription" value="The icon of the element specified using a platform plugin URI"/>
+        <details key="propertyCategory" value="Element"/>
+      </eAnnotations>
+    </eStructuralFeatures>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="ArchitectureContext" abstract="true"
       eSuperTypes="#//ADElement">
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/model/Architecture.genmodel b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/model/Architecture.genmodel
index f6c9a3e1f0d..429cef6c8e6 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/model/Architecture.genmodel
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/model/Architecture.genmodel
@@ -6,8 +6,8 @@
     modelPluginID="org.eclipse.papyrus.infra.core.architecture" modelName="Architecture"
     nonNLSMarkers="true" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
     testsDirectory="/org.eclipse.papyrus.infra.core.architecture.tests/src-gen" importerID="org.eclipse.emf.importer.ecore"
-    usedGenPackages="../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.genmodel#//types"
-    complianceLevel="8.0" copyrightFields="false" operationReflection="true" importOrganizing="true">
+    complianceLevel="8.0" copyrightFields="false" usedGenPackages="../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.genmodel#//types"
+    operationReflection="true" importOrganizing="true">
   <foreignModel>Architecture.ecore</foreignModel>
   <genPackages prefix="Architecture" basePackage="org.eclipse.papyrus.infra.core"
       disposableProviderFactory="true" extensibleProviderFactory="true" ecorePackage="Architecture.ecore#/">
@@ -68,6 +68,8 @@
       <genFeatures notify="false" createChild="false" propertyCategory="Representation Kind"
           propertyDescription="The set of concerns covered by the representation kind"
           propertySortChoices="true" ecoreFeature="ecore:EReference Architecture.ecore#//RepresentationKind/concerns"/>
+      <genFeatures createChild="false" propertyCategory="Element" propertyDescription="The icon of the element specified using a platform plugin URI"
+          ecoreFeature="ecore:EAttribute Architecture.ecore#//RepresentationKind/grayedIcon"/>
     </genClasses>
     <genClasses image="false" ecoreClass="Architecture.ecore#//ArchitectureContext">
       <genFeatures property="None" children="true" createChild="true" propertyDescription="The set of viewpoints defined by the context"
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/model/Architecture.uml b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/model/Architecture.uml
index 7b886fbf7f0..4cadc776a6e 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/model/Architecture.uml
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/model/Architecture.uml
@@ -118,6 +118,10 @@
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_46bPGl_sEeecE-N4uvmt0g"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_46bPG1_sEeecE-N4uvmt0g" value="*"/>
       </ownedAttribute>
+      <ownedAttribute xmi:id="_3prHYMrzEem0O816XhrVeA" name="grayedIcon" visibility="public" isOrdered="true">
+        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_3prHYcrzEem0O816XhrVeA"/>
+      </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_46bPHF_sEeecE-N4uvmt0g" name="ArchitectureDescriptionLanguage">
       <generalization xmi:id="_46bPHV_sEeecE-N4uvmt0g" general="_46bO8l_sEeecE-N4uvmt0g"/>
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/pom.xml b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/pom.xml
index ac4b3aef8cd..762d0659406 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/pom.xml
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/pom.xml
@@ -8,6 +8,6 @@
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.core.architecture</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
+	<version>2.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ADElement.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ADElement.java
index e1f107733b0..429b48483db 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ADElement.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ADElement.java
@@ -57,7 +57,6 @@ public interface ADElement extends EObject {
 	 * @see #setId(String)
 	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage#getADElement_Id()
 	 * @model required="true"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel propertyDescription='The unique id of the element' propertyCategory='Element'"
 	 * @generated
 	 */
 	String getId();
@@ -87,7 +86,6 @@ public interface ADElement extends EObject {
 	 * @see #setName(String)
 	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage#getADElement_Name()
 	 * @model required="true"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel propertyDescription='The name of the element' propertyCategory='Element'"
 	 * @generated
 	 */
 	String getName();
@@ -116,7 +114,7 @@ public interface ADElement extends EObject {
 	 * @return the value of the '<em>Description</em>' attribute.
 	 * @see #setDescription(String)
 	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage#getADElement_Description()
-	 * @model annotation="http://www.eclipse.org/emf/2002/GenModel propertyDescription='The description of the element' propertyCategory='Element'"
+	 * @model
 	 * @generated
 	 */
 	String getDescription();
@@ -145,7 +143,6 @@ public interface ADElement extends EObject {
 	 * @return the value of the '<em>Qualified Name</em>' attribute.
 	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage#getADElement_QualifiedName()
 	 * @model transient="true" changeable="false" volatile="true" derived="true"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel propertyDescription='The qualified name of the element' propertyCategory='Element'"
 	 * @generated
 	 */
 	String getQualifiedName();
@@ -164,7 +161,7 @@ public interface ADElement extends EObject {
 	 * @return the value of the '<em>Icon</em>' attribute.
 	 * @see #setIcon(String)
 	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage#getADElement_Icon()
-	 * @model annotation="http://www.eclipse.org/emf/2002/GenModel propertyDescription='The icon of the element specified using a platform plugin URI' propertyCategory='Element'"
+	 * @model
 	 * @generated
 	 */
 	String getIcon();
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ArchitectureContext.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ArchitectureContext.java
index 99c7d1a3747..0e194ac9d05 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ArchitectureContext.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ArchitectureContext.java
@@ -64,7 +64,6 @@ public interface ArchitectureContext extends ADElement {
 	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage#getArchitectureContext_Viewpoints()
 	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitectureViewpoint#getContext
 	 * @model opposite="context" containment="true"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel propertyDescription='The set of viewpoints defined by the context'"
 	 * @generated
 	 */
 	EList<ArchitectureViewpoint> getViewpoints();
@@ -83,7 +82,7 @@ public interface ArchitectureContext extends ADElement {
 	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Default Viewpoints</em>' reference list.
 	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage#getArchitectureContext_DefaultViewpoints()
-	 * @model annotation="http://www.eclipse.org/emf/2002/GenModel propertyDescription='The set of viewpoints that are selected for the context by default' propertyCategory='Context'"
+	 * @model
 	 * @generated
 	 */
 	EList<ArchitectureViewpoint> getDefaultViewpoints();
@@ -102,7 +101,7 @@ public interface ArchitectureContext extends ADElement {
 	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Element Types</em>' reference list.
 	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage#getArchitectureContext_ElementTypes()
-	 * @model annotation="http://www.eclipse.org/emf/2002/GenModel propertyDescription='The set of element type set configurations that are used by the context (typically found in .elementtypesconfigurations resources)' propertyCategory='Context'"
+	 * @model
 	 * @generated
 	 */
 	EList<ElementTypeSetConfiguration> getElementTypes();
@@ -121,7 +120,7 @@ public interface ArchitectureContext extends ADElement {
 	 * @return the value of the '<em>Extension Prefix</em>' attribute.
 	 * @see #setExtensionPrefix(String)
 	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage#getArchitectureContext_ExtensionPrefix()
-	 * @model annotation="http://www.eclipse.org/emf/2002/GenModel propertyDescription='The prefix of the file extension of the UML models applying this context (e.g., &lt;Name&gt;.&lt;prefixExtension&gt;.uml)' propertyCategory='Context'"
+	 * @model
 	 * @generated
 	 */
 	String getExtensionPrefix();
@@ -151,9 +150,7 @@ public interface ArchitectureContext extends ADElement {
 	 * @see #setCreationCommandClass(String)
 	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage#getArchitectureContext_CreationCommandClass()
 	 * @model required="true"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel propertyDescription='The fully qualified name of a command that creates models applying this context. The command must implement the org.eclipse.papyrus.infra.architecture.commands.IModelCreationCommand inteface' propertyCategory='Context'"
 	 * @generated
-	 * @since 2.0
 	 */
 	String getCreationCommandClass();
 
@@ -164,7 +161,6 @@ public interface ArchitectureContext extends ADElement {
 	 * @param value the new value of the '<em>Creation Command Class</em>' attribute.
 	 * @see #getCreationCommandClass()
 	 * @generated
-	 * @since 2.0
 	 */
 	void setCreationCommandClass(String value);
 
@@ -182,9 +178,8 @@ public interface ArchitectureContext extends ADElement {
 	 * @return the value of the '<em>Conversion Command Class</em>' attribute.
 	 * @see #setConversionCommandClass(String)
 	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage#getArchitectureContext_ConversionCommandClass()
-	 * @model annotation="http://www.eclipse.org/emf/2002/GenModel propertyDescription='The fully qualified name of a command that refactors models that switched to this context. The command must implement the org.eclipse.papyrus.infra.architecture.commands.IModelConversionCommand inteface' propertyCategory='Context'"
+	 * @model
 	 * @generated
-	 * @since 2.0
 	 */
 	String getConversionCommandClass();
 
@@ -195,7 +190,6 @@ public interface ArchitectureContext extends ADElement {
 	 * @param value the new value of the '<em>Conversion Command Class</em>' attribute.
 	 * @see #getConversionCommandClass()
 	 * @generated
-	 * @since 2.0
 	 */
 	void setConversionCommandClass(String value);
 
@@ -204,7 +198,6 @@ public interface ArchitectureContext extends ADElement {
 	 * <!-- end-user-doc -->
 	 * @model diagnosticsUnique="false" contextUnique="false"
 	 * @generated
-	 * @since 2.0
 	 */
 	boolean ceationCommandClassExists(DiagnosticChain diagnostics, Map<Object, Object> context);
 
@@ -213,7 +206,6 @@ public interface ArchitectureContext extends ADElement {
 	 * <!-- end-user-doc -->
 	 * @model diagnosticsUnique="false" contextUnique="false"
 	 * @generated
-	 * @since 2.0
 	 */
 	boolean conversionCommandClassExists(DiagnosticChain diagnostics, Map<Object, Object> context);
 
@@ -234,7 +226,6 @@ public interface ArchitectureContext extends ADElement {
 	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage#getArchitectureContext_Domain()
 	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitectureDomain#getContexts
 	 * @model opposite="contexts" required="true" transient="false"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel propertyDescription='The domain that defines the context'"
 	 * @generated
 	 */
 	ArchitectureDomain getDomain();
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ArchitectureDescription.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ArchitectureDescription.java
index 9a02104ce0f..a0e4d9b0c01 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ArchitectureDescription.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ArchitectureDescription.java
@@ -52,7 +52,7 @@ public interface ArchitectureDescription extends EObject {
 	 * @return the value of the '<em>Context Id</em>' attribute.
 	 * @see #setContextId(String)
 	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage#getArchitectureDescription_ContextId()
-	 * @model annotation="http://www.eclipse.org/emf/2002/GenModel propertyDescription='The id of the context applied to a UML model'"
+	 * @model
 	 * @generated
 	 */
 	String getContextId();
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ArchitectureDescriptionLanguage.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ArchitectureDescriptionLanguage.java
index 30fd654035a..497e9dac591 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ArchitectureDescriptionLanguage.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ArchitectureDescriptionLanguage.java
@@ -58,7 +58,6 @@ public interface ArchitectureDescriptionLanguage extends ArchitectureContext {
 	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage#getArchitectureDescriptionLanguage_RepresentationKinds()
 	 * @see org.eclipse.papyrus.infra.core.architecture.RepresentationKind#getLanguage
 	 * @model opposite="language" containment="true"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel propertyDescription='The set of representation kinds defined by the language'"
 	 * @generated
 	 */
 	EList<RepresentationKind> getRepresentationKinds();
@@ -78,7 +77,6 @@ public interface ArchitectureDescriptionLanguage extends ArchitectureContext {
 	 * @see #setMetamodel(EPackage)
 	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage#getArchitectureDescriptionLanguage_Metamodel()
 	 * @model required="true"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel propertyDescription='The metamodel used by the language' propertyCategory='Description Language'"
 	 * @generated
 	 */
 	EPackage getMetamodel();
@@ -107,7 +105,7 @@ public interface ArchitectureDescriptionLanguage extends ArchitectureContext {
 	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Profiles</em>' reference list.
 	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage#getArchitectureDescriptionLanguage_Profiles()
-	 * @model annotation="http://www.eclipse.org/emf/2002/GenModel propertyDescription='The set of UML profiles used by the language' propertyCategory='Description Language'"
+	 * @model
 	 * @generated
 	 */
 	EList<EPackage> getProfiles();
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ArchitectureDescriptionPreferences.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ArchitectureDescriptionPreferences.java
index 3878512586b..5bcd5a21fd8 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ArchitectureDescriptionPreferences.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ArchitectureDescriptionPreferences.java
@@ -54,7 +54,7 @@ public interface ArchitectureDescriptionPreferences extends EObject {
 	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Viewpoint Ids</em>' attribute list.
 	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage#getArchitectureDescriptionPreferences_ViewpointIds()
-	 * @model annotation="http://www.eclipse.org/emf/2002/GenModel propertyDescription='The set of ids of viewpoints enabled on a UML model'"
+	 * @model
 	 * @generated
 	 */
 	EList<String> getViewpointIds();
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ArchitectureDomain.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ArchitectureDomain.java
index 2af7710cc9b..49fb5188d59 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ArchitectureDomain.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ArchitectureDomain.java
@@ -57,7 +57,6 @@ public interface ArchitectureDomain extends ADElement {
 	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage#getArchitectureDomain_Stakeholders()
 	 * @see org.eclipse.papyrus.infra.core.architecture.Stakeholder#getDomain
 	 * @model opposite="domain" containment="true"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel propertyDescription='The set of stakeholders defined by the domain'"
 	 * @generated
 	 */
 	EList<Stakeholder> getStakeholders();
@@ -79,7 +78,6 @@ public interface ArchitectureDomain extends ADElement {
 	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage#getArchitectureDomain_Concerns()
 	 * @see org.eclipse.papyrus.infra.core.architecture.Concern#getDomain
 	 * @model opposite="domain" containment="true"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel propertyDescription='The set of concerns defined by the domain'"
 	 * @generated
 	 */
 	EList<Concern> getConcerns();
@@ -101,7 +99,6 @@ public interface ArchitectureDomain extends ADElement {
 	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage#getArchitectureDomain_Contexts()
 	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitectureContext#getDomain
 	 * @model opposite="domain" containment="true"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel propertyDescription='The set of contexts defined by the domain'"
 	 * @generated
 	 */
 	EList<ArchitectureContext> getContexts();
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ArchitecturePackage.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ArchitecturePackage.java
index b2dbc28c526..f8aaafdd779 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ArchitecturePackage.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ArchitecturePackage.java
@@ -379,7 +379,6 @@ public interface ArchitecturePackage extends EPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
-	 * @since 2.0
 	 */
 	int ARCHITECTURE_CONTEXT___CEATION_COMMAND_CLASS_EXISTS__DIAGNOSTICCHAIN_MAP = AD_ELEMENT_OPERATION_COUNT + 0;
 
@@ -389,7 +388,6 @@ public interface ArchitecturePackage extends EPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
-	 * @since 2.0
 	 */
 	int ARCHITECTURE_CONTEXT___CONVERSION_COMMAND_CLASS_EXISTS__DIAGNOSTICCHAIN_MAP = AD_ELEMENT_OPERATION_COUNT + 1;
 
@@ -562,7 +560,6 @@ public interface ArchitecturePackage extends EPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
-	 * @since 2.0
 	 */
 	int ARCHITECTURE_DESCRIPTION_LANGUAGE___CEATION_COMMAND_CLASS_EXISTS__DIAGNOSTICCHAIN_MAP = ARCHITECTURE_CONTEXT___CEATION_COMMAND_CLASS_EXISTS__DIAGNOSTICCHAIN_MAP;
 
@@ -572,7 +569,6 @@ public interface ArchitecturePackage extends EPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
-	 * @since 2.0
 	 */
 	int ARCHITECTURE_DESCRIPTION_LANGUAGE___CONVERSION_COMMAND_CLASS_EXISTS__DIAGNOSTICCHAIN_MAP = ARCHITECTURE_CONTEXT___CONVERSION_COMMAND_CLASS_EXISTS__DIAGNOSTICCHAIN_MAP;
 
@@ -932,13 +928,22 @@ public interface ArchitecturePackage extends EPackage {
 	int REPRESENTATION_KIND__CONCERNS = AD_ELEMENT_FEATURE_COUNT + 1;
 
 	/**
+	 * The feature id for the '<em><b>Grayed Icon</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int REPRESENTATION_KIND__GRAYED_ICON = AD_ELEMENT_FEATURE_COUNT + 2;
+
+	/**
 	 * The number of structural features of the '<em>Representation Kind</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int REPRESENTATION_KIND_FEATURE_COUNT = AD_ELEMENT_FEATURE_COUNT + 2;
+	int REPRESENTATION_KIND_FEATURE_COUNT = AD_ELEMENT_FEATURE_COUNT + 3;
 
 	/**
 	 * The number of operations of the '<em>Representation Kind</em>' class.
@@ -1082,7 +1087,6 @@ public interface ArchitecturePackage extends EPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
-	 * @since 2.0
 	 */
 	int ARCHITECTURE_FRAMEWORK___CEATION_COMMAND_CLASS_EXISTS__DIAGNOSTICCHAIN_MAP = ARCHITECTURE_CONTEXT___CEATION_COMMAND_CLASS_EXISTS__DIAGNOSTICCHAIN_MAP;
 
@@ -1092,7 +1096,6 @@ public interface ArchitecturePackage extends EPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
-	 * @since 2.0
 	 */
 	int ARCHITECTURE_FRAMEWORK___CONVERSION_COMMAND_CLASS_EXISTS__DIAGNOSTICCHAIN_MAP = ARCHITECTURE_CONTEXT___CONVERSION_COMMAND_CLASS_EXISTS__DIAGNOSTICCHAIN_MAP;
 
@@ -1449,6 +1452,17 @@ public interface ArchitecturePackage extends EPackage {
 	EReference getRepresentationKind_Concerns();
 
 	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.core.architecture.RepresentationKind#getGrayedIcon <em>Grayed Icon</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Grayed Icon</em>'.
+	 * @see org.eclipse.papyrus.infra.core.architecture.RepresentationKind#getGrayedIcon()
+	 * @see #getRepresentationKind()
+	 * @generated
+	 */
+	EAttribute getRepresentationKind_GrayedIcon();
+
+	/**
 	 * Returns the meta object for the container reference '{@link org.eclipse.papyrus.infra.core.architecture.RepresentationKind#getLanguage <em>Language</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -1542,7 +1556,6 @@ public interface ArchitecturePackage extends EPackage {
 	 * @return the meta object for the '<em>Ceation Command Class Exists</em>' operation.
 	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitectureContext#ceationCommandClassExists(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
-	 * @since 2.0
 	 */
 	EOperation getArchitectureContext__CeationCommandClassExists__DiagnosticChain_Map();
 
@@ -1553,7 +1566,6 @@ public interface ArchitecturePackage extends EPackage {
 	 * @return the meta object for the '<em>Conversion Command Class Exists</em>' operation.
 	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitectureContext#conversionCommandClassExists(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
-	 * @since 2.0
 	 */
 	EOperation getArchitectureContext__ConversionCommandClassExists__DiagnosticChain_Map();
 
@@ -1858,6 +1870,14 @@ public interface ArchitecturePackage extends EPackage {
 		EReference REPRESENTATION_KIND__CONCERNS = eINSTANCE.getRepresentationKind_Concerns();
 
 		/**
+		 * The meta object literal for the '<em><b>Grayed Icon</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute REPRESENTATION_KIND__GRAYED_ICON = eINSTANCE.getRepresentationKind_GrayedIcon();
+
+		/**
 		 * The meta object literal for the '<em><b>Language</b></em>' container reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
@@ -1928,7 +1948,6 @@ public interface ArchitecturePackage extends EPackage {
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
-		 * @since 2.0
 		 */
 		EOperation ARCHITECTURE_CONTEXT___CEATION_COMMAND_CLASS_EXISTS__DIAGNOSTICCHAIN_MAP = eINSTANCE.getArchitectureContext__CeationCommandClassExists__DiagnosticChain_Map();
 
@@ -1937,7 +1956,6 @@ public interface ArchitecturePackage extends EPackage {
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
-		 * @since 2.0
 		 */
 		EOperation ARCHITECTURE_CONTEXT___CONVERSION_COMMAND_CLASS_EXISTS__DIAGNOSTICCHAIN_MAP = eINSTANCE.getArchitectureContext__ConversionCommandClassExists__DiagnosticChain_Map();
 
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ArchitectureViewpoint.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ArchitectureViewpoint.java
index 21f92982e79..8782f8e0993 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ArchitectureViewpoint.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ArchitectureViewpoint.java
@@ -54,7 +54,7 @@ public interface ArchitectureViewpoint extends ADElement {
 	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Concerns</em>' reference list.
 	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage#getArchitectureViewpoint_Concerns()
-	 * @model annotation="http://www.eclipse.org/emf/2002/GenModel propertyDescription='The set of concerns covered by the viewpoint' propertyCategory='Viewpoint'"
+	 * @model
 	 * @generated
 	 */
 	EList<Concern> getConcerns();
@@ -73,7 +73,7 @@ public interface ArchitectureViewpoint extends ADElement {
 	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Representation Kinds</em>' reference list.
 	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage#getArchitectureViewpoint_RepresentationKinds()
-	 * @model annotation="http://www.eclipse.org/emf/2002/GenModel propertyDescription='The set of representation kinds provided by the viewpoint' propertyCategory='Viewpoint'"
+	 * @model
 	 * @generated
 	 */
 	EList<RepresentationKind> getRepresentationKinds();
@@ -95,7 +95,6 @@ public interface ArchitectureViewpoint extends ADElement {
 	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage#getArchitectureViewpoint_Context()
 	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitectureContext#getViewpoints
 	 * @model opposite="viewpoints" required="true" transient="false"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel propertyDescription='The context that defines the viewpoint'"
 	 * @generated
 	 */
 	ArchitectureContext getContext();
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/Concern.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/Concern.java
index 3e857448e0c..dc3f866a31c 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/Concern.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/Concern.java
@@ -55,7 +55,6 @@ public interface Concern extends ADElement {
 	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage#getConcern_Domain()
 	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitectureDomain#getConcerns
 	 * @model opposite="concerns" required="true" transient="false"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel propertyDescription='The domain that defines the concern'"
 	 * @generated
 	 */
 	ArchitectureDomain getDomain();
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/RepresentationKind.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/RepresentationKind.java
index 1f5cbc547fc..dd7aa0c8eef 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/RepresentationKind.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/RepresentationKind.java
@@ -32,6 +32,7 @@ import org.eclipse.emf.common.util.EList;
  * <ul>
  *   <li>{@link org.eclipse.papyrus.infra.core.architecture.RepresentationKind#getLanguage <em>Language</em>}</li>
  *   <li>{@link org.eclipse.papyrus.infra.core.architecture.RepresentationKind#getConcerns <em>Concerns</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.architecture.RepresentationKind#getGrayedIcon <em>Grayed Icon</em>}</li>
  * </ul>
  *
  * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage#getRepresentationKind()
@@ -53,12 +54,37 @@ public interface RepresentationKind extends ADElement {
 	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Concerns</em>' reference list.
 	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage#getRepresentationKind_Concerns()
-	 * @model annotation="http://www.eclipse.org/emf/2002/GenModel propertyDescription='The set of concerns covered by the representation kind' propertyCategory='Representation Kind'"
+	 * @model
 	 * @generated
 	 */
 	EList<Concern> getConcerns();
 
 	/**
+	 * Returns the value of the '<em><b>Grayed Icon</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * The icon of the element specified using a platform plugin URI
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Grayed Icon</em>' attribute.
+	 * @see #setGrayedIcon(String)
+	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage#getRepresentationKind_GrayedIcon()
+	 * @model
+	 * @generated
+	 */
+	String getGrayedIcon();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.core.architecture.RepresentationKind#getGrayedIcon <em>Grayed Icon</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Grayed Icon</em>' attribute.
+	 * @see #getGrayedIcon()
+	 * @generated
+	 */
+	void setGrayedIcon(String value);
+
+	/**
 	 * Returns the value of the '<em><b>Language</b></em>' container reference.
 	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureDescriptionLanguage#getRepresentationKinds <em>Representation Kinds</em>}'.
 	 * <!-- begin-user-doc -->
@@ -75,7 +101,6 @@ public interface RepresentationKind extends ADElement {
 	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage#getRepresentationKind_Language()
 	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitectureDescriptionLanguage#getRepresentationKinds
 	 * @model opposite="representationKinds" required="true" transient="false"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel propertyDescription='The language that defines the representation kind'"
 	 * @generated
 	 */
 	ArchitectureDescriptionLanguage getLanguage();
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/Stakeholder.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/Stakeholder.java
index 79b90c22e59..d00b4b4f9c1 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/Stakeholder.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/Stakeholder.java
@@ -53,7 +53,7 @@ public interface Stakeholder extends ADElement {
 	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Concerns</em>' reference list.
 	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage#getStakeholder_Concerns()
-	 * @model annotation="http://www.eclipse.org/emf/2002/GenModel propertyDescription='The set of concerns of the stakeholder' propertyCategory='Stakeholder'"
+	 * @model
 	 * @generated
 	 */
 	EList<Concern> getConcerns();
@@ -75,7 +75,6 @@ public interface Stakeholder extends ADElement {
 	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage#getStakeholder_Domain()
 	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitectureDomain#getStakeholders
 	 * @model opposite="stakeholders" required="true" transient="false"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel propertyDescription='The domain that defines the stakeholder'"
 	 * @generated
 	 */
 	ArchitectureDomain getDomain();
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ADElementImpl.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ADElementImpl.java
index 98577d30548..e2c875d9dae 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ADElementImpl.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ADElementImpl.java
@@ -156,6 +156,7 @@ public abstract class ADElementImpl extends MinimalEObjectImpl.Container impleme
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getId() {
 		return id;
 	}
@@ -165,6 +166,7 @@ public abstract class ADElementImpl extends MinimalEObjectImpl.Container impleme
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setId(String newId) {
 		String oldId = id;
 		id = newId;
@@ -177,6 +179,7 @@ public abstract class ADElementImpl extends MinimalEObjectImpl.Container impleme
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getName() {
 		return name;
 	}
@@ -186,6 +189,7 @@ public abstract class ADElementImpl extends MinimalEObjectImpl.Container impleme
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setName(String newName) {
 		String oldName = name;
 		name = newName;
@@ -198,6 +202,7 @@ public abstract class ADElementImpl extends MinimalEObjectImpl.Container impleme
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getDescription() {
 		return description;
 	}
@@ -207,6 +212,7 @@ public abstract class ADElementImpl extends MinimalEObjectImpl.Container impleme
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setDescription(String newDescription) {
 		String oldDescription = description;
 		description = newDescription;
@@ -234,6 +240,7 @@ public abstract class ADElementImpl extends MinimalEObjectImpl.Container impleme
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getIcon() {
 		return icon;
 	}
@@ -243,6 +250,7 @@ public abstract class ADElementImpl extends MinimalEObjectImpl.Container impleme
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setIcon(String newIcon) {
 		String oldIcon = icon;
 		icon = newIcon;
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ArchitectureContextImpl.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ArchitectureContextImpl.java
index bed8dcec7c1..01478c647f7 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ArchitectureContextImpl.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ArchitectureContextImpl.java
@@ -126,7 +126,6 @@ public abstract class ArchitectureContextImpl extends ADElementImpl implements A
 	 * @see #getCreationCommandClass()
 	 * @generated
 	 * @ordered
-	 * @since 2.0
 	 */
 	protected static final String CREATION_COMMAND_CLASS_EDEFAULT = null;
 
@@ -147,7 +146,6 @@ public abstract class ArchitectureContextImpl extends ADElementImpl implements A
 	 * @see #getConversionCommandClass()
 	 * @generated
 	 * @ordered
-	 * @since 2.0
 	 */
 	protected static final String CONVERSION_COMMAND_CLASS_EDEFAULT = null;
 
@@ -185,6 +183,7 @@ public abstract class ArchitectureContextImpl extends ADElementImpl implements A
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<ArchitectureViewpoint> getViewpoints() {
 		if (viewpoints == null) {
 			viewpoints = new EObjectContainmentWithInverseEList<ArchitectureViewpoint>(ArchitectureViewpoint.class, this, ArchitecturePackage.ARCHITECTURE_CONTEXT__VIEWPOINTS, ArchitecturePackage.ARCHITECTURE_VIEWPOINT__CONTEXT);
@@ -197,6 +196,7 @@ public abstract class ArchitectureContextImpl extends ADElementImpl implements A
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<ArchitectureViewpoint> getDefaultViewpoints() {
 		if (defaultViewpoints == null) {
 			defaultViewpoints = new EObjectResolvingEList<ArchitectureViewpoint>(ArchitectureViewpoint.class, this, ArchitecturePackage.ARCHITECTURE_CONTEXT__DEFAULT_VIEWPOINTS);
@@ -209,6 +209,7 @@ public abstract class ArchitectureContextImpl extends ADElementImpl implements A
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<ElementTypeSetConfiguration> getElementTypes() {
 		if (elementTypes == null) {
 			elementTypes = new EObjectResolvingEList<ElementTypeSetConfiguration>(ElementTypeSetConfiguration.class, this, ArchitecturePackage.ARCHITECTURE_CONTEXT__ELEMENT_TYPES);
@@ -221,6 +222,7 @@ public abstract class ArchitectureContextImpl extends ADElementImpl implements A
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getExtensionPrefix() {
 		return extensionPrefix;
 	}
@@ -230,6 +232,7 @@ public abstract class ArchitectureContextImpl extends ADElementImpl implements A
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setExtensionPrefix(String newExtensionPrefix) {
 		String oldExtensionPrefix = extensionPrefix;
 		extensionPrefix = newExtensionPrefix;
@@ -242,6 +245,7 @@ public abstract class ArchitectureContextImpl extends ADElementImpl implements A
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getCreationCommandClass() {
 		return creationCommandClass;
 	}
@@ -251,6 +255,7 @@ public abstract class ArchitectureContextImpl extends ADElementImpl implements A
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setCreationCommandClass(String newCreationCommandClass) {
 		String oldCreationCommandClass = creationCommandClass;
 		creationCommandClass = newCreationCommandClass;
@@ -263,6 +268,7 @@ public abstract class ArchitectureContextImpl extends ADElementImpl implements A
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getConversionCommandClass() {
 		return conversionCommandClass;
 	}
@@ -272,6 +278,7 @@ public abstract class ArchitectureContextImpl extends ADElementImpl implements A
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setConversionCommandClass(String newConversionCommandClass) {
 		String oldConversionCommandClass = conversionCommandClass;
 		conversionCommandClass = newConversionCommandClass;
@@ -374,6 +381,7 @@ public abstract class ArchitectureContextImpl extends ADElementImpl implements A
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public ArchitectureDomain getDomain() {
 		if (eContainerFeatureID() != ArchitecturePackage.ARCHITECTURE_CONTEXT__DOMAIN) return null;
 		return (ArchitectureDomain)eInternalContainer();
@@ -394,6 +402,7 @@ public abstract class ArchitectureContextImpl extends ADElementImpl implements A
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setDomain(ArchitectureDomain newDomain) {
 		if (newDomain != eInternalContainer() || (eContainerFeatureID() != ArchitecturePackage.ARCHITECTURE_CONTEXT__DOMAIN && newDomain != null)) {
 			if (EcoreUtil.isAncestor(this, newDomain))
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ArchitectureDescriptionImpl.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ArchitectureDescriptionImpl.java
index ef2fb37d2bc..7f2b11329ff 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ArchitectureDescriptionImpl.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ArchitectureDescriptionImpl.java
@@ -81,6 +81,7 @@ public class ArchitectureDescriptionImpl extends MinimalEObjectImpl.Container im
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getContextId() {
 		return contextId;
 	}
@@ -90,6 +91,7 @@ public class ArchitectureDescriptionImpl extends MinimalEObjectImpl.Container im
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setContextId(String newContextId) {
 		String oldContextId = contextId;
 		contextId = newContextId;
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ArchitectureDescriptionLanguageImpl.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ArchitectureDescriptionLanguageImpl.java
index 67cd0d697a6..2d873abfba7 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ArchitectureDescriptionLanguageImpl.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ArchitectureDescriptionLanguageImpl.java
@@ -104,6 +104,7 @@ public class ArchitectureDescriptionLanguageImpl extends ArchitectureContextImpl
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<RepresentationKind> getRepresentationKinds() {
 		if (representationKinds == null) {
 			representationKinds = new EObjectContainmentWithInverseEList<RepresentationKind>(RepresentationKind.class, this, ArchitecturePackage.ARCHITECTURE_DESCRIPTION_LANGUAGE__REPRESENTATION_KINDS, ArchitecturePackage.REPRESENTATION_KIND__LANGUAGE);
@@ -116,6 +117,7 @@ public class ArchitectureDescriptionLanguageImpl extends ArchitectureContextImpl
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EPackage getMetamodel() {
 		if (metamodel != null && metamodel.eIsProxy()) {
 			InternalEObject oldMetamodel = (InternalEObject)metamodel;
@@ -142,6 +144,7 @@ public class ArchitectureDescriptionLanguageImpl extends ArchitectureContextImpl
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setMetamodel(EPackage newMetamodel) {
 		EPackage oldMetamodel = metamodel;
 		metamodel = newMetamodel;
@@ -154,6 +157,7 @@ public class ArchitectureDescriptionLanguageImpl extends ArchitectureContextImpl
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<EPackage> getProfiles() {
 		if (profiles == null) {
 			profiles = new EObjectResolvingEList<EPackage>(EPackage.class, this, ArchitecturePackage.ARCHITECTURE_DESCRIPTION_LANGUAGE__PROFILES);
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ArchitectureDescriptionPreferencesImpl.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ArchitectureDescriptionPreferencesImpl.java
index 7baf30ba420..b7c78b10527 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ArchitectureDescriptionPreferencesImpl.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ArchitectureDescriptionPreferencesImpl.java
@@ -76,6 +76,7 @@ public class ArchitectureDescriptionPreferencesImpl extends MinimalEObjectImpl.C
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<String> getViewpointIds() {
 		if (viewpointIds == null) {
 			viewpointIds = new EDataTypeUniqueEList<String>(String.class, this, ArchitecturePackage.ARCHITECTURE_DESCRIPTION_PREFERENCES__VIEWPOINT_IDS);
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ArchitectureDomainImpl.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ArchitectureDomainImpl.java
index 7e07998946e..8ced9f60fb3 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ArchitectureDomainImpl.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ArchitectureDomainImpl.java
@@ -101,6 +101,7 @@ public class ArchitectureDomainImpl extends ADElementImpl implements Architectur
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<Stakeholder> getStakeholders() {
 		if (stakeholders == null) {
 			stakeholders = new EObjectContainmentWithInverseEList<Stakeholder>(Stakeholder.class, this, ArchitecturePackage.ARCHITECTURE_DOMAIN__STAKEHOLDERS, ArchitecturePackage.STAKEHOLDER__DOMAIN);
@@ -113,6 +114,7 @@ public class ArchitectureDomainImpl extends ADElementImpl implements Architectur
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<Concern> getConcerns() {
 		if (concerns == null) {
 			concerns = new EObjectContainmentWithInverseEList<Concern>(Concern.class, this, ArchitecturePackage.ARCHITECTURE_DOMAIN__CONCERNS, ArchitecturePackage.CONCERN__DOMAIN);
@@ -125,6 +127,7 @@ public class ArchitectureDomainImpl extends ADElementImpl implements Architectur
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<ArchitectureContext> getContexts() {
 		if (contexts == null) {
 			contexts = new EObjectContainmentWithInverseEList<ArchitectureContext>(ArchitectureContext.class, this, ArchitecturePackage.ARCHITECTURE_DOMAIN__CONTEXTS, ArchitecturePackage.ARCHITECTURE_CONTEXT__DOMAIN);
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ArchitectureFactoryImpl.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ArchitectureFactoryImpl.java
index 255b4b3fd45..b314dee703d 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ArchitectureFactoryImpl.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ArchitectureFactoryImpl.java
@@ -86,6 +86,7 @@ public class ArchitectureFactoryImpl extends EFactoryImpl implements Architectur
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public ArchitectureDomain createArchitectureDomain() {
 		ArchitectureDomainImpl architectureDomain = new ArchitectureDomainImpl();
 		return architectureDomain;
@@ -96,6 +97,7 @@ public class ArchitectureFactoryImpl extends EFactoryImpl implements Architectur
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public ArchitectureDescriptionLanguage createArchitectureDescriptionLanguage() {
 		ArchitectureDescriptionLanguageImpl architectureDescriptionLanguage = new ArchitectureDescriptionLanguageImpl();
 		return architectureDescriptionLanguage;
@@ -106,6 +108,7 @@ public class ArchitectureFactoryImpl extends EFactoryImpl implements Architectur
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Stakeholder createStakeholder() {
 		StakeholderImpl stakeholder = new StakeholderImpl();
 		return stakeholder;
@@ -116,6 +119,7 @@ public class ArchitectureFactoryImpl extends EFactoryImpl implements Architectur
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Concern createConcern() {
 		ConcernImpl concern = new ConcernImpl();
 		return concern;
@@ -126,6 +130,7 @@ public class ArchitectureFactoryImpl extends EFactoryImpl implements Architectur
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public ArchitectureViewpoint createArchitectureViewpoint() {
 		ArchitectureViewpointImpl architectureViewpoint = new ArchitectureViewpointImpl();
 		return architectureViewpoint;
@@ -136,6 +141,7 @@ public class ArchitectureFactoryImpl extends EFactoryImpl implements Architectur
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public ArchitectureFramework createArchitectureFramework() {
 		ArchitectureFrameworkImpl architectureFramework = new ArchitectureFrameworkImpl();
 		return architectureFramework;
@@ -146,6 +152,7 @@ public class ArchitectureFactoryImpl extends EFactoryImpl implements Architectur
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public ArchitectureDescription createArchitectureDescription() {
 		ArchitectureDescriptionImpl architectureDescription = new ArchitectureDescriptionImpl();
 		return architectureDescription;
@@ -156,6 +163,7 @@ public class ArchitectureFactoryImpl extends EFactoryImpl implements Architectur
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public ArchitectureDescriptionPreferences createArchitectureDescriptionPreferences() {
 		ArchitectureDescriptionPreferencesImpl architectureDescriptionPreferences = new ArchitectureDescriptionPreferencesImpl();
 		return architectureDescriptionPreferences;
@@ -166,6 +174,7 @@ public class ArchitectureFactoryImpl extends EFactoryImpl implements Architectur
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public ArchitecturePackage getArchitecturePackage() {
 		return (ArchitecturePackage)getEPackage();
 	}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ArchitecturePackageImpl.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ArchitecturePackageImpl.java
index db3fd6cfe14..30480cf26a0 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ArchitecturePackageImpl.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ArchitecturePackageImpl.java
@@ -186,6 +186,7 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur
 		EValidator.Registry.INSTANCE.put
 			(theArchitecturePackage,
 			 new EValidator.Descriptor() {
+				 @Override
 				 public EValidator getEValidator() {
 					 return ArchitectureValidator.INSTANCE;
 				 }
@@ -204,6 +205,7 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getADElement() {
 		return adElementEClass;
 	}
@@ -213,6 +215,7 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getADElement_Id() {
 		return (EAttribute)adElementEClass.getEStructuralFeatures().get(0);
 	}
@@ -222,6 +225,7 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getADElement_Name() {
 		return (EAttribute)adElementEClass.getEStructuralFeatures().get(1);
 	}
@@ -231,6 +235,7 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getADElement_Description() {
 		return (EAttribute)adElementEClass.getEStructuralFeatures().get(2);
 	}
@@ -240,6 +245,7 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getADElement_QualifiedName() {
 		return (EAttribute)adElementEClass.getEStructuralFeatures().get(3);
 	}
@@ -249,6 +255,7 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getADElement_Icon() {
 		return (EAttribute)adElementEClass.getEStructuralFeatures().get(4);
 	}
@@ -258,6 +265,7 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getArchitectureDomain() {
 		return architectureDomainEClass;
 	}
@@ -267,6 +275,7 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getArchitectureDomain_Stakeholders() {
 		return (EReference)architectureDomainEClass.getEStructuralFeatures().get(0);
 	}
@@ -276,6 +285,7 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getArchitectureDomain_Concerns() {
 		return (EReference)architectureDomainEClass.getEStructuralFeatures().get(1);
 	}
@@ -285,6 +295,7 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getArchitectureDomain_Contexts() {
 		return (EReference)architectureDomainEClass.getEStructuralFeatures().get(2);
 	}
@@ -294,6 +305,7 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getArchitectureDescriptionLanguage() {
 		return architectureDescriptionLanguageEClass;
 	}
@@ -303,6 +315,7 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getArchitectureDescriptionLanguage_RepresentationKinds() {
 		return (EReference)architectureDescriptionLanguageEClass.getEStructuralFeatures().get(0);
 	}
@@ -312,6 +325,7 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getArchitectureDescriptionLanguage_Metamodel() {
 		return (EReference)architectureDescriptionLanguageEClass.getEStructuralFeatures().get(1);
 	}
@@ -321,6 +335,7 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getArchitectureDescriptionLanguage_Profiles() {
 		return (EReference)architectureDescriptionLanguageEClass.getEStructuralFeatures().get(2);
 	}
@@ -330,6 +345,7 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getStakeholder() {
 		return stakeholderEClass;
 	}
@@ -339,6 +355,7 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getStakeholder_Concerns() {
 		return (EReference)stakeholderEClass.getEStructuralFeatures().get(0);
 	}
@@ -348,6 +365,7 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getStakeholder_Domain() {
 		return (EReference)stakeholderEClass.getEStructuralFeatures().get(1);
 	}
@@ -357,6 +375,7 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getConcern() {
 		return concernEClass;
 	}
@@ -366,6 +385,7 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getConcern_Domain() {
 		return (EReference)concernEClass.getEStructuralFeatures().get(0);
 	}
@@ -375,6 +395,7 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getArchitectureViewpoint() {
 		return architectureViewpointEClass;
 	}
@@ -384,6 +405,7 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getArchitectureViewpoint_Concerns() {
 		return (EReference)architectureViewpointEClass.getEStructuralFeatures().get(0);
 	}
@@ -393,6 +415,7 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getArchitectureViewpoint_RepresentationKinds() {
 		return (EReference)architectureViewpointEClass.getEStructuralFeatures().get(1);
 	}
@@ -402,6 +425,7 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getArchitectureViewpoint_Context() {
 		return (EReference)architectureViewpointEClass.getEStructuralFeatures().get(2);
 	}
@@ -411,6 +435,7 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getRepresentationKind() {
 		return representationKindEClass;
 	}
@@ -420,6 +445,7 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getRepresentationKind_Concerns() {
 		return (EReference)representationKindEClass.getEStructuralFeatures().get(1);
 	}
@@ -429,6 +455,17 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
+	public EAttribute getRepresentationKind_GrayedIcon() {
+		return (EAttribute)representationKindEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
 	public EReference getRepresentationKind_Language() {
 		return (EReference)representationKindEClass.getEStructuralFeatures().get(0);
 	}
@@ -438,6 +475,7 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getArchitectureContext() {
 		return architectureContextEClass;
 	}
@@ -447,6 +485,7 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getArchitectureContext_Viewpoints() {
 		return (EReference)architectureContextEClass.getEStructuralFeatures().get(0);
 	}
@@ -456,6 +495,7 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getArchitectureContext_DefaultViewpoints() {
 		return (EReference)architectureContextEClass.getEStructuralFeatures().get(1);
 	}
@@ -465,6 +505,7 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getArchitectureContext_ElementTypes() {
 		return (EReference)architectureContextEClass.getEStructuralFeatures().get(2);
 	}
@@ -474,6 +515,7 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getArchitectureContext_ExtensionPrefix() {
 		return (EAttribute)architectureContextEClass.getEStructuralFeatures().get(4);
 	}
@@ -483,6 +525,7 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getArchitectureContext_CreationCommandClass() {
 		return (EAttribute)architectureContextEClass.getEStructuralFeatures().get(5);
 	}
@@ -492,6 +535,7 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getArchitectureContext_ConversionCommandClass() {
 		return (EAttribute)architectureContextEClass.getEStructuralFeatures().get(6);
 	}
@@ -501,6 +545,7 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EOperation getArchitectureContext__CeationCommandClassExists__DiagnosticChain_Map() {
 		return architectureContextEClass.getEOperations().get(0);
 	}
@@ -510,6 +555,7 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EOperation getArchitectureContext__ConversionCommandClassExists__DiagnosticChain_Map() {
 		return architectureContextEClass.getEOperations().get(1);
 	}
@@ -519,6 +565,7 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getArchitectureContext_Domain() {
 		return (EReference)architectureContextEClass.getEStructuralFeatures().get(3);
 	}
@@ -528,6 +575,7 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getArchitectureFramework() {
 		return architectureFrameworkEClass;
 	}
@@ -537,6 +585,7 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getArchitectureDescription() {
 		return architectureDescriptionEClass;
 	}
@@ -546,6 +595,7 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getArchitectureDescription_ContextId() {
 		return (EAttribute)architectureDescriptionEClass.getEStructuralFeatures().get(0);
 	}
@@ -555,6 +605,7 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getArchitectureDescriptionPreferences() {
 		return architectureDescriptionPreferencesEClass;
 	}
@@ -564,6 +615,7 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getArchitectureDescriptionPreferences_ViewpointIds() {
 		return (EAttribute)architectureDescriptionPreferencesEClass.getEStructuralFeatures().get(0);
 	}
@@ -573,6 +625,7 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public ArchitectureFactory getArchitectureFactory() {
 		return (ArchitectureFactory)getEFactoryInstance();
 	}
@@ -628,6 +681,7 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur
 		representationKindEClass = createEClass(REPRESENTATION_KIND);
 		createEReference(representationKindEClass, REPRESENTATION_KIND__LANGUAGE);
 		createEReference(representationKindEClass, REPRESENTATION_KIND__CONCERNS);
+		createEAttribute(representationKindEClass, REPRESENTATION_KIND__GRAYED_ICON);
 
 		architectureContextEClass = createEClass(ARCHITECTURE_CONTEXT);
 		createEReference(architectureContextEClass, ARCHITECTURE_CONTEXT__VIEWPOINTS);
@@ -723,6 +777,7 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur
 		initEClass(representationKindEClass, RepresentationKind.class, "RepresentationKind", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 		initEReference(getRepresentationKind_Language(), this.getArchitectureDescriptionLanguage(), this.getArchitectureDescriptionLanguage_RepresentationKinds(), "language", null, 1, 1, RepresentationKind.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 		initEReference(getRepresentationKind_Concerns(), this.getConcern(), null, "concerns", null, 0, -1, RepresentationKind.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEAttribute(getRepresentationKind_GrayedIcon(), ecorePackage.getEString(), "grayedIcon", null, 0, 1, RepresentationKind.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 
 		initEClass(architectureContextEClass, ArchitectureContext.class, "ArchitectureContext", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 		initEReference(getArchitectureContext_Viewpoints(), this.getArchitectureViewpoint(), this.getArchitectureViewpoint_Context(), "viewpoints", null, 0, -1, ArchitectureContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ArchitectureViewpointImpl.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ArchitectureViewpointImpl.java
index 563ad8269f8..fd034c0c23b 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ArchitectureViewpointImpl.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ArchitectureViewpointImpl.java
@@ -94,6 +94,7 @@ public class ArchitectureViewpointImpl extends ADElementImpl implements Architec
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<Concern> getConcerns() {
 		if (concerns == null) {
 			concerns = new EObjectResolvingEList<Concern>(Concern.class, this, ArchitecturePackage.ARCHITECTURE_VIEWPOINT__CONCERNS);
@@ -106,6 +107,7 @@ public class ArchitectureViewpointImpl extends ADElementImpl implements Architec
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<RepresentationKind> getRepresentationKinds() {
 		if (representationKinds == null) {
 			representationKinds = new EObjectResolvingEList<RepresentationKind>(RepresentationKind.class, this, ArchitecturePackage.ARCHITECTURE_VIEWPOINT__REPRESENTATION_KINDS);
@@ -118,6 +120,7 @@ public class ArchitectureViewpointImpl extends ADElementImpl implements Architec
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public ArchitectureContext getContext() {
 		if (eContainerFeatureID() != ArchitecturePackage.ARCHITECTURE_VIEWPOINT__CONTEXT) return null;
 		return (ArchitectureContext)eInternalContainer();
@@ -138,6 +141,7 @@ public class ArchitectureViewpointImpl extends ADElementImpl implements Architec
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setContext(ArchitectureContext newContext) {
 		if (newContext != eInternalContainer() || (eContainerFeatureID() != ArchitecturePackage.ARCHITECTURE_VIEWPOINT__CONTEXT && newContext != null)) {
 			if (EcoreUtil.isAncestor(this, newContext))
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ConcernImpl.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ConcernImpl.java
index 7e93f56eeea..1da054a4e04 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ConcernImpl.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ConcernImpl.java
@@ -64,6 +64,7 @@ public class ConcernImpl extends ADElementImpl implements Concern {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public ArchitectureDomain getDomain() {
 		if (eContainerFeatureID() != ArchitecturePackage.CONCERN__DOMAIN) return null;
 		return (ArchitectureDomain)eInternalContainer();
@@ -84,6 +85,7 @@ public class ConcernImpl extends ADElementImpl implements Concern {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setDomain(ArchitectureDomain newDomain) {
 		if (newDomain != eInternalContainer() || (eContainerFeatureID() != ArchitecturePackage.CONCERN__DOMAIN && newDomain != null)) {
 			if (EcoreUtil.isAncestor(this, newDomain))
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/RepresentationKindImpl.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/RepresentationKindImpl.java
index 405ad7cd1fa..8379fae9188 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/RepresentationKindImpl.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/RepresentationKindImpl.java
@@ -43,6 +43,7 @@ import org.eclipse.papyrus.infra.core.architecture.RepresentationKind;
  * <ul>
  *   <li>{@link org.eclipse.papyrus.infra.core.architecture.impl.RepresentationKindImpl#getLanguage <em>Language</em>}</li>
  *   <li>{@link org.eclipse.papyrus.infra.core.architecture.impl.RepresentationKindImpl#getConcerns <em>Concerns</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.architecture.impl.RepresentationKindImpl#getGrayedIcon <em>Grayed Icon</em>}</li>
  * </ul>
  *
  * @generated
@@ -59,6 +60,25 @@ public abstract class RepresentationKindImpl extends ADElementImpl implements Re
 	protected EList<Concern> concerns;
 
 	/**
+	 * The default value of the '{@link #getGrayedIcon() <em>Grayed Icon</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getGrayedIcon()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String GRAYED_ICON_EDEFAULT = null;
+	/**
+	 * The cached value of the '{@link #getGrayedIcon() <em>Grayed Icon</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getGrayedIcon()
+	 * @generated
+	 * @ordered
+	 */
+	protected String grayedIcon = GRAYED_ICON_EDEFAULT;
+
+	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -82,6 +102,7 @@ public abstract class RepresentationKindImpl extends ADElementImpl implements Re
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<Concern> getConcerns() {
 		if (concerns == null) {
 			concerns = new EObjectResolvingEList<Concern>(Concern.class, this, ArchitecturePackage.REPRESENTATION_KIND__CONCERNS);
@@ -94,6 +115,30 @@ public abstract class RepresentationKindImpl extends ADElementImpl implements Re
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
+	public String getGrayedIcon() {
+		return grayedIcon;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setGrayedIcon(String newGrayedIcon) {
+		String oldGrayedIcon = grayedIcon;
+		grayedIcon = newGrayedIcon;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ArchitecturePackage.REPRESENTATION_KIND__GRAYED_ICON, oldGrayedIcon, grayedIcon));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
 	public ArchitectureDescriptionLanguage getLanguage() {
 		if (eContainerFeatureID() != ArchitecturePackage.REPRESENTATION_KIND__LANGUAGE) return null;
 		return (ArchitectureDescriptionLanguage)eInternalContainer();
@@ -114,6 +159,7 @@ public abstract class RepresentationKindImpl extends ADElementImpl implements Re
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setLanguage(ArchitectureDescriptionLanguage newLanguage) {
 		if (newLanguage != eInternalContainer() || (eContainerFeatureID() != ArchitecturePackage.REPRESENTATION_KIND__LANGUAGE && newLanguage != null)) {
 			if (EcoreUtil.isAncestor(this, newLanguage))
@@ -186,6 +232,8 @@ public abstract class RepresentationKindImpl extends ADElementImpl implements Re
 				return getLanguage();
 			case ArchitecturePackage.REPRESENTATION_KIND__CONCERNS:
 				return getConcerns();
+			case ArchitecturePackage.REPRESENTATION_KIND__GRAYED_ICON:
+				return getGrayedIcon();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -206,6 +254,9 @@ public abstract class RepresentationKindImpl extends ADElementImpl implements Re
 				getConcerns().clear();
 				getConcerns().addAll((Collection<? extends Concern>)newValue);
 				return;
+			case ArchitecturePackage.REPRESENTATION_KIND__GRAYED_ICON:
+				setGrayedIcon((String)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -224,6 +275,9 @@ public abstract class RepresentationKindImpl extends ADElementImpl implements Re
 			case ArchitecturePackage.REPRESENTATION_KIND__CONCERNS:
 				getConcerns().clear();
 				return;
+			case ArchitecturePackage.REPRESENTATION_KIND__GRAYED_ICON:
+				setGrayedIcon(GRAYED_ICON_EDEFAULT);
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -240,8 +294,26 @@ public abstract class RepresentationKindImpl extends ADElementImpl implements Re
 				return getLanguage() != null;
 			case ArchitecturePackage.REPRESENTATION_KIND__CONCERNS:
 				return concerns != null && !concerns.isEmpty();
+			case ArchitecturePackage.REPRESENTATION_KIND__GRAYED_ICON:
+				return GRAYED_ICON_EDEFAULT == null ? grayedIcon != null : !GRAYED_ICON_EDEFAULT.equals(grayedIcon);
 		}
 		return super.eIsSet(featureID);
 	}
 
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuilder result = new StringBuilder(super.toString());
+		result.append(" (grayedIcon: "); //$NON-NLS-1$
+		result.append(grayedIcon);
+		result.append(')');
+		return result.toString();
+	}
+
 } //RepresentationKindImpl
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/StakeholderImpl.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/StakeholderImpl.java
index ca6ac757bee..3893c4a5aa0 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/StakeholderImpl.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/StakeholderImpl.java
@@ -82,6 +82,7 @@ public class StakeholderImpl extends ADElementImpl implements Stakeholder {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<Concern> getConcerns() {
 		if (concerns == null) {
 			concerns = new EObjectResolvingEList<Concern>(Concern.class, this, ArchitecturePackage.STAKEHOLDER__CONCERNS);
@@ -94,6 +95,7 @@ public class StakeholderImpl extends ADElementImpl implements Stakeholder {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public ArchitectureDomain getDomain() {
 		if (eContainerFeatureID() != ArchitecturePackage.STAKEHOLDER__DOMAIN) return null;
 		return (ArchitectureDomain)eInternalContainer();
@@ -114,6 +116,7 @@ public class StakeholderImpl extends ADElementImpl implements Stakeholder {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setDomain(ArchitectureDomain newDomain) {
 		if (newDomain != eInternalContainer() || (eContainerFeatureID() != ArchitecturePackage.STAKEHOLDER__DOMAIN && newDomain != null)) {
 			if (EcoreUtil.isAncestor(this, newDomain))
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/util/ArchitectureValidator.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/util/ArchitectureValidator.java
index 82def2fe80a..5b5ef9e1d3b 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/util/ArchitectureValidator.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/util/ArchitectureValidator.java
@@ -32,7 +32,6 @@ import org.eclipse.papyrus.infra.core.architecture.*;
  * <!-- end-user-doc -->
  * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage
  * @generated
- * @since 2.0
  */
 public class ArchitectureValidator extends EObjectValidator {
 	/**
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF
index aa6f8bba424..8a58dfa4f0d 100755
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF
@@ -82,7 +82,7 @@ Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.common.Activator
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .
-Bundle-Version: 3.102.0.qualifier
+Bundle-Version: 3.103.0.qualifier
 Bundle-Localization: plugin
 Bundle-Name: %pluginName
 Bundle-ManifestVersion: 2
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/pom.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/pom.xml
index c6d5aa9b747..f6173572cc6 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/pom.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/pom.xml
@@ -9,6 +9,6 @@
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.gmfdiag.common</artifactId>
-	<version>3.102.0-SNAPSHOT</version>
+	<version>3.103.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/GMFDiagramViewTypeHelper.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/GMFDiagramViewTypeHelper.java
index b93b36dc903..a63b3c59b4e 100755
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/GMFDiagramViewTypeHelper.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/GMFDiagramViewTypeHelper.java
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Copyright (c) 2013, 2017 CEA LIST and others.
+ * Copyright (c) 2013, 2017, 2019 CEA LIST and others.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -12,6 +12,7 @@
  *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
  *  Christian W. Damus - bug 527580
  *  Ansgar Radermacher - bug 539754
+ *  Nicolas FAUVERGUE (CEA LIST) nicolas.fauvergue@cea.fr - Bug 550568
  *
  *****************************************************************************/
 package org.eclipse.papyrus.infra.gmfdiag.common.helper;
@@ -89,6 +90,6 @@ public class GMFDiagramViewTypeHelper extends AbstractViewTypeHelper<PapyrusDiag
 		Diagram diagram = (Diagram) view;
 
 		PolicyChecker checker = getPolicyChecker(diagram);
-		return DiagramUtils.getPrototype(diagram, checker);
+		return DiagramUtils.getPrototype(diagram, checker, false);
 	}
 }
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/DiagramUtils.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/DiagramUtils.java
index 9018362751d..9470abee5f6 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/DiagramUtils.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/DiagramUtils.java
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Copyright (c) 2013, 2017 CEA LIST and others.
+ * Copyright (c) 2013, 2017, 2019 CEA LIST and others.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -14,6 +14,7 @@
  *  Benoit Maggi    (Cea)        benoit.maggi@cea.fr - Add utility to get the containing diagram
  *  Christian W. Damus - bug 527580
  *  Ansgar Radermacher - bug 539754
+ *  Nicolas FAUVERGUE (CEA LIST) nicolas.fauvergue@cea.fr - Bug 550568
  *
  *****************************************************************************/
 package org.eclipse.papyrus.infra.gmfdiag.common.utils;
@@ -173,9 +174,28 @@ public class DiagramUtils {
 	 *            A diagram
 	 * @return The diagram's prototype
 	 */
-	public static ViewPrototype getPrototype(Diagram diagram) {
+	public static ViewPrototype getPrototype(final Diagram diagram) {
+		return getPrototype(diagram, true);
+	}
+
+	/**
+	 * Gets the prototype of a diagram
+	 * Check if the selected viewpoint contains
+	 * 1. the diagram model kind
+	 * 2. an ancestor of the diagram model kind
+	 * 3. a descendant of the diagram model kind
+	 *
+	 * @param diagram
+	 *            A diagram.
+	 * @param checkViewpoint
+	 *            Boolean to determinate if we have to check viewpoint consistency before returning the view prototype.
+	 * @return The diagram's prototype
+	 *
+	 * @since 3.103
+	 */
+	public static ViewPrototype getPrototype(final Diagram diagram, final boolean checkViewpoint) {
 		PolicyChecker checker = PolicyChecker.getFor(diagram);
-		return getPrototype(diagram, checker);
+		return getPrototype(diagram, checker, checkViewpoint);
 	}
 
 	/**
@@ -189,7 +209,25 @@ public class DiagramUtils {
 	 *
 	 * @since 3.2
 	 */
-	public static ViewPrototype getPrototype(Diagram diagram, PolicyChecker checker) {
+	public static ViewPrototype getPrototype(final Diagram diagram, final PolicyChecker checker) {
+		// By default check the viewpoint consistency
+		return getPrototype(diagram, checker, true);
+	}
+
+	/**
+	 * Gets the prototype of a {@code diagram} according to a given policy {@code checker}.
+	 *
+	 * @param diagram
+	 *            A diagram.
+	 * @param checker
+	 *            A policy checker.
+	 * @param checkViewpoint
+	 *            Boolean to determinate if we have to check viewpoint consistency before returning the view prototype.
+	 * @return the policy {@code checker}'s prototype for the {@code diagram}
+	 *
+	 * @since 3.103
+	 */
+	public static ViewPrototype getPrototype(final Diagram diagram, final PolicyChecker checker, final boolean checkViewpoint) {
 		PapyrusDiagramStyle pvs = getPapyrusDiagramStyle(diagram);
 		if (pvs != null) {
 			ArchitectureDomainManager manager = ArchitectureDomainManager.getInstance();
@@ -204,7 +242,7 @@ public class DiagramUtils {
 			// Check if the selected viewpoint contains the diagram model kind
 			if (repKind != null) {
 
-				if (checker.isInViewpoint(repKind)) {
+				if (!checkViewpoint || checker.isInViewpoint(repKind)) {
 					return ViewPrototype.get(repKind);
 				}
 
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/META-INF/MANIFEST.MF
index a21592cd247..2181e3cc8b9 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/META-INF/MANIFEST.MF
@@ -5,10 +5,13 @@ Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,
  org.eclipse.papyrus.views.modelexplorer;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.infra.internationalization.utils;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.papyrus.infra.internationalization.edit;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[3.0.0,4.0.0)"
+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[3.1.0,4.0.0)",
+ org.eclipse.papyrus.infra.core.architecture;bundle-version="[2.1.0,3.0.0)",
+ org.eclipse.papyrus.infra.architecture;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.architecture.representation;bundle-version="[2.1.0,3.0.0)"
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Localization: plugin
 Bundle-ManifestVersion: 2
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/pom.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/pom.xml
index 984865faf56..6ae1bca0e9d 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/pom.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/pom.xml
@@ -8,7 +8,7 @@
 	    <version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.gmfdiag.modelexplorer</artifactId>
-	<version>1.2.0-SNAPSHOT</version>
+	<version>1.3.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 	<description>This plugin provides : - the facets and the customization to display the GMF Diagrams in the ModelExplorer</description>
 </project>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/queries/GetDiagramIcon.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/queries/GetDiagramIcon.java
index 0c956562e24..ce1b2f67538 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/queries/GetDiagramIcon.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/queries/GetDiagramIcon.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (c) 2011, 2016 Atos, CEA LIST, Christian W. Damus, and others.
+ *  Copyright (c) 2011, 2016, 2019 Atos, CEA LIST, Christian W. Damus, and others.
  *
  *  All rights reserved. This program and the accompanying materials
  *  are made available under the terms of the Eclipse Public License 2.0
@@ -12,6 +12,7 @@
  *    Atos - Initial API and implementation
  *    Patrick Tessier (CEA LIST) - Modification
  *    Christian W. Damus - bug 485220
+ *    Nicolas FAUVERGUE (CEA LIST) nicolas.fauvergue@cea.fr - Bug 550568
  *
  */
 package org.eclipse.papyrus.infra.gmfdiag.modelexplorer.queries;
@@ -25,14 +26,30 @@ import org.eclipse.papyrus.emf.facet.query.java.core.IJavaQuery2;
 import org.eclipse.papyrus.emf.facet.query.java.core.IParameterValueList2;
 import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
 import org.eclipse.papyrus.infra.ui.editorsfactory.AbstractGetEditorIconQuery;
+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
 import org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype;
 
-/** Return the path to the icon of the corresponding diagram */
+/**
+ * Return the path to the icon of the corresponding diagram.
+ */
 public class GetDiagramIcon extends AbstractGetEditorIconQuery implements IJavaQuery2<Diagram, IImage> {
 
-
+	/**
+	 * {@inheritDoc}
+	 * Get the correct icon for diaram.
+	 *
+	 * @see org.eclipse.papyrus.emf.facet.query.java.core.IJavaQuery2#evaluate(org.eclipse.emf.ecore.EObject, org.eclipse.papyrus.emf.facet.query.java.core.IParameterValueList2, org.eclipse.papyrus.emf.facet.efacet.core.IFacetManager)
+	 */
+	@Override
 	public IImage evaluate(Diagram source, IParameterValueList2 parameterValues, IFacetManager facetManager) throws DerivedTypedElementException {
-		ViewPrototype prototype = DiagramUtils.getPrototype(source);
+		PolicyChecker checker = PolicyChecker.getFor(source);
+		ViewPrototype prototype = DiagramUtils.getPrototype(source, checker, false);
+
+		// If this is not an unavailable view prototype and is not in current viewpoints, display the grayed icon if possible
+		if (!ViewPrototype.UNAVAILABLE_VIEW.equals(prototype) && !checker.isInViewpoint(prototype.getRepresentationKind())) {
+			// If the grayed icon is not set, use the unavailable view prototype icon
+			return null == prototype.getGrayedIconURI() || prototype.getGrayedIconURI().isEmpty() ? ImageUtils.wrap(ViewPrototype.UNAVAILABLE_VIEW.getIconURI()) : ImageUtils.wrap(prototype.getGrayedIconURI());
+		}
 		return ImageUtils.wrap(prototype.getIconURI());
 	}
 }
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/META-INF/MANIFEST.MF
index f20d60ab0c9..151ef16fb0e 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/META-INF/MANIFEST.MF
@@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.papyrus.infra.properties.ui;bundle-version="[3.4.0,4
  org.eclipse.papyrus.infra.architecture.representation;bundle-version="[2.0.0,3.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy;exclude:="org.eclipse.papyrus.infra.gmfdiag.properties.constraint"
-Bundle-Version: 4.1.0.qualifier
+Bundle-Version: 4.1.100.qualifier
 Bundle-Localization: plugin
 Bundle-Name: %Bundle-Name
 Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.properties.Activator
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/pom.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/pom.xml
index 01599d01099..f2973e8f7d7 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/pom.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/pom.xml
@@ -8,6 +8,6 @@
 	    <version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.gmfdiag.properties</artifactId>
-	<version>4.1.0-SNAPSHOT</version>
+	<version>4.1.100-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/GMFModelElement.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/GMFModelElement.java
index 3a5303cf884..31c8ffd092b 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/GMFModelElement.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/GMFModelElement.java
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Copyright (c) 2011, 2017 CEA LIST, Christian W. Damus, and others.
+ * Copyright (c) 2011, 2017, 2019 CEA LIST, Christian W. Damus, and others.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -12,8 +12,9 @@
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *  Gabriel Pascual (ALL4TEC) gabriel.pascual@all4tec.net - Bug 454891
  *  Christian W. Damus - bugs 485220, 515459
- *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Bug 496905
- *  
+ *  Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Bug 496905
+ *  Nicolas FAUVERGUE (CEA LIST) nicolas.fauvergue@cea.fr - Bug 550568
+ *
  *****************************************************************************/
 package org.eclipse.papyrus.infra.gmfdiag.properties.modelelement;
 
@@ -89,11 +90,11 @@ public class GMFModelElement extends EMFModelElement {
 	@Override
 	protected boolean isFeatureEditable(String propertyPath) {
 		boolean result = true;
-		if(InternationalizationConstants.LABEL_PROPERTY_PATH.equals(propertyPath)){ //$NON-NLS-1$
+		if (InternationalizationConstants.LABEL_PROPERTY_PATH.equals(propertyPath)) {
 			result = true;
-		}else if (propertyPath.endsWith("owner")) { //$NON-NLS-1$
+		} else if (propertyPath.endsWith("owner")) { //$NON-NLS-1$
 			result = true;
-		}else{
+		} else {
 			result = super.isFeatureEditable(propertyPath);
 		}
 		return result;
@@ -101,10 +102,10 @@ public class GMFModelElement extends EMFModelElement {
 
 	@Override
 	protected IObservable doGetObservable(String propertyPath) {
-		if(InternationalizationConstants.LABEL_PROPERTY_PATH.equals(propertyPath)){ //$NON-NLS-1$
+		if (InternationalizationConstants.LABEL_PROPERTY_PATH.equals(propertyPath)) {
 			Diagram diagram = (Diagram) source;
 			return new DiagramLabelObservableValue(diagram, getDomain());
-		}else if (propertyPath.endsWith("owner")) {
+		} else if (propertyPath.endsWith("owner")) {
 			Diagram diagram = (Diagram) source;
 			Style style = diagram.getStyle(StylePackage.Literals.PAPYRUS_DIAGRAM_STYLE);
 			if (style != null) {
@@ -164,13 +165,21 @@ public class GMFModelElement extends EMFModelElement {
 
 				@Override
 				public Image getImage(Object element) {
-					ViewPrototype proto = DiagramUtils.getPrototype((Diagram) source);
-					return proto.getIcon();
+					PolicyChecker checker = PolicyChecker.getFor(source);
+					ViewPrototype prototype = DiagramUtils.getPrototype((Diagram) source, checker, false);
+
+					// If this is not an unavailable view prototype and is not in current viewpoints, display the grayed icon if possible
+					if (!ViewPrototype.UNAVAILABLE_VIEW.equals(prototype) && !checker.isInViewpoint(prototype.getRepresentationKind())) {
+						// If the grayed icon is not set, use the unavailable view prototype icon
+						return null == prototype.getGrayedIconURI() || prototype.getGrayedIconURI().isEmpty() ? ViewPrototype.UNAVAILABLE_VIEW.getIcon() : prototype.getGrayedIcon();
+					}
+
+					return prototype.getIcon();
 				}
 
 				@Override
 				public String getText(Object element) {
-					ViewPrototype proto = DiagramUtils.getPrototype((Diagram) source);
+					ViewPrototype proto = DiagramUtils.getPrototype((Diagram) source, false);
 					return proto.getQualifiedName();
 				}
 			};
@@ -224,7 +233,7 @@ public class GMFModelElement extends EMFModelElement {
 		}
 		return super.getContentProvider(propertyPath);
 	}
-	
+
 	/**
 	 * Gets the root EObject from the given one
 	 *
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/META-INF/MANIFEST.MF
index baf2324f51d..4db0bbb15e9 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.representation.edit;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.representation.provider.RepresentationEditPlugin$Implementation
 Bundle-Vendor: %providerName
@@ -10,10 +10,10 @@ Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.papyrus.infra.gmfdiag.representation.provider
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.representation;bundle-version="[1.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.representation;bundle-version="[2.1.0,3.0.0)",
  org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)",
- org.eclipse.papyrus.infra.core.architecture;bundle-version="[1.0.0,3.0.0)",
- org.eclipse.papyrus.infra.core.architecture.edit;bundle-version="[1.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.core.architecture;bundle-version="[2.1.0,3.0.0)",
+ org.eclipse.papyrus.infra.core.architecture.edit;bundle-version="[2.1.0,3.0.0)",
  org.eclipse.papyrus.infra.constraints;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.papyrus.infra.constraints.edit;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.13.0,3.0.0)",
@@ -22,8 +22,8 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
  org.eclipse.papyrus.infra.types.edit;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.papyrus.infra.architecture.representation;bundle-version="[1.0.0,3.0.0)",
- org.eclipse.papyrus.infra.architecture.representation.edit;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.papyrus.infra.architecture.representation;bundle-version="[2.1.0,3.0.0)",
+ org.eclipse.papyrus.infra.architecture.representation.edit;bundle-version="[1.2.0,2.0.0)",
  org.eclipse.papyrus.infra.filters;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.papyrus.infra.filters.edit;bundle-version="[1.0.0,2.0.0)"
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/pom.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/pom.xml
index 2f221dfac6e..6b32989652d 100755
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/pom.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/pom.xml
@@ -7,7 +7,7 @@
 	    <version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.gmfdiag.representation.edit</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
+	<version>2.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 	<description>Papyrus fork of org.eclipse.gmf.tooling.runtime to remain in the release train</description>
 </project>
 \ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/provider/PathElementItemProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/provider/PathElementItemProvider.java
index 01981f7e5d4..37143a518b5 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/provider/PathElementItemProvider.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/provider/PathElementItemProvider.java
@@ -184,7 +184,6 @@ public class PathElementItemProvider
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-		super.notifyChanged(notification);
 	}
 
 	/**
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/provider/RepresentationItemProviderAdapterFactory.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/provider/RepresentationItemProviderAdapterFactory.java
index a91d283c09b..82d215012d7 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/provider/RepresentationItemProviderAdapterFactory.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/provider/RepresentationItemProviderAdapterFactory.java
@@ -212,6 +212,7 @@ public class RepresentationItemProviderAdapterFactory extends RepresentationAdap
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public ComposeableAdapterFactory getRootAdapterFactory() {
 		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
 	}
@@ -222,6 +223,7 @@ public class RepresentationItemProviderAdapterFactory extends RepresentationAdap
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
 		this.parentAdapterFactory = parentAdapterFactory;
 	}
@@ -270,6 +272,7 @@ public class RepresentationItemProviderAdapterFactory extends RepresentationAdap
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void addListener(INotifyChangedListener notifyChangedListener) {
 		changeNotifier.addListener(notifyChangedListener);
 	}
@@ -280,6 +283,7 @@ public class RepresentationItemProviderAdapterFactory extends RepresentationAdap
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void removeListener(INotifyChangedListener notifyChangedListener) {
 		changeNotifier.removeListener(notifyChangedListener);
 	}
@@ -290,6 +294,7 @@ public class RepresentationItemProviderAdapterFactory extends RepresentationAdap
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void fireNotifyChanged(Notification notification) {
 		changeNotifier.fireNotifyChanged(notification);
 
@@ -304,6 +309,7 @@ public class RepresentationItemProviderAdapterFactory extends RepresentationAdap
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void dispose() {
 		if (papyrusDiagramItemProvider != null) papyrusDiagramItemProvider.dispose();
 		if (childRuleItemProvider != null) childRuleItemProvider.dispose();
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/META-INF/MANIFEST.MF
index 0ef043186c9..b0e73bf39da 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.representation;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -15,7 +15,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.infra.core.architecture;bundle-version="[1.0.0,3.0.0)",
  org.eclipse.papyrus.infra.constraints;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
  org.eclipse.papyrus.infra.types;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.papyrus.infra.architecture.representation;bundle-version="[1.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.architecture.representation;bundle-version="[2.1.0,3.0.0)",
  org.eclipse.papyrus.infra.filters;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
  org.eclipse.uml2.types;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
  org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration;bundle-version="[4.0.0,5.0.0)",
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/pom.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/pom.xml
index e7eb27ba837..c874060bb95 100755
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/pom.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/pom.xml
@@ -7,7 +7,7 @@
 	    <version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.gmfdiag.representation</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
+	<version>2.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 	<description>Papyrus fork of org.eclipse.gmf.tooling.runtime to remain in the release train</description>
 </project>
 \ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/AssistantRule.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/AssistantRule.java
index 4194971ee99..4ceb39fab0f 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/AssistantRule.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/AssistantRule.java
@@ -50,7 +50,7 @@ public interface AssistantRule extends Rule {
 	 * @return the value of the '<em>Element Type ID</em>' attribute.
 	 * @see #setElementTypeID(String)
 	 * @see org.eclipse.papyrus.infra.gmfdiag.representation.RepresentationPackage#getAssistantRule_ElementTypeID()
-	 * @model annotation="http://www.eclipse.org/emf/2002/GenModel propertyDescription='A pattern (that can include *) to match for the identifier of a assistant element.'"
+	 * @model
 	 * @generated
 	 */
 	String getElementTypeID();
@@ -73,7 +73,6 @@ public interface AssistantRule extends Rule {
 	 * <!-- end-model-doc -->
 	 * @model required="true" elementTypeDataType="org.eclipse.papyrus.infra.gmfdiag.representation.ElementType" elementTypeRequired="true"
 	 * @generated
-	 * @since 2.0
 	 */
 	boolean matches(IElementType elementType);
 
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/ChildRule.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/ChildRule.java
index 73d47dd4f19..f4edad1a3bf 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/ChildRule.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/ChildRule.java
@@ -59,7 +59,7 @@ public interface ChildRule extends Rule {
 	 * @return the value of the '<em>Element</em>' reference.
 	 * @see #setElement(EClass)
 	 * @see org.eclipse.papyrus.infra.gmfdiag.representation.RepresentationPackage#getChildRule_Element()
-	 * @model annotation="http://www.eclipse.org/emf/2002/GenModel propertyDescription='The type (from the language\'s metamodel) that an element must have to be dropped on this diagram kind.'"
+	 * @model
 	 * @generated
 	 */
 	EClass getElement();
@@ -88,7 +88,7 @@ public interface ChildRule extends Rule {
 	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Stereotypes</em>' reference list.
 	 * @see org.eclipse.papyrus.infra.gmfdiag.representation.RepresentationPackage#getChildRule_Stereotypes()
-	 * @model annotation="http://www.eclipse.org/emf/2002/GenModel propertyDescription='The stereotype (from the language\'s profiles) that an element must have to be dropped on this diagram kind.'"
+	 * @model
 	 * @generated
 	 */
 	EList<EClass> getStereotypes();
@@ -107,7 +107,7 @@ public interface ChildRule extends Rule {
 	 * @return the value of the '<em>Origin</em>' reference.
 	 * @see #setOrigin(EClass)
 	 * @see org.eclipse.papyrus.infra.gmfdiag.representation.RepresentationPackage#getChildRule_Origin()
-	 * @model annotation="http://www.eclipse.org/emf/2002/GenModel propertyDescription='The type (from the language\'s metamodel) that an element must have to be the target of the drop of the child model element.'"
+	 * @model
 	 * @generated
 	 */
 	EClass getOrigin();
@@ -137,7 +137,6 @@ public interface ChildRule extends Rule {
 	 * @return the value of the '<em>Insertion Path</em>' containment reference list.
 	 * @see org.eclipse.papyrus.infra.gmfdiag.representation.RepresentationPackage#getChildRule_InsertionPath()
 	 * @model containment="true"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel propertyDescription='A path of properties that must be used from the origin to insert the new child model element in the model.'"
 	 * @generated
 	 */
 	EList<PathElement> getInsertionPath();
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/PaletteRule.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/PaletteRule.java
index 0499a54effb..1fdc340de7b 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/PaletteRule.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/PaletteRule.java
@@ -52,7 +52,7 @@ public interface PaletteRule extends Rule {
 	 * @return the value of the '<em>Element</em>' attribute.
 	 * @see #setElement(String)
 	 * @see org.eclipse.papyrus.infra.gmfdiag.representation.RepresentationPackage#getPaletteRule_Element()
-	 * @model annotation="http://www.eclipse.org/emf/2002/GenModel propertyDescription='A pattern (that can include *) to match for the identifier of a palette element.'"
+	 * @model
 	 * @generated
 	 */
 	String getElement();
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/PapyrusDiagram.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/PapyrusDiagram.java
index d06bbd7867b..ca5a150e6e6 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/PapyrusDiagram.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/PapyrusDiagram.java
@@ -62,7 +62,7 @@ public interface PapyrusDiagram extends PapyrusRepresentationKind {
 	 * @return the value of the '<em>Custom Style</em>' attribute.
 	 * @see #setCustomStyle(String)
 	 * @see org.eclipse.papyrus.infra.gmfdiag.representation.RepresentationPackage#getPapyrusDiagram_CustomStyle()
-	 * @model annotation="http://www.eclipse.org/emf/2002/GenModel propertyDescription='The custom style for the diagram specified using a platform plugin URI of a CSS file' propertyCategory='Diagram'"
+	 * @model
 	 * @generated
 	 */
 	String getCustomStyle();
@@ -88,7 +88,6 @@ public interface PapyrusDiagram extends PapyrusRepresentationKind {
 	 * @return the value of the '<em>Child Rules</em>' containment reference list.
 	 * @see org.eclipse.papyrus.infra.gmfdiag.representation.RepresentationPackage#getPapyrusDiagram_ChildRules()
 	 * @model containment="true"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel propertyDescription='The set of rules that determine which model elements can be added as child of the origin through this diagram' propertyCategory='Diagram'"
 	 * @generated
 	 */
 	EList<ChildRule> getChildRules();
@@ -104,7 +103,6 @@ public interface PapyrusDiagram extends PapyrusRepresentationKind {
 	 * @return the value of the '<em>Palette Rules</em>' containment reference list.
 	 * @see org.eclipse.papyrus.infra.gmfdiag.representation.RepresentationPackage#getPapyrusDiagram_PaletteRules()
 	 * @model containment="true"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel propertyDescription='These set of rules that determine which palette elements should be available for this diagram' propertyCategory='Diagram'"
 	 * @generated
 	 */
 	EList<PaletteRule> getPaletteRules();
@@ -120,7 +118,6 @@ public interface PapyrusDiagram extends PapyrusRepresentationKind {
 	 * @return the value of the '<em>Assistant Rules</em>' containment reference list.
 	 * @see org.eclipse.papyrus.infra.gmfdiag.representation.RepresentationPackage#getPapyrusDiagram_AssistantRules()
 	 * @model containment="true"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel propertyDescription='The set of rules that determine which modeling assistants should be presented in this diagram' propertyCategory='Diagram'"
 	 * @generated
 	 */
 	EList<AssistantRule> getAssistantRules();
@@ -140,9 +137,7 @@ public interface PapyrusDiagram extends PapyrusRepresentationKind {
 	 * @see #setCreationCommandClass(String)
 	 * @see org.eclipse.papyrus.infra.gmfdiag.representation.RepresentationPackage#getPapyrusDiagram_CreationCommandClass()
 	 * @model required="true"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel propertyDescription='The fully qualified name of a command that creates the diagram. The command must implement the org.eclipse.papyrus.commands.ICreationCommand inteface' propertyCategory='Diagram'"
 	 * @generated
-	 * @since 2.0
 	 */
 	String getCreationCommandClass();
 
@@ -153,7 +148,6 @@ public interface PapyrusDiagram extends PapyrusRepresentationKind {
 	 * @param value the new value of the '<em>Creation Command Class</em>' attribute.
 	 * @see #getCreationCommandClass()
 	 * @generated
-	 * @since 2.0
 	 */
 	void setCreationCommandClass(String value);
 
@@ -171,7 +165,7 @@ public interface PapyrusDiagram extends PapyrusRepresentationKind {
 	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Palettes</em>' reference list.
 	 * @see org.eclipse.papyrus.infra.gmfdiag.representation.RepresentationPackage#getPapyrusDiagram_Palettes()
-	 * @model annotation="http://www.eclipse.org/emf/2002/GenModel propertyDescription='A set of palette configurations used by the diagram (typically found in .paletteconfiguration files)' propertyCategory='Diagram'"
+	 * @model
 	 * @generated
 	 */
 	EList<PaletteConfiguration> getPalettes();
@@ -181,7 +175,6 @@ public interface PapyrusDiagram extends PapyrusRepresentationKind {
 	 * <!-- end-user-doc -->
 	 * @model diagnosticsUnique="false" contextUnique="false"
 	 * @generated
-	 * @since 2.0
 	 */
 	boolean ceationCommandClassExists(DiagnosticChain diagnostics, Map<Object, Object> context);
 
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/PathElement.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/PathElement.java
index bf1eba23ae7..55f98f18a0e 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/PathElement.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/PathElement.java
@@ -57,7 +57,6 @@ public interface PathElement extends EObject {
 	 * @see #setFeature(EReference)
 	 * @see org.eclipse.papyrus.infra.gmfdiag.representation.RepresentationPackage#getPathElement_Feature()
 	 * @model required="true"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel propertyDescription='The reference from the origin type that represents the collection of next elements in the path.'"
 	 * @generated
 	 */
 	EReference getFeature();
@@ -86,7 +85,6 @@ public interface PathElement extends EObject {
 	 * @return the value of the '<em>Origin</em>' reference.
 	 * @see org.eclipse.papyrus.infra.gmfdiag.representation.RepresentationPackage#getPathElement_Origin()
 	 * @model required="true" transient="true" changeable="false" volatile="true" derived="true"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel propertyDescription='The type (from the language\'s metamodel) that an element must have to be the next segment in the path.'"
 	 * @generated
 	 */
 	EClass getOrigin();
@@ -105,7 +103,6 @@ public interface PathElement extends EObject {
 	 * @return the value of the '<em>Target</em>' reference.
 	 * @see org.eclipse.papyrus.infra.gmfdiag.representation.RepresentationPackage#getPathElement_Target()
 	 * @model required="true" transient="true" changeable="false" volatile="true" derived="true"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel propertyDescription='The type (from the language\'s metamodel) that is the type of the reference feature.'"
 	 * @generated
 	 */
 	EClass getTarget();
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/RepresentationPackage.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/RepresentationPackage.java
index 8d7f652e27d..7c54ae8648f 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/RepresentationPackage.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/RepresentationPackage.java
@@ -87,7 +87,6 @@ public interface RepresentationPackage extends EPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
-	 * @since 2.0
 	 */
 	int PAPYRUS_DIAGRAM__ID = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.PAPYRUS_REPRESENTATION_KIND__ID;
 
@@ -146,6 +145,15 @@ public interface RepresentationPackage extends EPackage {
 	int PAPYRUS_DIAGRAM__CONCERNS = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.PAPYRUS_REPRESENTATION_KIND__CONCERNS;
 
 	/**
+	 * The feature id for the '<em><b>Grayed Icon</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_DIAGRAM__GRAYED_ICON = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.PAPYRUS_REPRESENTATION_KIND__GRAYED_ICON;
+
+	/**
 	 * The feature id for the '<em><b>Parent</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -250,7 +258,6 @@ public interface RepresentationPackage extends EPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
-	 * @since 2.0
 	 */
 	int PAPYRUS_DIAGRAM___CEATION_COMMAND_CLASS_EXISTS__DIAGNOSTICCHAIN_MAP = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.PAPYRUS_REPRESENTATION_KIND_OPERATION_COUNT + 0;
 
@@ -586,7 +593,6 @@ public interface RepresentationPackage extends EPackage {
 	 * @return the meta object for the '<em>Ceation Command Class Exists</em>' operation.
 	 * @see org.eclipse.papyrus.infra.gmfdiag.representation.PapyrusDiagram#ceationCommandClassExists(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
-	 * @since 2.0
 	 */
 	EOperation getPapyrusDiagram__CeationCommandClassExists__DiagnosticChain_Map();
 
@@ -836,7 +842,6 @@ public interface RepresentationPackage extends EPackage {
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
-		 * @since 2.0
 		 */
 		EOperation PAPYRUS_DIAGRAM___CEATION_COMMAND_CLASS_EXISTS__DIAGNOSTICCHAIN_MAP = eINSTANCE.getPapyrusDiagram__CeationCommandClassExists__DiagnosticChain_Map();
 
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/impl/AssistantRuleImpl.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/impl/AssistantRuleImpl.java
index 2e36e54140b..faa4208944e 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/impl/AssistantRuleImpl.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/impl/AssistantRuleImpl.java
@@ -90,6 +90,7 @@ public class AssistantRuleImpl extends RuleImpl implements AssistantRule {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getElementTypeID() {
 		return elementTypeID;
 	}
@@ -99,6 +100,7 @@ public class AssistantRuleImpl extends RuleImpl implements AssistantRule {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setElementTypeID(String newElementTypeID) {
 		String oldElementTypeID = elementTypeID;
 		elementTypeID = newElementTypeID;
@@ -111,6 +113,7 @@ public class AssistantRuleImpl extends RuleImpl implements AssistantRule {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public boolean matches(IElementType elementType) {
 		// TODO: implement this method
 		// Ensure that you remove @generated or mark it @generated NOT
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/impl/ChildRuleImpl.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/impl/ChildRuleImpl.java
index 920e43dafb8..b326157e460 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/impl/ChildRuleImpl.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/impl/ChildRuleImpl.java
@@ -118,6 +118,7 @@ public class ChildRuleImpl extends RuleImpl implements ChildRule {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getElement() {
 		if (element != null && element.eIsProxy()) {
 			InternalEObject oldElement = (InternalEObject)element;
@@ -144,6 +145,7 @@ public class ChildRuleImpl extends RuleImpl implements ChildRule {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setElement(EClass newElement) {
 		EClass oldElement = element;
 		element = newElement;
@@ -156,6 +158,7 @@ public class ChildRuleImpl extends RuleImpl implements ChildRule {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<EClass> getStereotypes() {
 		if (stereotypes == null) {
 			stereotypes = new EObjectResolvingEList<EClass>(EClass.class, this, RepresentationPackage.CHILD_RULE__STEREOTYPES);
@@ -168,6 +171,7 @@ public class ChildRuleImpl extends RuleImpl implements ChildRule {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getOrigin() {
 		if (origin != null && origin.eIsProxy()) {
 			InternalEObject oldOrigin = (InternalEObject)origin;
@@ -194,6 +198,7 @@ public class ChildRuleImpl extends RuleImpl implements ChildRule {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setOrigin(EClass newOrigin) {
 		EClass oldOrigin = origin;
 		origin = newOrigin;
@@ -206,6 +211,7 @@ public class ChildRuleImpl extends RuleImpl implements ChildRule {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<PathElement> getInsertionPath() {
 		if (insertionPath == null) {
 			insertionPath = new EObjectContainmentEList<PathElement>(PathElement.class, this, RepresentationPackage.CHILD_RULE__INSERTION_PATH);
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/impl/PaletteRuleImpl.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/impl/PaletteRuleImpl.java
index ec14d797d30..226bb75fc17 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/impl/PaletteRuleImpl.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/impl/PaletteRuleImpl.java
@@ -84,6 +84,7 @@ public class PaletteRuleImpl extends RuleImpl implements PaletteRule {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getElement() {
 		return element;
 	}
@@ -93,6 +94,7 @@ public class PaletteRuleImpl extends RuleImpl implements PaletteRule {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setElement(String newElement) {
 		String oldElement = element;
 		element = newElement;
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/impl/PapyrusDiagramImpl.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/impl/PapyrusDiagramImpl.java
index 1a55067c74c..ea27501a57b 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/impl/PapyrusDiagramImpl.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/impl/PapyrusDiagramImpl.java
@@ -19,12 +19,8 @@ import java.lang.reflect.InvocationTargetException;
 import java.util.Collection;
 
 import java.util.Map;
-
-import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspace;
 import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
@@ -42,7 +38,6 @@ import org.eclipse.emf.ecore.util.EObjectResolvingEList;
 import org.eclipse.emf.ecore.util.EObjectValidator;
 import org.eclipse.emf.ecore.util.InternalEList;
 import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
 import org.eclipse.jdt.core.JavaCore;
 import org.eclipse.jdt.core.JavaModelException;
 import org.eclipse.papyrus.infra.architecture.representation.impl.PapyrusRepresentationKindImpl;
@@ -127,7 +122,6 @@ public class PapyrusDiagramImpl extends PapyrusRepresentationKindImpl implements
 	 * @see #getCreationCommandClass()
 	 * @generated
 	 * @ordered
-	 * @since 2.0
 	 */
 	protected static final String CREATION_COMMAND_CLASS_EDEFAULT = null;
 
@@ -172,6 +166,7 @@ public class PapyrusDiagramImpl extends PapyrusRepresentationKindImpl implements
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getCustomStyle() {
 		return customStyle;
 	}
@@ -180,6 +175,7 @@ public class PapyrusDiagramImpl extends PapyrusRepresentationKindImpl implements
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setCustomStyle(String newCustomStyle) {
 		String oldCustomStyle = customStyle;
 		customStyle = newCustomStyle;
@@ -191,6 +187,7 @@ public class PapyrusDiagramImpl extends PapyrusRepresentationKindImpl implements
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<ChildRule> getChildRules() {
 		if (childRules == null) {
 			childRules = new EObjectContainmentEList<ChildRule>(ChildRule.class, this, RepresentationPackage.PAPYRUS_DIAGRAM__CHILD_RULES);
@@ -202,6 +199,7 @@ public class PapyrusDiagramImpl extends PapyrusRepresentationKindImpl implements
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<PaletteRule> getPaletteRules() {
 		if (paletteRules == null) {
 			paletteRules = new EObjectContainmentEList<PaletteRule>(PaletteRule.class, this, RepresentationPackage.PAPYRUS_DIAGRAM__PALETTE_RULES);
@@ -213,6 +211,7 @@ public class PapyrusDiagramImpl extends PapyrusRepresentationKindImpl implements
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<AssistantRule> getAssistantRules() {
 		if (assistantRules == null) {
 			assistantRules = new EObjectContainmentEList<AssistantRule>(AssistantRule.class, this, RepresentationPackage.PAPYRUS_DIAGRAM__ASSISTANT_RULES);
@@ -224,6 +223,7 @@ public class PapyrusDiagramImpl extends PapyrusRepresentationKindImpl implements
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getCreationCommandClass() {
 		return creationCommandClass;
 	}
@@ -233,6 +233,7 @@ public class PapyrusDiagramImpl extends PapyrusRepresentationKindImpl implements
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setCreationCommandClass(String newCreationCommandClass) {
 		String oldCreationCommandClass = creationCommandClass;
 		creationCommandClass = newCreationCommandClass;
@@ -244,6 +245,7 @@ public class PapyrusDiagramImpl extends PapyrusRepresentationKindImpl implements
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<PaletteConfiguration> getPalettes() {
 		if (palettes == null) {
 			palettes = new EObjectResolvingEList<PaletteConfiguration>(PaletteConfiguration.class, this, RepresentationPackage.PAPYRUS_DIAGRAM__PALETTES);
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/impl/PathElementImpl.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/impl/PathElementImpl.java
index 2c7cb57c0ed..2346a9cbdd9 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/impl/PathElementImpl.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/impl/PathElementImpl.java
@@ -77,6 +77,7 @@ public class PathElementImpl extends MinimalEObjectImpl.Container implements Pat
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getFeature() {
 		if (feature != null && feature.eIsProxy()) {
 			InternalEObject oldFeature = (InternalEObject)feature;
@@ -103,6 +104,7 @@ public class PathElementImpl extends MinimalEObjectImpl.Container implements Pat
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setFeature(EReference newFeature) {
 		EReference oldFeature = feature;
 		feature = newFeature;
@@ -115,6 +117,7 @@ public class PathElementImpl extends MinimalEObjectImpl.Container implements Pat
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getOrigin() {
 		EClass origin = basicGetOrigin();
 		return origin != null && origin.eIsProxy() ? (EClass)eResolveProxy((InternalEObject)origin) : origin;
@@ -137,6 +140,7 @@ public class PathElementImpl extends MinimalEObjectImpl.Container implements Pat
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getTarget() {
 		EClass target = basicGetTarget();
 		return target != null && target.eIsProxy() ? (EClass)eResolveProxy((InternalEObject)target) : target;
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/impl/RepresentationFactoryImpl.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/impl/RepresentationFactoryImpl.java
index 4a2b18143a4..b5d9678a55e 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/impl/RepresentationFactoryImpl.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/impl/RepresentationFactoryImpl.java
@@ -117,6 +117,7 @@ public class RepresentationFactoryImpl extends EFactoryImpl implements Represent
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public PapyrusDiagram createPapyrusDiagram() {
 		PapyrusDiagramImpl papyrusDiagram = new PapyrusDiagramImpl();
 		return papyrusDiagram;
@@ -127,6 +128,7 @@ public class RepresentationFactoryImpl extends EFactoryImpl implements Represent
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public ChildRule createChildRule() {
 		ChildRuleImpl childRule = new ChildRuleImpl();
 		return childRule;
@@ -137,6 +139,7 @@ public class RepresentationFactoryImpl extends EFactoryImpl implements Represent
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public PaletteRule createPaletteRule() {
 		PaletteRuleImpl paletteRule = new PaletteRuleImpl();
 		return paletteRule;
@@ -147,6 +150,7 @@ public class RepresentationFactoryImpl extends EFactoryImpl implements Represent
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public PathElement createPathElement() {
 		PathElementImpl pathElement = new PathElementImpl();
 		return pathElement;
@@ -157,6 +161,7 @@ public class RepresentationFactoryImpl extends EFactoryImpl implements Represent
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public AssistantRule createAssistantRule() {
 		AssistantRuleImpl assistantRule = new AssistantRuleImpl();
 		return assistantRule;
@@ -185,6 +190,7 @@ public class RepresentationFactoryImpl extends EFactoryImpl implements Represent
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public RepresentationPackage getRepresentationPackage() {
 		return (RepresentationPackage)getEPackage();
 	}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/impl/RepresentationPackageImpl.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/impl/RepresentationPackageImpl.java
index 66fc7599cd4..677ef598efe 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/impl/RepresentationPackageImpl.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/impl/RepresentationPackageImpl.java
@@ -164,6 +164,7 @@ public class RepresentationPackageImpl extends EPackageImpl implements Represent
 		EValidator.Registry.INSTANCE.put
 			(theRepresentationPackage,
 			 new EValidator.Descriptor() {
+				 @Override
 				 public EValidator getEValidator() {
 					 return RepresentationValidator.INSTANCE;
 				 }
@@ -182,6 +183,7 @@ public class RepresentationPackageImpl extends EPackageImpl implements Represent
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getPapyrusDiagram() {
 		return papyrusDiagramEClass;
 	}
@@ -191,6 +193,7 @@ public class RepresentationPackageImpl extends EPackageImpl implements Represent
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getPapyrusDiagram_CustomStyle() {
 		return (EAttribute)papyrusDiagramEClass.getEStructuralFeatures().get(0);
 	}
@@ -200,6 +203,7 @@ public class RepresentationPackageImpl extends EPackageImpl implements Represent
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getPapyrusDiagram_ChildRules() {
 		return (EReference)papyrusDiagramEClass.getEStructuralFeatures().get(1);
 	}
@@ -209,6 +213,7 @@ public class RepresentationPackageImpl extends EPackageImpl implements Represent
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getPapyrusDiagram_PaletteRules() {
 		return (EReference)papyrusDiagramEClass.getEStructuralFeatures().get(2);
 	}
@@ -218,6 +223,7 @@ public class RepresentationPackageImpl extends EPackageImpl implements Represent
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getPapyrusDiagram_AssistantRules() {
 		return (EReference)papyrusDiagramEClass.getEStructuralFeatures().get(3);
 	}
@@ -227,6 +233,7 @@ public class RepresentationPackageImpl extends EPackageImpl implements Represent
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getPapyrusDiagram_CreationCommandClass() {
 		return (EAttribute)papyrusDiagramEClass.getEStructuralFeatures().get(4);
 	}
@@ -236,6 +243,7 @@ public class RepresentationPackageImpl extends EPackageImpl implements Represent
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getPapyrusDiagram_Palettes() {
 		return (EReference)papyrusDiagramEClass.getEStructuralFeatures().get(5);
 	}
@@ -245,6 +253,7 @@ public class RepresentationPackageImpl extends EPackageImpl implements Represent
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EOperation getPapyrusDiagram__CeationCommandClassExists__DiagnosticChain_Map() {
 		return papyrusDiagramEClass.getEOperations().get(0);
 	}
@@ -254,6 +263,7 @@ public class RepresentationPackageImpl extends EPackageImpl implements Represent
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getChildRule() {
 		return childRuleEClass;
 	}
@@ -263,6 +273,7 @@ public class RepresentationPackageImpl extends EPackageImpl implements Represent
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getChildRule_Element() {
 		return (EReference)childRuleEClass.getEStructuralFeatures().get(0);
 	}
@@ -272,6 +283,7 @@ public class RepresentationPackageImpl extends EPackageImpl implements Represent
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getChildRule_Stereotypes() {
 		return (EReference)childRuleEClass.getEStructuralFeatures().get(1);
 	}
@@ -281,6 +293,7 @@ public class RepresentationPackageImpl extends EPackageImpl implements Represent
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getChildRule_Origin() {
 		return (EReference)childRuleEClass.getEStructuralFeatures().get(2);
 	}
@@ -290,6 +303,7 @@ public class RepresentationPackageImpl extends EPackageImpl implements Represent
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getChildRule_InsertionPath() {
 		return (EReference)childRuleEClass.getEStructuralFeatures().get(3);
 	}
@@ -299,6 +313,7 @@ public class RepresentationPackageImpl extends EPackageImpl implements Represent
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getPaletteRule() {
 		return paletteRuleEClass;
 	}
@@ -308,6 +323,7 @@ public class RepresentationPackageImpl extends EPackageImpl implements Represent
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getPaletteRule_Element() {
 		return (EAttribute)paletteRuleEClass.getEStructuralFeatures().get(0);
 	}
@@ -317,6 +333,7 @@ public class RepresentationPackageImpl extends EPackageImpl implements Represent
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getPathElement() {
 		return pathElementEClass;
 	}
@@ -326,6 +343,7 @@ public class RepresentationPackageImpl extends EPackageImpl implements Represent
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getPathElement_Feature() {
 		return (EReference)pathElementEClass.getEStructuralFeatures().get(0);
 	}
@@ -335,6 +353,7 @@ public class RepresentationPackageImpl extends EPackageImpl implements Represent
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getPathElement_Origin() {
 		return (EReference)pathElementEClass.getEStructuralFeatures().get(1);
 	}
@@ -344,6 +363,7 @@ public class RepresentationPackageImpl extends EPackageImpl implements Represent
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getPathElement_Target() {
 		return (EReference)pathElementEClass.getEStructuralFeatures().get(2);
 	}
@@ -353,6 +373,7 @@ public class RepresentationPackageImpl extends EPackageImpl implements Represent
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getAssistantRule() {
 		return assistantRuleEClass;
 	}
@@ -362,6 +383,7 @@ public class RepresentationPackageImpl extends EPackageImpl implements Represent
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getAssistantRule_ElementTypeID() {
 		return (EAttribute)assistantRuleEClass.getEStructuralFeatures().get(0);
 	}
@@ -371,6 +393,7 @@ public class RepresentationPackageImpl extends EPackageImpl implements Represent
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EOperation getAssistantRule__Matches__IElementType() {
 		return assistantRuleEClass.getEOperations().get(0);
 	}
@@ -380,6 +403,7 @@ public class RepresentationPackageImpl extends EPackageImpl implements Represent
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EDataType getElementType() {
 		return elementTypeEDataType;
 	}
@@ -389,6 +413,7 @@ public class RepresentationPackageImpl extends EPackageImpl implements Represent
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public RepresentationFactory getRepresentationFactory() {
 		return (RepresentationFactory)getEFactoryInstance();
 	}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/util/RepresentationValidator.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/util/RepresentationValidator.java
index fa79cda52fc..d80b5fd7cbb 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/util/RepresentationValidator.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/util/RepresentationValidator.java
@@ -34,7 +34,6 @@ import org.eclipse.papyrus.infra.gmfdiag.representation.*;
  * <!-- end-user-doc -->
  * @see org.eclipse.papyrus.infra.gmfdiag.representation.RepresentationPackage
  * @generated
- * @since 2.0
  */
 public class RepresentationValidator extends EObjectValidator {
 	/**
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/META-INF/MANIFEST.MF
index 487f6e96e2e..a364cce8d08 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/META-INF/MANIFEST.MF
@@ -26,7 +26,7 @@ Require-Bundle: org.eclipse.papyrus.infra.nattable;bundle-version="[6.0.0,7.0.0)
  org.eclipse.papyrus.infra.architecture.representation;bundle-version="[2.0.0,3.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 5.2.0.qualifier
+Bundle-Version: 5.3.0.qualifier
 Bundle-Name: %Bundle-Name
 Bundle-Activator: org.eclipse.papyrus.infra.nattable.common.Activator
 Bundle-ManifestVersion: 2
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/pom.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/pom.xml
index aac59bec95c..f867f9080d9 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/pom.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/pom.xml
@@ -8,6 +8,6 @@
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.nattable.common</artifactId>
-	<version>5.2.0-SNAPSHOT</version>
+	<version>5.3.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/helper/TableCommandHelper.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/helper/TableCommandHelper.java
index f173085ba7b..d7cdd0488ba 100755
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/helper/TableCommandHelper.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/helper/TableCommandHelper.java
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Copyright (c) 2013, 2017 CEA LIST and others.
+ * Copyright (c) 2013, 2017, 2019 CEA LIST and others.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -12,17 +12,17 @@
  *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
  *  Thanh Liem PHAN (ALL4TEC) thanhliem.phan@all4tec.net - Bug 516882
  *  Christian W. Damus - bug 527580
+ *  Nicolas FAUVERGUE (CEA LIST) nicolas.fauvergue@cea.fr - Bug 550568
  *****************************************************************************/
 package org.eclipse.papyrus.infra.nattable.common.helper;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.infra.architecture.ArchitectureDomainManager;
+import org.eclipse.papyrus.infra.nattable.common.utils.TableUtil;
 import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
 import org.eclipse.papyrus.infra.nattable.representation.PapyrusTable;
 import org.eclipse.papyrus.infra.nattable.representation.RepresentationPackage;
 import org.eclipse.papyrus.infra.viewpoints.policy.AbstractViewTypeHelper;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
 import org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype;
 
 /**
@@ -57,7 +57,7 @@ public class TableCommandHelper extends AbstractViewTypeHelper<PapyrusTable> {
 
 	/**
 	 * {@inheritDoc}
-	 * 
+	 *
 	 * @since 5.0
 	 */
 	@Override
@@ -67,16 +67,11 @@ public class TableCommandHelper extends AbstractViewTypeHelper<PapyrusTable> {
 
 	/**
 	 * {@inheritDoc}
-	 * 
+	 *
 	 * @since 4.1
 	 */
 	@Override
 	protected ViewPrototype doGetPrototypeOf(EObject view) {
-		PolicyChecker checker = getPolicyChecker(view);
-		ArchitectureDomainManager manager = ArchitectureDomainManager.getInstance();
-		PapyrusTable repKind = (PapyrusTable) manager.getRepresentationKindById(((Table) view).getTableKindId());
-		if (null != repKind && checker.isInViewpoint(repKind)) // null when we are destroying the table (undo after a creation for example), bug 516882
-			return getPrototypeFor(repKind);
-		return ViewPrototype.UNAVAILABLE_VIEW;
+		return TableUtil.getPrototype((Table) view, false);
 	}
 }
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/utils/TableUtil.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/utils/TableUtil.java
index 40e0e18a7eb..71678527970 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/utils/TableUtil.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/utils/TableUtil.java
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Copyright (c) 2014 CEA LIST.
+ * Copyright (c) 2014, 2019 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -10,6 +10,7 @@
  *
  * Contributors:
  *  Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - Initial API and implementation
+ *  Nicolas FAUVERGUE (CEA LIST) nicolas.fauvergue@cea.fr - Bug 550568
  *****************************************************************************/
 package org.eclipse.papyrus.infra.nattable.common.utils;
 
@@ -22,9 +23,17 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.papyrus.infra.architecture.ArchitectureDomainManager;
+import org.eclipse.papyrus.infra.architecture.representation.PapyrusRepresentationKind;
+import org.eclipse.papyrus.infra.core.architecture.RepresentationKind;
+import org.eclipse.papyrus.infra.core.architecture.merged.MergedArchitectureViewpoint;
 import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.nattable.common.Activator;
 import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;
 import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.representation.PapyrusTable;
+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
+import org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype;
 
 
 public class TableUtil {
@@ -48,7 +57,7 @@ public class TableUtil {
 			// Deny
 			result = Collections.emptyList();
 		} else {
-			result = new ArrayList<Table>(3); // Don't anticipate many
+			result = new ArrayList<>(3); // Don't anticipate many
 			for (EStructuralFeature.Setting setting : EMFHelper.getUsages(element)) {
 				if (setting.getEStructuralFeature() == NattablePackage.Literals.TABLE__OWNER) {
 					if (EMFHelper.getResourceSet(setting.getEObject()) == resourceSet) {
@@ -71,7 +80,7 @@ public class TableUtil {
 	 */
 	public static List<Table> getAssociatedTablesFromNotationResource(EObject element, Resource notationResource) {
 		if (notationResource != null) {
-			LinkedList<Table> tables = new LinkedList<Table>();
+			LinkedList<Table> tables = new LinkedList<>();
 			for (EObject eObj : notationResource.getContents()) {
 				if (eObj instanceof Table) {
 					Table table = (Table) eObj;
@@ -84,4 +93,122 @@ public class TableUtil {
 		}
 		return Collections.emptyList();
 	}
+
+	/**
+	 * Gets the prototype of a table
+	 * Check if the selected viewpoint contains
+	 * 1. the table model kind
+	 * 2. an ancestor of the table model kind
+	 * 3. a descendant of the table model kind
+	 *
+	 * @param table
+	 *            A table
+	 * @return The table's prototype
+	 * @since 5.3
+	 */
+	public static ViewPrototype getPrototype(final Table table) {
+		PolicyChecker checker = PolicyChecker.getFor(table);
+		return getPrototype(table, checker);
+	}
+
+	/**
+	 * Gets the prototype of a table
+	 * Check if the selected viewpoint contains
+	 * 1. the table model kind
+	 * 2. an ancestor of the table model kind
+	 * 3. a descendant of the table model kind
+	 *
+	 * @param table
+	 *            A table.
+	 * @param checkViewpoint
+	 *            Boolean to determinate if we have to check viewpoint consistency before returning the view prototype.
+	 * @return The table's prototype
+	 * @since 5.3
+	 */
+	public static ViewPrototype getPrototype(final Table table, final boolean checkViewpoint) {
+		PolicyChecker checker = PolicyChecker.getFor(table);
+		return getPrototype(table, checker, checkViewpoint);
+	}
+
+	/**
+	 * Gets the prototype of a {@code table} according to a given policy {@code checker}.
+	 *
+	 * @param table
+	 *            a table
+	 * @param checker
+	 *            a policy checker
+	 * @return the policy {@code checker}'s prototype for the {@code table}
+	 * @since 5.3
+	 */
+	public static ViewPrototype getPrototype(final Table table, final PolicyChecker checker) {
+		// By default check the viewpoint consistency
+		return getPrototype(table, checker, true);
+	}
+
+	/**
+	 * Gets the prototype of a {@code table} according to a given policy {@code checker}.
+	 *
+	 * @param table
+	 *            A table.
+	 * @param checker
+	 *            A policy checker.
+	 * @param checkViewpoint
+	 *            Boolean to determinate if we have to check viewpoint consistency before returning the view prototype.
+	 * @return the policy {@code checker}'s prototype for the {@code table}
+	 *
+	 * @since 5.3
+	 */
+	public static ViewPrototype getPrototype(final Table table, final PolicyChecker checker, final boolean checkViewpoint) {
+		ArchitectureDomainManager manager = ArchitectureDomainManager.getInstance();
+		PapyrusTable repKind = null;
+		String tableKindId = table.getTableKindId();
+		if (manager.getRepresentationKindById(tableKindId) instanceof PapyrusTable) {
+			repKind = (PapyrusTable) manager.getRepresentationKindById(tableKindId);
+		} else {
+			Activator.log.info("Unexpected table kind: " + tableKindId + " Your notation file might be broken or created with a previous version of the architecture framework."); //$NON-NLS-1$ //$NON-NLS-2$
+		}
+
+		// Check if the selected viewpoint contains the diagram model kind
+		if (repKind != null) {
+
+			if (!checkViewpoint || checker.isInViewpoint(repKind)) {
+				return ViewPrototype.get(repKind);
+			}
+
+			// Check if the selected viewpoint contains an ancestor of the diagram model kind
+			PapyrusRepresentationKind tableParentView = repKind.getParent();
+			while (tableParentView != null && !checker.isInViewpoint(tableParentView)) {
+				tableParentView = tableParentView.getParent();
+			}
+			if (tableParentView != null) {
+				return ViewPrototype.get(tableParentView);
+			}
+
+			// Check if the selected viewpoint contains a descendant of the diagram model kind
+			String tableConfigName = repKind.getName();
+			if (tableConfigName != null) { // the model kind name is used as a "semantic" key to test equality
+				for (final MergedArchitectureViewpoint viewpoint : checker.getViewpoints()) {
+					for (final RepresentationKind representationKind : viewpoint.getRepresentationKinds()) {
+						if (representationKind instanceof PapyrusRepresentationKind) {
+							PapyrusRepresentationKind papyrusRepresentationKind = (PapyrusRepresentationKind) representationKind;
+
+							if (tableConfigName.equals(papyrusRepresentationKind.getName())) {
+								ViewPrototype.get(papyrusRepresentationKind);
+							}
+
+							PapyrusRepresentationKind parentPapyrusRepresentationKind = papyrusRepresentationKind.getParent();
+							while (parentPapyrusRepresentationKind != null && !tableConfigName.equals(parentPapyrusRepresentationKind.getName())) {
+								parentPapyrusRepresentationKind = parentPapyrusRepresentationKind.getParent();
+							}
+							if (parentPapyrusRepresentationKind != null) {
+								return ViewPrototype.get(papyrusRepresentationKind);
+							}
+						}
+					}
+				}
+			}
+
+		}
+		return ViewPrototype.get(checker, table.getTableKindId(), table.getOwner(), table.getContext());
+	}
 }
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/META-INF/MANIFEST.MF
index 6afd45195f8..69690c3489c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/META-INF/MANIFEST.MF
@@ -20,9 +20,11 @@ Require-Bundle: org.eclipse.papyrus.infra.nattable.model;bundle-version="[4.0.0,
  org.eclipse.papyrus.views.modelexplorer;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.infra.internationalization.utils;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.papyrus.infra.nattable.model.edit;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.papyrus.infra.architecture.representation;bundle-version="[2.0.0,3.0.0)"
+ org.eclipse.papyrus.infra.architecture.representation;bundle-version="[2.1.0,3.0.0)",
+ org.eclipse.papyrus.infra.architecture;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.nattable.common;bundle-version="[5.2.0,6.0.0)"
 Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 4.0.100.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.infra.nattable.modelexplorer.Activator
 Bundle-ManifestVersion: 2
 Bundle-Description: %pluginDescription
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/pom.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/pom.xml
index c3be3deded0..012837d1a6a 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/pom.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/pom.xml
@@ -8,7 +8,7 @@
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.nattable.modelexplorer</artifactId>
-	<version>4.0.100-SNAPSHOT</version>
+	<version>4.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 	<description>This plugin provides : - the facets and the customization to display the Papyrus Nattables in the ModelExplorer</description>
 </project>
 \ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/queries/GetTableIcon.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/queries/GetTableIcon.java
index 179c39aca40..c15b04a6cb9 100755
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/queries/GetTableIcon.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/queries/GetTableIcon.java
@@ -19,8 +19,10 @@ import org.eclipse.papyrus.emf.facet.efacet.core.IFacetManager;
 import org.eclipse.papyrus.emf.facet.efacet.core.exception.DerivedTypedElementException;
 import org.eclipse.papyrus.emf.facet.query.java.core.IJavaQuery2;
 import org.eclipse.papyrus.emf.facet.query.java.core.IParameterValueList2;
+import org.eclipse.papyrus.infra.nattable.common.utils.TableUtil;
 import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
 import org.eclipse.papyrus.infra.ui.editorsfactory.AbstractGetEditorIconQuery;
+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
 import org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype;
 
 /** Return the path to the icon of the corresponding table */
@@ -28,7 +30,14 @@ public class GetTableIcon extends AbstractGetEditorIconQuery implements IJavaQue
 
 	@Override
 	public IImage evaluate(Table source, IParameterValueList2 parameterValues, IFacetManager facetManager) throws DerivedTypedElementException {
-		ViewPrototype prototype = ViewPrototype.get(source);
-		return (prototype != null) ? ImageUtils.wrap(prototype.getIconURI()) : null;
+		PolicyChecker checker = PolicyChecker.getFor(source);
+		ViewPrototype prototype = TableUtil.getPrototype(source, checker, false);
+
+		// If this is not an unavailable view prototype and is not in current viewpoints, display the grayed icon if possible
+		if (!ViewPrototype.UNAVAILABLE_VIEW.equals(prototype) && !checker.isInViewpoint(prototype.getRepresentationKind())) {
+			// If the grayed icon is not set, use the unavailable view prototype icon
+			return null == prototype.getGrayedIconURI() || prototype.getGrayedIconURI().isEmpty() ? ImageUtils.wrap(ViewPrototype.UNAVAILABLE_VIEW.getIconURI()) : ImageUtils.wrap(prototype.getGrayedIconURI());
+		}
+		return ImageUtils.wrap(prototype.getIconURI());
 	}
 }
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/META-INF/MANIFEST.MF
index 70d13ae98bd..7a94312ff4e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/META-INF/MANIFEST.MF
@@ -11,10 +11,11 @@ Require-Bundle: org.eclipse.papyrus.infra.properties.ui;bundle-version="[3.0.0,4
  org.eclipse.papyrus.infra.internationalization.utils;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.papyrus.infra.internationalization;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.papyrus.infra.nattable;bundle-version="[6.1.0,7.0.0)",
- org.eclipse.papyrus.infra.architecture.representation;bundle-version="[2.0.0,3.0.0)"
+ org.eclipse.papyrus.infra.architecture.representation;bundle-version="[2.1.0,3.0.0)",
+ org.eclipse.papyrus.infra.architecture;bundle-version="[2.0.0,3.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 2.3.0.qualifier
+Bundle-Version: 2.4.0.qualifier
 Bundle-Name: %Bundle-Name
 Bundle-Activator: org.eclipse.papyrus.infra.nattable.properties.Activator
 Bundle-ManifestVersion: 2
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/pom.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/pom.xml
index 20a6c9d95fa..ca52306a008 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/pom.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/pom.xml
@@ -7,6 +7,6 @@
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.nattable.properties</artifactId>
-	<version>2.3.0-SNAPSHOT</version>
+	<version>2.4.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
 \ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/modelelement/NatTableModelElement.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/modelelement/NatTableModelElement.java
index eb47f7a4d7f..a5ef650be54 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/modelelement/NatTableModelElement.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/modelelement/NatTableModelElement.java
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Copyright (c) 2013, 2017 CEA LIST and others.
+ * Copyright (c) 2013, 2017, 2019 CEA LIST and others.
  *
  *
  * All rights reserved. This program and the accompanying materials
@@ -14,6 +14,7 @@
  *  Christian W. Damus (CEA) - bug 323802
  *  Nicolas FAUVERGUE (CEA LIST) nicolas.fauvergue@cea.fr - Bug 476618, 192891, 496905, 508175
  *  Thanh Liem PHAN (ALL4TEC) thanhliem.phan@all4tec.net - Bug 520188
+ *  Nicolas FAUVERGUE (CEA LIST) nicolas.fauvergue@cea.fr - Bug 550568
  *****************************************************************************/
 package org.eclipse.papyrus.infra.nattable.properties.modelelement;
 
@@ -30,7 +31,7 @@ import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.papyrus.infra.architecture.representation.PapyrusRepresentationKind;
+import org.eclipse.papyrus.infra.nattable.common.helper.TableViewPrototype;
 import org.eclipse.papyrus.infra.nattable.contentprovider.ColumnAxisIdentifierContentProvider;
 import org.eclipse.papyrus.infra.nattable.contentprovider.ColumnContainmentFeatureContentProvider;
 import org.eclipse.papyrus.infra.nattable.contentprovider.ColumnElementTypeIdContentProvider;
@@ -79,12 +80,14 @@ import org.eclipse.papyrus.infra.nattable.properties.observable.RowPasteEObjectE
 import org.eclipse.papyrus.infra.nattable.properties.observable.RowPasteObjectDetachedModeObservableValue;
 import org.eclipse.papyrus.infra.nattable.properties.observable.RowPasteObjectPostActionsObservableValue;
 import org.eclipse.papyrus.infra.nattable.properties.observable.TableLabelObservableValue;
+import org.eclipse.papyrus.infra.nattable.properties.observable.TablePrototypeObservableValue;
 import org.eclipse.papyrus.infra.nattable.properties.provider.AxisIdentifierLabelProvider;
 import org.eclipse.papyrus.infra.nattable.properties.provider.ColumnPostActionIdsProvider;
 import org.eclipse.papyrus.infra.nattable.properties.provider.RowPostActionIdsProvider;
 import org.eclipse.papyrus.infra.nattable.properties.utils.Constants;
 import org.eclipse.papyrus.infra.nattable.utils.HeaderAxisConfigurationManagementUtils;
 import org.eclipse.papyrus.infra.properties.ui.modelelement.EMFModelElement;
+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
 import org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype;
 import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;
 import org.eclipse.swt.graphics.Image;
@@ -133,7 +136,7 @@ public class NatTableModelElement extends EMFModelElement {
 
 	/**
 	 * This allows to keep a reference to the table to manage (because the source must be modified when the edited object is not a table).
-	 * 
+	 *
 	 * @since 2.1
 	 */
 	protected Table table;
@@ -164,6 +167,7 @@ public class NatTableModelElement extends EMFModelElement {
 	 *            the editing domain
 	 * @deprecated since 4.0
 	 */
+	@Deprecated
 	public NatTableModelElement(final Table source, final EditingDomain domain) {
 		super(source, domain);
 		table = source;
@@ -453,6 +457,8 @@ public class NatTableModelElement extends EMFModelElement {
 
 		else if (Constants.TABLE_LABEL.equals(propertyPath)) {
 			value = new TableLabelObservableValue(table);
+		} else if (Constants.TABLE_PROTOTYPE.equals(propertyPath)) {
+			value = new TablePrototypeObservableValue(table);
 		}
 
 		if (value != null) {
@@ -622,7 +628,7 @@ public class NatTableModelElement extends EMFModelElement {
 	@Override
 	public ILabelProvider getLabelProvider(String propertyPath) {
 		ILabelProvider provider = null;
-		if (propertyPath.endsWith("prototype")) { //$NON-NLS-1$
+		if (propertyPath.endsWith(Constants.TABLE_PROTOTYPE)) {
 			provider = new ILabelProvider() {
 				@Override
 				public void addListener(ILabelProviderListener listener) {
@@ -643,20 +649,20 @@ public class NatTableModelElement extends EMFModelElement {
 
 				@Override
 				public Image getImage(Object element) {
-					if (!(element instanceof PapyrusRepresentationKind)) {
-						return null;
+					if (element instanceof TableViewPrototype) {
+						PolicyChecker checker = PolicyChecker.getFor(table);
+						TableViewPrototype prototype = (TableViewPrototype) element;
+						return null != prototype.getRepresentationKind() && null != checker && !checker.isInViewpoint(prototype.getRepresentationKind()) ? prototype.getGrayedIcon() : prototype.getIcon();
 					}
-					ViewPrototype proto = ViewPrototype.get((PapyrusRepresentationKind) element);
-					return proto.getIcon();
+					return ViewPrototype.UNAVAILABLE_VIEW.getIcon();
 				}
 
 				@Override
 				public String getText(Object element) {
-					if (!(element instanceof PapyrusRepresentationKind)) {
+					if (!(element instanceof TableViewPrototype)) {
 						return null;
 					}
-					ViewPrototype proto = ViewPrototype.get((PapyrusRepresentationKind) element);
-					return proto.getQualifiedName();
+					return ((TableViewPrototype) element).getQualifiedName();
 				}
 			};
 		}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/TablePrototypeObservableValue.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/TablePrototypeObservableValue.java
new file mode 100644
index 00000000000..d466f4b5e3e
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/TablePrototypeObservableValue.java
@@ -0,0 +1,106 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *   Nicolas FAUVERGUE (CEA LIST) nicolas.fauvergue@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.properties.observable;
+
+import org.eclipse.core.databinding.observable.Realm;
+import org.eclipse.core.databinding.observable.value.AbstractObservableValue;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype;
+
+/**
+ * The observable value for the prototype of the {@link Table}.
+ */
+@SuppressWarnings("rawtypes")
+public class TablePrototypeObservableValue extends AbstractObservableValue {
+
+	/**
+	 * The object instance.
+	 */
+	protected Table table;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param table
+	 *            The table.
+	 */
+	public TablePrototypeObservableValue(final Table table) {
+		this(Realm.getDefault(), table);
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 * @param realm
+	 *            The current Realm.
+	 * @param table
+	 *            The table.
+	 */
+	public TablePrototypeObservableValue(final Realm realm, final Table table) {
+		super(realm);
+		this.table = table;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * @see org.eclipse.core.databinding.observable.AbstractObservable#dispose()
+	 */
+	@Override
+	public synchronized void dispose() {
+		table = null;
+		super.dispose();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * @see org.eclipse.core.databinding.observable.IObserving#getObserved()
+	 */
+	public Object getObserved() {
+		return table;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * @see org.eclipse.core.databinding.observable.value.AbstractObservableValue#doGetValue()
+	 */
+	@Override
+	protected Object doGetValue() {
+		return ViewPrototype.get(table);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * @see org.eclipse.core.databinding.observable.value.AbstractObservableValue#doSetValue(java.lang.Object)
+	 */
+	@Override
+	protected void doSetValue(final Object value) {
+		// Do nothing, impossible to modify it
+	}
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()
+	 */
+	@Override
+	public Object getValueType() {
+		return ViewPrototype.class;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/utils/Constants.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/utils/Constants.java
index 5f24d4d6fb2..a808eb06730 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/utils/Constants.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/utils/Constants.java
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
+ * Copyright (c) 2013, 2019 CEA LIST.
  *
  *
  * All rights reserved. This program and the accompanying materials
@@ -12,6 +12,7 @@
  * Contributors:
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
  *  Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Bug 496905
+ *  Nicolas FAUVERGUE (CEA LIST) nicolas.fauvergue@cea.fr - Bug 550568
  *
  *****************************************************************************/
 package org.eclipse.papyrus.infra.nattable.properties.utils;
@@ -30,15 +31,17 @@ public class Constants {
 
 	/**
 	 * The table owner constant.
-	 * 
+	 *
 	 * @since 2.1
 	 */
 	public static final String TABLE_OWNER = "owner"; //$NON-NLS-1$
 
 	public static final String TABLE_CONTEXT = "context"; //$NON-NLS-1$
-	
+
 	public static final String TABLE_LABEL = "label"; //$NON-NLS-1$
 
+	public static final String TABLE_PROTOTYPE = "prototype"; //$NON-NLS-1$
+
 	public static final String LOCAL_COLUMN_HEADER_AXIS_CONFIGURATION_DISPLAY_LABEL = "localColumnHeaderAxisConfiguration.displayLabel"; //$NON-NLS-1$
 
 	public static final String LOCAL_COLUMN_HEADER_AXIS_CONFIGURATION_DISPLAY_FILTER = "localColumnHeaderAxisConfiguration.displayFilter"; //$NON-NLS-1$
@@ -106,7 +109,7 @@ public class Constants {
 	public static final String ROW_PASTED_OBJECT_POST_ACTIONS_FEATURE = "localRowHeaderAxisConfiguration.postActions";//$NON-NLS-1$
 
 	public static final String COLUMN_PASTED_EOBJECT_ID = "localColumnHeaderAxisConfiguration.pastedEObjectId";//$NON-NLS-1$
-	
+
 	public static final String ROW_PASTED_EOBJECT_AXIS_IDENTIFIER_FEATURE = "localRowHeaderAxisConfiguration.axisIdentifier";//$NON-NLS-1$
 
 	public static final String COLUMN_PASTED_EOBJECT_CONTAINMENT_FEATURE = "localColumnHeaderAxisConfiguration.pastedEObjectContainmentFeature";//$NON-NLS-1$
@@ -114,7 +117,7 @@ public class Constants {
 	public static final String COLUMN_PASTED_OBJECT_DETACHED_MODE_FEATURE = "localColumnHeaderAxisConfiguration.detachedMode";//$NON-NLS-1$
 
 	public static final String COLUMN_PASTED_OBJECT_POST_ACTIONS_FEATURE = "localColumnHeaderAxisConfiguration.postActions";//$NON-NLS-1$
-	
+
 	public static final String COLUMN_PASTED_EOBJECT_AXIS_IDENTIFIER_FEATURE = "localColumnHeaderAxisConfiguration.axisIdentifier";//$NON-NLS-1$
 
 }
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/META-INF/MANIFEST.MF
index c4122e43971..bc5842ffe8e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.representation.edit;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.papyrus.infra.nattable.representation.provider.RepresentationEditPlugin$Implementation
 Bundle-Vendor: %providerName
@@ -10,10 +10,10 @@ Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.papyrus.infra.nattable.representation.provider
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.nattable.representation;bundle-version="[1.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.nattable.representation;bundle-version="[2.1.0,3.0.0)",
  org.eclipse.emf.edit;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.core.architecture;bundle-version="[1.0.0,3.0.0)",
- org.eclipse.papyrus.infra.core.architecture.edit;bundle-version="[1.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.core.architecture;bundle-version="[2.1.0,3.0.0)",
+ org.eclipse.papyrus.infra.core.architecture.edit;bundle-version="[2.1.0,3.0.0)",
  org.eclipse.papyrus.infra.constraints;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.papyrus.infra.constraints.edit;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.0.0,3.0.0)",
@@ -22,8 +22,9 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.infra.types.edit;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.papyrus.infra.nattable.model;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.papyrus.infra.nattable.model.edit;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.papyrus.infra.architecture.representation;bundle-version="[1.0.0,3.0.0)",
- org.eclipse.papyrus.infra.architecture.representation.edit;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.papyrus.infra.architecture.representation;bundle-version="[2.1.0,3.0.0)",
+ org.eclipse.papyrus.infra.architecture.representation.edit;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.emf.expressions,
  org.eclipse.papyrus.infra.emf.expressions.edit;bundle-version="[1.0.0,2.0.0)"
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.papyrus.infra.nattable.representation.edit
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/pom.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/pom.xml
index 71cab7826bf..bac590df444 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/pom.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/pom.xml
@@ -7,6 +7,6 @@
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.nattable.representation.edit</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
+	<version>2.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
 \ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/src-gen/org/eclipse/papyrus/infra/nattable/representation/provider/RepresentationItemProviderAdapterFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/src-gen/org/eclipse/papyrus/infra/nattable/representation/provider/RepresentationItemProviderAdapterFactory.java
index 7ee41032609..ac13a5fa523 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/src-gen/org/eclipse/papyrus/infra/nattable/representation/provider/RepresentationItemProviderAdapterFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/src-gen/org/eclipse/papyrus/infra/nattable/representation/provider/RepresentationItemProviderAdapterFactory.java
@@ -130,6 +130,7 @@ public class RepresentationItemProviderAdapterFactory extends RepresentationAdap
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public ComposeableAdapterFactory getRootAdapterFactory() {
 		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
 	}
@@ -140,6 +141,7 @@ public class RepresentationItemProviderAdapterFactory extends RepresentationAdap
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
 		this.parentAdapterFactory = parentAdapterFactory;
 	}
@@ -188,6 +190,7 @@ public class RepresentationItemProviderAdapterFactory extends RepresentationAdap
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void addListener(INotifyChangedListener notifyChangedListener) {
 		changeNotifier.addListener(notifyChangedListener);
 	}
@@ -198,6 +201,7 @@ public class RepresentationItemProviderAdapterFactory extends RepresentationAdap
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void removeListener(INotifyChangedListener notifyChangedListener) {
 		changeNotifier.removeListener(notifyChangedListener);
 	}
@@ -208,6 +212,7 @@ public class RepresentationItemProviderAdapterFactory extends RepresentationAdap
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void fireNotifyChanged(Notification notification) {
 		changeNotifier.fireNotifyChanged(notification);
 
@@ -222,6 +227,7 @@ public class RepresentationItemProviderAdapterFactory extends RepresentationAdap
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void dispose() {
 		if (papyrusTableItemProvider != null) papyrusTableItemProvider.dispose();
 	}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/META-INF/MANIFEST.MF
index 722e0482326..fd0d380f94a 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.representation;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -12,11 +12,11 @@ Export-Package: org.eclipse.papyrus.infra.nattable.representation,
  org.eclipse.papyrus.infra.nattable.representation.util
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.core.architecture;bundle-version="[1.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.core.architecture;bundle-version="[2.1.0,3.0.0)",
  org.eclipse.papyrus.infra.constraints;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.papyrus.infra.types;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.papyrus.infra.nattable.model;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.papyrus.infra.architecture.representation;bundle-version="[1.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.architecture.representation;bundle-version="[2.1.0,3.0.0)",
  org.eclipse.papyrus.infra.emf.expressions;bundle-version="[1.0.0,2.0.0)"
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.papyrus.infra.nattable.representation
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/pom.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/pom.xml
index f947bf42a56..ca2018ac799 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/pom.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/pom.xml
@@ -7,6 +7,6 @@
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.nattable.representation</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
+	<version>2.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
 \ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/src-gen/org/eclipse/papyrus/infra/nattable/representation/PapyrusTable.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/src-gen/org/eclipse/papyrus/infra/nattable/representation/PapyrusTable.java
index 8eb18a3700e..78f9cb35947 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/src-gen/org/eclipse/papyrus/infra/nattable/representation/PapyrusTable.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/src-gen/org/eclipse/papyrus/infra/nattable/representation/PapyrusTable.java
@@ -54,7 +54,6 @@ public interface PapyrusTable extends PapyrusRepresentationKind {
 	 * @see #setConfiguration(TableConfiguration)
 	 * @see org.eclipse.papyrus.infra.nattable.representation.RepresentationPackage#getPapyrusTable_Configuration()
 	 * @model required="true"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel propertyDescription='The configuration of the table' propertyCategory='Table'"
 	 * @generated
 	 */
 	TableConfiguration getConfiguration();
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/src-gen/org/eclipse/papyrus/infra/nattable/representation/RepresentationPackage.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/src-gen/org/eclipse/papyrus/infra/nattable/representation/RepresentationPackage.java
index a96ef4338e0..72f584f5aac 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/src-gen/org/eclipse/papyrus/infra/nattable/representation/RepresentationPackage.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/src-gen/org/eclipse/papyrus/infra/nattable/representation/RepresentationPackage.java
@@ -84,7 +84,6 @@ public interface RepresentationPackage extends EPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
-	 * @since 2.0
 	 */
 	int PAPYRUS_TABLE__ID = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.PAPYRUS_REPRESENTATION_KIND__ID;
 
@@ -143,6 +142,15 @@ public interface RepresentationPackage extends EPackage {
 	int PAPYRUS_TABLE__CONCERNS = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.PAPYRUS_REPRESENTATION_KIND__CONCERNS;
 
 	/**
+	 * The feature id for the '<em><b>Grayed Icon</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_TABLE__GRAYED_ICON = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.PAPYRUS_REPRESENTATION_KIND__GRAYED_ICON;
+
+	/**
 	 * The feature id for the '<em><b>Parent</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/src-gen/org/eclipse/papyrus/infra/nattable/representation/impl/PapyrusTableImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/src-gen/org/eclipse/papyrus/infra/nattable/representation/impl/PapyrusTableImpl.java
index 9256f4f2d8a..1a03d2581cf 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/src-gen/org/eclipse/papyrus/infra/nattable/representation/impl/PapyrusTableImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/src-gen/org/eclipse/papyrus/infra/nattable/representation/impl/PapyrusTableImpl.java
@@ -76,6 +76,7 @@ public class PapyrusTableImpl extends PapyrusRepresentationKindImpl implements P
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public TableConfiguration getConfiguration() {
 		if (configuration != null && configuration.eIsProxy()) {
 			InternalEObject oldConfiguration = (InternalEObject)configuration;
@@ -102,6 +103,7 @@ public class PapyrusTableImpl extends PapyrusRepresentationKindImpl implements P
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setConfiguration(TableConfiguration newConfiguration) {
 		TableConfiguration oldConfiguration = configuration;
 		configuration = newConfiguration;
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/src-gen/org/eclipse/papyrus/infra/nattable/representation/impl/RepresentationFactoryImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/src-gen/org/eclipse/papyrus/infra/nattable/representation/impl/RepresentationFactoryImpl.java
index 13f892a2ff9..c86348dfa5b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/src-gen/org/eclipse/papyrus/infra/nattable/representation/impl/RepresentationFactoryImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/src-gen/org/eclipse/papyrus/infra/nattable/representation/impl/RepresentationFactoryImpl.java
@@ -80,6 +80,7 @@ public class RepresentationFactoryImpl extends EFactoryImpl implements Represent
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public PapyrusTable createPapyrusTable() {
 		PapyrusTableImpl papyrusTable = new PapyrusTableImpl();
 		return papyrusTable;
@@ -90,6 +91,7 @@ public class RepresentationFactoryImpl extends EFactoryImpl implements Represent
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public RepresentationPackage getRepresentationPackage() {
 		return (RepresentationPackage)getEPackage();
 	}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/src-gen/org/eclipse/papyrus/infra/nattable/representation/impl/RepresentationPackageImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/src-gen/org/eclipse/papyrus/infra/nattable/representation/impl/RepresentationPackageImpl.java
index 0537f0cdb63..9cd89a9dd13 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/src-gen/org/eclipse/papyrus/infra/nattable/representation/impl/RepresentationPackageImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/src-gen/org/eclipse/papyrus/infra/nattable/representation/impl/RepresentationPackageImpl.java
@@ -123,6 +123,7 @@ public class RepresentationPackageImpl extends EPackageImpl implements Represent
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getPapyrusTable() {
 		return papyrusTableEClass;
 	}
@@ -132,6 +133,7 @@ public class RepresentationPackageImpl extends EPackageImpl implements Represent
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getPapyrusTable_Configuration() {
 		return (EReference)papyrusTableEClass.getEStructuralFeatures().get(0);
 	}
@@ -141,6 +143,7 @@ public class RepresentationPackageImpl extends EPackageImpl implements Represent
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public RepresentationFactory getRepresentationFactory() {
 		return (RepresentationFactory)getEFactoryInstance();
 	}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/icons/nattablepageeditor_grayed.png b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/icons/nattablepageeditor_grayed.png
new file mode 100644
index 00000000000..c8d272569cd
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/icons/nattablepageeditor_grayed.png
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/META-INF/MANIFEST.MF b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/META-INF/MANIFEST.MF
index 85e4bb88406..53fb40a553e 100755
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/META-INF/MANIFEST.MF
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/META-INF/MANIFEST.MF
@@ -23,14 +23,14 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)";visibility:=reex
  org.eclipse.papyrus.infra.ui.emf;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.papyrus.infra.internationalization.utils;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.papyrus.infra.architecture;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.architecture.representation;bundle-version="[1.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.architecture.representation;bundle-version="[2.1.0,3.0.0)",
  org.eclipse.papyrus.infra.gmfdiag.representation;bundle-version="[1.0.0,3.0.0)",
  org.eclipse.papyrus.infra.nattable.representation;bundle-version="[1.0.0,3.0.0)",
  org.eclipse.papyrus.infra.core.architecture.edit;bundle-version="[1.0.0,3.0.0)"
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .
-Bundle-Version: 3.0.0.qualifier
+Bundle-Version: 3.1.0.qualifier
 Bundle-Localization: plugin
 Bundle-Name: %pluginName
 Bundle-ManifestVersion: 2
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/pom.xml b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/pom.xml
index d3cb2cc77fa..51007a33d01 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/pom.xml
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/pom.xml
@@ -6,6 +6,6 @@
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.viewpoints.policy</artifactId>
-	<version>3.0.0-SNAPSHOT</version>
+	<version>3.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
 \ No newline at end of file
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/ViewPrototype.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/ViewPrototype.java
index 51a0f1e3811..5588656b539 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/ViewPrototype.java
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/ViewPrototype.java
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Copyright (c) 2013, 2017 CEA LIST, Christian W. Damus, and others.
+ * Copyright (c) 2013, 2017, 2019 CEA LIST, Christian W. Damus, and others.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -11,6 +11,7 @@
  * Contributors:
  *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
  *  Christian W. Damus - bugs 474467, 493375, 527580
+ *  Nicolas FAUVERGUE (CEA LIST) nicolas.fauvergue@cea.fr - Bug 550568
  *
  *****************************************************************************/
 package org.eclipse.papyrus.infra.viewpoints.policy;
@@ -53,11 +54,11 @@ public abstract class ViewPrototype {
 	/**
 	 * Singleton for unavailable views
 	 */
-	public static final ViewPrototype UNAVAILABLE_VIEW = new UnavailableViewPrototype("View", "View");
+	public static final ViewPrototype UNAVAILABLE_VIEW = new UnavailableViewPrototype("View", "View"); //$NON-NLS-1$ //$NON-NLS-2$
 	/**
 	 * ID of the extension point for Papyrus diagrams
 	 */
-	protected static final String EXTENSION_ID = "org.eclipse.papyrus.infra.viewpoints.policy.viewType";
+	protected static final String EXTENSION_ID = "org.eclipse.papyrus.infra.viewpoints.policy.viewType"; //$NON-NLS-1$
 
 	/**
 	 * The collection of helpers
@@ -75,7 +76,7 @@ public abstract class ViewPrototype {
 
 		// Only the view helper elements
 		for (Iterator<IConfigurationElement> iter = elements.iterator(); iter.hasNext();) {
-			if (!"helper".equals(iter.next().getName())) {
+			if (!"helper".equals(iter.next().getName())) { //$NON-NLS-1$
 				iter.remove();
 			}
 		}
@@ -86,7 +87,7 @@ public abstract class ViewPrototype {
 		Collection<IViewTypeHelper> result = new ArrayList<>();
 		for (IConfigurationElement element : elements) {
 			try {
-				IViewTypeHelper instance = (IViewTypeHelper) element.createExecutableExtension("class");
+				IViewTypeHelper instance = (IViewTypeHelper) element.createExecutableExtension("class"); //$NON-NLS-1$
 				if (instance != null) {
 					result.add(instance);
 				}
@@ -199,9 +200,9 @@ public abstract class ViewPrototype {
 
 	/**
 	 * Queries whether the prototype is unavailable, effectively a <em>Null Object</em>.
-	 * 
+	 *
 	 * @return whether the prototype is a non-view prototype
-	 * 
+	 *
 	 * @since 1.2
 	 */
 	public boolean isUnavailable() {
@@ -233,20 +234,20 @@ public abstract class ViewPrototype {
 	 */
 	public String getFullLabel() {
 		StringBuilder builder = new StringBuilder(getLabel());
-		builder.append(" for ");
+		builder.append(" for "); //$NON-NLS-1$
 		boolean first = true;
 		for (ModelRule rule : representationKind.getModelRules()) {
 			if (rule.getStereotypes() != null && rule.getStereotypes().size() > 0) {
 				for (EClass stereotype : rule.getStereotypes()) {
 					if (!first) {
-						builder.append(", ");
+						builder.append(", "); //$NON-NLS-1$
 						first = false;
 					}
 					builder.append(stereotype.getName());
 				}
 			} else if (rule.getElement() != null) {
 				if (!first) {
-					builder.append(", ");
+					builder.append(", "); //$NON-NLS-1$
 					first = false;
 				}
 				builder.append(rule.getElement().getName());
@@ -264,7 +265,7 @@ public abstract class ViewPrototype {
 	 */
 	public String getQualifiedName() {
 		ArchitectureDescriptionLanguage lang = (ArchitectureDescriptionLanguage) representationKind.eContainer();
-		return lang.getName() + " :: " + getLabel();
+		return lang.getName() + " :: " + getLabel(); //$NON-NLS-1$
 	}
 
 	/**
@@ -277,6 +278,16 @@ public abstract class ViewPrototype {
 	}
 
 	/**
+	 * Gets the URI of this prototype's grayed icon.
+	 *
+	 * @return The grayed icon's URI.
+	 * @since 3.1
+	 */
+	public String getGrayedIconURI() {
+		return representationKind.getGrayedIcon();
+	}
+
+	/**
 	 * Gets the image descriptor of this prototype's icon
 	 *
 	 * @return The icon's descriptor
@@ -286,7 +297,23 @@ public abstract class ViewPrototype {
 		try {
 			url = new URL(getIconURI());
 		} catch (MalformedURLException e) {
-			Activator.log.error("Cannot load icon at URI " + getIconURI(), e);
+			Activator.log.error("Cannot load icon at URI " + getIconURI(), e); //$NON-NLS-1$
+		}
+		return ImageDescriptor.createFromURL(url);
+	}
+
+	/**
+	 * Gets the image descriptor of this prototype's grayed icon.
+	 *
+	 * @return The grayed icon's descriptor.
+	 * @since 3.1
+	 */
+	public ImageDescriptor getGrayedIconDescriptor() {
+		URL url = null;
+		try {
+			url = new URL(getGrayedIconURI());
+		} catch (MalformedURLException e) {
+			Activator.log.error("Cannot load grayed icon at URI " + getIconURI(), e); //$NON-NLS-1$
 		}
 		return ImageDescriptor.createFromURL(url);
 	}
@@ -301,6 +328,16 @@ public abstract class ViewPrototype {
 	}
 
 	/**
+	 * Gets the image of this prototype's grayed icon.
+	 *
+	 * @return The grayed icon's image.
+	 * @since 3.1
+	 */
+	public Image getGrayedIcon() {
+		return org.eclipse.papyrus.infra.widgets.Activator.getDefault().getImage(getGrayedIconDescriptor());
+	}
+
+	/**
 	 * Determines whether the instances of this prototype can change owners
 	 *
 	 * @return <code>true</code> if the owner is reassignable
@@ -462,7 +499,7 @@ public abstract class ViewPrototype {
 	/**
 	 * Comparator to order view-type helper configurations from highest to
 	 * lowest priority.
-	 * 
+	 *
 	 * @return the descending priority comparator
 	 */
 	private static Comparator<IConfigurationElement> helperConfigComparator() {
@@ -480,7 +517,7 @@ public abstract class ViewPrototype {
 
 				if (result == null) {
 					result = 0;
-					String priorityString = element.getAttribute("priority");
+					String priorityString = element.getAttribute("priority"); //$NON-NLS-1$
 					if (priorityString != null) {
 						try {
 							result = Integer.parseInt(priorityString);
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/ViewPrototypeLabelProvider.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/ViewPrototypeLabelProvider.java
index 5d9b1533d4d..60edf48ea1b 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/ViewPrototypeLabelProvider.java
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/ViewPrototypeLabelProvider.java
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Copyright (c) 2012, 2016 CEA LIST, Christian W. Damus, and others.
+ * Copyright (c) 2012, 2016, 2019 CEA LIST, Christian W. Damus, and others.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -12,7 +12,8 @@
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *  Christian W. Damus - bug 474467
  *  Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Bug 496905
- *  
+ *  Nicolas FAUVERGUE (CEA LIST) nicolas.fauvergue@cea.fr - Bug 550568
+ *
  *****************************************************************************/
 package org.eclipse.papyrus.infra.viewpoints.policy;
 
@@ -26,20 +27,29 @@ import org.eclipse.swt.graphics.Image;
 
 /**
  * A Label Provider for viewpoint-based notations.
- * 
+ *
  * @since 1.2
  */
 public class ViewPrototypeLabelProvider extends DependentEMFLabelProvider {
 
 	@Override
 	protected Image getImage(EObject element) {
-		Image result;
+		Image result = null;
 
 		ViewPrototype proto = ViewPrototype.get(element);
 		if (proto != null) {
-			// This is shared by the Widgets plug-in activator, so don't
-			// dispose it
-			result = proto.getIcon();
+			if (!ViewPrototype.UNAVAILABLE_VIEW.equals(proto)) {
+				// This is shared by the Widgets plug-in activator, so don't dispose it
+				final PolicyChecker checker = PolicyChecker.getFor(element);
+				if (null != checker && !checker.isInViewpoint(proto.getRepresentationKind())) {
+					// If the grayed icon is not set, use the unavailable view prototype icon
+					result = null == proto.getGrayedIconURI() || proto.getGrayedIconURI().isEmpty() ? ViewPrototype.UNAVAILABLE_VIEW.getIcon() : proto.getGrayedIcon();
+				}
+			}
+
+			if (null == result) {
+				result = proto.getIcon();
+			}
 		} else {
 			result = super.getImage(element);
 		}
@@ -86,18 +96,18 @@ public class ViewPrototypeLabelProvider extends DependentEMFLabelProvider {
 	/**
 	 * Attempts to infer the name of an {@code object} by looking for a string-valued
 	 * attribute named "name".
-	 * 
+	 *
 	 * @param object
 	 *            an object
-	 * 
+	 *
 	 * @return a best-effort name for the {@code object}
-	 * 
+	 *
 	 * @see EMFCoreUtil#getName(EObject)
 	 */
 	protected String getName(EObject object) {
 		String value = null;
-		if(object instanceof Diagram){
-			value = LabelInternationalization.getInstance().getDiagramLabel((Diagram)object);
+		if (object instanceof Diagram) {
+			value = LabelInternationalization.getInstance().getDiagramLabel((Diagram) object);
 		}
 		return null != value ? value : EMFCoreUtil.getName(object);
 	}
diff --git a/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/model/uml.architecture b/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/model/uml.architecture
index c70b0f40d92..5a7ccd83d83 100644
--- a/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/model/uml.architecture
+++ b/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/model/uml.architecture
@@ -32,7 +32,7 @@
     <elementTypes xmi:type="elementtypesconfigurations:ElementTypeSetConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>
     <elementTypes xmi:type="elementtypesconfigurations:ElementTypeSetConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types.ui/model/uml-advice.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>
     <elementTypes xmi:type="elementtypesconfigurations:ElementTypeSetConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.diagram.sequence/model/SequenceDiagram.elementtypesconfigurations#_uuwoQENKEeimO7ZhVBpjkg"/>
-    <representationKinds xmi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_UzcgsHDtEeWh-MssWmCB_A" id="org.eclipse.papyrus.uml.diagram.activity" name="Activity Diagram" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.activity/icons/obj16/Diagram_Activity.gif" concerns="_HQhf5MSYEeaKZJ_pGfaSiA" implementationID="PapyrusUMLActivityDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.activity.CreateActivityDiagramCommand">
+    <representationKinds xmi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_UzcgsHDtEeWh-MssWmCB_A" id="org.eclipse.papyrus.uml.diagram.activity" name="Activity Diagram" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.activity/icons/obj16/Diagram_Activity.gif" concerns="_HQhf5MSYEeaKZJ_pGfaSiA" implementationID="PapyrusUMLActivityDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.activity.CreateActivityDiagramCommand" grayedIcon="platform:/plugin/org.eclipse.papyrus.uml.diagram.activity/icons/obj16/Diagram_Activity_grayed.gif">
       <modelRules xmi:type="representation:ModelRule" xmi:id="_UzcgsXDtEeWh-MssWmCB_A" permit="true" elementMultiplicity="1" multiplicity="-1">
         <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Activity"/>
       </modelRules>
@@ -60,7 +60,7 @@
       <childRules xmi:type="gmfdiagrepresentation:ChildRule" xmi:id="_UzcguXDtEeWh-MssWmCB_A" permit="true"/>
       <palettes xmi:type="paletteconfiguration:PaletteConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.diagram.activity/model/PapyrusUMLActivityDiagram.paletteconfiguration#/"/>
     </representationKinds>
-    <representationKinds xmi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_zzf4gHDtEeWh-MssWmCB_A" id="org.eclipse.papyrus.uml.diagram.class" name="Class Diagram" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.clazz/icons/obj16/Diagram_Class.gif" concerns="_HQhf48SYEeaKZJ_pGfaSiA" implementationID="PapyrusUMLClassDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.clazz.CreateClassDiagramCommand">
+    <representationKinds xmi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_zzf4gHDtEeWh-MssWmCB_A" id="org.eclipse.papyrus.uml.diagram.class" name="Class Diagram" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.clazz/icons/obj16/Diagram_Class.gif" concerns="_HQhf48SYEeaKZJ_pGfaSiA" implementationID="PapyrusUMLClassDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.clazz.CreateClassDiagramCommand" grayedIcon="platform:/plugin/org.eclipse.papyrus.uml.diagram.clazz/icons/obj16/Diagram_Class_grayed.gif">
       <modelRules xmi:type="representation:ModelRule" xmi:id="_zzf4gXDtEeWh-MssWmCB_A" permit="true" elementMultiplicity="1" multiplicity="-1">
         <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
       </modelRules>
@@ -70,7 +70,7 @@
       <childRules xmi:type="gmfdiagrepresentation:ChildRule" xmi:id="_zzf4g3DtEeWh-MssWmCB_A" permit="true"/>
       <palettes xmi:type="paletteconfiguration:PaletteConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.diagram.clazz/model/PapyrusUMLClassDiagram.paletteconfiguration#/"/>
     </representationKinds>
-    <representationKinds xmi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_zzf4YHDtEeWh-MssWmCB_A" id="org.eclipse.papyrus.uml.diagram.innerClass" name="Inner Class Diagram" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.clazz/icons/obj16/Diagram_Class.gif" concerns="_HQhf48SYEeaKZJ_pGfaSiA" implementationID="PapyrusUMLClassDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.clazz.CreateClassDiagramCommand">
+    <representationKinds xmi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_zzf4YHDtEeWh-MssWmCB_A" id="org.eclipse.papyrus.uml.diagram.innerClass" name="Inner Class Diagram" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.clazz/icons/obj16/Diagram_Class.gif" concerns="_HQhf48SYEeaKZJ_pGfaSiA" implementationID="PapyrusUMLClassDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.clazz.CreateClassDiagramCommand" grayedIcon="platform:/plugin/org.eclipse.papyrus.uml.diagram.clazz/icons/obj16/Diagram_Class_grayed.gif">
       <modelRules xmi:type="representation:ModelRule" xmi:id="_zzf4YXDtEeWh-MssWmCB_A" permit="true" elementMultiplicity="1" multiplicity="-1">
         <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
       </modelRules>
@@ -105,7 +105,7 @@
       <paletteRules xmi:type="gmfdiagrepresentation:PaletteRule" xmi:id="_zzf4cHDtEeWh-MssWmCB_A" permit="true" element=""/>
       <palettes xmi:type="paletteconfiguration:PaletteConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.diagram.clazz/model/PapyrusUMLClassDiagram.paletteconfiguration#/"/>
     </representationKinds>
-    <representationKinds xmi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_zzf4cXDtEeWh-MssWmCB_A" id="org.eclipse.papyrus.uml.diagram.package" name="Package Diagram" icon="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/icons/Diagram_Package.gif" concerns="_HQhf48SYEeaKZJ_pGfaSiA" implementationID="PapyrusUMLClassDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.clazz.CreateClassDiagramCommand">
+    <representationKinds xmi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_zzf4cXDtEeWh-MssWmCB_A" id="org.eclipse.papyrus.uml.diagram.package" name="Package Diagram" icon="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/icons/Diagram_Package.gif" concerns="_HQhf48SYEeaKZJ_pGfaSiA" implementationID="PapyrusUMLClassDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.clazz.CreateClassDiagramCommand" grayedIcon="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/icons/Diagram_Package_grayed.gif">
       <modelRules xmi:type="representation:ModelRule" xmi:id="_zzf4cnDtEeWh-MssWmCB_A" permit="true" elementMultiplicity="1" multiplicity="-1">
         <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
       </modelRules>
@@ -128,7 +128,7 @@
       <paletteRules xmi:type="gmfdiagrepresentation:PaletteRule" xmi:id="_zzf4f3DtEeWh-MssWmCB_A" permit="true" element=""/>
       <palettes xmi:type="paletteconfiguration:PaletteConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.diagram.clazz/model/PapyrusUMLClassDiagram.paletteconfiguration#/"/>
     </representationKinds>
-    <representationKinds xmi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_jRtroHDuEeWh-MssWmCB_A" id="org.eclipse.papyrus.uml.diagram.communication" name="Communication Diagram" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.communication/icons/obj16/Diagram_Communication.gif" concerns="_HQhf48SYEeaKZJ_pGfaSiA" implementationID="PapyrusUMLCommunicationDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.communication.CreateCommunicationDiagramCommand">
+    <representationKinds xmi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_jRtroHDuEeWh-MssWmCB_A" id="org.eclipse.papyrus.uml.diagram.communication" name="Communication Diagram" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.communication/icons/obj16/Diagram_Communication.gif" concerns="_HQhf48SYEeaKZJ_pGfaSiA" implementationID="PapyrusUMLCommunicationDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.communication.CreateCommunicationDiagramCommand" grayedIcon="platform:/plugin/org.eclipse.papyrus.uml.diagram.communication/icons/obj16/Diagram_Communication_grayed.gif">
       <modelRules xmi:type="representation:ModelRule" xmi:id="_jRtroXDuEeWh-MssWmCB_A" permit="true" elementMultiplicity="1" multiplicity="-1">
         <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Interaction"/>
       </modelRules>
@@ -156,7 +156,7 @@
       <childRules xmi:type="gmfdiagrepresentation:ChildRule" xmi:id="_jRtrqXDuEeWh-MssWmCB_A" permit="true"/>
       <palettes xmi:type="paletteconfiguration:PaletteConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.diagram.communication/model/PapyrusUMLCommunicationDiagram.paletteconfiguration#/"/>
     </representationKinds>
-    <representationKinds xmi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_fa4kAHDuEeWh-MssWmCB_A" id="org.eclipse.papyrus.uml.diagram.component.root.package" name="Component Diagram" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.component/icons/obj16/ComponentDiagram.gif" concerns="_HQhf48SYEeaKZJ_pGfaSiA" implementationID="PapyrusUMLComponentDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.component.CreateComponentDiagramCommand">
+    <representationKinds xmi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_fa4kAHDuEeWh-MssWmCB_A" id="org.eclipse.papyrus.uml.diagram.component.root.package" name="Component Diagram" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.component/icons/obj16/ComponentDiagram.gif" concerns="_HQhf48SYEeaKZJ_pGfaSiA" implementationID="PapyrusUMLComponentDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.component.CreateComponentDiagramCommand" grayedIcon="platform:/plugin/org.eclipse.papyrus.uml.diagram.component/icons/obj16/ComponentDiagram_grayed.gif">
       <modelRules xmi:type="representation:ModelRule" xmi:id="_fa4kAXDuEeWh-MssWmCB_A" permit="true" elementMultiplicity="1" multiplicity="-1">
         <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
       </modelRules>
@@ -166,7 +166,7 @@
       <childRules xmi:type="gmfdiagrepresentation:ChildRule" xmi:id="_fa4kA3DuEeWh-MssWmCB_A" permit="true"/>
       <palettes xmi:type="paletteconfiguration:PaletteConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.diagram.component/model/PapyrusUMLComponentDiagram.paletteconfiguration#/"/>
     </representationKinds>
-    <representationKinds xmi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_fa4kBHDuEeWh-MssWmCB_A" id="org.eclipse.papyrus.uml.diagram.component.root.component" name="Component Diagram" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.component/icons/obj16/ComponentDiagram.gif" concerns="_HQhf48SYEeaKZJ_pGfaSiA" implementationID="PapyrusUMLComponentDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.component.CreateComponentDiagramCommand">
+    <representationKinds xmi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_fa4kBHDuEeWh-MssWmCB_A" id="org.eclipse.papyrus.uml.diagram.component.root.component" name="Component Diagram" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.component/icons/obj16/ComponentDiagram.gif" concerns="_HQhf48SYEeaKZJ_pGfaSiA" implementationID="PapyrusUMLComponentDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.component.CreateComponentDiagramCommand" grayedIcon="platform:/plugin/org.eclipse.papyrus.uml.diagram.component/icons/obj16/ComponentDiagram_grayed.gif">
       <modelRules xmi:type="representation:ModelRule" xmi:id="_fa4kBXDuEeWh-MssWmCB_A" permit="true" elementMultiplicity="1" multiplicity="-1">
         <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Component"/>
       </modelRules>
@@ -207,7 +207,7 @@
       <paletteRules xmi:type="gmfdiagrepresentation:PaletteRule" xmi:id="_fa4kEHDuEeWh-MssWmCB_A" permit="false" element="component.tool.model"/>
       <paletteRules xmi:type="gmfdiagrepresentation:PaletteRule" xmi:id="_fa4kEXDuEeWh-MssWmCB_A" permit="false" element="component.tool.package"/>
     </representationKinds>
-    <representationKinds xmi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_bKiwMHDuEeWh-MssWmCB_A" id="org.eclipse.papyrus.uml.diagram.compositeStructure.root.package" name="Composite Structure Diagram" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.composite/icons/obj16/Diagram_CompositeStructure.gif" concerns="_HQhf48SYEeaKZJ_pGfaSiA" implementationID="CompositeStructure" creationCommandClass="org.eclipse.papyrus.uml.diagram.composite.CreateCompositeDiagramCommand">
+    <representationKinds xmi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_bKiwMHDuEeWh-MssWmCB_A" id="org.eclipse.papyrus.uml.diagram.compositeStructure.root.package" name="Composite Structure Diagram" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.composite/icons/obj16/Diagram_CompositeStructure.gif" concerns="_HQhf48SYEeaKZJ_pGfaSiA" implementationID="CompositeStructure" creationCommandClass="org.eclipse.papyrus.uml.diagram.composite.CreateCompositeDiagramCommand" grayedIcon="platform:/plugin/org.eclipse.papyrus.uml.diagram.composite/icons/obj16/Diagram_CompositeStructure_grayed.gif">
       <modelRules xmi:type="representation:ModelRule" xmi:id="_bKiwMXDuEeWh-MssWmCB_A" permit="true" elementMultiplicity="1" multiplicity="-1">
         <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
       </modelRules>
@@ -217,7 +217,7 @@
       <childRules xmi:type="gmfdiagrepresentation:ChildRule" xmi:id="_bKiwM3DuEeWh-MssWmCB_A" permit="true"/>
       <palettes xmi:type="paletteconfiguration:PaletteConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.diagram.composite/model/CompositeStructure.paletteconfiguration#/"/>
     </representationKinds>
-    <representationKinds xmi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_bKiwNHDuEeWh-MssWmCB_A" id="org.eclipse.papyrus.uml.diagram.compositeStructure.root.structuredClassifier" name="Composite Structure Diagram" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.composite/icons/obj16/Diagram_CompositeStructure.gif" concerns="_HQhf48SYEeaKZJ_pGfaSiA" implementationID="CompositeStructure" creationCommandClass="org.eclipse.papyrus.uml.diagram.composite.CreateCompositeDiagramCommand">
+    <representationKinds xmi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_bKiwNHDuEeWh-MssWmCB_A" id="org.eclipse.papyrus.uml.diagram.compositeStructure.root.structuredClassifier" name="Composite Structure Diagram" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.composite/icons/obj16/Diagram_CompositeStructure.gif" concerns="_HQhf48SYEeaKZJ_pGfaSiA" implementationID="CompositeStructure" creationCommandClass="org.eclipse.papyrus.uml.diagram.composite.CreateCompositeDiagramCommand" grayedIcon="platform:/plugin/org.eclipse.papyrus.uml.diagram.composite/icons/obj16/Diagram_CompositeStructure_grayed.gif">
       <modelRules xmi:type="representation:ModelRule" xmi:id="_bKiwNXDuEeWh-MssWmCB_A" permit="true" elementMultiplicity="1" multiplicity="-1">
         <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier"/>
       </modelRules>
@@ -229,7 +229,7 @@
       </owningRules>
       <childRules xmi:type="gmfdiagrepresentation:ChildRule" xmi:id="_bKiwOHDuEeWh-MssWmCB_A" permit="true"/>
     </representationKinds>
-    <representationKinds xmi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_ARGokHDuEeWh-MssWmCB_A" id="org.eclipse.papyrus.uml.diagram.deployment" name="Deployment Diagram" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.deployment/icons/obj16/DeploymentDiagram.gif" concerns="_HQhf48SYEeaKZJ_pGfaSiA" implementationID="PapyrusUMLDeploymentDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.deployment.CreateDeploymentDiagramCommand">
+    <representationKinds xmi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_ARGokHDuEeWh-MssWmCB_A" id="org.eclipse.papyrus.uml.diagram.deployment" name="Deployment Diagram" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.deployment/icons/obj16/DeploymentDiagram.gif" concerns="_HQhf48SYEeaKZJ_pGfaSiA" implementationID="PapyrusUMLDeploymentDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.deployment.CreateDeploymentDiagramCommand" grayedIcon="platform:/plugin/org.eclipse.papyrus.uml.diagram.deployment/icons/obj16/DeploymentDiagram_grayed.gif">
       <modelRules xmi:type="representation:ModelRule" xmi:id="_ARGokXDuEeWh-MssWmCB_A" permit="true" elementMultiplicity="1" multiplicity="-1">
         <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
       </modelRules>
@@ -239,7 +239,7 @@
       <childRules xmi:type="gmfdiagrepresentation:ChildRule" xmi:id="_ARGok3DuEeWh-MssWmCB_A" permit="true"/>
       <palettes xmi:type="paletteconfiguration:PaletteConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.diagram.deployment/model/PapyrusUMLDeploymentDiagram.paletteconfiguration#/"/>
     </representationKinds>
-    <representationKinds xmi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_FuMjYHDuEeWh-MssWmCB_A" id="org.eclipse.papyrus.uml.diagram.interactionOverview" name="Interaction Overview Diagram" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.interactionoverview/icons/obj16/interactionOverviewDiagram.gif" concerns="_HQhf5MSYEeaKZJ_pGfaSiA" implementationID="PapyrusUMLInteractionOverviewDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.interactionoverview.InteractionOverviewDiagramCreateCommand">
+    <representationKinds xmi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_FuMjYHDuEeWh-MssWmCB_A" id="org.eclipse.papyrus.uml.diagram.interactionOverview" name="Interaction Overview Diagram" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.interactionoverview/icons/obj16/interactionOverviewDiagram.gif" concerns="_HQhf5MSYEeaKZJ_pGfaSiA" implementationID="PapyrusUMLInteractionOverviewDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.interactionoverview.InteractionOverviewDiagramCreateCommand" grayedIcon="platform:/plugin/org.eclipse.papyrus.uml.diagram.interactionoverview/icons/obj16/interactionOverviewDiagram_grayed.gif">
       <modelRules xmi:type="representation:ModelRule" xmi:id="_FuMjYXDuEeWh-MssWmCB_A" permit="true" elementMultiplicity="1" multiplicity="-1">
         <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Activity"/>
       </modelRules>
@@ -267,7 +267,7 @@
       <childRules xmi:type="gmfdiagrepresentation:ChildRule" xmi:id="_FuMjaXDuEeWh-MssWmCB_A" permit="true"/>
       <palettes xmi:type="paletteconfiguration:PaletteConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.diagram.interactionoverview/palettes/PapyrusInteractionOverviewDiagram.paletteconfiguration#/"/>
     </representationKinds>
-    <representationKinds xmi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_UekVgHDwEeWh-MssWmCB_A" id="org.eclipse.papyrus.uml.diagram.profile" name="Profile Diagram" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.profile/icons/obj16/Diagram_Profile.gif" concerns="_NxfRgMSjEeaCPPhpB0_9OQ" implementationID="PapyrusUMLProfileDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.profile.CreateProfileDiagramCommand">
+    <representationKinds xmi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_UekVgHDwEeWh-MssWmCB_A" id="org.eclipse.papyrus.uml.diagram.profile" name="Profile Diagram" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.profile/icons/obj16/Diagram_Profile.gif" concerns="_NxfRgMSjEeaCPPhpB0_9OQ" implementationID="PapyrusUMLProfileDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.profile.CreateProfileDiagramCommand" grayedIcon="platform:/plugin/org.eclipse.papyrus.uml.diagram.profile/icons/obj16/Diagram_Profile_grayed.gif">
       <modelRules xmi:type="representation:ModelRule" xmi:id="_UekVgXDwEeWh-MssWmCB_A" permit="true" elementMultiplicity="1" multiplicity="-1">
         <constraints xmi:type="constraints:SimpleConstraint" xmi:id="_UekVgnDwEeWh-MssWmCB_A" name="IsContainedByProfile" overrideable="true">
           <constraintType xmi:type="environment:ConstraintType" href="platform:/plugin/org.eclipse.papyrus.infra.constraints/Model/ConstraintEnvironment.xmi#//@constraintTypes.4"/>
@@ -284,7 +284,7 @@
       <childRules xmi:type="gmfdiagrepresentation:ChildRule" xmi:id="_UekVhnDwEeWh-MssWmCB_A" permit="true"/>
       <palettes xmi:type="paletteconfiguration:PaletteConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.diagram.profile/model/PapyrusUMLProfileDiagram.paletteconfiguration#/"/>
     </representationKinds>
-    <representationKinds xmi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_TR15IHDvEeWh-MssWmCB_A" id="org.eclipse.papyrus.uml.diagram.sequence" name="Sequence Diagram" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.sequence/icons/obj16/Diagram_Sequence.gif" concerns="_HQhf5MSYEeaKZJ_pGfaSiA" implementationID="PapyrusUMLSequenceDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.sequence.CreateSequenceDiagramCommand">
+    <representationKinds xmi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_TR15IHDvEeWh-MssWmCB_A" id="org.eclipse.papyrus.uml.diagram.sequence" name="Sequence Diagram" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.sequence/icons/obj16/Diagram_Sequence.gif" concerns="_HQhf5MSYEeaKZJ_pGfaSiA" implementationID="PapyrusUMLSequenceDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.sequence.CreateSequenceDiagramCommand" grayedIcon="platform:/plugin/org.eclipse.papyrus.uml.diagram.sequence/icons/obj16/Diagram_Sequence_grayed.gif">
       <modelRules xmi:type="representation:ModelRule" xmi:id="_TR15IXDvEeWh-MssWmCB_A" permit="true" elementMultiplicity="1" multiplicity="-1">
         <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Interaction"/>
       </modelRules>
@@ -318,7 +318,7 @@
       <childRules xmi:type="gmfdiagrepresentation:ChildRule" xmi:id="_TR15K3DvEeWh-MssWmCB_A" permit="true"/>
       <palettes xmi:type="paletteconfiguration:PaletteConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.diagram.sequence/model/PapyrusUMLSequenceDiagram.paletteconfiguration#/"/>
     </representationKinds>
-    <representationKinds xmi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_PwD0cHDvEeWh-MssWmCB_A" id="org.eclipse.papyrus.uml.diagram.stateMachine" name="State Machine Diagram" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.statemachine/icons/obj16/Diagram_StateMachine.gif" concerns="_HQhf5MSYEeaKZJ_pGfaSiA" implementationID="PapyrusUMLStateMachineDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.statemachine.CreateStateMachineDiagramCommand">
+    <representationKinds xmi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_PwD0cHDvEeWh-MssWmCB_A" id="org.eclipse.papyrus.uml.diagram.stateMachine" name="State Machine Diagram" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.statemachine/icons/obj16/Diagram_StateMachine.gif" concerns="_HQhf5MSYEeaKZJ_pGfaSiA" implementationID="PapyrusUMLStateMachineDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.statemachine.CreateStateMachineDiagramCommand" grayedIcon="platform:/plugin/org.eclipse.papyrus.uml.diagram.statemachine/icons/obj16/Diagram_StateMachine_grayed.gif">
       <modelRules xmi:type="representation:ModelRule" xmi:id="_PwD0cXDvEeWh-MssWmCB_A" permit="true" elementMultiplicity="1" multiplicity="-1">
         <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//StateMachine"/>
       </modelRules>
@@ -358,7 +358,7 @@
       <childRules xmi:type="gmfdiagrepresentation:ChildRule" xmi:id="_PwD0e3DvEeWh-MssWmCB_A" permit="true"/>
       <palettes xmi:type="paletteconfiguration:PaletteConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.diagram.statemachine/model/PapyrusUMLStateMachineDiagram.paletteconfiguration#/"/>
     </representationKinds>
-    <representationKinds xmi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_LzyMIHDvEeWh-MssWmCB_A" id="org.eclipse.papyrus.uml.diagram.timing" name="Timing Diagram" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.timing/icons/obj16/Diagram_Timing.gif" concerns="_HQhf5MSYEeaKZJ_pGfaSiA" implementationID="PapyrusUMLTimingDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.timing.custom.CreateTimingDiagramCommand">
+    <representationKinds xmi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_LzyMIHDvEeWh-MssWmCB_A" id="org.eclipse.papyrus.uml.diagram.timing" name="Timing Diagram" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.timing/icons/obj16/Diagram_Timing.gif" concerns="_HQhf5MSYEeaKZJ_pGfaSiA" implementationID="PapyrusUMLTimingDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.timing.custom.CreateTimingDiagramCommand" grayedIcon="platform:/plugin/org.eclipse.papyrus.uml.diagram.timing/icons/obj16/Diagram_Timing_grayed.gif">
       <modelRules xmi:type="representation:ModelRule" xmi:id="_LzyMIXDvEeWh-MssWmCB_A" permit="true" elementMultiplicity="1" multiplicity="-1">
         <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
       </modelRules>
@@ -367,7 +367,7 @@
       </owningRules>
       <childRules xmi:type="gmfdiagrepresentation:ChildRule" xmi:id="_LzyMI3DvEeWh-MssWmCB_A" permit="true"/>
     </representationKinds>
-    <representationKinds xmi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_yeY0sHDvEeWh-MssWmCB_A" id="org.eclipse.papyrus.uml.diagram.useCase" name="Use Case Diagram" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.usecase/icons/obj16/Diagram_UseCase.gif" concerns="_HQhf4sSYEeaKZJ_pGfaSiA" implementationID="UseCase" customStyle="platform:/plugin/org.eclipse.papyrus.uml.diagram.usecase/models/usecase.css" creationCommandClass="org.eclipse.papyrus.uml.diagram.usecase.CreateUseCaseDiagramCommand">
+    <representationKinds xmi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_yeY0sHDvEeWh-MssWmCB_A" id="org.eclipse.papyrus.uml.diagram.useCase" name="Use Case Diagram" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.usecase/icons/obj16/Diagram_UseCase.gif" concerns="_HQhf4sSYEeaKZJ_pGfaSiA" implementationID="UseCase" customStyle="platform:/plugin/org.eclipse.papyrus.uml.diagram.usecase/models/usecase.css" creationCommandClass="org.eclipse.papyrus.uml.diagram.usecase.CreateUseCaseDiagramCommand" grayedIcon="platform:/plugin/org.eclipse.papyrus.uml.diagram.usecase/icons/obj16/Diagram_UseCase_grayed.gif">
       <modelRules xmi:type="representation:ModelRule" xmi:id="_yeY0sXDvEeWh-MssWmCB_A" permit="true" elementMultiplicity="1" multiplicity="-1">
         <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
       </modelRules>
@@ -383,7 +383,7 @@
       <childRules xmi:type="gmfdiagrepresentation:ChildRule" xmi:id="_yeY0tXDvEeWh-MssWmCB_A" permit="true"/>
       <palettes xmi:type="paletteconfiguration:PaletteConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.diagram.usecase/models/UseCase.paletteconfiguration#/"/>
     </representationKinds>
-    <representationKinds xmi:type="nattablerepresentation:PapyrusTable" xmi:id="_P3J1cEa7EeSVGbM3cmVSqQ" id="org.eclipse.papyrus.uml.table.genericTree" name="Generic Tree Table" icon="platform:/plugin/org.eclipse.papyrus.uml.nattable/icons/uml_generic_table.png" concerns="_HQhf48SYEeaKZJ_pGfaSiA" implementationID="PapyrusUMLGenericTreeTable">
+    <representationKinds xmi:type="nattablerepresentation:PapyrusTable" xmi:id="_P3J1cEa7EeSVGbM3cmVSqQ" id="org.eclipse.papyrus.uml.table.genericTree" name="Generic Tree Table" icon="platform:/plugin/org.eclipse.papyrus.uml.nattable/icons/uml_generic_table.png" concerns="_HQhf48SYEeaKZJ_pGfaSiA" implementationID="PapyrusUMLGenericTreeTable" grayedIcon="platform:/plugin/org.eclipse.papyrus.uml.nattable/icons/uml_generic_table_grayed.png">
       <modelRules xmi:type="representation:ModelRule" xmi:id="_vZwgkEr7EeSVGbM3cmVSqQ" permit="true" elementMultiplicity="1" multiplicity="-1">
         <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
       </modelRules>
@@ -392,7 +392,7 @@
       </owningRules>
       <configuration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable/configs/genericTreeTable.nattableconfiguration#PapyrusUMLGenericTreeTable_XMI_ID"/>
     </representationKinds>
-    <representationKinds xmi:type="nattablerepresentation:PapyrusTable" xmi:id="_P3J1cEb7EeRVGbM3cmVSqQ" id="org.eclipse.papyrus.uml.table.classTree" name="Class Tree Table" icon="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/icons/uml_generic_table.png" concerns="_HQhf48SYEeaKZJ_pGfaSiA" implementationID="PapyrusClassTreeTable">
+    <representationKinds xmi:type="nattablerepresentation:PapyrusTable" xmi:id="_P3J1cEb7EeRVGbM3cmVSqQ" id="org.eclipse.papyrus.uml.table.classTree" name="Class Tree Table" icon="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/icons/uml_generic_table.png" concerns="_HQhf48SYEeaKZJ_pGfaSiA" implementationID="PapyrusClassTreeTable" grayedIcon="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/icons/uml_generic_table_grayed.png">
       <modelRules xmi:type="representation:ModelRule" xmi:id="_vZwgkEr7EeSVGbM3cmVSqQ" permit="true" elementMultiplicity="1" multiplicity="-1">
         <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
       </modelRules>
@@ -401,7 +401,7 @@
       </owningRules>
       <configuration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#PapyrusClassTreeTable_XMI_ID"/>
     </representationKinds>
-    <representationKinds xmi:type="nattablerepresentation:PapyrusTable" xmi:id="_Uz8agHDcEeWh-MssWmCB_A" id="org.eclipse.papyrus.uml.table.generic" name="Generic Table" icon="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/icons/uml_generic_table.png" concerns="_HQhf48SYEeaKZJ_pGfaSiA" implementationID="PapyrusGenericTable">
+    <representationKinds xmi:type="nattablerepresentation:PapyrusTable" xmi:id="_Uz8agHDcEeWh-MssWmCB_A" id="org.eclipse.papyrus.uml.table.generic" name="Generic Table" icon="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/icons/uml_generic_table.png" concerns="_HQhf48SYEeaKZJ_pGfaSiA" implementationID="PapyrusGenericTable" grayedIcon="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/icons/uml_generic_table_grayed.png">
       <modelRules xmi:type="representation:ModelRule" xmi:id="_Uz8agXDuEeWh-MssWmCB_A" permit="true" elementMultiplicity="1" multiplicity="-1">
         <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
       </modelRules>
@@ -410,7 +410,7 @@
       </owningRules>
       <configuration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#PapyrusGenericTable_XMI_ID"/>
     </representationKinds>
-    <representationKinds xmi:type="nattablerepresentation:PapyrusTable" xmi:id="_WC1q0P4UEhSRsNBVzfUrzA" id="org.eclipse.papyrus.uml.table.stereotypeDisplayTree" name="Stereotype Display Tree Table" icon="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/icons/uml_generic_table.png" concerns="_NxfRgMSjEeaCPPhpB0_9OQ" implementationID="PapyrusStereotypeDisplayTreeTable">
+    <representationKinds xmi:type="nattablerepresentation:PapyrusTable" xmi:id="_WC1q0P4UEhSRsNBVzfUrzA" id="org.eclipse.papyrus.uml.table.stereotypeDisplayTree" name="Stereotype Display Tree Table" icon="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/icons/uml_generic_table.png" concerns="_NxfRgMSjEeaCPPhpB0_9OQ" implementationID="PapyrusStereotypeDisplayTreeTable" grayedIcon="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/icons/uml_generic_table_grayed.png">
       <modelRules xmi:type="representation:ModelRule" xmi:id="_7k79wP4VEeSRsNBVzfUrzA" permit="true" elementMultiplicity="1" multiplicity="-1">
         <element xmi:type="ecore:EClass" href="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//View"/>
       </modelRules>
@@ -419,7 +419,7 @@
       </owningRules>
       <configuration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotype.display/config/stereotype.nattableconfiguration#PapyrusStereotypeDisplayTreeTable_XMI_ID"/>
     </representationKinds>
-    <representationKinds xmi:type="nattablerepresentation:PapyrusTable" xmi:id="_wXztQHDwEwWh-MssWmCB_A" id="org.eclipse.papyrus.uml.table.view" name="View Table" icon="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/icons/nattablepageeditor.png" concerns="_HQhf48SYEeaKZJ_pGfaSiA" implementationID="PapyrusViewsTable">
+    <representationKinds xmi:type="nattablerepresentation:PapyrusTable" xmi:id="_wXztQHDwEwWh-MssWmCB_A" id="org.eclipse.papyrus.uml.table.view" name="View Table" icon="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/icons/nattablepageeditor.png" concerns="_HQhf48SYEeaKZJ_pGfaSiA" implementationID="PapyrusViewsTable" grayedIcon="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/icons/nattablepageeditor_grayed.png">
       <modelRules xmi:type="representation:ModelRule" xmi:id="_wXztQXDwEeWh-MssWmCB_A" permit="true" elementMultiplicity="1" multiplicity="-1">
         <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
       </modelRules>
@@ -428,7 +428,7 @@
       </owningRules>
       <configuration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#PapyrusViewsTable_XMI_ID"/>
     </representationKinds>
-    <representationKinds xmi:type="nattablerepresentation:PapyrusTable" xmi:id="_d4-QwCT-EeedRqoTe_1ZiA" id="org.eclipse.papyrus.uml.table.matrix" name="Relationship Generic Matrix" icon="platform:/plugin/org.eclipse.papyrus.uml.nattable.matrix/icons/uml_generic_matrix_relationships.png" concerns="_HQhf48SYEeaKZJ_pGfaSiA" implementationID="UMLGenericMatrixOfRelationships">
+    <representationKinds xmi:type="nattablerepresentation:PapyrusTable" xmi:id="_d4-QwCT-EeedRqoTe_1ZiA" id="org.eclipse.papyrus.uml.table.matrix" name="Relationship Generic Matrix" icon="platform:/plugin/org.eclipse.papyrus.uml.nattable.matrix/icons/uml_generic_matrix_relationships.png" concerns="_HQhf48SYEeaKZJ_pGfaSiA" implementationID="UMLGenericMatrixOfRelationships" grayedIcon="platform:/plugin/org.eclipse.papyrus.uml.nattable.matrix/icons/uml_generic_matrix_relationships_grayed.png">
       <modelRules xmi:type="representation:ModelRule" xmi:id="_d4-QwST-EeedRqoTe_1ZiA" permit="true" elementMultiplicity="1" multiplicity="-1">
         <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
       </modelRules>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/icons/obj16/Diagram_Activity_grayed.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/icons/obj16/Diagram_Activity_grayed.gif
new file mode 100644
index 00000000000..fdf127ef126
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/icons/obj16/Diagram_Activity_grayed.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/icons/obj16/Diagram_Class_grayed.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/icons/obj16/Diagram_Class_grayed.gif
new file mode 100644
index 00000000000..5de2dd1ad49
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/icons/obj16/Diagram_Class_grayed.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/icons/obj16/Diagram_Communication_grayed.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/icons/obj16/Diagram_Communication_grayed.gif
new file mode 100644
index 00000000000..b1d44566a92
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/icons/obj16/Diagram_Communication_grayed.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/icons/obj16/ComponentDiagram_grayed.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/icons/obj16/ComponentDiagram_grayed.gif
new file mode 100644
index 00000000000..1a3c4999403
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/icons/obj16/ComponentDiagram_grayed.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/icons/obj16/Diagram_CompositeStructure_grayed.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/icons/obj16/Diagram_CompositeStructure_grayed.gif
new file mode 100644
index 00000000000..c2c10f5abb4
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/icons/obj16/Diagram_CompositeStructure_grayed.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/icons/obj16/DeploymentDiagram_grayed.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/icons/obj16/DeploymentDiagram_grayed.gif
new file mode 100644
index 00000000000..8107d1e7186
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/icons/obj16/DeploymentDiagram_grayed.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/icons/obj16/Diagram_InteractionOverview_grayed.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/icons/obj16/Diagram_InteractionOverview_grayed.gif
new file mode 100644
index 00000000000..347decf599a
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/icons/obj16/Diagram_InteractionOverview_grayed.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/icons/obj16/Diagram_Profile_grayed.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/icons/obj16/Diagram_Profile_grayed.gif
new file mode 100644
index 00000000000..bf85cb89c36
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/icons/obj16/Diagram_Profile_grayed.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/icons/obj16/Diagram_Sequence_grayed.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/icons/obj16/Diagram_Sequence_grayed.gif
new file mode 100644
index 00000000000..a6dd7353ad0
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/icons/obj16/Diagram_Sequence_grayed.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/icons/obj16/Diagram_StateMachine_grayed.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/icons/obj16/Diagram_StateMachine_grayed.gif
new file mode 100644
index 00000000000..67693607b2b
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/icons/obj16/Diagram_StateMachine_grayed.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/icons/obj16/Diagram_Timing_grayed.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/icons/obj16/Diagram_Timing_grayed.gif
new file mode 100644
index 00000000000..48c571b8f1a
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/icons/obj16/Diagram_Timing_grayed.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/icons/obj16/Diagram_UseCase_grayed.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/icons/obj16/Diagram_UseCase_grayed.gif
new file mode 100644
index 00000000000..d7a6b937fff
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/icons/obj16/Diagram_UseCase_grayed.gif
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.config/icons/uml_generic_table_grayed.png b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.config/icons/uml_generic_table_grayed.png
new file mode 100644
index 00000000000..045afd63bec
--- /dev/null
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.config/icons/uml_generic_table_grayed.png
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix/icons/uml_generic_matrix_relationships_grayed.png b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix/icons/uml_generic_matrix_relationships_grayed.png
new file mode 100644
index 00000000000..aad69cf8e9f
--- /dev/null
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix/icons/uml_generic_matrix_relationships_grayed.png
diff --git a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.architecture.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.architecture.tests/META-INF/MANIFEST.MF
index 181655a4fe7..8d73b0c753f 100644
--- a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.architecture.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.architecture.tests/META-INF/MANIFEST.MF
@@ -15,6 +15,9 @@ Require-Bundle: org.junit;bundle-version="4.12.0",
  org.eclipse.papyrus.infra.ui.architecture;bundle-version="[2.1.0,3.0.0)",
  org.eclipse.papyrus.infra.emf;bundle-version="[3.1.0,4.0.0)",
  org.eclipse.papyrus.views.modelexplorer;bundle-version="[3.1.0,4.0.0)",
- org.eclipse.papyrus.views.modelexplorer.tests;bundle-version="[1.2.0,2.0.0)"
+ org.eclipse.papyrus.views.modelexplorer.tests;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[3.1.0,4.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.103.0,4.0.0)",
+ org.eclipse.papyrus.infra.architecture.representation;bundle-version="[2.1.0,3.0.0)"
 Export-Package: org.eclipse.papyrus.infra.ui.architecture.tests
 Bundle-Activator: org.eclipse.papyrus.infra.ui.architecture.tests.Activator
diff --git a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.architecture.tests/resources/GrayedIcon.di b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.architecture.tests/resources/GrayedIcon.di
new file mode 100644
index 00000000000..8c549eecdc6
--- /dev/null
+++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.architecture.tests/resources/GrayedIcon.di
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<architecture:ArchitectureDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:architecture="http://www.eclipse.org/papyrus/infra/core/architecture" contextId="org.eclipse.papyrus.infra.services.edit.TypeContext"/>
diff --git a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.architecture.tests/resources/GrayedIcon.notation b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.architecture.tests/resources/GrayedIcon.notation
new file mode 100644
index 00000000000..e3ed6adf9e8
--- /dev/null
+++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.architecture.tests/resources/GrayedIcon.notation
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider">
+  <nattable:Table xmi:id="_6KNXUM5dEemmCI5rrjVnbw" name="Class Tree Table" currentRowAxisProvider="_6KNXU85dEemmCI5rrjVnbw" currentColumnAxisProvider="_6KNXUc5dEemmCI5rrjVnbw" tableKindId="org.eclipse.papyrus.uml.table.classTree">
+    <eAnnotations xmi:id="_6KUFAM5dEemmCI5rrjVnbw" source="http://www.eclipse.org/papyrus/infra/nattable/version">
+      <details xmi:id="_6KUFAc5dEemmCI5rrjVnbw" key="version" value="1.3.0"/>
+    </eAnnotations>
+    <context href="GrayedIcon.uml#_6IECQM5dEemmCI5rrjVnbw"/>
+    <owner href="GrayedIcon.uml#_6IECQM5dEemmCI5rrjVnbw"/>
+    <tableConfiguration href="platform:/resource/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#PapyrusClassTreeTable_XMI_ID"/>
+    <columnAxisProvidersHistory xsi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_6KNXUc5dEemmCI5rrjVnbw" description="This axis provider provides available columns according to the rows of the table (features of the object displayed on the other axis)" name="UML Feature axis provider">
+      <axis xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_6KNXUs5dEemmCI5rrjVnbw">
+        <manager href="platform:/resource/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#_UJa7yDzQEei_1txcmoHe_A"/>
+        <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
+      </axis>
+    </columnAxisProvidersHistory>
+    <rowAxisProvidersHistory xsi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_6KNXU85dEemmCI5rrjVnbw" description="This axis provider manages the rows, according to the wanted hierarchy" name="HierarchicalRowaAxisManager" disconnectSlave="true"/>
+  </nattable:Table>
+  <notation:Diagram xmi:id="_6NTHkM5dEemmCI5rrjVnbw" type="PapyrusUMLStateMachineDiagram" name="State Machine Diagram" measurementUnit="Pixel">
+    <children xsi:type="notation:Shape" xmi:id="_6NTHkc5dEemmCI5rrjVnbw" type="StateMachine_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_6NTHks5dEemmCI5rrjVnbw" type="StateMachine_NameLabel">
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_6NTHk85dEemmCI5rrjVnbw" width="700" height="20"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_6NTHlM5dEemmCI5rrjVnbw" type="StateMachine_RegionCompartment">
+        <children xsi:type="notation:Shape" xmi:id="_6NTHlc5dEemmCI5rrjVnbw" type="Region_Shape">
+          <eAnnotations xmi:id="_6NTHls5dEemmCI5rrjVnbw" source="RegionAnnotationKey">
+            <details xmi:id="_6NTHl85dEemmCI5rrjVnbw" key="RegionZoneKey" value=""/>
+          </eAnnotations>
+          <children xsi:type="notation:BasicCompartment" xmi:id="_6NTHmM5dEemmCI5rrjVnbw" type="Region_SubvertexCompartment">
+            <layoutConstraint xsi:type="notation:Bounds" xmi:id="_6NTHmc5dEemmCI5rrjVnbw"/>
+          </children>
+          <element href="GrayedIcon.uml#_6NMZ4M5dEemmCI5rrjVnbw"/>
+          <layoutConstraint xsi:type="notation:Bounds" xmi:id="_6NTHms5dEemmCI5rrjVnbw" width="700" height="280"/>
+        </children>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_6NTHm85dEemmCI5rrjVnbw" y="20" width="700" height="280"/>
+      </children>
+      <element href="GrayedIcon.uml#_6LOrAM5dEemmCI5rrjVnbw"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_6NTHnM5dEemmCI5rrjVnbw" x="30" y="30" width="700" height="300"/>
+    </children>
+    <styles xsi:type="notation:StringValueStyle" xmi:id="_6NTHnc5dEemmCI5rrjVnbw" name="diagram_compatibility_version" stringValue="1.4.0"/>
+    <styles xsi:type="notation:DiagramStyle" xmi:id="_6NTHns5dEemmCI5rrjVnbw"/>
+    <styles xsi:type="style:PapyrusDiagramStyle" xmi:id="_6NTHn85dEemmCI5rrjVnbw" diagramKindId="org.eclipse.papyrus.uml.diagram.stateMachine">
+      <owner href="GrayedIcon.uml#_6IECQM5dEemmCI5rrjVnbw"/>
+    </styles>
+    <element href="GrayedIcon.uml#_6LOrAM5dEemmCI5rrjVnbw"/>
+  </notation:Diagram>
+  <notation:Diagram xmi:id="_6NdfoM5dEemmCI5rrjVnbw" type="PapyrusUMLClassDiagram" name="Class Diagram" measurementUnit="Pixel">
+    <styles xsi:type="notation:StringValueStyle" xmi:id="_6Ndfoc5dEemmCI5rrjVnbw" name="diagram_compatibility_version" stringValue="1.4.0"/>
+    <styles xsi:type="notation:DiagramStyle" xmi:id="_6Ndfos5dEemmCI5rrjVnbw"/>
+    <styles xsi:type="style:PapyrusDiagramStyle" xmi:id="_6Ndfo85dEemmCI5rrjVnbw" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
+      <owner href="GrayedIcon.uml#_6IECQM5dEemmCI5rrjVnbw"/>
+    </styles>
+    <element href="GrayedIcon.uml#_6IECQM5dEemmCI5rrjVnbw"/>
+  </notation:Diagram>
+  <notation:Diagram xmi:id="_6NulYM5dEemmCI5rrjVnbw" type="PapyrusUMLActivityDiagram" name="Activity Diagram" measurementUnit="Pixel">
+    <children xsi:type="notation:Shape" xmi:id="_6NulYc5dEemmCI5rrjVnbw" type="Activity_Shape">
+      <children xsi:type="notation:DecorationNode" xmi:id="_6NulYs5dEemmCI5rrjVnbw" type="Activity_NameLabel"/>
+      <children xsi:type="notation:DecorationNode" xmi:id="_6NulY85dEemmCI5rrjVnbw" type="Activity_KeywordLabel"/>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_6NulZM5dEemmCI5rrjVnbw" type="Activity_ParameterCompartment">
+        <styles xsi:type="notation:SortingStyle" xmi:id="_6NulZc5dEemmCI5rrjVnbw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_6NulZs5dEemmCI5rrjVnbw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_6NulZ85dEemmCI5rrjVnbw"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_6NulaM5dEemmCI5rrjVnbw" type="Activity_PreconditionCompartment">
+        <styles xsi:type="notation:SortingStyle" xmi:id="_6Nulac5dEemmCI5rrjVnbw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_6Nulas5dEemmCI5rrjVnbw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_6Nula85dEemmCI5rrjVnbw"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_6NulbM5dEemmCI5rrjVnbw" type="Activity_PostconditionCompartment">
+        <styles xsi:type="notation:SortingStyle" xmi:id="_6Nulbc5dEemmCI5rrjVnbw"/>
+        <styles xsi:type="notation:FilteringStyle" xmi:id="_6Nulbs5dEemmCI5rrjVnbw"/>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_6Nulb85dEemmCI5rrjVnbw"/>
+      </children>
+      <children xsi:type="notation:BasicCompartment" xmi:id="_6NulcM5dEemmCI5rrjVnbw" type="Activity_ActivityNodeCompartment">
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_6Nulcc5dEemmCI5rrjVnbw"/>
+      </children>
+      <element href="GrayedIcon.uml#_6Nk0YM5dEemmCI5rrjVnbw"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_6Nulcs5dEemmCI5rrjVnbw"/>
+    </children>
+    <styles xsi:type="notation:StringValueStyle" xmi:id="_6Nulc85dEemmCI5rrjVnbw" name="diagram_compatibility_version" stringValue="1.4.0"/>
+    <styles xsi:type="notation:DiagramStyle" xmi:id="_6NuldM5dEemmCI5rrjVnbw"/>
+    <styles xsi:type="style:PapyrusDiagramStyle" xmi:id="_6Nuldc5dEemmCI5rrjVnbw" diagramKindId="org.eclipse.papyrus.uml.diagram.activity">
+      <owner href="GrayedIcon.uml#_6IECQM5dEemmCI5rrjVnbw"/>
+    </styles>
+    <element href="GrayedIcon.uml#_6Nk0YM5dEemmCI5rrjVnbw"/>
+  </notation:Diagram>
+</xmi:XMI>
diff --git a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.architecture.tests/resources/GrayedIcon.uml b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.architecture.tests/resources/GrayedIcon.uml
new file mode 100644
index 00000000000..786c2cc0ec2
--- /dev/null
+++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.architecture.tests/resources/GrayedIcon.uml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_6IECQM5dEemmCI5rrjVnbw" name="GrayedIcon">
+  <packageImport xmi:type="uml:PackageImport" xmi:id="_6QZe4M5dEemmCI5rrjVnbw">
+    <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
+  </packageImport>
+  <packagedElement xmi:type="uml:StateMachine" xmi:id="_6LOrAM5dEemmCI5rrjVnbw" name="StateMachine1">
+    <region xmi:type="uml:Region" xmi:id="_6NMZ4M5dEemmCI5rrjVnbw" name="Region1"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Activity" xmi:id="_6Nk0YM5dEemmCI5rrjVnbw" name="Activity2"/>
+</uml:Model>
diff --git a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.architecture.tests/src/org/eclipse/papyrus/infra/ui/architecture/tests/AllTests.java b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.architecture.tests/src/org/eclipse/papyrus/infra/ui/architecture/tests/AllTests.java
index 4562c8ce382..069677383e5 100644
--- a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.architecture.tests/src/org/eclipse/papyrus/infra/ui/architecture/tests/AllTests.java
+++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.architecture.tests/src/org/eclipse/papyrus/infra/ui/architecture/tests/AllTests.java
@@ -14,6 +14,7 @@
  *****************************************************************************/
 package org.eclipse.papyrus.infra.ui.architecture.tests;
 
+import org.eclipse.papyrus.infra.ui.architecture.tests.editors.GrayedIconTest;
 import org.eclipse.papyrus.infra.ui.architecture.tests.editors.ModelExplorerViewpointFilterTest;
 import org.eclipse.papyrus.infra.ui.architecture.tests.editors.SwitchViewpointsTest;
 import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
@@ -28,6 +29,7 @@ import org.junit.runners.Suite.SuiteClasses;
 @SuiteClasses({
 	SwitchViewpointsTest.class,
 	ModelExplorerViewpointFilterTest.class,
+	GrayedIconTest.class,
 	})
 @Headless
 public class AllTests {
diff --git a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.architecture.tests/src/org/eclipse/papyrus/infra/ui/architecture/tests/editors/GrayedIconTest.java b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.architecture.tests/src/org/eclipse/papyrus/infra/ui/architecture/tests/editors/GrayedIconTest.java
new file mode 100644
index 00000000000..0c9f5d422b5
--- /dev/null
+++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.architecture.tests/src/org/eclipse/papyrus/infra/ui/architecture/tests/editors/GrayedIconTest.java
@@ -0,0 +1,112 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *   Nicolas FAUVERGUE (CEA LIST) nicolas.fauvergue@cea.fr - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.ui.architecture.tests.editors;
+
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.papyrus.infra.architecture.ArchitectureDescriptionUtils;
+import org.eclipse.papyrus.infra.core.sasheditor.editor.IMultiPageEditorPart;
+import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;
+import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;
+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
+import org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype;
+import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
+import org.eclipse.papyrus.junit.utils.rules.PapyrusEditorFixture;
+import org.eclipse.papyrus.junit.utils.rules.PluginResource;
+import org.junit.Assert;
+import org.junit.Rule;
+import org.junit.Test;
+
+/**
+ * This class allows to check the icons depending to the enabled viewpoints.
+ */
+@SuppressWarnings("nls")
+@PluginResource("/resources/GrayedIcon.di")
+public class GrayedIconTest extends AbstractPapyrusTest {
+
+	/**
+	 * The editor fixture to manage the opening model.
+	 */
+	@Rule
+	public final PapyrusEditorFixture editorFixture = new PapyrusEditorFixture();
+
+	/**
+	 * This allows to check the icon depending to the enabled viewpoints.
+	 */
+	@Test
+	public void checkIcons() {
+
+		// Get the active editor
+		final IMultiDiagramEditor activeEditor = editorFixture.getEditor();
+
+		// Get the page manager
+		final IPageManager pageManager = ((IMultiPageEditorPart) activeEditor).getAdapter(IPageManager.class);
+		Assert.assertNotNull("The page manager cannot be null", null != pageManager);
+
+		// Get the activity diagram
+		final Diagram activityDiagram = getActivityDiagram(pageManager);
+		Assert.assertNotNull("The activity diagram is not found", activityDiagram);
+
+		// Check the current icon (it won't be the grayed one)
+		Assert.assertEquals("The icon is not the correct one", "platform:/plugin/org.eclipse.papyrus.uml.diagram.activity/icons/obj16/Diagram_Activity.gif", getIcon(activityDiagram));
+
+		// Change the architecture viewpoint
+		final ArchitectureDescriptionUtils helper = new ArchitectureDescriptionUtils(editorFixture.getModelSet());
+		// Only keep the analysis viewpoint
+		final Set<String> viewpointIds = helper.getArchitectureViewpointIds().stream().filter(id -> id.equals("org.eclipse.papyrus.uml.analysis")).collect(Collectors.toSet());
+
+		// execute the command to change viewpoint and close editors
+		editorFixture.getEditingDomain().getCommandStack().execute(helper.switchArchitectureViewpointIds(viewpointIds.toArray(new String[0])));
+
+		// Check the current icon (it should be the grayed one)
+		Assert.assertEquals("The icon is not the correct one", "platform:/plugin/org.eclipse.papyrus.uml.diagram.activity/icons/obj16/Diagram_Activity_grayed.gif", getIcon(activityDiagram));
+	}
+
+	/**
+	 * Get the activity diagram from the page manager.
+	 * 
+	 * @param pageManager
+	 *            The page manager.
+	 * @return The activity diagram.
+	 */
+	private Diagram getActivityDiagram(final IPageManager pageManager) {
+		for (final Object pageIdentifier : pageManager.allPages()) {
+			if (pageIdentifier instanceof Diagram && "PapyrusUMLActivityDiagram".equals(((Diagram) pageIdentifier).getDiagram().getType())) {
+				return (Diagram) pageIdentifier;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Get the icon for the activity diagram for example.
+	 * 
+	 * @param activityDiagram
+	 *            The activity diagram.
+	 * @return The grayed icon if not in viewpoint, otherwise the initial icon.
+	 */
+	private String getIcon(final Diagram activityDiagram) {
+		final PolicyChecker checker = PolicyChecker.getFor(activityDiagram);
+		final ViewPrototype viewPrototype = ViewPrototype.get(activityDiagram);
+		if (checker.isInViewpoint(viewPrototype.getRepresentationKind())) {
+			return viewPrototype.getIconURI();
+		} else {
+			return viewPrototype.getGrayedIconURI();
+		}
+	}
+}
author	Nicolas FAUVERGUE	2019-08-30 14:49:46 +0000
committer	Patrick Tessier	2019-09-18 07:54:48 +0000
commit	2ec299164d14b33e605d71058237016125e0ee72 (patch)
tree	23cfac79363c2851169cb13da40d6e68a5b64558
parent	8fd2a0edd4ab3a6b26bf4c87cecf0ef6cf9e9e7e (diff)
download	org.eclipse.papyrus-2ec299164d14b33e605d71058237016125e0ee72.tar.gz org.eclipse.papyrus-2ec299164d14b33e605d71058237016125e0ee72.tar.xz org.eclipse.papyrus-2ec299164d14b33e605d71058237016125e0ee72.zip