Bug 532299 - Add tooltips on properties in architecture framework

editor.

Added descriptions on all properties that show in the architecture
editor. Those descriptions appear in the status bar of the Eclipse
window when the property is selected (not as toolips when hovering over
properties). Also, some properties are categorized in the property sheet
into sub categories to ease understanding.

I also added the same descriptions as documentation of the AF model API.


Change-Id: I2a4e928b177ae5434c6f38255ea1bba41c822416
Signed-off-by: Maged Elaasar <melaasar@gmail.com>

31 files changed, 523 insertions, 145 deletions

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 96da8b2ada6..003266d15ef 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
@@ -14,6 +14,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
  org.eclipse.papyrus.infra.core.architecture;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
  org.eclipse.papyrus.infra.types;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
  org.eclipse.papyrus.infra.types.edit;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
- org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.emf.ecore.edit;visibility:=reexport
+ org.eclipse.emf.ecore;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecore.edit;bundle-version="[2.0.0,3.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
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 c99a9d69210..23f551d5442 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
@@ -65,3 +65,37 @@ _UI_Unknown_feature = Unspecified
 _UI_ArchitectureContext_defaultViewpoints_feature = Default Viewpoints
 _UI_ADElement_id_feature = Id
 _UI_ADElement_icon_feature = Icon
+_UI_ADElement_id_description = The unique id of the element
+_UI_ADElement_name_description = The name of the element
+_UI_ADElement_description_description = The description of the element
+_UI_ADElement_qualifiedName_description = The qualified name of the element
+_UI_ADElement_icon_description = The icon of the element specified using a platform plugin URI
+_UI_ArchitectureDomain_stakeholders_description = The set of stakeholders defined by the domain
+_UI_ArchitectureDomain_concerns_description = The set of concerns defined by the domain
+_UI_ArchitectureDomain_contexts_description = The set of contexts defined by the domain
+_UI_ArchitectureDescriptionLanguage_representationKinds_description = The set of representation kinds defined by the language
+_UI_ArchitectureDescriptionLanguage_metamodel_description = The metamodel used by the language
+_UI_ArchitectureDescriptionLanguage_profiles_description = The set of UML profiles used by the language
+_UI_Stakeholder_concerns_description = The set of concerns of the stakeholder
+_UI_Stakeholder_domain_description = The domain that defines the stakeholder
+_UI_Concern_domain_description = The domain that defines the concern
+_UI_ArchitectureViewpoint_concerns_description = The set of concerns covered by the viewpoint
+_UI_ArchitectureViewpoint_representationKinds_description = The set of representation kinds provided by the viewpoint
+_UI_ArchitectureViewpoint_context_description = The context that defines the viewpoint
+_UI_RepresentationKind_language_description = The language that defines the representation kind
+_UI_RepresentationKind_concerns_description = The set of concerns covered by the representation kind
+_UI_ArchitectureContext_viewpoints_description = The set of viewpoints defined by the context
+_UI_ArchitectureContext_defaultViewpoints_description = The set of viewpoints that are selected for the context by default
+_UI_ArchitectureContext_elementTypes_description = The set of element type set configurations that are used by the context (typically found in .elementtypesconfigurations resources)
+_UI_ArchitectureContext_domain_description = The domain that defines the context
+_UI_ArchitectureContext_extensionPrefix_description = The prefix of the file extension of the UML models applying this context (e.g., <Name>.<prefixExtension>.uml)
+_UI_ArchitectureContext_creationCommandClass_description = 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
+_UI_ArchitectureContext_conversionCommandClass_description = 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
+_UI_ArchitectureDescription_contextId_description = The id of the context applied to a UML model
+_UI_ArchitectureDescriptionPreferences_viewpointIds_description = The set of ids of viewpoints enabled on a UML model
+_UI_ContextPropertyCategory = Context
+_UI_StakeholderPropertyCategory = Stakeholder
+_UI_DescriptionLanguagePropertyCategory = Description Language
+_UI_RepresentationKindPropertyCategory = Representation Kind
+_UI_ViewpointPropertyCategory = Viewpoint
+_UI_ElementPropertyCategory = Element
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/ADElementItemProvider.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/ADElementItemProvider.java
index dcc543fd876..2c4855b2732 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/ADElementItemProvider.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/ADElementItemProvider.java
@@ -92,13 +92,13 @@ public class ADElementItemProvider
 				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
 				 getResourceLocator(),
 				 getString("_UI_ADElement_id_feature"), //$NON-NLS-1$
-				 getString("_UI_PropertyDescriptor_description", "_UI_ADElement_id_feature", "_UI_ADElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 getString("_UI_ADElement_id_description"), //$NON-NLS-1$
 				 ArchitecturePackage.Literals.AD_ELEMENT__ID,
 				 true,
 				 false,
 				 false,
 				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
+				 getString("_UI_ElementPropertyCategory"), //$NON-NLS-1$
 				 null));
 	}
 
@@ -114,13 +114,13 @@ public class ADElementItemProvider
 				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
 				 getResourceLocator(),
 				 getString("_UI_ADElement_name_feature"), //$NON-NLS-1$
-				 getString("_UI_PropertyDescriptor_description", "_UI_ADElement_name_feature", "_UI_ADElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 getString("_UI_ADElement_name_description"), //$NON-NLS-1$
 				 ArchitecturePackage.Literals.AD_ELEMENT__NAME,
 				 true,
 				 false,
 				 false,
 				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
+				 getString("_UI_ElementPropertyCategory"), //$NON-NLS-1$
 				 null));
 	}
 
@@ -136,13 +136,13 @@ public class ADElementItemProvider
 				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
 				 getResourceLocator(),
 				 getString("_UI_ADElement_description_feature"), //$NON-NLS-1$
-				 getString("_UI_PropertyDescriptor_description", "_UI_ADElement_description_feature", "_UI_ADElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 getString("_UI_ADElement_description_description"), //$NON-NLS-1$
 				 ArchitecturePackage.Literals.AD_ELEMENT__DESCRIPTION,
 				 true,
 				 false,
 				 false,
 				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
+				 getString("_UI_ElementPropertyCategory"), //$NON-NLS-1$
 				 null));
 	}
 
@@ -158,13 +158,13 @@ public class ADElementItemProvider
 				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
 				 getResourceLocator(),
 				 getString("_UI_ADElement_qualifiedName_feature"), //$NON-NLS-1$
-				 getString("_UI_PropertyDescriptor_description", "_UI_ADElement_qualifiedName_feature", "_UI_ADElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 getString("_UI_ADElement_qualifiedName_description"), //$NON-NLS-1$
 				 ArchitecturePackage.Literals.AD_ELEMENT__QUALIFIED_NAME,
 				 true,
 				 false,
 				 false,
 				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
+				 getString("_UI_ElementPropertyCategory"), //$NON-NLS-1$
 				 null));
 	}
 
@@ -180,13 +180,13 @@ public class ADElementItemProvider
 				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
 				 getResourceLocator(),
 				 getString("_UI_ADElement_icon_feature"), //$NON-NLS-1$
-				 getString("_UI_PropertyDescriptor_description", "_UI_ADElement_icon_feature", "_UI_ADElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 getString("_UI_ADElement_icon_description"), //$NON-NLS-1$
 				 ArchitecturePackage.Literals.AD_ELEMENT__ICON,
 				 true,
 				 false,
 				 false,
 				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
+				 getString("_UI_ElementPropertyCategory"), //$NON-NLS-1$
 				 null));
 	}
 
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/ArchitectureContextItemProvider.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/ArchitectureContextItemProvider.java
index a3371ccd2b8..3d120e6a9a2 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/ArchitectureContextItemProvider.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/ArchitectureContextItemProvider.java
@@ -79,13 +79,13 @@ public class ArchitectureContextItemProvider extends ADElementItemProvider {
 				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
 				 getResourceLocator(),
 				 getString("_UI_ArchitectureContext_defaultViewpoints_feature"), //$NON-NLS-1$
-				 getString("_UI_PropertyDescriptor_description", "_UI_ArchitectureContext_defaultViewpoints_feature", "_UI_ArchitectureContext_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 getString("_UI_ArchitectureContext_defaultViewpoints_description"), //$NON-NLS-1$
 				 ArchitecturePackage.Literals.ARCHITECTURE_CONTEXT__DEFAULT_VIEWPOINTS,
 				 true,
 				 false,
 				 true,
 				 null,
-				 null,
+				 getString("_UI_ContextPropertyCategory"), //$NON-NLS-1$
 				 null));
 	}
 
@@ -101,13 +101,13 @@ public class ArchitectureContextItemProvider extends ADElementItemProvider {
 				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
 				 getResourceLocator(),
 				 getString("_UI_ArchitectureContext_elementTypes_feature"), //$NON-NLS-1$
-				 getString("_UI_PropertyDescriptor_description", "_UI_ArchitectureContext_elementTypes_feature", "_UI_ArchitectureContext_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 getString("_UI_ArchitectureContext_elementTypes_description"), //$NON-NLS-1$
 				 ArchitecturePackage.Literals.ARCHITECTURE_CONTEXT__ELEMENT_TYPES,
 				 true,
 				 false,
 				 true,
 				 null,
-				 null,
+				 getString("_UI_ContextPropertyCategory"), //$NON-NLS-1$
 				 null));
 	}
 
@@ -123,13 +123,13 @@ public class ArchitectureContextItemProvider extends ADElementItemProvider {
 				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
 				 getResourceLocator(),
 				 getString("_UI_ArchitectureContext_extensionPrefix_feature"), //$NON-NLS-1$
-				 getString("_UI_PropertyDescriptor_description", "_UI_ArchitectureContext_extensionPrefix_feature", "_UI_ArchitectureContext_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 getString("_UI_ArchitectureContext_extensionPrefix_description"), //$NON-NLS-1$
 				 ArchitecturePackage.Literals.ARCHITECTURE_CONTEXT__EXTENSION_PREFIX,
 				 true,
 				 false,
 				 false,
 				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
+				 getString("_UI_ContextPropertyCategory"), //$NON-NLS-1$
 				 null));
 	}
 
@@ -145,13 +145,13 @@ public class ArchitectureContextItemProvider extends ADElementItemProvider {
 				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
 				 getResourceLocator(),
 				 getString("_UI_ArchitectureContext_creationCommandClass_feature"), //$NON-NLS-1$
-				 getString("_UI_PropertyDescriptor_description", "_UI_ArchitectureContext_creationCommandClass_feature", "_UI_ArchitectureContext_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 getString("_UI_ArchitectureContext_creationCommandClass_description"), //$NON-NLS-1$
 				 ArchitecturePackage.Literals.ARCHITECTURE_CONTEXT__CREATION_COMMAND_CLASS,
 				 true,
 				 false,
 				 false,
 				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
+				 getString("_UI_ContextPropertyCategory"), //$NON-NLS-1$
 				 null));
 	}
 
@@ -167,13 +167,13 @@ public class ArchitectureContextItemProvider extends ADElementItemProvider {
 				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
 				 getResourceLocator(),
 				 getString("_UI_ArchitectureContext_conversionCommandClass_feature"), //$NON-NLS-1$
-				 getString("_UI_PropertyDescriptor_description", "_UI_ArchitectureContext_conversionCommandClass_feature", "_UI_ArchitectureContext_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 getString("_UI_ArchitectureContext_conversionCommandClass_description"), //$NON-NLS-1$
 				 ArchitecturePackage.Literals.ARCHITECTURE_CONTEXT__CONVERSION_COMMAND_CLASS,
 				 true,
 				 false,
 				 false,
 				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
+				 getString("_UI_ContextPropertyCategory"), //$NON-NLS-1$
 				 null));
 	}
 
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/ArchitectureDescriptionItemProvider.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/ArchitectureDescriptionItemProvider.java
index 31eae3382eb..f36fed3ab82 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/ArchitectureDescriptionItemProvider.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/ArchitectureDescriptionItemProvider.java
@@ -88,7 +88,7 @@ public class ArchitectureDescriptionItemProvider
 				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
 				 getResourceLocator(),
 				 getString("_UI_ArchitectureDescription_contextId_feature"), //$NON-NLS-1$
-				 getString("_UI_PropertyDescriptor_description", "_UI_ArchitectureDescription_contextId_feature", "_UI_ArchitectureDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 getString("_UI_ArchitectureDescription_contextId_description"), //$NON-NLS-1$
 				 ArchitecturePackage.Literals.ARCHITECTURE_DESCRIPTION__CONTEXT_ID,
 				 true,
 				 false,
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/ArchitectureDescriptionLanguageItemProvider.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/ArchitectureDescriptionLanguageItemProvider.java
index 8861c068a7e..b59772c85ee 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/ArchitectureDescriptionLanguageItemProvider.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/ArchitectureDescriptionLanguageItemProvider.java
@@ -78,7 +78,7 @@ public class ArchitectureDescriptionLanguageItemProvider extends ArchitectureCon
 				false,
 				true,
 				null,
-				null,
+				getString("_UI_DescriptionLanguagePropertyCategory"), //$NON-NLS-1$,
 				null)));
 	}
 
@@ -98,7 +98,7 @@ public class ArchitectureDescriptionLanguageItemProvider extends ArchitectureCon
 				false,
 				true,
 				null,
-				null,
+				getString("_UI_DescriptionLanguagePropertyCategory"), //$NON-NLS-1$,
 				null)));
 	}
 
@@ -136,15 +136,11 @@ public class ArchitectureDescriptionLanguageItemProvider extends ArchitectureCon
 	 * This returns ArchitectureDescriptionLanguage.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated NOT
+	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		String icon = "full/obj16/ArchitectureDescriptionLanguage"; //$NON-NLS-1$
-		ArchitectureDescriptionLanguage language = (ArchitectureDescriptionLanguage)object;
-		if (language.getIcon() != null && !language.getIcon().isEmpty())
-			icon = language.getIcon();
-		return overlayImage(object, getResourceLocator().getImage(icon));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/ArchitectureDescriptionLanguage")); //$NON-NLS-1$
 	}
 
 	/**
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/ArchitectureDescriptionPreferencesItemProvider.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/ArchitectureDescriptionPreferencesItemProvider.java
index 804315081b6..a4b87164073 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/ArchitectureDescriptionPreferencesItemProvider.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/ArchitectureDescriptionPreferencesItemProvider.java
@@ -89,7 +89,7 @@ public class ArchitectureDescriptionPreferencesItemProvider
 				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
 				 getResourceLocator(),
 				 getString("_UI_ArchitectureDescriptionPreferences_viewpointIds_feature"), //$NON-NLS-1$
-				 getString("_UI_PropertyDescriptor_description", "_UI_ArchitectureDescriptionPreferences_viewpointIds_feature", "_UI_ArchitectureDescriptionPreferences_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 getString("_UI_ArchitectureDescriptionPreferences_viewpointIds_description"), //$NON-NLS-1$
 				 ArchitecturePackage.Literals.ARCHITECTURE_DESCRIPTION_PREFERENCES__VIEWPOINT_IDS,
 				 true,
 				 false,
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/ArchitectureEditPlugin.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/ArchitectureEditPlugin.java
index cfb7b83ef67..d67a882ab8e 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/ArchitectureEditPlugin.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/ArchitectureEditPlugin.java
@@ -54,8 +54,8 @@ public final class ArchitectureEditPlugin extends EMFPlugin {
 	public ArchitectureEditPlugin() {
 		super
 		  (new ResourceLocator [] {
-		     TypesConfigurationsEditPlugin.INSTANCE,
 		     EcoreEditPlugin.INSTANCE,
+		     TypesConfigurationsEditPlugin.INSTANCE,
 		   });
 	}
 
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 9255ef61d1d..ab0de41a3bd 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
@@ -58,15 +58,11 @@ public class ArchitectureFrameworkItemProvider extends ArchitectureContextItemPr
 	 * This returns ArchitectureFramework.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated NOT
+	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		String icon = "full/obj16/ArchitectureFramework"; //$NON-NLS-1$
-		ArchitectureFramework framework = (ArchitectureFramework)object;
-		if (framework.getIcon() != null && !framework.getIcon().isEmpty())
-			icon = framework.getIcon();
-		return overlayImage(object, getResourceLocator().getImage(icon));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/ArchitectureFramework")); //$NON-NLS-1$
 	}
 
 	/**
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 aa491474278..aa3286e98cb 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
@@ -71,13 +71,13 @@ public class ArchitectureViewpointItemProvider extends ADElementItemProvider {
 				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
 				 getResourceLocator(),
 				 getString("_UI_ArchitectureViewpoint_concerns_feature"), //$NON-NLS-1$
-				 getString("_UI_PropertyDescriptor_description", "_UI_ArchitectureViewpoint_concerns_feature", "_UI_ArchitectureViewpoint_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 getString("_UI_ArchitectureViewpoint_concerns_description"), //$NON-NLS-1$
 				 ArchitecturePackage.Literals.ARCHITECTURE_VIEWPOINT__CONCERNS,
 				 true,
 				 false,
 				 true,
 				 null,
-				 null,
+				 getString("_UI_ViewpointPropertyCategory"), //$NON-NLS-1$
 				 null));
 	}
 
@@ -93,13 +93,13 @@ public class ArchitectureViewpointItemProvider extends ADElementItemProvider {
 				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
 				 getResourceLocator(),
 				 getString("_UI_ArchitectureViewpoint_representationKinds_feature"), //$NON-NLS-1$
-				 getString("_UI_PropertyDescriptor_description", "_UI_ArchitectureViewpoint_representationKinds_feature", "_UI_ArchitectureViewpoint_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 getString("_UI_ArchitectureViewpoint_representationKinds_description"), //$NON-NLS-1$
 				 ArchitecturePackage.Literals.ARCHITECTURE_VIEWPOINT__REPRESENTATION_KINDS,
 				 true,
 				 false,
 				 true,
 				 null,
-				 null,
+				 getString("_UI_ViewpointPropertyCategory"), //$NON-NLS-1$
 				 null));
 	}
 
@@ -118,13 +118,14 @@ public class ArchitectureViewpointItemProvider extends ADElementItemProvider {
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated NOT
+	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
 		String label = ((ArchitectureViewpoint)object).getName();
 		return label == null || label.length() == 0 ?
-			getString("_UI_ArchitectureViewpoint_type") : label;
+			getString("_UI_ArchitectureViewpoint_type") : //$NON-NLS-1$
+			getString("_UI_ArchitectureViewpoint_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 	
 
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 44361b33057..ffdc274fe58 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
@@ -70,13 +70,13 @@ public class RepresentationKindItemProvider extends ADElementItemProvider {
 				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
 				 getResourceLocator(),
 				 getString("_UI_RepresentationKind_concerns_feature"), //$NON-NLS-1$
-				 getString("_UI_PropertyDescriptor_description", "_UI_RepresentationKind_concerns_feature", "_UI_RepresentationKind_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 getString("_UI_RepresentationKind_concerns_description"), //$NON-NLS-1$
 				 ArchitecturePackage.Literals.REPRESENTATION_KIND__CONCERNS,
 				 true,
 				 false,
 				 true,
 				 null,
-				 null,
+				 getString("_UI_RepresentationKindPropertyCategory"), //$NON-NLS-1$
 				 null));
 	}
 
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 7ebbd0cd450..66dc2182b50 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
@@ -70,13 +70,13 @@ public class StakeholderItemProvider extends ADElementItemProvider {
 				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
 				 getResourceLocator(),
 				 getString("_UI_Stakeholder_concerns_feature"), //$NON-NLS-1$
-				 getString("_UI_PropertyDescriptor_description", "_UI_Stakeholder_concerns_feature", "_UI_Stakeholder_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 getString("_UI_Stakeholder_concerns_description"), //$NON-NLS-1$
 				 ArchitecturePackage.Literals.STAKEHOLDER__CONCERNS,
 				 true,
 				 false,
 				 true,
 				 null,
-				 null,
+				 getString("_UI_StakeholderPropertyCategory"), //$NON-NLS-1$
 				 null));
 	}
 
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 343ef41e859..6b53c7d9252 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
@@ -2,103 +2,274 @@
 <ecore:EPackage 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" name="architecture" nsURI="http://www.eclipse.org/papyrus/infra/core/architecture"
     nsPrefix="architecture">
-  <eAnnotations source="An architecture context is a method for customizing Papyrus for a given domain. It defines a regime for editing a Papyrus model semantically and notationally. The semantic editing is defined by a set of element type set configurations (from some domain), while the notational side is defined by a set of viewpoints consisting of a set of representation kinds (e.g., diagram kinds and table kinds) and other notational configurations.&#xA;&#xA;An architecture context is composed within an architecture domain (a namespace) and satisfies a set of concerns that belong to a set of stakeholders, both of which are composed in (the same or another) architecture domain. An architecture domain can be specified by one or more architecture models. In the latter case, all of these models are dynamically merged at runtime.&#xA;&#xA;An architecture context can either be an architecture description language or an architecture framework. In the former case, it can own its own set of representation kinds, while in the latter, it cannot. However, in both cases, a context can own a set of viewpoints that reference representation kinds owned by any description language.&#xA;&#xA;Each model in Papyrus is created using a specific architecture context, although this context may later be switched, possibly resulting in the model details being changed. A model also specifies a subset of its context's viewpoints as enabled at creation time, although this set may later be switched as well. When a viewpoint is enabled on a model, a user can create representations, based on this viewpoint's referenced representation kinds, and see them in model explorer. When a viewpoint is disabled, its representations become invisible, unless another enabled viewpoint references their representation kinds."
-      references="#/"/>
-    <eClassifiers xsi:type="ecore:EClass" name="ADElement" abstract="true">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+  <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+    <details key="documentation" value="An architecture context is a method for customizing Papyrus for a given domain. It defines a regime for editing a Papyrus model semantically and notationally. The semantic editing is defined by a set of element type set configurations (from some domain), while the notational side is defined by a set of viewpoints consisting of a set of representation kinds (e.g., diagram kinds and table kinds) and other notational configurations...."/>
+  </eAnnotations>
+  <eClassifiers xsi:type="ecore:EClass" name="ADElement" abstract="true">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="The superclass of all architecture elements"/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" lowerBound="1" 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 unique id of the element"/>
+        <details key="propertyDescription" value="The unique id of the element"/>
+        <details key="propertyCategory" value="Element"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" 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 name of the element"/>
+        <details key="propertyDescription" value="The name of the element"/>
+        <details key="propertyCategory" value="Element"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" 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 description of the element"/>
+        <details key="propertyDescription" value="The description of the element"/>
+        <details key="propertyCategory" value="Element"/>
+      </eAnnotations>
+    </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="qualifiedName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
-        changeable="false" volatile="true" transient="true" derived="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="icon" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+        changeable="false" volatile="true" transient="true" derived="true">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="The qualified name of the element"/>
+        <details key="propertyDescription" value="The qualified name of the element"/>
+        <details key="propertyCategory" value="Element"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="icon" 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="ArchitectureDomain" eSuperTypes="#//ADElement">
-    <eAnnotations source="A domain is the root of the architecture model. It can contains a collection of concerns, stakeholders, as well as contexts (which can be description languages and/or frameworks)."
-        references="#//ArchitectureDomain"/>
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="A domain is the root of the architecture model. It can contains a collection of concerns, stakeholders, as well as contexts (which can be description languages and/or frameworks)."/>
+    </eAnnotations>
     <eStructuralFeatures xsi:type="ecore:EReference" name="stakeholders" upperBound="-1"
-        eType="#//Stakeholder" containment="true" eOpposite="#//Stakeholder/domain"/>
+        eType="#//Stakeholder" containment="true" eOpposite="#//Stakeholder/domain">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="The set of stakeholders defined by the domain"/>
+        <details key="propertyDescription" value="The set of stakeholders defined by the domain"/>
+      </eAnnotations>
+    </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EReference" name="concerns" upperBound="-1"
-        eType="#//Concern" containment="true" eOpposite="#//Concern/domain"/>
+        eType="#//Concern" containment="true" eOpposite="#//Concern/domain">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="The set of concerns defined by the domain"/>
+        <details key="propertyDescription" value="The set of concerns defined by the domain"/>
+      </eAnnotations>
+    </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EReference" name="contexts" upperBound="-1"
-        eType="#//ArchitectureContext" containment="true" eOpposite="#//ArchitectureContext/domain"/>
+        eType="#//ArchitectureContext" containment="true" eOpposite="#//ArchitectureContext/domain">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="The set of contexts defined by the domain"/>
+        <details key="propertyDescription" value="The set of contexts defined by the domain"/>
+      </eAnnotations>
+    </eStructuralFeatures>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="ArchitectureDescriptionLanguage" eSuperTypes="#//ArchitectureContext">
-    <eAnnotations source="A description language (from ISO 42010) represents in Papyrus a modeling language (e.g., UML, SysML). It has a unique id' that corresponds to that of an ''IClientContext from GMF. It references a metamodel, a set of profiles, a set of element type set configurations, a creation command (creates a model of this language), a conversion command (converts a model to this language), and and icon. It also has an optional extension prefix for its models. It can also contain a set of representation kinds (which can be either diagrams or tables) and a set of viewpoints."
-        references="#//ArchitectureDescriptionLanguage"/>
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="A description language (from ISO 42010) represents in Papyrus a modeling language (e.g., UML, SysML). It has a unique id' that corresponds to that of an ''IClientContext from GMF. It references a metamodel, a set of profiles, a set of element type set configurations, a creation command (creates a model of this language), a conversion command (converts a model to this language), and and icon. It also has an optional extension prefix for its models. It can also contain a set of representation kinds (which can be either diagrams or tables) and a set of viewpoints."/>
+    </eAnnotations>
     <eStructuralFeatures xsi:type="ecore:EReference" name="representationKinds" upperBound="-1"
-        eType="#//RepresentationKind" containment="true" eOpposite="#//RepresentationKind/language"/>
+        eType="#//RepresentationKind" containment="true" eOpposite="#//RepresentationKind/language">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="The set of representation kinds defined by the language"/>
+        <details key="propertyDescription" value="The set of representation kinds defined by the language"/>
+      </eAnnotations>
+    </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EReference" name="metamodel" lowerBound="1"
-        eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EPackage"/>
+        eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EPackage">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="The metamodel used by the language"/>
+        <details key="propertyDescription" value="The metamodel used by the language"/>
+        <details key="propertyCategory" value="Description Language"/>
+      </eAnnotations>
+    </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EReference" name="profiles" upperBound="-1"
-        eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EPackage"/>
+        eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EPackage">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="The set of UML profiles used by the language"/>
+        <details key="propertyDescription" value="The set of UML profiles used by the language"/>
+        <details key="propertyCategory" value="Description Language"/>
+      </eAnnotations>
+    </eStructuralFeatures>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Stakeholder" eSuperTypes="#//ADElement">
-    <eAnnotations source="A stakeholder (from ISO 42010) represents in Papyrus an archetype of users. It references a set of its concerns."
-        references="#//Stakeholder"/>
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="A stakeholder (from ISO 42010) represents in Papyrus an archetype of users. It references a set of its concerns."/>
+    </eAnnotations>
     <eStructuralFeatures xsi:type="ecore:EReference" name="concerns" upperBound="-1"
-        eType="#//Concern"/>
+        eType="#//Concern">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="The set of concerns of the stakeholder"/>
+        <details key="propertyDescription" value="The set of concerns of the stakeholder"/>
+        <details key="propertyCategory" value="Stakeholder"/>
+      </eAnnotations>
+    </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EReference" name="domain" lowerBound="1"
-        eType="#//ArchitectureDomain" eOpposite="#//ArchitectureDomain/stakeholders"/>
+        eType="#//ArchitectureDomain" eOpposite="#//ArchitectureDomain/stakeholders">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="The domain that defines the stakeholder"/>
+        <details key="propertyDescription" value="The domain that defines the stakeholder"/>
+      </eAnnotations>
+    </eStructuralFeatures>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Concern" eSuperTypes="#//ADElement">
-    <eAnnotations source="A concern (from ISO 42010) represents in Papyrus a matter of interest to some stakeholder."
-        references="#//Concern"/>
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="A concern (from ISO 42010) represents in Papyrus a matter of interest to some stakeholder."/>
+    </eAnnotations>
     <eStructuralFeatures xsi:type="ecore:EReference" name="domain" lowerBound="1"
-        eType="#//ArchitectureDomain" eOpposite="#//ArchitectureDomain/concerns"/>
+        eType="#//ArchitectureDomain" eOpposite="#//ArchitectureDomain/concerns">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="The domain that defines the concern"/>
+        <details key="propertyDescription" value="The domain that defines the concern"/>
+      </eAnnotations>
+    </eStructuralFeatures>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="ArchitectureViewpoint" eSuperTypes="#//ADElement">
-    <eAnnotations source="A viewpoint (from ISO 42010) in Papyrus references set of representation kinds, which can be diagrams or tables."
-        references="#//ArchitectureViewpoint"/>
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="A viewpoint (from ISO 42010) in Papyrus references set of representation kinds, which can be diagrams or tables."/>
+    </eAnnotations>
     <eStructuralFeatures xsi:type="ecore:EReference" name="concerns" upperBound="-1"
-        eType="#//Concern"/>
+        eType="#//Concern">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="The set of concerns covered by the viewpoint"/>
+        <details key="propertyDescription" value="The set of concerns covered by the viewpoint"/>
+        <details key="propertyCategory" value="Viewpoint"/>
+      </eAnnotations>
+    </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EReference" name="representationKinds" upperBound="-1"
-        eType="#//RepresentationKind"/>
+        eType="#//RepresentationKind">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="The set of representation kinds provided by the viewpoint"/>
+        <details key="propertyDescription" value="The set of representation kinds provided by the viewpoint"/>
+        <details key="propertyCategory" value="Viewpoint"/>
+      </eAnnotations>
+    </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EReference" name="context" lowerBound="1"
-        eType="#//ArchitectureContext" eOpposite="#//ArchitectureContext/viewpoints"/>
+        eType="#//ArchitectureContext" eOpposite="#//ArchitectureContext/viewpoints">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="The context that defines the viewpoint"/>
+        <details key="propertyDescription" value="The context that defines the viewpoint"/>
+      </eAnnotations>
+    </eStructuralFeatures>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="RepresentationKind" abstract="true"
       eSuperTypes="#//ADElement">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="The kind of representations defined by architectural contexts and that depict some information from a model"/>
+    </eAnnotations>
     <eStructuralFeatures xsi:type="ecore:EReference" name="language" lowerBound="1"
-        eType="#//ArchitectureDescriptionLanguage" eOpposite="#//ArchitectureDescriptionLanguage/representationKinds"/>
+        eType="#//ArchitectureDescriptionLanguage" eOpposite="#//ArchitectureDescriptionLanguage/representationKinds">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="The language that defines the representation kind"/>
+        <details key="propertyDescription" value="The language that defines the representation kind"/>
+      </eAnnotations>
+    </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EReference" name="concerns" upperBound="-1"
-        eType="#//Concern"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="icon" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+        eType="#//Concern">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="The set of concerns covered by the representation kind"/>
+        <details key="propertyDescription" value="The set of concerns covered by the representation kind"/>
+        <details key="propertyCategory" value="Representation Kind"/>
+      </eAnnotations>
+    </eStructuralFeatures>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="ArchitectureContext" abstract="true"
       eSuperTypes="#//ADElement">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="The superclass of architectural description languages or architecture frameworks. It defines a collection of viewpoints on models."/>
+    </eAnnotations>
     <eStructuralFeatures xsi:type="ecore:EReference" name="viewpoints" upperBound="-1"
-        eType="#//ArchitectureViewpoint" containment="true" eOpposite="#//ArchitectureViewpoint/context"/>
+        eType="#//ArchitectureViewpoint" containment="true" eOpposite="#//ArchitectureViewpoint/context">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="The set of viewpoints defined by the context"/>
+        <details key="propertyDescription" value="The set of viewpoints defined by the context"/>
+      </eAnnotations>
+    </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EReference" name="defaultViewpoints" upperBound="-1"
-        eType="#//ArchitectureViewpoint"/>
+        eType="#//ArchitectureViewpoint">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="The set of viewpoints that are selected for the context by default"/>
+        <details key="propertyDescription" value="The set of viewpoints that are selected for the context by default"/>
+        <details key="propertyCategory" value="Context"/>
+      </eAnnotations>
+    </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EReference" name="elementTypes" upperBound="-1"
-        eType="ecore:EClass ../../org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.ecore#//ElementTypeSetConfiguration"/>
+        eType="ecore:EClass ../../org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.ecore#//ElementTypeSetConfiguration">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="The set of element type set configurations that are used by the context (typically found in .elementtypesconfigurations resources)"/>
+        <details key="propertyDescription" value="The set of element type set configurations that are used by the context (typically found in .elementtypesconfigurations resources)"/>
+        <details key="propertyCategory" value="Context"/>
+      </eAnnotations>
+    </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EReference" name="domain" lowerBound="1"
-        eType="#//ArchitectureDomain" eOpposite="#//ArchitectureDomain/contexts"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="extensionPrefix" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+        eType="#//ArchitectureDomain" eOpposite="#//ArchitectureDomain/contexts">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="The domain that defines the context"/>
+        <details key="propertyDescription" value="The domain that defines the context"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="extensionPrefix" 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 prefix of the file extension of the UML models applying this context (e.g., &lt;Name>.&lt;prefixExtension>.uml)"/>
+        <details key="propertyDescription" value="The prefix of the file extension of the UML models applying this context (e.g., &lt;Name>.&lt;prefixExtension>.uml)"/>
+        <details key="propertyCategory" value="Context"/>
+      </eAnnotations>
+    </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="creationCommandClass" lowerBound="1">
-      <eAnnotations source="point to a java class responsible for creating the root of your model of interest. for instance, for UML, it will create the initial package, whereas for SysML it will create initial package and apply the SysML stereotype. Fill it by example with org.eclipse.papyrus.uml.diagram.common.commands.CreateUMLModelCommand"
-          references="#//ArchitectureContext/creationCommandClass"/>
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="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"/>
+        <details key="propertyDescription" value="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"/>
+        <details key="propertyCategory" value="Context"/>
+      </eAnnotations>
       <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaClass">
         <eTypeArguments/>
       </eGenericType>
     </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="conversionCommandClass">
-      <eAnnotations source="point to a java class responsible to control if you switch from another Archiecturecontext to your ArchitectureContext. Fill it by example with org.eclipse.papyrus.uml.diagram.common.commands.ConversionUMLModelCommand"
-          references="#//ArchitectureContext/conversionCommandClass"/>
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="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"/>
+        <details key="propertyDescription" value="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"/>
+        <details key="propertyCategory" value="Context"/>
+      </eAnnotations>
       <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaClass">
         <eTypeArguments/>
       </eGenericType>
     </eStructuralFeatures>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="ArchitectureFramework" eSuperTypes="#//ArchitectureContext">
-    <eAnnotations source="A framework (from ISO 42010) represents in Papyrus a modeling framework (e.g., DoDAF). It has a unique id' that corresponds to that of an ''IClientContext from GMF. It references a set of element type set configurations, a creation command (creates a model of this framework), a conversion command (converts a model to this framework), and an icon. It also has an optional extension prefix for its models. It can also contain a set of viewpoints."
-        references="#//ArchitectureFramework"/>
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="A framework (from ISO 42010) represents in Papyrus a modeling framework (e.g., DoDAF). It has a unique id' that corresponds to that of an ''IClientContext from GMF. It references a set of element type set configurations, a creation command (creates a model of this framework), a conversion command (converts a model to this framework), and an icon. It also has an optional extension prefix for its models. It can also contain a set of viewpoints."/>
+    </eAnnotations>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="ArchitectureDescription">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="contextId" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="An element that is added to a DI model to record the id of the architecture context applied to a model set"/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="contextId" 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 id of the context applied to a UML model"/>
+        <details key="propertyDescription" value="The id of the context applied to a UML model"/>
+      </eAnnotations>
+    </eStructuralFeatures>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="ArchitectureDescriptionPreferences">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="An element that is added to a DI model to record the architecture preferences used by a model set"/>
+    </eAnnotations>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="viewpointIds" upperBound="-1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+        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 set of ids of viewpoints enabled on a UML model"/>
+        <details key="propertyDescription" value="The set of ids of viewpoints enabled on a UML model"/>
+      </eAnnotations>
+    </eStructuralFeatures>
   </eClassifiers>
 </ecore:EPackage>
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 bb4e65e06c2..3624d20754d 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,60 +6,94 @@
     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"
-    complianceLevel="8.0" copyrightFields="false" usedGenPackages="../../org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.genmodel#//types ../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"
+    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"
       resource="XMI" disposableProviderFactory="true" extensibleProviderFactory="true"
       ecorePackage="Architecture.ecore#/">
     <genClasses image="false" ecoreClass="Architecture.ecore#//ADElement">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Architecture.ecore#//ADElement/id"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Architecture.ecore#//ADElement/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Architecture.ecore#//ADElement/description"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Architecture.ecore#//ADElement/qualifiedName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Architecture.ecore#//ADElement/icon"/>
+      <genFeatures createChild="false" propertyCategory="Element" propertyDescription="The unique id of the element"
+          ecoreFeature="ecore:EAttribute Architecture.ecore#//ADElement/id"/>
+      <genFeatures createChild="false" propertyCategory="Element" propertyDescription="The name of the element"
+          ecoreFeature="ecore:EAttribute Architecture.ecore#//ADElement/name"/>
+      <genFeatures createChild="false" propertyCategory="Element" propertyDescription="The description of the element"
+          ecoreFeature="ecore:EAttribute Architecture.ecore#//ADElement/description"/>
+      <genFeatures createChild="false" propertyCategory="Element" propertyDescription="The qualified name of the element"
+          ecoreFeature="ecore:EAttribute Architecture.ecore#//ADElement/qualifiedName"/>
+      <genFeatures createChild="false" propertyCategory="Element" propertyDescription="The icon of the element specified using a platform plugin URI"
+          ecoreFeature="ecore:EAttribute Architecture.ecore#//ADElement/icon"/>
     </genClasses>
     <genClasses ecoreClass="Architecture.ecore#//ArchitectureDomain">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Architecture.ecore#//ArchitectureDomain/stakeholders"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Architecture.ecore#//ArchitectureDomain/concerns"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Architecture.ecore#//ArchitectureDomain/contexts"/>
+      <genFeatures property="None" children="true" createChild="true" propertyDescription="The set of stakeholders defined by the domain"
+          ecoreFeature="ecore:EReference Architecture.ecore#//ArchitectureDomain/stakeholders"/>
+      <genFeatures property="None" children="true" createChild="true" propertyDescription="The set of concerns defined by the domain"
+          ecoreFeature="ecore:EReference Architecture.ecore#//ArchitectureDomain/concerns"/>
+      <genFeatures property="None" children="true" createChild="true" propertyDescription="The set of contexts defined by the domain"
+          ecoreFeature="ecore:EReference Architecture.ecore#//ArchitectureDomain/contexts"/>
     </genClasses>
     <genClasses ecoreClass="Architecture.ecore#//ArchitectureDescriptionLanguage">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Architecture.ecore#//ArchitectureDescriptionLanguage/representationKinds"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Architecture.ecore#//ArchitectureDescriptionLanguage/metamodel"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Architecture.ecore#//ArchitectureDescriptionLanguage/profiles"/>
+      <genFeatures property="None" children="true" createChild="true" propertyDescription="The set of representation kinds defined by the language"
+          ecoreFeature="ecore:EReference Architecture.ecore#//ArchitectureDescriptionLanguage/representationKinds"/>
+      <genFeatures notify="false" createChild="false" propertyCategory="Description Language"
+          propertyDescription="The metamodel used by the language" propertySortChoices="true"
+          ecoreFeature="ecore:EReference Architecture.ecore#//ArchitectureDescriptionLanguage/metamodel"/>
+      <genFeatures notify="false" createChild="false" propertyCategory="Description Language"
+          propertyDescription="The set of UML profiles used by the language" propertySortChoices="true"
+          ecoreFeature="ecore:EReference Architecture.ecore#//ArchitectureDescriptionLanguage/profiles"/>
     </genClasses>
     <genClasses ecoreClass="Architecture.ecore#//Stakeholder">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Architecture.ecore#//Stakeholder/concerns"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference Architecture.ecore#//Stakeholder/domain"/>
+      <genFeatures notify="false" createChild="false" propertyCategory="Stakeholder"
+          propertyDescription="The set of concerns of the stakeholder" propertySortChoices="true"
+          ecoreFeature="ecore:EReference Architecture.ecore#//Stakeholder/concerns"/>
+      <genFeatures property="None" notify="false" createChild="false" propertyDescription="The domain that defines the stakeholder"
+          ecoreFeature="ecore:EReference Architecture.ecore#//Stakeholder/domain"/>
     </genClasses>
     <genClasses ecoreClass="Architecture.ecore#//Concern">
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference Architecture.ecore#//Concern/domain"/>
+      <genFeatures property="None" notify="false" createChild="false" propertyDescription="The domain that defines the concern"
+          ecoreFeature="ecore:EReference Architecture.ecore#//Concern/domain"/>
     </genClasses>
     <genClasses ecoreClass="Architecture.ecore#//ArchitectureViewpoint">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Architecture.ecore#//ArchitectureViewpoint/concerns"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Architecture.ecore#//ArchitectureViewpoint/representationKinds"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference Architecture.ecore#//ArchitectureViewpoint/context"/>
+      <genFeatures notify="false" createChild="false" propertyCategory="Viewpoint"
+          propertyDescription="The set of concerns covered by the viewpoint" propertySortChoices="true"
+          ecoreFeature="ecore:EReference Architecture.ecore#//ArchitectureViewpoint/concerns"/>
+      <genFeatures notify="false" createChild="false" propertyCategory="Viewpoint"
+          propertyDescription="The set of representation kinds provided by the viewpoint"
+          propertySortChoices="true" ecoreFeature="ecore:EReference Architecture.ecore#//ArchitectureViewpoint/representationKinds"/>
+      <genFeatures property="None" notify="false" createChild="false" propertyDescription="The context that defines the viewpoint"
+          ecoreFeature="ecore:EReference Architecture.ecore#//ArchitectureViewpoint/context"/>
     </genClasses>
     <genClasses image="false" ecoreClass="Architecture.ecore#//RepresentationKind">
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference Architecture.ecore#//RepresentationKind/language"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Architecture.ecore#//RepresentationKind/concerns"/>
+      <genFeatures property="None" notify="false" createChild="false" propertyDescription="The language that defines the representation kind"
+          ecoreFeature="ecore:EReference Architecture.ecore#//RepresentationKind/language"/>
+      <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"/>
     </genClasses>
     <genClasses image="false" ecoreClass="Architecture.ecore#//ArchitectureContext">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Architecture.ecore#//ArchitectureContext/viewpoints"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Architecture.ecore#//ArchitectureContext/defaultViewpoints"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Architecture.ecore#//ArchitectureContext/elementTypes"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference Architecture.ecore#//ArchitectureContext/domain"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Architecture.ecore#//ArchitectureContext/extensionPrefix"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Architecture.ecore#//ArchitectureContext/creationCommandClass"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Architecture.ecore#//ArchitectureContext/conversionCommandClass"/>
+      <genFeatures property="None" children="true" createChild="true" propertyDescription="The set of viewpoints defined by the context"
+          ecoreFeature="ecore:EReference Architecture.ecore#//ArchitectureContext/viewpoints"/>
+      <genFeatures notify="false" createChild="false" propertyCategory="Context" propertyDescription="The set of viewpoints that are selected for the context by default"
+          propertySortChoices="true" ecoreFeature="ecore:EReference Architecture.ecore#//ArchitectureContext/defaultViewpoints"/>
+      <genFeatures notify="false" createChild="false" propertyCategory="Context" propertyDescription="The set of element type set configurations that are used by the context (typically found in .elementtypesconfigurations resources)"
+          propertySortChoices="true" ecoreFeature="ecore:EReference Architecture.ecore#//ArchitectureContext/elementTypes"/>
+      <genFeatures property="None" notify="false" createChild="false" propertyDescription="The domain that defines the context"
+          ecoreFeature="ecore:EReference Architecture.ecore#//ArchitectureContext/domain"/>
+      <genFeatures createChild="false" propertyCategory="Context" propertyDescription="The prefix of the file extension of the UML models applying this context (e.g., &lt;Name>.&lt;prefixExtension>.uml)"
+          ecoreFeature="ecore:EAttribute Architecture.ecore#//ArchitectureContext/extensionPrefix"/>
+      <genFeatures createChild="false" propertyCategory="Context" 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"
+          ecoreFeature="ecore:EAttribute Architecture.ecore#//ArchitectureContext/creationCommandClass"/>
+      <genFeatures createChild="false" propertyCategory="Context" 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"
+          ecoreFeature="ecore:EAttribute Architecture.ecore#//ArchitectureContext/conversionCommandClass"/>
     </genClasses>
     <genClasses ecoreClass="Architecture.ecore#//ArchitectureFramework"/>
     <genClasses ecoreClass="Architecture.ecore#//ArchitectureDescription">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Architecture.ecore#//ArchitectureDescription/contextId"/>
+      <genFeatures createChild="false" propertyDescription="The id of the context applied to a UML model"
+          ecoreFeature="ecore:EAttribute Architecture.ecore#//ArchitectureDescription/contextId"/>
     </genClasses>
     <genClasses ecoreClass="Architecture.ecore#//ArchitectureDescriptionPreferences">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Architecture.ecore#//ArchitectureDescriptionPreferences/viewpointIds"/>
+      <genFeatures createChild="false" propertyDescription="The set of ids of viewpoints enabled on a UML model"
+          ecoreFeature="ecore:EAttribute Architecture.ecore#//ArchitectureDescriptionPreferences/viewpointIds"/>
     </genClasses>
   </genPackages>
 </genmodel:GenModel>
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 1c2468b7823..55dbc5dc193 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
@@ -20,6 +20,10 @@ import org.eclipse.emf.ecore.EObject;
  * A representation of the model object '<em><b>AD Element</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * The superclass of all architecture elements
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * </p>
@@ -44,10 +48,14 @@ public interface ADElement extends EObject {
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * The unique id of the element
+	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Id</em>' attribute.
 	 * @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();
@@ -70,10 +78,14 @@ public interface ADElement extends EObject {
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * The name of the element
+	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Name</em>' attribute.
 	 * @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();
@@ -96,10 +108,13 @@ public interface ADElement extends EObject {
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * The description of the element
+	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Description</em>' attribute.
 	 * @see #setDescription(String)
 	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage#getADElement_Description()
-	 * @model
+	 * @model annotation="http://www.eclipse.org/emf/2002/GenModel propertyDescription='The description of the element' propertyCategory='Element'"
 	 * @generated
 	 */
 	String getDescription();
@@ -122,9 +137,13 @@ public interface ADElement extends EObject {
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * The qualified name of the element
+	 * <!-- end-model-doc -->
 	 * @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();
@@ -137,10 +156,13 @@ public interface ADElement extends EObject {
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- 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>Icon</em>' attribute.
 	 * @see #setIcon(String)
 	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage#getADElement_Icon()
-	 * @model
+	 * @model annotation="http://www.eclipse.org/emf/2002/GenModel propertyDescription='The icon of the element specified using a platform plugin URI' propertyCategory='Element'"
 	 * @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 e1479115928..ab1c176a4db 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
@@ -21,6 +21,10 @@ import org.eclipse.papyrus.infra.types.ElementTypeSetConfiguration;
  * A representation of the model object '<em><b>Context</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * The superclass of architectural description languages or architecture frameworks. It defines a collection of viewpoints on models.
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * </p>
@@ -49,10 +53,14 @@ public interface ArchitectureContext extends ADElement {
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * The set of viewpoints defined by the context
+	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Viewpoints</em>' containment reference list.
 	 * @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();
@@ -66,9 +74,12 @@ public interface ArchitectureContext extends ADElement {
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * The set of viewpoints that are selected for the context by default
+	 * <!-- 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
+	 * @model annotation="http://www.eclipse.org/emf/2002/GenModel propertyDescription='The set of viewpoints that are selected for the context by default' propertyCategory='Context'"
 	 * @generated
 	 */
 	EList<ArchitectureViewpoint> getDefaultViewpoints();
@@ -82,9 +93,12 @@ public interface ArchitectureContext extends ADElement {
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * The set of element type set configurations that are used by the context (typically found in .elementtypesconfigurations resources)
+	 * <!-- 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
+	 * @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'"
 	 * @generated
 	 */
 	EList<ElementTypeSetConfiguration> getElementTypes();
@@ -97,10 +111,13 @@ public interface ArchitectureContext extends ADElement {
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * The prefix of the file extension of the UML models applying this context (e.g., <Name>.<prefixExtension>.uml)
+	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Extension Prefix</em>' attribute.
 	 * @see #setExtensionPrefix(String)
 	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage#getArchitectureContext_ExtensionPrefix()
-	 * @model
+	 * @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'"
 	 * @generated
 	 */
 	String getExtensionPrefix();
@@ -123,10 +140,14 @@ public interface ArchitectureContext extends ADElement {
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * 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
+	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Creation Command Class</em>' attribute.
 	 * @see #setCreationCommandClass(Class)
 	 * @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
 	 */
 	Class<?> getCreationCommandClass();
@@ -149,10 +170,13 @@ public interface ArchitectureContext extends ADElement {
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * 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
+	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Conversion Command Class</em>' attribute.
 	 * @see #setConversionCommandClass(Class)
 	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage#getArchitectureContext_ConversionCommandClass()
-	 * @model
+	 * @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'"
 	 * @generated
 	 */
 	Class<?> getConversionCommandClass();
@@ -176,11 +200,15 @@ public interface ArchitectureContext extends ADElement {
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * The domain that defines the context
+	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Domain</em>' container reference.
 	 * @see #setDomain(ArchitectureDomain)
 	 * @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 e7386326323..0863081fe7d 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
@@ -20,6 +20,10 @@ import org.eclipse.emf.ecore.EObject;
  * A representation of the model object '<em><b>Description</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * An element that is added to a DI model to record the id of the architecture context applied to a model set
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * </p>
@@ -40,10 +44,13 @@ public interface ArchitectureDescription extends EObject {
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * The id of the context applied to a UML model
+	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Context Id</em>' attribute.
 	 * @see #setContextId(String)
 	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage#getArchitectureDescription_ContextId()
-	 * @model
+	 * @model annotation="http://www.eclipse.org/emf/2002/GenModel propertyDescription='The id of the context applied to a UML 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 d4fc61e950b..6164169e6ac 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
@@ -21,6 +21,10 @@ import org.eclipse.emf.ecore.EPackage;
  * A representation of the model object '<em><b>Description Language</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * A description language (from ISO 42010) represents in Papyrus a modeling language (e.g., UML, SysML). It has a unique id' that corresponds to that of an ''IClientContext from GMF. It references a metamodel, a set of profiles, a set of element type set configurations, a creation command (creates a model of this language), a conversion command (converts a model to this language), and and icon. It also has an optional extension prefix for its models. It can also contain a set of representation kinds (which can be either diagrams or tables) and a set of viewpoints.
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * </p>
@@ -45,10 +49,14 @@ public interface ArchitectureDescriptionLanguage extends ArchitectureContext {
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * The set of representation kinds defined by the language
+	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Representation Kinds</em>' containment reference list.
 	 * @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();
@@ -61,10 +69,14 @@ public interface ArchitectureDescriptionLanguage extends ArchitectureContext {
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * The metamodel used by the language
+	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Metamodel</em>' reference.
 	 * @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();
@@ -88,9 +100,12 @@ public interface ArchitectureDescriptionLanguage extends ArchitectureContext {
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * The set of UML profiles used by the language
+	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Profiles</em>' reference list.
 	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage#getArchitectureDescriptionLanguage_Profiles()
-	 * @model
+	 * @model annotation="http://www.eclipse.org/emf/2002/GenModel propertyDescription='The set of UML profiles used by the language' propertyCategory='Description Language'"
 	 * @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 c5b8dda0e17..fab369b308a 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
@@ -22,6 +22,10 @@ import org.eclipse.emf.ecore.EObject;
  * A representation of the model object '<em><b>Description Preferences</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * An element that is added to a DI model to record the architecture preferences used by a model set
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * </p>
@@ -43,9 +47,12 @@ public interface ArchitectureDescriptionPreferences extends EObject {
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * The set of ids of viewpoints enabled on a UML model
+	 * <!-- 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
+	 * @model annotation="http://www.eclipse.org/emf/2002/GenModel propertyDescription='The set of ids of viewpoints enabled on a UML 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 8a19c42084a..d421e4f9c0b 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
@@ -20,6 +20,10 @@ import org.eclipse.emf.common.util.EList;
  * A representation of the model object '<em><b>Domain</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * A domain is the root of the architecture model. It can contains a collection of concerns, stakeholders, as well as contexts (which can be description languages and/or frameworks).
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * </p>
@@ -44,10 +48,14 @@ public interface ArchitectureDomain extends ADElement {
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * The set of stakeholders defined by the domain
+	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Stakeholders</em>' containment reference list.
 	 * @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();
@@ -62,10 +70,14 @@ public interface ArchitectureDomain extends ADElement {
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * The set of concerns defined by the domain
+	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Concerns</em>' containment reference list.
 	 * @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();
@@ -80,10 +92,14 @@ public interface ArchitectureDomain extends ADElement {
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * The set of contexts defined by the domain
+	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Contexts</em>' containment reference list.
 	 * @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/ArchitectureFramework.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ArchitectureFramework.java
index e08dfd79173..93cc4481f4b 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ArchitectureFramework.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ArchitectureFramework.java
@@ -19,6 +19,10 @@ package org.eclipse.papyrus.infra.core.architecture;
  * A representation of the model object '<em><b>Framework</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * A framework (from ISO 42010) represents in Papyrus a modeling framework (e.g., DoDAF). It has a unique id' that corresponds to that of an ''IClientContext from GMF. It references a set of element type set configurations, a creation command (creates a model of this framework), a conversion command (converts a model to this framework), and an icon. It also has an optional extension prefix for its models. It can also contain a set of viewpoints.
+ * <!-- end-model-doc -->
+ *
  *
  * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage#getArchitectureFramework()
  * @model
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 e176bf17e11..15710401468 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
@@ -30,6 +30,9 @@ import org.eclipse.emf.ecore.EReference;
  *   <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
+ * <!-- begin-model-doc -->
+ * An architecture context is a method for customizing Papyrus for a given domain. It defines a regime for editing a Papyrus model semantically and notationally. The semantic editing is defined by a set of element type set configurations (from some domain), while the notational side is defined by a set of viewpoints consisting of a set of representation kinds (e.g., diagram kinds and table kinds) and other notational configurations....
+ * <!-- end-model-doc -->
  * @see org.eclipse.papyrus.infra.core.architecture.ArchitectureFactory
  * @model kind="package"
  * @generated
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 b078d8db164..eb5d27f944a 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
@@ -20,6 +20,10 @@ import org.eclipse.emf.common.util.EList;
  * A representation of the model object '<em><b>Viewpoint</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * A viewpoint (from ISO 42010) in Papyrus references set of representation kinds, which can be diagrams or tables.
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * </p>
@@ -43,9 +47,12 @@ public interface ArchitectureViewpoint extends ADElement {
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * The set of concerns covered by the viewpoint
+	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Concerns</em>' reference list.
 	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage#getArchitectureViewpoint_Concerns()
-	 * @model
+	 * @model annotation="http://www.eclipse.org/emf/2002/GenModel propertyDescription='The set of concerns covered by the viewpoint' propertyCategory='Viewpoint'"
 	 * @generated
 	 */
 	EList<Concern> getConcerns();
@@ -59,9 +66,12 @@ public interface ArchitectureViewpoint extends ADElement {
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * The set of representation kinds provided by the viewpoint
+	 * <!-- 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
+	 * @model annotation="http://www.eclipse.org/emf/2002/GenModel propertyDescription='The set of representation kinds provided by the viewpoint' propertyCategory='Viewpoint'"
 	 * @generated
 	 */
 	EList<RepresentationKind> getRepresentationKinds();
@@ -75,11 +85,15 @@ public interface ArchitectureViewpoint extends ADElement {
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * The context that defines the viewpoint
+	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Context</em>' container reference.
 	 * @see #setContext(ArchitectureContext)
 	 * @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 e5de014c4ab..7a5ad2f489e 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
@@ -19,6 +19,10 @@ package org.eclipse.papyrus.infra.core.architecture;
  * A representation of the model object '<em><b>Concern</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * A concern (from ISO 42010) represents in Papyrus a matter of interest to some stakeholder.
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * </p>
@@ -41,11 +45,15 @@ public interface Concern extends ADElement {
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * The domain that defines the concern
+	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Domain</em>' container reference.
 	 * @see #setDomain(ArchitectureDomain)
 	 * @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 c032c8ab73e..365fc7f69ee 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
@@ -20,6 +20,10 @@ import org.eclipse.emf.common.util.EList;
  * A representation of the model object '<em><b>Representation Kind</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * The kind of representations defined by architectural contexts and that depict some information from a model
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * </p>
@@ -42,9 +46,12 @@ public interface RepresentationKind extends ADElement {
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * The set of concerns covered by the representation kind
+	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Concerns</em>' reference list.
 	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage#getRepresentationKind_Concerns()
-	 * @model
+	 * @model annotation="http://www.eclipse.org/emf/2002/GenModel propertyDescription='The set of concerns covered by the representation kind' propertyCategory='Representation Kind'"
 	 * @generated
 	 */
 	EList<Concern> getConcerns();
@@ -58,11 +65,15 @@ public interface RepresentationKind extends ADElement {
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * The language that defines the representation kind
+	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Language</em>' container reference.
 	 * @see #setLanguage(ArchitectureDescriptionLanguage)
 	 * @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 01ebf98df14..a04a992e5e3 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
@@ -20,6 +20,10 @@ import org.eclipse.emf.common.util.EList;
  * A representation of the model object '<em><b>Stakeholder</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * A stakeholder (from ISO 42010) represents in Papyrus an archetype of users. It references a set of its concerns.
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * </p>
@@ -42,9 +46,12 @@ public interface Stakeholder extends ADElement {
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * The set of concerns of the stakeholder
+	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Concerns</em>' reference list.
 	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage#getStakeholder_Concerns()
-	 * @model
+	 * @model annotation="http://www.eclipse.org/emf/2002/GenModel propertyDescription='The set of concerns of the stakeholder' propertyCategory='Stakeholder'"
 	 * @generated
 	 */
 	EList<Concern> getConcerns();
@@ -58,11 +65,15 @@ public interface Stakeholder extends ADElement {
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * The domain that defines the stakeholder
+	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Domain</em>' container reference.
 	 * @see #setDomain(ArchitectureDomain)
 	 * @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 ebb496ae56d..5bcb1899b90 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
@@ -349,7 +349,7 @@ public abstract class ADElementImpl extends MinimalEObjectImpl.Container impleme
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (id: "); //$NON-NLS-1$
 		result.append(id);
 		result.append(", name: "); //$NON-NLS-1$
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 1ecfa168c73..7fbdb422e0c 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
@@ -463,7 +463,7 @@ public abstract class ArchitectureContextImpl extends ADElementImpl implements A
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (extensionPrefix: "); //$NON-NLS-1$
 		result.append(extensionPrefix);
 		result.append(", creationCommandClass: "); //$NON-NLS-1$
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 ecadcae096d..2f56909a0bc 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
@@ -162,7 +162,7 @@ public class ArchitectureDescriptionImpl extends MinimalEObjectImpl.Container im
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (contextId: "); //$NON-NLS-1$
 		result.append(contextId);
 		result.append(')');
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 86416a478cc..53d9044dc93 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
@@ -150,7 +150,7 @@ public class ArchitectureDescriptionPreferencesImpl extends MinimalEObjectImpl.C
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (viewpointIds: "); //$NON-NLS-1$
 		result.append(viewpointIds);
 		result.append(')');
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 947de0b583d..73737f7b647 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
@@ -148,7 +148,7 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur
 
 	/**
 	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-	 * 
+	 *
 	 * <p>This method is used to initialize {@link ArchitecturePackage#eINSTANCE} when that field is accessed.
 	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
 	 * <!-- begin-user-doc -->
@@ -162,13 +162,14 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur
 		if (isInited) return (ArchitecturePackage)EPackage.Registry.INSTANCE.getEPackage(ArchitecturePackage.eNS_URI);
 
 		// Obtain or create and register package
-		ArchitecturePackageImpl theArchitecturePackage = (ArchitecturePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ArchitecturePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new ArchitecturePackageImpl());
+		Object registeredArchitecturePackage = EPackage.Registry.INSTANCE.get(eNS_URI);
+		ArchitecturePackageImpl theArchitecturePackage = registeredArchitecturePackage instanceof ArchitecturePackageImpl ? (ArchitecturePackageImpl)registeredArchitecturePackage : new ArchitecturePackageImpl();
 
 		isInited = true;
 
 		// Initialize simple dependencies
-		ElementTypesConfigurationsPackage.eINSTANCE.eClass();
 		EcorePackage.eINSTANCE.eClass();
+		ElementTypesConfigurationsPackage.eINSTANCE.eClass();
 
 		// Create package meta-data objects
 		theArchitecturePackage.createPackageContents();
@@ -179,7 +180,6 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur
 		// Mark meta-data to indicate it can't be changed
 		theArchitecturePackage.freeze();
 
-  
 		// Update the registry and return the package
 		EPackage.Registry.INSTANCE.put(ArchitecturePackage.eNS_URI, theArchitecturePackage);
 		return theArchitecturePackage;