ASSIGNED - bug 359058: [Refactoring - Architecture] Identify the layers and sub-layers for the Papyrus architecture

https://bugs.eclipse.org/bugs/show_bug.cgi?id=359058

Improve the architecture profile

24 files changed, 1759 insertions, 1147 deletions

diff --git a/extraplugins/design/org.eclipse.papyrus.design.profile.architecture.edit/icons/full/obj16/Project.gif b/extraplugins/design/org.eclipse.papyrus.design.profile.architecture.edit/icons/full/obj16/Project.gif
new file mode 100644
index 00000000000..7bac4fd3808
--- /dev/null
+++ b/extraplugins/design/org.eclipse.papyrus.design.profile.architecture.edit/icons/full/obj16/Project.gif
diff --git a/extraplugins/design/org.eclipse.papyrus.design.profile.architecture.edit/icons/full/obj16/ProjectDependency.gif b/extraplugins/design/org.eclipse.papyrus.design.profile.architecture.edit/icons/full/obj16/ProjectDependency.gif
new file mode 100644
index 00000000000..420eee17752
--- /dev/null
+++ b/extraplugins/design/org.eclipse.papyrus.design.profile.architecture.edit/icons/full/obj16/ProjectDependency.gif
diff --git a/extraplugins/design/org.eclipse.papyrus.design.profile.architecture.edit/plugin.properties b/extraplugins/design/org.eclipse.papyrus.design.profile.architecture.edit/plugin.properties
index c1118e9529f..d35bdd430ee 100644
--- a/extraplugins/design/org.eclipse.papyrus.design.profile.architecture.edit/plugin.properties
+++ b/extraplugins/design/org.eclipse.papyrus.design.profile.architecture.edit/plugin.properties
@@ -48,3 +48,15 @@ _UI_Plugin_base_Package_feature = Base Package
 _UI_PluginDependency_deprecatedComment_feature = Deprecated Comment

 _UI_PluginDependency_isDeprecated_feature = Is Deprecated

 _UI_PluginDependency_base_Dependency_feature = Base Dependency

+_UI_Project_type = Project

+_UI_ProjectDependency_type = Project Dependency

+_UI_Project_isDeprecated_feature = Is Deprecated

+_UI_Project_deprecatedComment_feature = Deprecated Comment

+_UI_Project_name_feature = Name

+_UI_Project_referent_feature = Referent

+_UI_Project_parentFolder_feature = Parent Folder

+_UI_Project_originalParentFolder_feature = Original Parent Folder

+_UI_Project_base_Package_feature = Base Package

+_UI_ProjectDependency_deprecatedComment_feature = Deprecated Comment

+_UI_ProjectDependency_isDeprecated_feature = Is Deprecated

+_UI_ProjectDependency_base_Dependency_feature = Base Dependency

diff --git a/extraplugins/design/org.eclipse.papyrus.design.profile.architecture.edit/src/org/eclipse/papyrus/design/profile/architecture/provider/ArchitectureItemProviderAdapterFactory.java b/extraplugins/design/org.eclipse.papyrus.design.profile.architecture.edit/src/org/eclipse/papyrus/design/profile/architecture/provider/ArchitectureItemProviderAdapterFactory.java
index 3d0503ecd40..a5f0c25bad4 100644
--- a/extraplugins/design/org.eclipse.papyrus.design.profile.architecture.edit/src/org/eclipse/papyrus/design/profile/architecture/provider/ArchitectureItemProviderAdapterFactory.java
+++ b/extraplugins/design/org.eclipse.papyrus.design.profile.architecture.edit/src/org/eclipse/papyrus/design/profile/architecture/provider/ArchitectureItemProviderAdapterFactory.java
@@ -145,26 +145,49 @@ public class ArchitectureItemProviderAdapterFactory extends ArchitectureAdapterF
 	}

 

 	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.design.profile.architecture.PluginDependency} instances.

+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.design.profile.architecture.Project} instances.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

-	protected PluginDependencyItemProvider pluginDependencyItemProvider;

+	protected ProjectItemProvider projectItemProvider;

 

 	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.design.profile.architecture.PluginDependency}.

+	 * This creates an adapter for a {@link org.eclipse.papyrus.design.profile.architecture.Project}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

 	@Override

-	public Adapter createPluginDependencyAdapter() {

-		if (pluginDependencyItemProvider == null) {

-			pluginDependencyItemProvider = new PluginDependencyItemProvider(this);

+	public Adapter createProjectAdapter() {

+		if (projectItemProvider == null) {

+			projectItemProvider = new ProjectItemProvider(this);

 		}

 

-		return pluginDependencyItemProvider;

+		return projectItemProvider;

+	}

+

+	/**

+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.design.profile.architecture.ProjectDependency} instances.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected ProjectDependencyItemProvider projectDependencyItemProvider;

+

+	/**

+	 * This creates an adapter for a {@link org.eclipse.papyrus.design.profile.architecture.ProjectDependency}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Adapter createProjectDependencyAdapter() {

+		if (projectDependencyItemProvider == null) {

+			projectDependencyItemProvider = new ProjectDependencyItemProvider(this);

+		}

+

+		return projectDependencyItemProvider;

 	}

 

 	/**

@@ -269,7 +292,8 @@ public class ArchitectureItemProviderAdapterFactory extends ArchitectureAdapterF
 		if (layerItemProvider != null) layerItemProvider.dispose();

 		if (layerDependencyItemProvider != null) layerDependencyItemProvider.dispose();

 		if (pluginItemProvider != null) pluginItemProvider.dispose();

-		if (pluginDependencyItemProvider != null) pluginDependencyItemProvider.dispose();

+		if (projectItemProvider != null) projectItemProvider.dispose();

+		if (projectDependencyItemProvider != null) projectDependencyItemProvider.dispose();

 	}

 

 }

diff --git a/extraplugins/design/org.eclipse.papyrus.design.profile.architecture.edit/src/org/eclipse/papyrus/design/profile/architecture/provider/PluginItemProvider.java b/extraplugins/design/org.eclipse.papyrus.design.profile.architecture.edit/src/org/eclipse/papyrus/design/profile/architecture/provider/PluginItemProvider.java
index b766cc30eac..506f47e2cb4 100644
--- a/extraplugins/design/org.eclipse.papyrus.design.profile.architecture.edit/src/org/eclipse/papyrus/design/profile/architecture/provider/PluginItemProvider.java
+++ b/extraplugins/design/org.eclipse.papyrus.design.profile.architecture.edit/src/org/eclipse/papyrus/design/profile/architecture/provider/PluginItemProvider.java
@@ -33,7 +33,7 @@ import org.eclipse.papyrus.design.profile.architecture.Plugin;
  * @generated

  */

 public class PluginItemProvider

-	extends ElementItemProvider

+	extends ProjectItemProvider

 	implements

 		IEditingDomainItemProvider,

 		IStructuredItemContentProvider,

@@ -61,172 +61,11 @@ public class PluginItemProvider
 		if (itemPropertyDescriptors == null) {

 			super.getPropertyDescriptors(object);

 

-			addNamePropertyDescriptor(object);

-			addParentFolderPropertyDescriptor(object);

-			addOriginalParentFolderPropertyDescriptor(object);

-			addIsDeprecatedPropertyDescriptor(object);

-			addDeprecatedCommentPropertyDescriptor(object);

-			addReferentPropertyDescriptor(object);

-			addBase_PackagePropertyDescriptor(object);

 		}

 		return itemPropertyDescriptors;

 	}

 

 	/**

-	 * This adds a property descriptor for the Name feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addNamePropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_Plugin_name_feature"),

-				 getString("_UI_PropertyDescriptor_description", "_UI_Plugin_name_feature", "_UI_Plugin_type"),

-				 ArchitecturePackage.Literals.PLUGIN__NAME,

-				 true,

-				 false,

-				 false,

-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Parent Folder feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addParentFolderPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_Plugin_parentFolder_feature"),

-				 getString("_UI_PropertyDescriptor_description", "_UI_Plugin_parentFolder_feature", "_UI_Plugin_type"),

-				 ArchitecturePackage.Literals.PLUGIN__PARENT_FOLDER,

-				 true,

-				 false,

-				 false,

-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Original Parent Folder feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addOriginalParentFolderPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_Plugin_originalParentFolder_feature"),

-				 getString("_UI_PropertyDescriptor_description", "_UI_Plugin_originalParentFolder_feature", "_UI_Plugin_type"),

-				 ArchitecturePackage.Literals.PLUGIN__ORIGINAL_PARENT_FOLDER,

-				 true,

-				 false,

-				 false,

-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Is Deprecated feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addIsDeprecatedPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_Plugin_isDeprecated_feature"),

-				 getString("_UI_PropertyDescriptor_description", "_UI_Plugin_isDeprecated_feature", "_UI_Plugin_type"),

-				 ArchitecturePackage.Literals.PLUGIN__IS_DEPRECATED,

-				 true,

-				 false,

-				 false,

-				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Deprecated Comment feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addDeprecatedCommentPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_Plugin_deprecatedComment_feature"),

-				 getString("_UI_PropertyDescriptor_description", "_UI_Plugin_deprecatedComment_feature", "_UI_Plugin_type"),

-				 ArchitecturePackage.Literals.PLUGIN__DEPRECATED_COMMENT,

-				 true,

-				 false,

-				 false,

-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Referent feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addReferentPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_Plugin_referent_feature"),

-				 getString("_UI_PropertyDescriptor_description", "_UI_Plugin_referent_feature", "_UI_Plugin_type"),

-				 ArchitecturePackage.Literals.PLUGIN__REFERENT,

-				 true,

-				 false,

-				 false,

-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Base Package feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addBase_PackagePropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_Plugin_base_Package_feature"),

-				 getString("_UI_PropertyDescriptor_description", "_UI_Plugin_base_Package_feature", "_UI_Plugin_type"),

-				 ArchitecturePackage.Literals.PLUGIN__BASE_PACKAGE,

-				 true,

-				 false,

-				 true,

-				 null,

-				 null,

-				 null));

-	}

-

-	/**

 	 * This returns Plugin.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

@@ -261,17 +100,6 @@ public class PluginItemProvider
 	@Override

 	public void notifyChanged(Notification notification) {

 		updateChildren(notification);

-

-		switch (notification.getFeatureID(Plugin.class)) {

-			case ArchitecturePackage.PLUGIN__NAME:

-			case ArchitecturePackage.PLUGIN__PARENT_FOLDER:

-			case ArchitecturePackage.PLUGIN__ORIGINAL_PARENT_FOLDER:

-			case ArchitecturePackage.PLUGIN__IS_DEPRECATED:

-			case ArchitecturePackage.PLUGIN__DEPRECATED_COMMENT:

-			case ArchitecturePackage.PLUGIN__REFERENT:

-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-				return;

-		}

 		super.notifyChanged(notification);

 	}

 

diff --git a/extraplugins/design/org.eclipse.papyrus.design.profile.architecture.edit/src/org/eclipse/papyrus/design/profile/architecture/provider/PluginDependencyItemProvider.java b/extraplugins/design/org.eclipse.papyrus.design.profile.architecture.edit/src/org/eclipse/papyrus/design/profile/architecture/provider/ProjectDependencyItemProvider.java
index 33e90ac2dc5..4c6f8ab7ef7 100644
--- a/extraplugins/design/org.eclipse.papyrus.design.profile.architecture.edit/src/org/eclipse/papyrus/design/profile/architecture/provider/PluginDependencyItemProvider.java
+++ b/extraplugins/design/org.eclipse.papyrus.design.profile.architecture.edit/src/org/eclipse/papyrus/design/profile/architecture/provider/ProjectDependencyItemProvider.java
@@ -24,15 +24,15 @@ import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;

 

 import org.eclipse.papyrus.design.profile.architecture.ArchitecturePackage;

-import org.eclipse.papyrus.design.profile.architecture.PluginDependency;

+import org.eclipse.papyrus.design.profile.architecture.ProjectDependency;

 

 /**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.design.profile.architecture.PluginDependency} object.

+ * This is the item provider adapter for a {@link org.eclipse.papyrus.design.profile.architecture.ProjectDependency} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

  * @generated

  */

-public class PluginDependencyItemProvider

+public class ProjectDependencyItemProvider

 	extends ElementItemProvider

 	implements

 		IEditingDomainItemProvider,

@@ -46,7 +46,7 @@ public class PluginDependencyItemProvider
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

-	public PluginDependencyItemProvider(AdapterFactory adapterFactory) {

+	public ProjectDependencyItemProvider(AdapterFactory adapterFactory) {

 		super(adapterFactory);

 	}

 

@@ -79,9 +79,9 @@ public class PluginDependencyItemProvider
 			(createItemPropertyDescriptor

 				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

 				 getResourceLocator(),

-				 getString("_UI_PluginDependency_deprecatedComment_feature"),

-				 getString("_UI_PropertyDescriptor_description", "_UI_PluginDependency_deprecatedComment_feature", "_UI_PluginDependency_type"),

-				 ArchitecturePackage.Literals.PLUGIN_DEPENDENCY__DEPRECATED_COMMENT,

+				 getString("_UI_ProjectDependency_deprecatedComment_feature"),

+				 getString("_UI_PropertyDescriptor_description", "_UI_ProjectDependency_deprecatedComment_feature", "_UI_ProjectDependency_type"),

+				 ArchitecturePackage.Literals.PROJECT_DEPENDENCY__DEPRECATED_COMMENT,

 				 true,

 				 false,

 				 false,

@@ -101,9 +101,9 @@ public class PluginDependencyItemProvider
 			(createItemPropertyDescriptor

 				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

 				 getResourceLocator(),

-				 getString("_UI_PluginDependency_isDeprecated_feature"),

-				 getString("_UI_PropertyDescriptor_description", "_UI_PluginDependency_isDeprecated_feature", "_UI_PluginDependency_type"),

-				 ArchitecturePackage.Literals.PLUGIN_DEPENDENCY__IS_DEPRECATED,

+				 getString("_UI_ProjectDependency_isDeprecated_feature"),

+				 getString("_UI_PropertyDescriptor_description", "_UI_ProjectDependency_isDeprecated_feature", "_UI_ProjectDependency_type"),

+				 ArchitecturePackage.Literals.PROJECT_DEPENDENCY__IS_DEPRECATED,

 				 true,

 				 false,

 				 false,

@@ -123,9 +123,9 @@ public class PluginDependencyItemProvider
 			(createItemPropertyDescriptor

 				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

 				 getResourceLocator(),

-				 getString("_UI_PluginDependency_base_Dependency_feature"),

-				 getString("_UI_PropertyDescriptor_description", "_UI_PluginDependency_base_Dependency_feature", "_UI_PluginDependency_type"),

-				 ArchitecturePackage.Literals.PLUGIN_DEPENDENCY__BASE_DEPENDENCY,

+				 getString("_UI_ProjectDependency_base_Dependency_feature"),

+				 getString("_UI_PropertyDescriptor_description", "_UI_ProjectDependency_base_Dependency_feature", "_UI_ProjectDependency_type"),

+				 ArchitecturePackage.Literals.PROJECT_DEPENDENCY__BASE_DEPENDENCY,

 				 true,

 				 false,

 				 true,

@@ -135,14 +135,14 @@ public class PluginDependencyItemProvider
 	}

 

 	/**

-	 * This returns PluginDependency.gif.

+	 * This returns ProjectDependency.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

 	@Override

 	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/PluginDependency"));

+		return overlayImage(object, getResourceLocator().getImage("full/obj16/ProjectDependency"));

 	}

 

 	/**

@@ -153,10 +153,10 @@ public class PluginDependencyItemProvider
 	 */

 	@Override

 	public String getText(Object object) {

-		String label = ((PluginDependency)object).getDocumentation();

+		String label = ((ProjectDependency)object).getDocumentation();

 		return label == null || label.length() == 0 ?

-			getString("_UI_PluginDependency_type") :

-			getString("_UI_PluginDependency_type") + " " + label;

+			getString("_UI_ProjectDependency_type") :

+			getString("_UI_ProjectDependency_type") + " " + label;

 	}

 

 	/**

@@ -170,9 +170,9 @@ public class PluginDependencyItemProvider
 	public void notifyChanged(Notification notification) {

 		updateChildren(notification);

 

-		switch (notification.getFeatureID(PluginDependency.class)) {

-			case ArchitecturePackage.PLUGIN_DEPENDENCY__DEPRECATED_COMMENT:

-			case ArchitecturePackage.PLUGIN_DEPENDENCY__IS_DEPRECATED:

+		switch (notification.getFeatureID(ProjectDependency.class)) {

+			case ArchitecturePackage.PROJECT_DEPENDENCY__DEPRECATED_COMMENT:

+			case ArchitecturePackage.PROJECT_DEPENDENCY__IS_DEPRECATED:

 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

 				return;

 		}

diff --git a/extraplugins/design/org.eclipse.papyrus.design.profile.architecture.edit/src/org/eclipse/papyrus/design/profile/architecture/provider/ProjectItemProvider.java b/extraplugins/design/org.eclipse.papyrus.design.profile.architecture.edit/src/org/eclipse/papyrus/design/profile/architecture/provider/ProjectItemProvider.java
new file mode 100644
index 00000000000..a292c85d434
--- /dev/null
+++ b/extraplugins/design/org.eclipse.papyrus.design.profile.architecture.edit/src/org/eclipse/papyrus/design/profile/architecture/provider/ProjectItemProvider.java
@@ -0,0 +1,290 @@
+/**

+ * <copyright>

+ * </copyright>

+ *

+ * $Id$

+ */

+package org.eclipse.papyrus.design.profile.architecture.provider;

+

+

+import java.util.Collection;

+import java.util.List;

+

+import org.eclipse.emf.common.notify.AdapterFactory;

+import org.eclipse.emf.common.notify.Notification;

+

+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

+import org.eclipse.emf.edit.provider.IItemLabelProvider;

+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

+import org.eclipse.emf.edit.provider.IItemPropertySource;

+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

+import org.eclipse.emf.edit.provider.ViewerNotification;

+

+import org.eclipse.papyrus.design.profile.architecture.ArchitecturePackage;

+import org.eclipse.papyrus.design.profile.architecture.Project;

+

+/**

+ * This is the item provider adapter for a {@link org.eclipse.papyrus.design.profile.architecture.Project} object.

+ * <!-- begin-user-doc -->

+ * <!-- end-user-doc -->

+ * @generated

+ */

+public class ProjectItemProvider

+	extends ElementItemProvider

+	implements

+		IEditingDomainItemProvider,

+		IStructuredItemContentProvider,

+		ITreeItemContentProvider,

+		IItemLabelProvider,

+		IItemPropertySource {

+	/**

+	 * This constructs an instance from a factory and a notifier.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public ProjectItemProvider(AdapterFactory adapterFactory) {

+		super(adapterFactory);

+	}

+

+	/**

+	 * This returns the property descriptors for the adapted class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

+		if (itemPropertyDescriptors == null) {

+			super.getPropertyDescriptors(object);

+

+			addIsDeprecatedPropertyDescriptor(object);

+			addDeprecatedCommentPropertyDescriptor(object);

+			addNamePropertyDescriptor(object);

+			addReferentPropertyDescriptor(object);

+			addParentFolderPropertyDescriptor(object);

+			addOriginalParentFolderPropertyDescriptor(object);

+			addBase_PackagePropertyDescriptor(object);

+		}

+		return itemPropertyDescriptors;

+	}

+

+	/**

+	 * This adds a property descriptor for the Is Deprecated feature.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected void addIsDeprecatedPropertyDescriptor(Object object) {

+		itemPropertyDescriptors.add

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_Project_isDeprecated_feature"),

+				 getString("_UI_PropertyDescriptor_description", "_UI_Project_isDeprecated_feature", "_UI_Project_type"),

+				 ArchitecturePackage.Literals.PROJECT__IS_DEPRECATED,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

+				 null,

+				 null));

+	}

+

+	/**

+	 * This adds a property descriptor for the Deprecated Comment feature.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected void addDeprecatedCommentPropertyDescriptor(Object object) {

+		itemPropertyDescriptors.add

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_Project_deprecatedComment_feature"),

+				 getString("_UI_PropertyDescriptor_description", "_UI_Project_deprecatedComment_feature", "_UI_Project_type"),

+				 ArchitecturePackage.Literals.PROJECT__DEPRECATED_COMMENT,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

+				 null,

+				 null));

+	}

+

+	/**

+	 * This adds a property descriptor for the Name feature.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected void addNamePropertyDescriptor(Object object) {

+		itemPropertyDescriptors.add

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_Project_name_feature"),

+				 getString("_UI_PropertyDescriptor_description", "_UI_Project_name_feature", "_UI_Project_type"),

+				 ArchitecturePackage.Literals.PROJECT__NAME,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

+				 null,

+				 null));

+	}

+

+	/**

+	 * This adds a property descriptor for the Referent feature.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected void addReferentPropertyDescriptor(Object object) {

+		itemPropertyDescriptors.add

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_Project_referent_feature"),

+				 getString("_UI_PropertyDescriptor_description", "_UI_Project_referent_feature", "_UI_Project_type"),

+				 ArchitecturePackage.Literals.PROJECT__REFERENT,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

+				 null,

+				 null));

+	}

+

+	/**

+	 * This adds a property descriptor for the Parent Folder feature.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected void addParentFolderPropertyDescriptor(Object object) {

+		itemPropertyDescriptors.add

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_Project_parentFolder_feature"),

+				 getString("_UI_PropertyDescriptor_description", "_UI_Project_parentFolder_feature", "_UI_Project_type"),

+				 ArchitecturePackage.Literals.PROJECT__PARENT_FOLDER,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

+				 null,

+				 null));

+	}

+

+	/**

+	 * This adds a property descriptor for the Original Parent Folder feature.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected void addOriginalParentFolderPropertyDescriptor(Object object) {

+		itemPropertyDescriptors.add

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_Project_originalParentFolder_feature"),

+				 getString("_UI_PropertyDescriptor_description", "_UI_Project_originalParentFolder_feature", "_UI_Project_type"),

+				 ArchitecturePackage.Literals.PROJECT__ORIGINAL_PARENT_FOLDER,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

+				 null,

+				 null));

+	}

+

+	/**

+	 * This adds a property descriptor for the Base Package feature.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected void addBase_PackagePropertyDescriptor(Object object) {

+		itemPropertyDescriptors.add

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_Project_base_Package_feature"),

+				 getString("_UI_PropertyDescriptor_description", "_UI_Project_base_Package_feature", "_UI_Project_type"),

+				 ArchitecturePackage.Literals.PROJECT__BASE_PACKAGE,

+				 true,

+				 false,

+				 true,

+				 null,

+				 null,

+				 null));

+	}

+

+	/**

+	 * This returns Project.gif.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object getImage(Object object) {

+		return overlayImage(object, getResourceLocator().getImage("full/obj16/Project"));

+	}

+

+	/**

+	 * This returns the label text for the adapted class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public String getText(Object object) {

+		String label = ((Project)object).getName();

+		return label == null || label.length() == 0 ?

+			getString("_UI_Project_type") :

+			getString("_UI_Project_type") + " " + label;

+	}

+

+	/**

+	 * This handles model notifications by calling {@link #updateChildren} to update any cached

+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void notifyChanged(Notification notification) {

+		updateChildren(notification);

+

+		switch (notification.getFeatureID(Project.class)) {

+			case ArchitecturePackage.PROJECT__IS_DEPRECATED:

+			case ArchitecturePackage.PROJECT__DEPRECATED_COMMENT:

+			case ArchitecturePackage.PROJECT__NAME:

+			case ArchitecturePackage.PROJECT__REFERENT:

+			case ArchitecturePackage.PROJECT__PARENT_FOLDER:

+			case ArchitecturePackage.PROJECT__ORIGINAL_PARENT_FOLDER:

+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

+				return;

+		}

+		super.notifyChanged(notification);

+	}

+

+	/**

+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

+	 * that can be created under this object.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

+		super.collectNewChildDescriptors(newChildDescriptors, object);

+	}

+

+}

diff --git a/extraplugins/design/org.eclipse.papyrus.design.profile.architecture/models/architecture.ecore b/extraplugins/design/org.eclipse.papyrus.design.profile.architecture/models/architecture.ecore
index 657ea61cad6..dec6c551bd0 100644
--- a/extraplugins/design/org.eclipse.papyrus.design.profile.architecture/models/architecture.ecore
+++ b/extraplugins/design/org.eclipse.papyrus.design.profile.architecture/models/architecture.ecore
@@ -58,13 +58,31 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_Dependency" ordered="false"

         lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Dependency"/>

   </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Plugin" eSuperTypes="#//Element">

+  <eClassifiers xsi:type="ecore:EClass" name="Plugin" eSuperTypes="#//Project #//Element">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="A plugin project"/>

+    </eAnnotations>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="Project" eSuperTypes="#//Element">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="A simple project with no type."/>

+    </eAnnotations>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isDeprecated" ordered="false"

+        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="deprecatedComment" ordered="false"

+        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="&lt;p>&#xD;&#xA;    A comment associated to the isDeprecated=true&#xD;&#xA;&lt;/p>"/>

+      </eAnnotations>

+    </eStructuralFeatures>

     <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" ordered="false" 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="&lt;p>&#xD;&#xA;    An alternative name to be used in place of the stereotyped element's name.&#xD;&#xA;&lt;/p>"/>

       </eAnnotations>

     </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="referent" ordered="false"

+        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

     <eStructuralFeatures xsi:type="ecore:EAttribute" name="parentFolder" ordered="false"

         lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">

       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

@@ -77,20 +95,10 @@
         <details key="documentation" value="&lt;p>&#xD;&#xA;    The name of the parent folder that was containing the layer before the refactoring, if any.&#xD;&#xA;&lt;/p>&#xD;&#xA;"/>

       </eAnnotations>

     </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isDeprecated" ordered="false"

-        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="deprecatedComment" ordered="false"

-        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="&lt;p>&#xD;&#xA;    A comment associated to the isDeprecated=true&#xD;&#xA;&lt;/p>"/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="referent" ordered="false"

-        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

     <eStructuralFeatures xsi:type="ecore:EReference" name="base_Package" ordered="false"

         lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Package"/>

   </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="PluginDependency" eSuperTypes="#//Element">

+  <eClassifiers xsi:type="ecore:EClass" name="ProjectDependency" eSuperTypes="#//Element">

     <eStructuralFeatures xsi:type="ecore:EAttribute" name="deprecatedComment" ordered="false"

         lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">

       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

diff --git a/extraplugins/design/org.eclipse.papyrus.design.profile.architecture/models/architecture.profile.genmodel b/extraplugins/design/org.eclipse.papyrus.design.profile.architecture/models/architecture.profile.genmodel
index 24fb789bd3d..561acd5d435 100644
--- a/extraplugins/design/org.eclipse.papyrus.design.profile.architecture/models/architecture.profile.genmodel
+++ b/extraplugins/design/org.eclipse.papyrus.design.profile.architecture/models/architecture.profile.genmodel
@@ -45,21 +45,22 @@
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

           propertySortChoices="true" ecoreFeature="ecore:EReference architecture.ecore#//LayerDependency/base_Dependency"/>

     </genClasses>

-    <genClasses xsi:type="genmodel:GenClass" ecoreClass="architecture.ecore#//Plugin">

-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute architecture.ecore#//Plugin/name"/>

-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute architecture.ecore#//Plugin/parentFolder"/>

-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute architecture.ecore#//Plugin/originalParentFolder"/>

-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute architecture.ecore#//Plugin/isDeprecated"/>

-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute architecture.ecore#//Plugin/deprecatedComment"/>

-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute architecture.ecore#//Plugin/referent"/>

+    <genClasses xsi:type="genmodel:GenClass" ecoreClass="architecture.ecore#//Plugin"/>

+    <genClasses xsi:type="genmodel:GenClass" ecoreClass="architecture.ecore#//Project">

+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute architecture.ecore#//Project/isDeprecated"/>

+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute architecture.ecore#//Project/deprecatedComment"/>

+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute architecture.ecore#//Project/name"/>

+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute architecture.ecore#//Project/referent"/>

+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute architecture.ecore#//Project/parentFolder"/>

+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute architecture.ecore#//Project/originalParentFolder"/>

       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

-          propertySortChoices="true" ecoreFeature="ecore:EReference architecture.ecore#//Plugin/base_Package"/>

+          propertySortChoices="true" ecoreFeature="ecore:EReference architecture.ecore#//Project/base_Package"/>

     </genClasses>

-    <genClasses xsi:type="genmodel:GenClass" ecoreClass="architecture.ecore#//PluginDependency">

-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute architecture.ecore#//PluginDependency/deprecatedComment"/>

-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute architecture.ecore#//PluginDependency/isDeprecated"/>

+    <genClasses xsi:type="genmodel:GenClass" ecoreClass="architecture.ecore#//ProjectDependency">

+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute architecture.ecore#//ProjectDependency/deprecatedComment"/>

+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute architecture.ecore#//ProjectDependency/isDeprecated"/>

       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

-          propertySortChoices="true" ecoreFeature="ecore:EReference architecture.ecore#//PluginDependency/base_Dependency"/>

+          propertySortChoices="true" ecoreFeature="ecore:EReference architecture.ecore#//ProjectDependency/base_Dependency"/>

     </genClasses>

   </genPackages>

 </genmodel:GenModel>

diff --git a/extraplugins/design/org.eclipse.papyrus.design.profile.architecture/models/architecture.profile.notation b/extraplugins/design/org.eclipse.papyrus.design.profile.architecture/models/architecture.profile.notation
index 30687da9b3c..97e82ed7c19 100644
--- a/extraplugins/design/org.eclipse.papyrus.design.profile.architecture/models/architecture.profile.notation
+++ b/extraplugins/design/org.eclipse.papyrus.design.profile.architecture/models/architecture.profile.notation
@@ -78,7 +78,7 @@
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wX_orfS4EeCQ4s2W2w_p6A"/>

     </children>

     <element xmi:type="uml:Stereotype" href="architecture.profile.uml#_wXyNQPS4EeCQ4s2W2w_p6A"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wX-agfS4EeCQ4s2W2w_p6A" x="786" y="372" width="205"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wX-agfS4EeCQ4s2W2w_p6A" x="942" y="348" width="205"/>

   </children>

   <children xmi:type="notation:Shape" xmi:id="_FoesQPTQEeCDBuWvZAIMYg" type="1031" fontName="Segoe UI" lineColor="0">

     <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Fof6YPTQEeCDBuWvZAIMYg" source="ShadowFigure">

@@ -160,30 +160,6 @@
     </eAnnotations>

     <children xmi:type="notation:DecorationNode" xmi:id="_GkI7ofpUEeCbIZwHSJSkOQ" type="1034"/>

     <children xmi:type="notation:BasicCompartment" xmi:id="_GkI7ovpUEeCbIZwHSJSkOQ" type="1071">

-      <children xmi:type="notation:Shape" xmi:id="_YsUpAPpUEeCbIZwHSJSkOQ" type="3002" fontName="Segoe UI" lineColor="0">

-        <element xmi:type="uml:Property" href="architecture.profile.uml#_Xk8KMPpUEeCbIZwHSJSkOQ"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_YsVQEPpUEeCbIZwHSJSkOQ" x="51" y="23"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_Y2i8APpUEeCbIZwHSJSkOQ" type="3002" fontName="Segoe UI" lineColor="0">

-        <element xmi:type="uml:Property" href="architecture.profile.uml#_Xk8KMfpUEeCbIZwHSJSkOQ"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Y2i8AfpUEeCbIZwHSJSkOQ" x="51" y="23"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_Y_rC0PpUEeCbIZwHSJSkOQ" type="3002" fontName="Segoe UI" lineColor="0">

-        <element xmi:type="uml:Property" href="architecture.profile.uml#_Xk8xQPpUEeCbIZwHSJSkOQ"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Y_rC0fpUEeCbIZwHSJSkOQ" x="51" y="23"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_ZIGmEPpUEeCbIZwHSJSkOQ" type="3002" fontName="Segoe UI" lineColor="0">

-        <element xmi:type="uml:Property" href="architecture.profile.uml#_Xk8xQvpUEeCbIZwHSJSkOQ"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ZIGmEfpUEeCbIZwHSJSkOQ" x="51" y="23"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_ZQftEPpUEeCbIZwHSJSkOQ" type="3002" fontName="Segoe UI" lineColor="0">

-        <element xmi:type="uml:Property" href="architecture.profile.uml#_Xk8xQ_pUEeCbIZwHSJSkOQ"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ZQftEfpUEeCbIZwHSJSkOQ" x="51" y="23"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_sKl_kPpUEeCbIZwHSJSkOQ" type="3002" fontName="Segoe UI" lineColor="0">

-        <element xmi:type="uml:Property" href="architecture.profile.uml#_jifhUPpUEeCbIZwHSJSkOQ"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_sKmmoPpUEeCbIZwHSJSkOQ" x="82" y="116"/>

-      </children>

       <styles xmi:type="notation:TitleStyle" xmi:id="_GkI7o_pUEeCbIZwHSJSkOQ"/>

       <styles xmi:type="notation:SortingStyle" xmi:id="_GkI7pPpUEeCbIZwHSJSkOQ"/>

       <styles xmi:type="notation:FilteringStyle" xmi:id="_GkI7pfpUEeCbIZwHSJSkOQ"/>

@@ -196,7 +172,7 @@
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GkI7q_pUEeCbIZwHSJSkOQ"/>

     </children>

     <element xmi:type="uml:Stereotype" href="architecture.profile.uml#_GbwbsPpUEeCbIZwHSJSkOQ"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GkHtgfpUEeCbIZwHSJSkOQ" x="312" y="264"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GkHtgfpUEeCbIZwHSJSkOQ" x="312" y="342"/>

   </children>

   <children xmi:type="notation:Shape" xmi:id="_SvT4APpUEeCbIZwHSJSkOQ" type="1026" fontName="Segoe UI" lineColor="0">

     <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_SvUfEPpUEeCbIZwHSJSkOQ" source="ShadowFigure">

@@ -224,6 +200,56 @@
     <element xmi:type="uml:Stereotype" href="architecture.profile.uml#_SoO_oPpUEeCbIZwHSJSkOQ"/>

     <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SvT4AfpUEeCbIZwHSJSkOQ" x="366" y="624"/>

   </children>

+  <children xmi:type="notation:Shape" xmi:id="_NqPEQPsHEeCAZfBv4HE2iw" type="1026" fontName="Segoe UI" lineColor="0">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_NqRggPsHEeCAZfBv4HE2iw" source="ShadowFigure">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NqRggfsHEeCAZfBv4HE2iw" key="ShadowFigure_Value" value="false"/>

+    </eAnnotations>

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_NqRggvsHEeCAZfBv4HE2iw" source="displayNameLabelIcon">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NqRgg_sHEeCAZfBv4HE2iw" key="displayNameLabelIcon_value" value="false"/>

+    </eAnnotations>

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_NqSHkPsHEeCAZfBv4HE2iw" source="QualifiedName">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NqSHkfsHEeCAZfBv4HE2iw" key="QualifiedNameDepth" value="1000"/>

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_NqSHkvsHEeCAZfBv4HE2iw" type="1034"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_NqSHk_sHEeCAZfBv4HE2iw" type="1071">

+      <children xmi:type="notation:Shape" xmi:id="_YsUpAPpUEeCbIZwHSJSkOQ" type="3002" fontName="Segoe UI" lineColor="0">

+        <element xmi:type="uml:Property" href="architecture.profile.uml#_Xk8KMPpUEeCbIZwHSJSkOQ"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_YsVQEPpUEeCbIZwHSJSkOQ" x="51" y="23"/>

+      </children>

+      <children xmi:type="notation:Shape" xmi:id="_Y_rC0PpUEeCbIZwHSJSkOQ" type="3002" fontName="Segoe UI" lineColor="0">

+        <element xmi:type="uml:Property" href="architecture.profile.uml#_Xk8xQPpUEeCbIZwHSJSkOQ"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Y_rC0fpUEeCbIZwHSJSkOQ" x="51" y="23"/>

+      </children>

+      <children xmi:type="notation:Shape" xmi:id="_Y2i8APpUEeCbIZwHSJSkOQ" type="3002" fontName="Segoe UI" lineColor="0">

+        <element xmi:type="uml:Property" href="architecture.profile.uml#_Xk8KMfpUEeCbIZwHSJSkOQ"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Y2i8AfpUEeCbIZwHSJSkOQ" x="51" y="23"/>

+      </children>

+      <children xmi:type="notation:Shape" xmi:id="_ZIGmEPpUEeCbIZwHSJSkOQ" type="3002" fontName="Segoe UI" lineColor="0">

+        <element xmi:type="uml:Property" href="architecture.profile.uml#_Xk8xQvpUEeCbIZwHSJSkOQ"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ZIGmEfpUEeCbIZwHSJSkOQ" x="51" y="23"/>

+      </children>

+      <children xmi:type="notation:Shape" xmi:id="_ZQftEPpUEeCbIZwHSJSkOQ" type="3002" fontName="Segoe UI" lineColor="0">

+        <element xmi:type="uml:Property" href="architecture.profile.uml#_Xk8xQ_pUEeCbIZwHSJSkOQ"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ZQftEfpUEeCbIZwHSJSkOQ" x="51" y="23"/>

+      </children>

+      <children xmi:type="notation:Shape" xmi:id="_sKl_kPpUEeCbIZwHSJSkOQ" type="3002" fontName="Segoe UI" lineColor="0">

+        <element xmi:type="uml:Property" href="architecture.profile.uml#_jifhUPpUEeCbIZwHSJSkOQ"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_sKmmoPpUEeCbIZwHSJSkOQ" x="82" y="116"/>

+      </children>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_NqSHlPsHEeCAZfBv4HE2iw"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_NqSHlfsHEeCAZfBv4HE2iw"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_NqSHlvsHEeCAZfBv4HE2iw"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NqSHl_sHEeCAZfBv4HE2iw"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_NqSuoPsHEeCAZfBv4HE2iw" visible="false" type="1019">

+      <styles xmi:type="notation:TitleStyle" xmi:id="_NqSuofsHEeCAZfBv4HE2iw"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_NqSuovsHEeCAZfBv4HE2iw"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_NqSuo_sHEeCAZfBv4HE2iw"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NqSupPsHEeCAZfBv4HE2iw"/>

+    </children>

+    <element xmi:type="uml:Stereotype" href="architecture.profile.uml#_Np67MPsHEeCAZfBv4HE2iw"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NqPEQfsHEeCAZfBv4HE2iw" x="492" y="264"/>

+  </children>

   <styles xmi:type="notation:DiagramStyle" xmi:id="_4J9lkfS3EeCQ4s2W2w_p6A"/>

   <element xmi:type="uml:Profile" href="architecture.profile.uml#_4J5UIPS3EeCQ4s2W2w_p6A"/>

   <edges xmi:type="notation:Connector" xmi:id="_NmYOYPS5EeCQ4s2W2w_p6A" type="4002" source="_9EVN0PS3EeCQ4s2W2w_p6A" target="_wX-agPS4EeCQ4s2W2w_p6A" lineColor="0">

@@ -263,15 +289,15 @@
     <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9h_60PpVEeCbIZwHSJSkOQ" id="(0.88,0.2641509433962264)"/>

     <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9h_60fpVEeCbIZwHSJSkOQ" id="(0.2,0.7076923076923077)"/>

   </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_-dWIwPpVEeCbIZwHSJSkOQ" type="4002" source="_GkHtgPpUEeCbIZwHSJSkOQ" target="_wX-agPS4EeCQ4s2W2w_p6A" lineColor="0">

+  <edges xmi:type="notation:Connector" xmi:id="_-dWIwPpVEeCbIZwHSJSkOQ" type="4002" source="_GkHtgPpUEeCbIZwHSJSkOQ" target="_NqPEQPsHEeCAZfBv4HE2iw" lineColor="0">

     <children xmi:type="notation:DecorationNode" xmi:id="_-dWv0PpVEeCbIZwHSJSkOQ" type="6007">

       <layoutConstraint xmi:type="notation:Location" xmi:id="_-dWv0fpVEeCbIZwHSJSkOQ" y="60"/>

     </children>

     <styles xmi:type="notation:FontStyle" xmi:id="_-dWIwfpVEeCbIZwHSJSkOQ" fontName="Segoe UI"/>

     <element xmi:type="uml:Generalization" href="architecture.profile.uml#_-dTFcPpVEeCbIZwHSJSkOQ"/>

     <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_-dWIwvpVEeCbIZwHSJSkOQ" points="[-17, -10, 351, 209]$[-335, -199, 33, 20]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-dddgPpVEeCbIZwHSJSkOQ" id="(0.22325581395348837,0.04608294930875576)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-dddgfpVEeCbIZwHSJSkOQ" id="(0.8390243902439024,0.8384615384615385)"/>

+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-dddgPpVEeCbIZwHSJSkOQ" id="(0.93,0.7924528301886793)"/>

+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lAXdMPsHEeCAZfBv4HE2iw" id="(0.027906976744186046,0.8)"/>

   </edges>

   <edges xmi:type="notation:Connector" xmi:id="_AvVZgPpWEeCbIZwHSJSkOQ" type="1013" source="_BRs1UPapEeCMT_0n-PmDbg" target="_rliAIPpTEeCbIZwHSJSkOQ" lineColor="0">

     <styles xmi:type="notation:FontStyle" xmi:id="_AvVZgfpWEeCbIZwHSJSkOQ" fontName="Segoe UI"/>

@@ -294,4 +320,21 @@
     <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HHqNgPpWEeCbIZwHSJSkOQ" id="(0.0,0.25806451612903225)"/>

     <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HHqNgfpWEeCbIZwHSJSkOQ" id="(0.82,0.46)"/>

   </edges>

+  <edges xmi:type="notation:Connector" xmi:id="_X4u4kPsHEeCAZfBv4HE2iw" type="4002" source="_NqPEQPsHEeCAZfBv4HE2iw" target="_wX-agPS4EeCQ4s2W2w_p6A" lineColor="0">

+    <children xmi:type="notation:DecorationNode" xmi:id="_X4x74PsHEeCAZfBv4HE2iw" visible="false" type="6007">

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_X4x74fsHEeCAZfBv4HE2iw" y="60"/>

+    </children>

+    <styles xmi:type="notation:FontStyle" xmi:id="_X4u4kfsHEeCAZfBv4HE2iw" fontName="Segoe UI"/>

+    <element xmi:type="uml:Generalization" href="architecture.profile.uml#_X4mVsPsHEeCAZfBv4HE2iw"/>

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_X4u4kvsHEeCAZfBv4HE2iw" points="[11, 3, -208, -63]$[217, 66, -2, 0]"/>

+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_X5BzgPsHEeCAZfBv4HE2iw" id="(0.89,0.61)"/>

+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_X5CakPsHEeCAZfBv4HE2iw" id="(0.00975609756097561,0.6076923076923076)"/>

+  </edges>

+  <edges xmi:type="notation:Connector" xmi:id="_j09aAPsHEeCAZfBv4HE2iw" type="1013" source="_NqPEQPsHEeCAZfBv4HE2iw" target="_FoesQPTQEeCDBuWvZAIMYg" lineColor="0">

+    <styles xmi:type="notation:FontStyle" xmi:id="_j09aAfsHEeCAZfBv4HE2iw" fontName="Segoe UI"/>

+    <element xmi:type="uml:Extension" href="architecture.profile.uml#_j02FQPsHEeCAZfBv4HE2iw"/>

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_j09aAvsHEeCAZfBv4HE2iw" points="[-17, 7, 310, 0]$[-319, 4, 8, -3]"/>

+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_j1EuwPsHEeCAZfBv4HE2iw" id="(0.07906976744186046,0.06190476190476191)"/>

+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_j1FV0PsHEeCAZfBv4HE2iw" id="(0.92,0.28)"/>

+  </edges>

 </notation:Diagram>

diff --git a/extraplugins/design/org.eclipse.papyrus.design.profile.architecture/models/architecture.profile.uml b/extraplugins/design/org.eclipse.papyrus.design.profile.architecture/models/architecture.profile.uml
index df85c387f8b..3e69ca0b499 100644
--- a/extraplugins/design/org.eclipse.papyrus.design.profile.architecture/models/architecture.profile.uml
+++ b/extraplugins/design/org.eclipse.papyrus.design.profile.architecture/models/architecture.profile.uml
@@ -645,53 +645,11 @@
       </ownedAttribute>

     </packagedElement>

     <packagedElement xmi:type="uml:Stereotype" xmi:id="_GbwbsPpUEeCbIZwHSJSkOQ" name="Plugin">

+      <ownedComment xmi:id="_d05VAPsHEeCAZfBv4HE2iw" annotatedElement="_GbwbsPpUEeCbIZwHSJSkOQ">

+        <body>A plugin project</body>

+      </ownedComment>

       <generalization xmi:id="_89YAQPpUEeCbIZwHSJSkOQ" general="_wXyNQPS4EeCQ4s2W2w_p6A"/>

-      <generalization xmi:id="_-dTFcPpVEeCbIZwHSJSkOQ" general="_wXyNQPS4EeCQ4s2W2w_p6A"/>

-      <ownedAttribute xmi:id="_Xk8KMfpUEeCbIZwHSJSkOQ" name="name">

-        <ownedComment xmi:id="_Xk8KMvpUEeCbIZwHSJSkOQ" annotatedElement="_Xk8KMfpUEeCbIZwHSJSkOQ">

-          <body>&lt;p>&#xD;

-    An alternative name to be used in place of the stereotyped element's name.&#xD;

-&lt;/p></body>

-        </ownedComment>

-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:id="_Xk8xQ_pUEeCbIZwHSJSkOQ" name="parentFolder">

-        <ownedComment xmi:id="_Xk8xRPpUEeCbIZwHSJSkOQ" annotatedElement="_Xk8xQ_pUEeCbIZwHSJSkOQ">

-          <body>&lt;p>&#xD;

-    The name of the parent folder that will contain the layer, if any.&#xD;

-&lt;/p>&#xD;

-&lt;p>&#xD;

-    If no parent is specified, the layer is 'virtual' (no corresponding physical folder)&#xD;

-&lt;/p>&#xD;

-&lt;p>&#xD;

-    Ex: plugins&#xD;

-&lt;/p></body>

-        </ownedComment>

-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:id="_jifhUPpUEeCbIZwHSJSkOQ" name="originalParentFolder">

-        <ownedComment xmi:id="_jifhUfpUEeCbIZwHSJSkOQ" annotatedElement="_jifhUPpUEeCbIZwHSJSkOQ">

-          <body>&lt;p>&#xD;

-    The name of the parent folder that was containing the layer before the refactoring, if any.&#xD;

-&lt;/p>&#xD;

-</body>

-        </ownedComment>

-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:id="_Xk8KMPpUEeCbIZwHSJSkOQ" name="isDeprecated">

-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:id="_Xk8xQPpUEeCbIZwHSJSkOQ" name="deprecatedComment">

-        <ownedComment xmi:id="_Xk8xQfpUEeCbIZwHSJSkOQ" annotatedElement="_Xk8xQPpUEeCbIZwHSJSkOQ">

-          <body>&lt;p>&#xD;

-    A comment associated to the isDeprecated=true&#xD;

-&lt;/p></body>

-        </ownedComment>

-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:id="_Xk8xQvpUEeCbIZwHSJSkOQ" name="referent">

-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>

-      </ownedAttribute>

+      <generalization xmi:id="_-dTFcPpVEeCbIZwHSJSkOQ" general="_Np67MPsHEeCAZfBv4HE2iw"/>

       <ownedAttribute xmi:id="_GPu8cPpVEeCbIZwHSJSkOQ" name="base_Package" association="_GPvjgPpVEeCbIZwHSJSkOQ">

         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package"/>

       </ownedAttribute>

@@ -699,7 +657,7 @@
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package"/>

       </ownedAttribute>

     </packagedElement>

-    <packagedElement xmi:type="uml:Stereotype" xmi:id="_SoO_oPpUEeCbIZwHSJSkOQ" name="PluginDependency">

+    <packagedElement xmi:type="uml:Stereotype" xmi:id="_SoO_oPpUEeCbIZwHSJSkOQ" name="ProjectDependency">

       <generalization xmi:id="_90ZH0PpUEeCbIZwHSJSkOQ" general="_wXyNQPS4EeCQ4s2W2w_p6A"/>

       <generalization xmi:id="_9h1iwPpVEeCbIZwHSJSkOQ" general="_wXyNQPS4EeCQ4s2W2w_p6A"/>

       <ownedAttribute xmi:id="_dN_dYPpUEeCbIZwHSJSkOQ" name="deprecatedComment">

@@ -732,12 +690,69 @@
     <packagedElement xmi:type="uml:Extension" xmi:id="_AvSWMfpWEeCbIZwHSJSkOQ" name="E_LayerDependency_Dependency1" memberEnd="_AvSWMvpWEeCbIZwHSJSkOQ _AvSWMPpWEeCbIZwHSJSkOQ">

       <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_AvSWMvpWEeCbIZwHSJSkOQ" name="extension_LayerDependency" type="_BRgBAPapEeCMT_0n-PmDbg" aggregation="composite" association="_AvSWMfpWEeCbIZwHSJSkOQ"/>

     </packagedElement>

-    <packagedElement xmi:type="uml:Extension" xmi:id="_BO8GofpWEeCbIZwHSJSkOQ" name="E_PluginDependency_Dependency1" memberEnd="_BO8GovpWEeCbIZwHSJSkOQ _BO8GoPpWEeCbIZwHSJSkOQ">

-      <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_BO8GovpWEeCbIZwHSJSkOQ" name="extension_PluginDependency" type="_SoO_oPpUEeCbIZwHSJSkOQ" aggregation="composite" association="_BO8GofpWEeCbIZwHSJSkOQ"/>

+    <packagedElement xmi:type="uml:Extension" xmi:id="_BO8GofpWEeCbIZwHSJSkOQ" name="E_ProjectDependency_Dependency0" memberEnd="_BO8GovpWEeCbIZwHSJSkOQ _BO8GoPpWEeCbIZwHSJSkOQ">

+      <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_BO8GovpWEeCbIZwHSJSkOQ" name="extension_ProjectDependency" type="_SoO_oPpUEeCbIZwHSJSkOQ" aggregation="composite" association="_BO8GofpWEeCbIZwHSJSkOQ"/>

     </packagedElement>

     <packagedElement xmi:type="uml:Extension" xmi:id="_HHhqoPpWEeCbIZwHSJSkOQ" name="E_Plugin_Package1" memberEnd="_HHhqofpWEeCbIZwHSJSkOQ _HHhDkPpWEeCbIZwHSJSkOQ">

       <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_HHhqofpWEeCbIZwHSJSkOQ" name="extension_Plugin" type="_GbwbsPpUEeCbIZwHSJSkOQ" aggregation="composite" association="_HHhqoPpWEeCbIZwHSJSkOQ"/>

     </packagedElement>

+    <packagedElement xmi:type="uml:Stereotype" xmi:id="_Np67MPsHEeCAZfBv4HE2iw" name="Project">

+      <ownedComment xmi:id="_R-GtMPsHEeCAZfBv4HE2iw" annotatedElement="_Np67MPsHEeCAZfBv4HE2iw">

+        <body>A simple project with no type.</body>

+      </ownedComment>

+      <generalization xmi:id="_X4mVsPsHEeCAZfBv4HE2iw" general="_wXyNQPS4EeCQ4s2W2w_p6A"/>

+      <ownedAttribute xmi:id="_Xk8KMPpUEeCbIZwHSJSkOQ" name="isDeprecated">

+        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>

+      </ownedAttribute>

+      <ownedAttribute xmi:id="_Xk8xQPpUEeCbIZwHSJSkOQ" name="deprecatedComment">

+        <ownedComment xmi:id="_Xk8xQfpUEeCbIZwHSJSkOQ" annotatedElement="_Xk8xQPpUEeCbIZwHSJSkOQ">

+          <body>&lt;p>&#xD;

+    A comment associated to the isDeprecated=true&#xD;

+&lt;/p></body>

+        </ownedComment>

+        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>

+      </ownedAttribute>

+      <ownedAttribute xmi:id="_Xk8KMfpUEeCbIZwHSJSkOQ" name="name">

+        <ownedComment xmi:id="_Xk8KMvpUEeCbIZwHSJSkOQ" annotatedElement="_Xk8KMfpUEeCbIZwHSJSkOQ">

+          <body>&lt;p>&#xD;

+    An alternative name to be used in place of the stereotyped element's name.&#xD;

+&lt;/p></body>

+        </ownedComment>

+        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>

+      </ownedAttribute>

+      <ownedAttribute xmi:id="_Xk8xQvpUEeCbIZwHSJSkOQ" name="referent">

+        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>

+      </ownedAttribute>

+      <ownedAttribute xmi:id="_Xk8xQ_pUEeCbIZwHSJSkOQ" name="parentFolder">

+        <ownedComment xmi:id="_Xk8xRPpUEeCbIZwHSJSkOQ" annotatedElement="_Xk8xQ_pUEeCbIZwHSJSkOQ">

+          <body>&lt;p>&#xD;

+    The name of the parent folder that will contain the layer, if any.&#xD;

+&lt;/p>&#xD;

+&lt;p>&#xD;

+    If no parent is specified, the layer is 'virtual' (no corresponding physical folder)&#xD;

+&lt;/p>&#xD;

+&lt;p>&#xD;

+    Ex: plugins&#xD;

+&lt;/p></body>

+        </ownedComment>

+        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>

+      </ownedAttribute>

+      <ownedAttribute xmi:id="_jifhUPpUEeCbIZwHSJSkOQ" name="originalParentFolder">

+        <ownedComment xmi:id="_jifhUfpUEeCbIZwHSJSkOQ" annotatedElement="_jifhUPpUEeCbIZwHSJSkOQ">

+          <body>&lt;p>&#xD;

+    The name of the parent folder that was containing the layer before the refactoring, if any.&#xD;

+&lt;/p>&#xD;

+</body>

+        </ownedComment>

+        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>

+      </ownedAttribute>

+      <ownedAttribute xmi:id="_j01eMPsHEeCAZfBv4HE2iw" name="base_Package" association="_j02FQPsHEeCAZfBv4HE2iw">

+        <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package"/>

+      </ownedAttribute>

+    </packagedElement>

+    <packagedElement xmi:type="uml:Extension" xmi:id="_j02FQPsHEeCAZfBv4HE2iw" name="E_Project_Package0" memberEnd="_j02sUPsHEeCAZfBv4HE2iw _j01eMPsHEeCAZfBv4HE2iw">

+      <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_j02sUPsHEeCAZfBv4HE2iw" name="extension_Project" type="_Np67MPsHEeCAZfBv4HE2iw" aggregation="composite" association="_j02FQPsHEeCAZfBv4HE2iw"/>

+    </packagedElement>

     <profileApplication xmi:id="_s0-i8PS6EeCDBuWvZAIMYg">

       <eAnnotations xmi:id="_s13TwPS6EeCDBuWvZAIMYg" source="http://www.eclipse.org/uml2/2.0.0/UML">

         <references xmi:type="ecore:EPackage" href="pathmap://UML_PROFILES/Ecore.profile.uml#_z1OFcHjqEdy8S4Cr8Rc_NA"/>

diff --git a/extraplugins/design/org.eclipse.papyrus.design.profile.architecture/src/org/eclipse/papyrus/design/profile/architecture/ArchitectureFactory.java b/extraplugins/design/org.eclipse.papyrus.design.profile.architecture/src/org/eclipse/papyrus/design/profile/architecture/ArchitectureFactory.java
index dbe61fc397b..7f64de900b9 100644
--- a/extraplugins/design/org.eclipse.papyrus.design.profile.architecture/src/org/eclipse/papyrus/design/profile/architecture/ArchitectureFactory.java
+++ b/extraplugins/design/org.eclipse.papyrus.design.profile.architecture/src/org/eclipse/papyrus/design/profile/architecture/ArchitectureFactory.java
@@ -53,13 +53,22 @@ public interface ArchitectureFactory extends EFactory {
 	Plugin createPlugin();

 

 	/**

-	 * Returns a new object of class '<em>Plugin Dependency</em>'.

+	 * Returns a new object of class '<em>Project</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * @return a new object of class '<em>Plugin Dependency</em>'.

+	 * @return a new object of class '<em>Project</em>'.

 	 * @generated

 	 */

-	PluginDependency createPluginDependency();

+	Project createProject();

+

+	/**

+	 * Returns a new object of class '<em>Project Dependency</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return a new object of class '<em>Project Dependency</em>'.

+	 * @generated

+	 */

+	ProjectDependency createProjectDependency();

 

 	/**

 	 * Returns the package supported by this factory.

diff --git a/extraplugins/design/org.eclipse.papyrus.design.profile.architecture/src/org/eclipse/papyrus/design/profile/architecture/ArchitecturePackage.java b/extraplugins/design/org.eclipse.papyrus.design.profile.architecture/src/org/eclipse/papyrus/design/profile/architecture/ArchitecturePackage.java
index c28e55559a8..c8cabcb0006 100644
--- a/extraplugins/design/org.eclipse.papyrus.design.profile.architecture/src/org/eclipse/papyrus/design/profile/architecture/ArchitecturePackage.java
+++ b/extraplugins/design/org.eclipse.papyrus.design.profile.architecture/src/org/eclipse/papyrus/design/profile/architecture/ArchitecturePackage.java
@@ -254,14 +254,14 @@ public interface ArchitecturePackage extends EPackage {
 

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.design.profile.architecture.impl.PluginImpl <em>Plugin</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.design.profile.architecture.impl.ProjectImpl <em>Project</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.design.profile.architecture.impl.PluginImpl

-	 * @see org.eclipse.papyrus.design.profile.architecture.impl.ArchitecturePackageImpl#getPlugin()

+	 * @see org.eclipse.papyrus.design.profile.architecture.impl.ProjectImpl

+	 * @see org.eclipse.papyrus.design.profile.architecture.impl.ArchitecturePackageImpl#getProject()

 	 * @generated

 	 */

-	int PLUGIN = 3;

+	int PROJECT = 4;

 

 	/**

 	 * The feature id for the '<em><b>Documentation</b></em>' attribute.

@@ -270,7 +270,7 @@ public interface ArchitecturePackage extends EPackage {
 	 * @generated

 	 * @ordered

 	 */

-	int PLUGIN__DOCUMENTATION = ELEMENT__DOCUMENTATION;

+	int PROJECT__DOCUMENTATION = ELEMENT__DOCUMENTATION;

 

 	/**

 	 * The feature id for the '<em><b>Comment</b></em>' attribute.

@@ -279,7 +279,25 @@ public interface ArchitecturePackage extends EPackage {
 	 * @generated

 	 * @ordered

 	 */

-	int PLUGIN__COMMENT = ELEMENT__COMMENT;

+	int PROJECT__COMMENT = ELEMENT__COMMENT;

+

+	/**

+	 * The feature id for the '<em><b>Is Deprecated</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int PROJECT__IS_DEPRECATED = ELEMENT_FEATURE_COUNT + 0;

+

+	/**

+	 * The feature id for the '<em><b>Deprecated Comment</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int PROJECT__DEPRECATED_COMMENT = ELEMENT_FEATURE_COUNT + 1;

 

 	/**

 	 * The feature id for the '<em><b>Name</b></em>' attribute.

@@ -288,7 +306,16 @@ public interface ArchitecturePackage extends EPackage {
 	 * @generated

 	 * @ordered

 	 */

-	int PLUGIN__NAME = ELEMENT_FEATURE_COUNT + 0;

+	int PROJECT__NAME = ELEMENT_FEATURE_COUNT + 2;

+

+	/**

+	 * The feature id for the '<em><b>Referent</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int PROJECT__REFERENT = ELEMENT_FEATURE_COUNT + 3;

 

 	/**

 	 * The feature id for the '<em><b>Parent Folder</b></em>' attribute.

@@ -297,7 +324,7 @@ public interface ArchitecturePackage extends EPackage {
 	 * @generated

 	 * @ordered

 	 */

-	int PLUGIN__PARENT_FOLDER = ELEMENT_FEATURE_COUNT + 1;

+	int PROJECT__PARENT_FOLDER = ELEMENT_FEATURE_COUNT + 4;

 

 	/**

 	 * The feature id for the '<em><b>Original Parent Folder</b></em>' attribute.

@@ -306,7 +333,53 @@ public interface ArchitecturePackage extends EPackage {
 	 * @generated

 	 * @ordered

 	 */

-	int PLUGIN__ORIGINAL_PARENT_FOLDER = ELEMENT_FEATURE_COUNT + 2;

+	int PROJECT__ORIGINAL_PARENT_FOLDER = ELEMENT_FEATURE_COUNT + 5;

+

+	/**

+	 * The feature id for the '<em><b>Base Package</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int PROJECT__BASE_PACKAGE = ELEMENT_FEATURE_COUNT + 6;

+

+	/**

+	 * The number of structural features of the '<em>Project</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int PROJECT_FEATURE_COUNT = ELEMENT_FEATURE_COUNT + 7;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.design.profile.architecture.impl.PluginImpl <em>Plugin</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.papyrus.design.profile.architecture.impl.PluginImpl

+	 * @see org.eclipse.papyrus.design.profile.architecture.impl.ArchitecturePackageImpl#getPlugin()

+	 * @generated

+	 */

+	int PLUGIN = 3;

+

+	/**

+	 * The feature id for the '<em><b>Documentation</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int PLUGIN__DOCUMENTATION = PROJECT__DOCUMENTATION;

+

+	/**

+	 * The feature id for the '<em><b>Comment</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int PLUGIN__COMMENT = PROJECT__COMMENT;

 

 	/**

 	 * The feature id for the '<em><b>Is Deprecated</b></em>' attribute.

@@ -315,7 +388,7 @@ public interface ArchitecturePackage extends EPackage {
 	 * @generated

 	 * @ordered

 	 */

-	int PLUGIN__IS_DEPRECATED = ELEMENT_FEATURE_COUNT + 3;

+	int PLUGIN__IS_DEPRECATED = PROJECT__IS_DEPRECATED;

 

 	/**

 	 * The feature id for the '<em><b>Deprecated Comment</b></em>' attribute.

@@ -324,7 +397,16 @@ public interface ArchitecturePackage extends EPackage {
 	 * @generated

 	 * @ordered

 	 */

-	int PLUGIN__DEPRECATED_COMMENT = ELEMENT_FEATURE_COUNT + 4;

+	int PLUGIN__DEPRECATED_COMMENT = PROJECT__DEPRECATED_COMMENT;

+

+	/**

+	 * The feature id for the '<em><b>Name</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int PLUGIN__NAME = PROJECT__NAME;

 

 	/**

 	 * The feature id for the '<em><b>Referent</b></em>' attribute.

@@ -333,7 +415,25 @@ public interface ArchitecturePackage extends EPackage {
 	 * @generated

 	 * @ordered

 	 */

-	int PLUGIN__REFERENT = ELEMENT_FEATURE_COUNT + 5;

+	int PLUGIN__REFERENT = PROJECT__REFERENT;

+

+	/**

+	 * The feature id for the '<em><b>Parent Folder</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int PLUGIN__PARENT_FOLDER = PROJECT__PARENT_FOLDER;

+

+	/**

+	 * The feature id for the '<em><b>Original Parent Folder</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int PLUGIN__ORIGINAL_PARENT_FOLDER = PROJECT__ORIGINAL_PARENT_FOLDER;

 

 	/**

 	 * The feature id for the '<em><b>Base Package</b></em>' reference.

@@ -342,7 +442,7 @@ public interface ArchitecturePackage extends EPackage {
 	 * @generated

 	 * @ordered

 	 */

-	int PLUGIN__BASE_PACKAGE = ELEMENT_FEATURE_COUNT + 6;

+	int PLUGIN__BASE_PACKAGE = PROJECT__BASE_PACKAGE;

 

 	/**

 	 * The number of structural features of the '<em>Plugin</em>' class.

@@ -351,17 +451,17 @@ public interface ArchitecturePackage extends EPackage {
 	 * @generated

 	 * @ordered

 	 */

-	int PLUGIN_FEATURE_COUNT = ELEMENT_FEATURE_COUNT + 7;

+	int PLUGIN_FEATURE_COUNT = PROJECT_FEATURE_COUNT + 0;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.design.profile.architecture.impl.PluginDependencyImpl <em>Plugin Dependency</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.design.profile.architecture.impl.ProjectDependencyImpl <em>Project Dependency</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.design.profile.architecture.impl.PluginDependencyImpl

-	 * @see org.eclipse.papyrus.design.profile.architecture.impl.ArchitecturePackageImpl#getPluginDependency()

+	 * @see org.eclipse.papyrus.design.profile.architecture.impl.ProjectDependencyImpl

+	 * @see org.eclipse.papyrus.design.profile.architecture.impl.ArchitecturePackageImpl#getProjectDependency()

 	 * @generated

 	 */

-	int PLUGIN_DEPENDENCY = 4;

+	int PROJECT_DEPENDENCY = 5;

 

 	/**

 	 * The feature id for the '<em><b>Documentation</b></em>' attribute.

@@ -370,7 +470,7 @@ public interface ArchitecturePackage extends EPackage {
 	 * @generated

 	 * @ordered

 	 */

-	int PLUGIN_DEPENDENCY__DOCUMENTATION = ELEMENT__DOCUMENTATION;

+	int PROJECT_DEPENDENCY__DOCUMENTATION = ELEMENT__DOCUMENTATION;

 

 	/**

 	 * The feature id for the '<em><b>Comment</b></em>' attribute.

@@ -379,7 +479,7 @@ public interface ArchitecturePackage extends EPackage {
 	 * @generated

 	 * @ordered

 	 */

-	int PLUGIN_DEPENDENCY__COMMENT = ELEMENT__COMMENT;

+	int PROJECT_DEPENDENCY__COMMENT = ELEMENT__COMMENT;

 

 	/**

 	 * The feature id for the '<em><b>Deprecated Comment</b></em>' attribute.

@@ -388,7 +488,7 @@ public interface ArchitecturePackage extends EPackage {
 	 * @generated

 	 * @ordered

 	 */

-	int PLUGIN_DEPENDENCY__DEPRECATED_COMMENT = ELEMENT_FEATURE_COUNT + 0;

+	int PROJECT_DEPENDENCY__DEPRECATED_COMMENT = ELEMENT_FEATURE_COUNT + 0;

 

 	/**

 	 * The feature id for the '<em><b>Is Deprecated</b></em>' attribute.

@@ -397,7 +497,7 @@ public interface ArchitecturePackage extends EPackage {
 	 * @generated

 	 * @ordered

 	 */

-	int PLUGIN_DEPENDENCY__IS_DEPRECATED = ELEMENT_FEATURE_COUNT + 1;

+	int PROJECT_DEPENDENCY__IS_DEPRECATED = ELEMENT_FEATURE_COUNT + 1;

 

 	/**

 	 * The feature id for the '<em><b>Base Dependency</b></em>' reference.

@@ -406,17 +506,16 @@ public interface ArchitecturePackage extends EPackage {
 	 * @generated

 	 * @ordered

 	 */

-	int PLUGIN_DEPENDENCY__BASE_DEPENDENCY = ELEMENT_FEATURE_COUNT + 2;

+	int PROJECT_DEPENDENCY__BASE_DEPENDENCY = ELEMENT_FEATURE_COUNT + 2;

 

 	/**

-	 * The number of structural features of the '<em>Plugin Dependency</em>' class.

+	 * The number of structural features of the '<em>Project Dependency</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @generated

 	 * @ordered

 	 */

-	int PLUGIN_DEPENDENCY_FEATURE_COUNT = ELEMENT_FEATURE_COUNT + 3;

-

+	int PROJECT_DEPENDENCY_FEATURE_COUNT = ELEMENT_FEATURE_COUNT + 3;

 

 	/**

 	 * Returns the meta object for class '{@link org.eclipse.papyrus.design.profile.architecture.Layer <em>Layer</em>}'.

@@ -580,124 +679,134 @@ public interface ArchitecturePackage extends EPackage {
 	EClass getPlugin();

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.design.profile.architecture.Plugin#getName <em>Name</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.design.profile.architecture.Project <em>Project</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * @return the meta object for the attribute '<em>Name</em>'.

-	 * @see org.eclipse.papyrus.design.profile.architecture.Plugin#getName()

-	 * @see #getPlugin()

+	 * @return the meta object for class '<em>Project</em>'.

+	 * @see org.eclipse.papyrus.design.profile.architecture.Project

 	 * @generated

 	 */

-	EAttribute getPlugin_Name();

+	EClass getProject();

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.design.profile.architecture.Plugin#getParentFolder <em>Parent Folder</em>}'.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.design.profile.architecture.Project#isDeprecated <em>Is Deprecated</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * @return the meta object for the attribute '<em>Parent Folder</em>'.

-	 * @see org.eclipse.papyrus.design.profile.architecture.Plugin#getParentFolder()

-	 * @see #getPlugin()

+	 * @return the meta object for the attribute '<em>Is Deprecated</em>'.

+	 * @see org.eclipse.papyrus.design.profile.architecture.Project#isDeprecated()

+	 * @see #getProject()

 	 * @generated

 	 */

-	EAttribute getPlugin_ParentFolder();

+	EAttribute getProject_IsDeprecated();

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.design.profile.architecture.Plugin#getOriginalParentFolder <em>Original Parent Folder</em>}'.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.design.profile.architecture.Project#getDeprecatedComment <em>Deprecated Comment</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * @return the meta object for the attribute '<em>Original Parent Folder</em>'.

-	 * @see org.eclipse.papyrus.design.profile.architecture.Plugin#getOriginalParentFolder()

-	 * @see #getPlugin()

+	 * @return the meta object for the attribute '<em>Deprecated Comment</em>'.

+	 * @see org.eclipse.papyrus.design.profile.architecture.Project#getDeprecatedComment()

+	 * @see #getProject()

 	 * @generated

 	 */

-	EAttribute getPlugin_OriginalParentFolder();

+	EAttribute getProject_DeprecatedComment();

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.design.profile.architecture.Plugin#isDeprecated <em>Is Deprecated</em>}'.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.design.profile.architecture.Project#getName <em>Name</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * @return the meta object for the attribute '<em>Is Deprecated</em>'.

-	 * @see org.eclipse.papyrus.design.profile.architecture.Plugin#isDeprecated()

-	 * @see #getPlugin()

+	 * @return the meta object for the attribute '<em>Name</em>'.

+	 * @see org.eclipse.papyrus.design.profile.architecture.Project#getName()

+	 * @see #getProject()

 	 * @generated

 	 */

-	EAttribute getPlugin_IsDeprecated();

+	EAttribute getProject_Name();

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.design.profile.architecture.Plugin#getDeprecatedComment <em>Deprecated Comment</em>}'.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.design.profile.architecture.Project#getReferent <em>Referent</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * @return the meta object for the attribute '<em>Deprecated Comment</em>'.

-	 * @see org.eclipse.papyrus.design.profile.architecture.Plugin#getDeprecatedComment()

-	 * @see #getPlugin()

+	 * @return the meta object for the attribute '<em>Referent</em>'.

+	 * @see org.eclipse.papyrus.design.profile.architecture.Project#getReferent()

+	 * @see #getProject()

 	 * @generated

 	 */

-	EAttribute getPlugin_DeprecatedComment();

+	EAttribute getProject_Referent();

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.design.profile.architecture.Plugin#getReferent <em>Referent</em>}'.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.design.profile.architecture.Project#getParentFolder <em>Parent Folder</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * @return the meta object for the attribute '<em>Referent</em>'.

-	 * @see org.eclipse.papyrus.design.profile.architecture.Plugin#getReferent()

-	 * @see #getPlugin()

+	 * @return the meta object for the attribute '<em>Parent Folder</em>'.

+	 * @see org.eclipse.papyrus.design.profile.architecture.Project#getParentFolder()

+	 * @see #getProject()

+	 * @generated

+	 */

+	EAttribute getProject_ParentFolder();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.design.profile.architecture.Project#getOriginalParentFolder <em>Original Parent Folder</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Original Parent Folder</em>'.

+	 * @see org.eclipse.papyrus.design.profile.architecture.Project#getOriginalParentFolder()

+	 * @see #getProject()

 	 * @generated

 	 */

-	EAttribute getPlugin_Referent();

+	EAttribute getProject_OriginalParentFolder();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.design.profile.architecture.Plugin#getBase_Package <em>Base Package</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.design.profile.architecture.Project#getBase_Package <em>Base Package</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @return the meta object for the reference '<em>Base Package</em>'.

-	 * @see org.eclipse.papyrus.design.profile.architecture.Plugin#getBase_Package()

-	 * @see #getPlugin()

+	 * @see org.eclipse.papyrus.design.profile.architecture.Project#getBase_Package()

+	 * @see #getProject()

 	 * @generated

 	 */

-	EReference getPlugin_Base_Package();

+	EReference getProject_Base_Package();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.design.profile.architecture.PluginDependency <em>Plugin Dependency</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.design.profile.architecture.ProjectDependency <em>Project Dependency</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>Plugin Dependency</em>'.

-	 * @see org.eclipse.papyrus.design.profile.architecture.PluginDependency

+	 * @return the meta object for class '<em>Project Dependency</em>'.

+	 * @see org.eclipse.papyrus.design.profile.architecture.ProjectDependency

 	 * @generated

 	 */

-	EClass getPluginDependency();

+	EClass getProjectDependency();

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.design.profile.architecture.PluginDependency#getDeprecatedComment <em>Deprecated Comment</em>}'.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.design.profile.architecture.ProjectDependency#getDeprecatedComment <em>Deprecated Comment</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @return the meta object for the attribute '<em>Deprecated Comment</em>'.

-	 * @see org.eclipse.papyrus.design.profile.architecture.PluginDependency#getDeprecatedComment()

-	 * @see #getPluginDependency()

+	 * @see org.eclipse.papyrus.design.profile.architecture.ProjectDependency#getDeprecatedComment()

+	 * @see #getProjectDependency()

 	 * @generated

 	 */

-	EAttribute getPluginDependency_DeprecatedComment();

+	EAttribute getProjectDependency_DeprecatedComment();

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.design.profile.architecture.PluginDependency#isDeprecated <em>Is Deprecated</em>}'.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.design.profile.architecture.ProjectDependency#isDeprecated <em>Is Deprecated</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @return the meta object for the attribute '<em>Is Deprecated</em>'.

-	 * @see org.eclipse.papyrus.design.profile.architecture.PluginDependency#isDeprecated()

-	 * @see #getPluginDependency()

+	 * @see org.eclipse.papyrus.design.profile.architecture.ProjectDependency#isDeprecated()

+	 * @see #getProjectDependency()

 	 * @generated

 	 */

-	EAttribute getPluginDependency_IsDeprecated();

+	EAttribute getProjectDependency_IsDeprecated();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.design.profile.architecture.PluginDependency#getBase_Dependency <em>Base Dependency</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.design.profile.architecture.ProjectDependency#getBase_Dependency <em>Base Dependency</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @return the meta object for the reference '<em>Base Dependency</em>'.

-	 * @see org.eclipse.papyrus.design.profile.architecture.PluginDependency#getBase_Dependency()

-	 * @see #getPluginDependency()

+	 * @see org.eclipse.papyrus.design.profile.architecture.ProjectDependency#getBase_Dependency()

+	 * @see #getProjectDependency()

 	 * @generated

 	 */

-	EReference getPluginDependency_Base_Dependency();

+	EReference getProjectDependency_Base_Dependency();

 

 	/**

 	 * Returns the factory that creates the instances of the model.

@@ -850,52 +959,62 @@ public interface ArchitecturePackage extends EPackage {
 		EClass PLUGIN = eINSTANCE.getPlugin();

 

 		/**

-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.design.profile.architecture.impl.ProjectImpl <em>Project</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * @see org.eclipse.papyrus.design.profile.architecture.impl.ProjectImpl

+		 * @see org.eclipse.papyrus.design.profile.architecture.impl.ArchitecturePackageImpl#getProject()

 		 * @generated

 		 */

-		EAttribute PLUGIN__NAME = eINSTANCE.getPlugin_Name();

+		EClass PROJECT = eINSTANCE.getProject();

 

 		/**

-		 * The meta object literal for the '<em><b>Parent Folder</b></em>' attribute feature.

+		 * The meta object literal for the '<em><b>Is Deprecated</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

 		 * @generated

 		 */

-		EAttribute PLUGIN__PARENT_FOLDER = eINSTANCE.getPlugin_ParentFolder();

+		EAttribute PROJECT__IS_DEPRECATED = eINSTANCE.getProject_IsDeprecated();

 

 		/**

-		 * The meta object literal for the '<em><b>Original Parent Folder</b></em>' attribute feature.

+		 * The meta object literal for the '<em><b>Deprecated Comment</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

 		 * @generated

 		 */

-		EAttribute PLUGIN__ORIGINAL_PARENT_FOLDER = eINSTANCE.getPlugin_OriginalParentFolder();

+		EAttribute PROJECT__DEPRECATED_COMMENT = eINSTANCE.getProject_DeprecatedComment();

 

 		/**

-		 * The meta object literal for the '<em><b>Is Deprecated</b></em>' attribute feature.

+		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

 		 * @generated

 		 */

-		EAttribute PLUGIN__IS_DEPRECATED = eINSTANCE.getPlugin_IsDeprecated();

+		EAttribute PROJECT__NAME = eINSTANCE.getProject_Name();

 

 		/**

-		 * The meta object literal for the '<em><b>Deprecated Comment</b></em>' attribute feature.

+		 * The meta object literal for the '<em><b>Referent</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

 		 * @generated

 		 */

-		EAttribute PLUGIN__DEPRECATED_COMMENT = eINSTANCE.getPlugin_DeprecatedComment();

+		EAttribute PROJECT__REFERENT = eINSTANCE.getProject_Referent();

 

 		/**

-		 * The meta object literal for the '<em><b>Referent</b></em>' attribute feature.

+		 * The meta object literal for the '<em><b>Parent Folder</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		EAttribute PROJECT__PARENT_FOLDER = eINSTANCE.getProject_ParentFolder();

+

+		/**

+		 * The meta object literal for the '<em><b>Original Parent Folder</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

 		 * @generated

 		 */

-		EAttribute PLUGIN__REFERENT = eINSTANCE.getPlugin_Referent();

+		EAttribute PROJECT__ORIGINAL_PARENT_FOLDER = eINSTANCE.getProject_OriginalParentFolder();

 

 		/**

 		 * The meta object literal for the '<em><b>Base Package</b></em>' reference feature.

@@ -903,17 +1022,17 @@ public interface ArchitecturePackage extends EPackage {
 		 * <!-- end-user-doc -->

 		 * @generated

 		 */

-		EReference PLUGIN__BASE_PACKAGE = eINSTANCE.getPlugin_Base_Package();

+		EReference PROJECT__BASE_PACKAGE = eINSTANCE.getProject_Base_Package();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.design.profile.architecture.impl.PluginDependencyImpl <em>Plugin Dependency</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.design.profile.architecture.impl.ProjectDependencyImpl <em>Project Dependency</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.design.profile.architecture.impl.PluginDependencyImpl

-		 * @see org.eclipse.papyrus.design.profile.architecture.impl.ArchitecturePackageImpl#getPluginDependency()

+		 * @see org.eclipse.papyrus.design.profile.architecture.impl.ProjectDependencyImpl

+		 * @see org.eclipse.papyrus.design.profile.architecture.impl.ArchitecturePackageImpl#getProjectDependency()

 		 * @generated

 		 */

-		EClass PLUGIN_DEPENDENCY = eINSTANCE.getPluginDependency();

+		EClass PROJECT_DEPENDENCY = eINSTANCE.getProjectDependency();

 

 		/**

 		 * The meta object literal for the '<em><b>Deprecated Comment</b></em>' attribute feature.

@@ -921,7 +1040,7 @@ public interface ArchitecturePackage extends EPackage {
 		 * <!-- end-user-doc -->

 		 * @generated

 		 */

-		EAttribute PLUGIN_DEPENDENCY__DEPRECATED_COMMENT = eINSTANCE.getPluginDependency_DeprecatedComment();

+		EAttribute PROJECT_DEPENDENCY__DEPRECATED_COMMENT = eINSTANCE.getProjectDependency_DeprecatedComment();

 

 		/**

 		 * The meta object literal for the '<em><b>Is Deprecated</b></em>' attribute feature.

@@ -929,7 +1048,7 @@ public interface ArchitecturePackage extends EPackage {
 		 * <!-- end-user-doc -->

 		 * @generated

 		 */

-		EAttribute PLUGIN_DEPENDENCY__IS_DEPRECATED = eINSTANCE.getPluginDependency_IsDeprecated();

+		EAttribute PROJECT_DEPENDENCY__IS_DEPRECATED = eINSTANCE.getProjectDependency_IsDeprecated();

 

 		/**

 		 * The meta object literal for the '<em><b>Base Dependency</b></em>' reference feature.

@@ -937,7 +1056,7 @@ public interface ArchitecturePackage extends EPackage {
 		 * <!-- end-user-doc -->

 		 * @generated

 		 */

-		EReference PLUGIN_DEPENDENCY__BASE_DEPENDENCY = eINSTANCE.getPluginDependency_Base_Dependency();

+		EReference PROJECT_DEPENDENCY__BASE_DEPENDENCY = eINSTANCE.getProjectDependency_Base_Dependency();

 

 	}

 

diff --git a/extraplugins/design/org.eclipse.papyrus.design.profile.architecture/src/org/eclipse/papyrus/design/profile/architecture/Plugin.java b/extraplugins/design/org.eclipse.papyrus.design.profile.architecture/src/org/eclipse/papyrus/design/profile/architecture/Plugin.java
index fb5f0305e9f..1683e1df818 100644
--- a/extraplugins/design/org.eclipse.papyrus.design.profile.architecture/src/org/eclipse/papyrus/design/profile/architecture/Plugin.java
+++ b/extraplugins/design/org.eclipse.papyrus.design.profile.architecture/src/org/eclipse/papyrus/design/profile/architecture/Plugin.java
@@ -12,215 +12,15 @@ package org.eclipse.papyrus.design.profile.architecture;
  * A representation of the model object '<em><b>Plugin</b></em>'.

  * <!-- end-user-doc -->

  *

- * <p>

- * The following features are supported:

- * <ul>

- *   <li>{@link org.eclipse.papyrus.design.profile.architecture.Plugin#getName <em>Name</em>}</li>

- *   <li>{@link org.eclipse.papyrus.design.profile.architecture.Plugin#getParentFolder <em>Parent Folder</em>}</li>

- *   <li>{@link org.eclipse.papyrus.design.profile.architecture.Plugin#getOriginalParentFolder <em>Original Parent Folder</em>}</li>

- *   <li>{@link org.eclipse.papyrus.design.profile.architecture.Plugin#isDeprecated <em>Is Deprecated</em>}</li>

- *   <li>{@link org.eclipse.papyrus.design.profile.architecture.Plugin#getDeprecatedComment <em>Deprecated Comment</em>}</li>

- *   <li>{@link org.eclipse.papyrus.design.profile.architecture.Plugin#getReferent <em>Referent</em>}</li>

- *   <li>{@link org.eclipse.papyrus.design.profile.architecture.Plugin#getBase_Package <em>Base Package</em>}</li>

- * </ul>

- * </p>

+ * <!-- begin-model-doc -->

+ * A plugin project

+ * <!-- end-model-doc -->

+ *

  *

  * @see org.eclipse.papyrus.design.profile.architecture.ArchitecturePackage#getPlugin()

  * @model

  * @generated

  */

-public interface Plugin extends Element {

-	/**

-	 * Returns the value of the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * <p>

-	 *     An alternative name to be used in place of the stereotyped element's name.

-	 * </p>

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Name</em>' attribute.

-	 * @see #setName(String)

-	 * @see org.eclipse.papyrus.design.profile.architecture.ArchitecturePackage#getPlugin_Name()

-	 * @model required="true" ordered="false"

-	 * @generated

-	 */

-	String getName();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.design.profile.architecture.Plugin#getName <em>Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Name</em>' attribute.

-	 * @see #getName()

-	 * @generated

-	 */

-	void setName(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Parent Folder</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * <p>

-	 *     The name of the parent folder that will contain the layer, if any.

-	 * </p>

-	 * <p>

-	 *     If no parent is specified, the layer is 'virtual' (no corresponding physical folder)

-	 * </p>

-	 * <p>

-	 *     Ex: plugins

-	 * </p>

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Parent Folder</em>' attribute.

-	 * @see #setParentFolder(String)

-	 * @see org.eclipse.papyrus.design.profile.architecture.ArchitecturePackage#getPlugin_ParentFolder()

-	 * @model required="true" ordered="false"

-	 * @generated

-	 */

-	String getParentFolder();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.design.profile.architecture.Plugin#getParentFolder <em>Parent Folder</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Parent Folder</em>' attribute.

-	 * @see #getParentFolder()

-	 * @generated

-	 */

-	void setParentFolder(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Original Parent Folder</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * <p>

-	 *     The name of the parent folder that was containing the layer before the refactoring, if any.

-	 * </p>

-	 * 

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Original Parent Folder</em>' attribute.

-	 * @see #setOriginalParentFolder(String)

-	 * @see org.eclipse.papyrus.design.profile.architecture.ArchitecturePackage#getPlugin_OriginalParentFolder()

-	 * @model required="true" ordered="false"

-	 * @generated

-	 */

-	String getOriginalParentFolder();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.design.profile.architecture.Plugin#getOriginalParentFolder <em>Original Parent Folder</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Original Parent Folder</em>' attribute.

-	 * @see #getOriginalParentFolder()

-	 * @generated

-	 */

-	void setOriginalParentFolder(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Is Deprecated</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Is Deprecated</em>' attribute isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @return the value of the '<em>Is Deprecated</em>' attribute.

-	 * @see #setIsDeprecated(boolean)

-	 * @see org.eclipse.papyrus.design.profile.architecture.ArchitecturePackage#getPlugin_IsDeprecated()

-	 * @model required="true" ordered="false"

-	 * @generated

-	 */

-	boolean isDeprecated();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.design.profile.architecture.Plugin#isDeprecated <em>Is Deprecated</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Is Deprecated</em>' attribute.

-	 * @see #isDeprecated()

-	 * @generated

-	 */

-	void setIsDeprecated(boolean value);

-

-	/**

-	 * Returns the value of the '<em><b>Deprecated Comment</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * <p>

-	 *     A comment associated to the isDeprecated=true

-	 * </p>

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Deprecated Comment</em>' attribute.

-	 * @see #setDeprecatedComment(String)

-	 * @see org.eclipse.papyrus.design.profile.architecture.ArchitecturePackage#getPlugin_DeprecatedComment()

-	 * @model required="true" ordered="false"

-	 * @generated

-	 */

-	String getDeprecatedComment();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.design.profile.architecture.Plugin#getDeprecatedComment <em>Deprecated Comment</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Deprecated Comment</em>' attribute.

-	 * @see #getDeprecatedComment()

-	 * @generated

-	 */

-	void setDeprecatedComment(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Referent</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Referent</em>' attribute isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @return the value of the '<em>Referent</em>' attribute.

-	 * @see #setReferent(String)

-	 * @see org.eclipse.papyrus.design.profile.architecture.ArchitecturePackage#getPlugin_Referent()

-	 * @model required="true" ordered="false"

-	 * @generated

-	 */

-	String getReferent();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.design.profile.architecture.Plugin#getReferent <em>Referent</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Referent</em>' attribute.

-	 * @see #getReferent()

-	 * @generated

-	 */

-	void setReferent(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Base Package</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Base Package</em>' reference isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @return the value of the '<em>Base Package</em>' reference.

-	 * @see #setBase_Package(org.eclipse.uml2.uml.Package)

-	 * @see org.eclipse.papyrus.design.profile.architecture.ArchitecturePackage#getPlugin_Base_Package()

-	 * @model required="true" ordered="false"

-	 * @generated

-	 */

-	org.eclipse.uml2.uml.Package getBase_Package();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.design.profile.architecture.Plugin#getBase_Package <em>Base Package</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Base Package</em>' reference.

-	 * @see #getBase_Package()

-	 * @generated

-	 */

-	void setBase_Package(org.eclipse.uml2.uml.Package value);

+public interface Plugin extends Project, Element {

 

 } // Plugin

diff --git a/extraplugins/design/org.eclipse.papyrus.design.profile.architecture/src/org/eclipse/papyrus/design/profile/architecture/Project.java b/extraplugins/design/org.eclipse.papyrus.design.profile.architecture/src/org/eclipse/papyrus/design/profile/architecture/Project.java
new file mode 100644
index 00000000000..ae03bf8bebe
--- /dev/null
+++ b/extraplugins/design/org.eclipse.papyrus.design.profile.architecture/src/org/eclipse/papyrus/design/profile/architecture/Project.java
@@ -0,0 +1,230 @@
+/**

+ * <copyright>

+ * </copyright>

+ *

+ * $Id$

+ */

+package org.eclipse.papyrus.design.profile.architecture;

+

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>Project</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <!-- begin-model-doc -->

+ * A simple project with no type.

+ * <!-- end-model-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ *   <li>{@link org.eclipse.papyrus.design.profile.architecture.Project#isDeprecated <em>Is Deprecated</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.design.profile.architecture.Project#getDeprecatedComment <em>Deprecated Comment</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.design.profile.architecture.Project#getName <em>Name</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.design.profile.architecture.Project#getReferent <em>Referent</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.design.profile.architecture.Project#getParentFolder <em>Parent Folder</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.design.profile.architecture.Project#getOriginalParentFolder <em>Original Parent Folder</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.design.profile.architecture.Project#getBase_Package <em>Base Package</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.papyrus.design.profile.architecture.ArchitecturePackage#getProject()

+ * @model

+ * @generated

+ */

+public interface Project extends Element {

+	/**

+	 * Returns the value of the '<em><b>Is Deprecated</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Is Deprecated</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Is Deprecated</em>' attribute.

+	 * @see #setIsDeprecated(boolean)

+	 * @see org.eclipse.papyrus.design.profile.architecture.ArchitecturePackage#getProject_IsDeprecated()

+	 * @model required="true" ordered="false"

+	 * @generated

+	 */

+	boolean isDeprecated();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.design.profile.architecture.Project#isDeprecated <em>Is Deprecated</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Is Deprecated</em>' attribute.

+	 * @see #isDeprecated()

+	 * @generated

+	 */

+	void setIsDeprecated(boolean value);

+

+	/**

+	 * Returns the value of the '<em><b>Deprecated Comment</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * <!-- begin-model-doc -->

+	 * <p>

+	 *     A comment associated to the isDeprecated=true

+	 * </p>

+	 * <!-- end-model-doc -->

+	 * @return the value of the '<em>Deprecated Comment</em>' attribute.

+	 * @see #setDeprecatedComment(String)

+	 * @see org.eclipse.papyrus.design.profile.architecture.ArchitecturePackage#getProject_DeprecatedComment()

+	 * @model required="true" ordered="false"

+	 * @generated

+	 */

+	String getDeprecatedComment();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.design.profile.architecture.Project#getDeprecatedComment <em>Deprecated Comment</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Deprecated Comment</em>' attribute.

+	 * @see #getDeprecatedComment()

+	 * @generated

+	 */

+	void setDeprecatedComment(String value);

+

+	/**

+	 * Returns the value of the '<em><b>Name</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * <!-- begin-model-doc -->

+	 * <p>

+	 *     An alternative name to be used in place of the stereotyped element's name.

+	 * </p>

+	 * <!-- end-model-doc -->

+	 * @return the value of the '<em>Name</em>' attribute.

+	 * @see #setName(String)

+	 * @see org.eclipse.papyrus.design.profile.architecture.ArchitecturePackage#getProject_Name()

+	 * @model required="true" ordered="false"

+	 * @generated

+	 */

+	String getName();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.design.profile.architecture.Project#getName <em>Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Name</em>' attribute.

+	 * @see #getName()

+	 * @generated

+	 */

+	void setName(String value);

+

+	/**

+	 * Returns the value of the '<em><b>Referent</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Referent</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Referent</em>' attribute.

+	 * @see #setReferent(String)

+	 * @see org.eclipse.papyrus.design.profile.architecture.ArchitecturePackage#getProject_Referent()

+	 * @model required="true" ordered="false"

+	 * @generated

+	 */

+	String getReferent();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.design.profile.architecture.Project#getReferent <em>Referent</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Referent</em>' attribute.

+	 * @see #getReferent()

+	 * @generated

+	 */

+	void setReferent(String value);

+

+	/**

+	 * Returns the value of the '<em><b>Parent Folder</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * <!-- begin-model-doc -->

+	 * <p>

+	 *     The name of the parent folder that will contain the layer, if any.

+	 * </p>

+	 * <p>

+	 *     If no parent is specified, the layer is 'virtual' (no corresponding physical folder)

+	 * </p>

+	 * <p>

+	 *     Ex: plugins

+	 * </p>

+	 * <!-- end-model-doc -->

+	 * @return the value of the '<em>Parent Folder</em>' attribute.

+	 * @see #setParentFolder(String)

+	 * @see org.eclipse.papyrus.design.profile.architecture.ArchitecturePackage#getProject_ParentFolder()

+	 * @model required="true" ordered="false"

+	 * @generated

+	 */

+	String getParentFolder();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.design.profile.architecture.Project#getParentFolder <em>Parent Folder</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Parent Folder</em>' attribute.

+	 * @see #getParentFolder()

+	 * @generated

+	 */

+	void setParentFolder(String value);

+

+	/**

+	 * Returns the value of the '<em><b>Original Parent Folder</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * <!-- begin-model-doc -->

+	 * <p>

+	 *     The name of the parent folder that was containing the layer before the refactoring, if any.

+	 * </p>

+	 * 

+	 * <!-- end-model-doc -->

+	 * @return the value of the '<em>Original Parent Folder</em>' attribute.

+	 * @see #setOriginalParentFolder(String)

+	 * @see org.eclipse.papyrus.design.profile.architecture.ArchitecturePackage#getProject_OriginalParentFolder()

+	 * @model required="true" ordered="false"

+	 * @generated

+	 */

+	String getOriginalParentFolder();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.design.profile.architecture.Project#getOriginalParentFolder <em>Original Parent Folder</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Original Parent Folder</em>' attribute.

+	 * @see #getOriginalParentFolder()

+	 * @generated

+	 */

+	void setOriginalParentFolder(String value);

+

+	/**

+	 * Returns the value of the '<em><b>Base Package</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Base Package</em>' reference isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Base Package</em>' reference.

+	 * @see #setBase_Package(org.eclipse.uml2.uml.Package)

+	 * @see org.eclipse.papyrus.design.profile.architecture.ArchitecturePackage#getProject_Base_Package()

+	 * @model required="true" ordered="false"

+	 * @generated

+	 */

+	org.eclipse.uml2.uml.Package getBase_Package();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.design.profile.architecture.Project#getBase_Package <em>Base Package</em>}' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Base Package</em>' reference.

+	 * @see #getBase_Package()

+	 * @generated

+	 */

+	void setBase_Package(org.eclipse.uml2.uml.Package value);

+

+} // Project

diff --git a/extraplugins/design/org.eclipse.papyrus.design.profile.architecture/src/org/eclipse/papyrus/design/profile/architecture/ProjectDependency.java b/extraplugins/design/org.eclipse.papyrus.design.profile.architecture/src/org/eclipse/papyrus/design/profile/architecture/ProjectDependency.java
new file mode 100644
index 00000000000..584323077de
--- /dev/null
+++ b/extraplugins/design/org.eclipse.papyrus.design.profile.architecture/src/org/eclipse/papyrus/design/profile/architecture/ProjectDependency.java
@@ -0,0 +1,109 @@
+/**

+ * <copyright>

+ * </copyright>

+ *

+ * $Id$

+ */

+package org.eclipse.papyrus.design.profile.architecture;

+

+import org.eclipse.uml2.uml.Dependency;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>Project Dependency</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ *   <li>{@link org.eclipse.papyrus.design.profile.architecture.ProjectDependency#getDeprecatedComment <em>Deprecated Comment</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.design.profile.architecture.ProjectDependency#isDeprecated <em>Is Deprecated</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.design.profile.architecture.ProjectDependency#getBase_Dependency <em>Base Dependency</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.papyrus.design.profile.architecture.ArchitecturePackage#getProjectDependency()

+ * @model

+ * @generated

+ */

+public interface ProjectDependency extends Element {

+	/**

+	 * Returns the value of the '<em><b>Deprecated Comment</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * <!-- begin-model-doc -->

+	 * <p>

+	 *     A comment associated to the isDeprecated=true

+	 * </p>

+	 * <!-- end-model-doc -->

+	 * @return the value of the '<em>Deprecated Comment</em>' attribute.

+	 * @see #setDeprecatedComment(String)

+	 * @see org.eclipse.papyrus.design.profile.architecture.ArchitecturePackage#getProjectDependency_DeprecatedComment()

+	 * @model required="true" ordered="false"

+	 * @generated

+	 */

+	String getDeprecatedComment();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.design.profile.architecture.ProjectDependency#getDeprecatedComment <em>Deprecated Comment</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Deprecated Comment</em>' attribute.

+	 * @see #getDeprecatedComment()

+	 * @generated

+	 */

+	void setDeprecatedComment(String value);

+

+	/**

+	 * Returns the value of the '<em><b>Is Deprecated</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Is Deprecated</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Is Deprecated</em>' attribute.

+	 * @see #setIsDeprecated(boolean)

+	 * @see org.eclipse.papyrus.design.profile.architecture.ArchitecturePackage#getProjectDependency_IsDeprecated()

+	 * @model required="true" ordered="false"

+	 * @generated

+	 */

+	boolean isDeprecated();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.design.profile.architecture.ProjectDependency#isDeprecated <em>Is Deprecated</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Is Deprecated</em>' attribute.

+	 * @see #isDeprecated()

+	 * @generated

+	 */

+	void setIsDeprecated(boolean value);

+

+	/**

+	 * Returns the value of the '<em><b>Base Dependency</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Base Dependency</em>' reference isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Base Dependency</em>' reference.

+	 * @see #setBase_Dependency(Dependency)

+	 * @see org.eclipse.papyrus.design.profile.architecture.ArchitecturePackage#getProjectDependency_Base_Dependency()

+	 * @model required="true" ordered="false"

+	 * @generated

+	 */

+	Dependency getBase_Dependency();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.design.profile.architecture.ProjectDependency#getBase_Dependency <em>Base Dependency</em>}' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Base Dependency</em>' reference.

+	 * @see #getBase_Dependency()

+	 * @generated

+	 */

+	void setBase_Dependency(Dependency value);

+

+} // ProjectDependency

diff --git a/extraplugins/design/org.eclipse.papyrus.design.profile.architecture/src/org/eclipse/papyrus/design/profile/architecture/impl/ArchitectureFactoryImpl.java b/extraplugins/design/org.eclipse.papyrus.design.profile.architecture/src/org/eclipse/papyrus/design/profile/architecture/impl/ArchitectureFactoryImpl.java
index 6a3b6318359..d64d2082c2b 100644
--- a/extraplugins/design/org.eclipse.papyrus.design.profile.architecture/src/org/eclipse/papyrus/design/profile/architecture/impl/ArchitectureFactoryImpl.java
+++ b/extraplugins/design/org.eclipse.papyrus.design.profile.architecture/src/org/eclipse/papyrus/design/profile/architecture/impl/ArchitectureFactoryImpl.java
@@ -63,7 +63,8 @@ public class ArchitectureFactoryImpl extends EFactoryImpl implements Architectur
 			case ArchitecturePackage.LAYER: return createLayer();

 			case ArchitecturePackage.LAYER_DEPENDENCY: return createLayerDependency();

 			case ArchitecturePackage.PLUGIN: return createPlugin();

-			case ArchitecturePackage.PLUGIN_DEPENDENCY: return createPluginDependency();

+			case ArchitecturePackage.PROJECT: return createProject();

+			case ArchitecturePackage.PROJECT_DEPENDENCY: return createProjectDependency();

 			default:

 				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");

 		}

@@ -104,9 +105,19 @@ public class ArchitectureFactoryImpl extends EFactoryImpl implements Architectur
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

-	public PluginDependency createPluginDependency() {

-		PluginDependencyImpl pluginDependency = new PluginDependencyImpl();

-		return pluginDependency;

+	public Project createProject() {

+		ProjectImpl project = new ProjectImpl();

+		return project;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public ProjectDependency createProjectDependency() {

+		ProjectDependencyImpl projectDependency = new ProjectDependencyImpl();

+		return projectDependency;

 	}

 

 	/**

diff --git a/extraplugins/design/org.eclipse.papyrus.design.profile.architecture/src/org/eclipse/papyrus/design/profile/architecture/impl/ArchitecturePackageImpl.java b/extraplugins/design/org.eclipse.papyrus.design.profile.architecture/src/org/eclipse/papyrus/design/profile/architecture/impl/ArchitecturePackageImpl.java
index 98578dcda52..720a9ce446b 100644
--- a/extraplugins/design/org.eclipse.papyrus.design.profile.architecture/src/org/eclipse/papyrus/design/profile/architecture/impl/ArchitecturePackageImpl.java
+++ b/extraplugins/design/org.eclipse.papyrus.design.profile.architecture/src/org/eclipse/papyrus/design/profile/architecture/impl/ArchitecturePackageImpl.java
@@ -19,6 +19,8 @@ import org.eclipse.papyrus.design.profile.architecture.Element;
 import org.eclipse.papyrus.design.profile.architecture.Layer;

 import org.eclipse.papyrus.design.profile.architecture.LayerDependency;

 import org.eclipse.papyrus.design.profile.architecture.Plugin;

+import org.eclipse.papyrus.design.profile.architecture.Project;

+import org.eclipse.papyrus.design.profile.architecture.ProjectDependency;

 import org.eclipse.papyrus.design.profile.architecture.PluginDependency;

 import org.eclipse.uml2.uml.UMLPackage;

 

@@ -62,7 +64,14 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

-	private EClass pluginDependencyEClass = null;

+	private EClass projectEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EClass projectDependencyEClass = null;

 

 	/**

 	 * Creates an instance of the model <b>Package</b>, registered with

@@ -268,8 +277,17 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

-	public EAttribute getPlugin_Name() {

-		return (EAttribute)pluginEClass.getEStructuralFeatures().get(0);

+	public EClass getProject() {

+		return projectEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EAttribute getProject_IsDeprecated() {

+		return (EAttribute)projectEClass.getEStructuralFeatures().get(0);

 	}

 

 	/**

@@ -277,8 +295,8 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

-	public EAttribute getPlugin_ParentFolder() {

-		return (EAttribute)pluginEClass.getEStructuralFeatures().get(1);

+	public EAttribute getProject_DeprecatedComment() {

+		return (EAttribute)projectEClass.getEStructuralFeatures().get(1);

 	}

 

 	/**

@@ -286,8 +304,8 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

-	public EAttribute getPlugin_OriginalParentFolder() {

-		return (EAttribute)pluginEClass.getEStructuralFeatures().get(2);

+	public EAttribute getProject_Name() {

+		return (EAttribute)projectEClass.getEStructuralFeatures().get(2);

 	}

 

 	/**

@@ -295,8 +313,8 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

-	public EAttribute getPlugin_IsDeprecated() {

-		return (EAttribute)pluginEClass.getEStructuralFeatures().get(3);

+	public EAttribute getProject_Referent() {

+		return (EAttribute)projectEClass.getEStructuralFeatures().get(3);

 	}

 

 	/**

@@ -304,8 +322,8 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

-	public EAttribute getPlugin_DeprecatedComment() {

-		return (EAttribute)pluginEClass.getEStructuralFeatures().get(4);

+	public EAttribute getProject_ParentFolder() {

+		return (EAttribute)projectEClass.getEStructuralFeatures().get(4);

 	}

 

 	/**

@@ -313,8 +331,8 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

-	public EAttribute getPlugin_Referent() {

-		return (EAttribute)pluginEClass.getEStructuralFeatures().get(5);

+	public EAttribute getProject_OriginalParentFolder() {

+		return (EAttribute)projectEClass.getEStructuralFeatures().get(5);

 	}

 

 	/**

@@ -322,8 +340,8 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

-	public EReference getPlugin_Base_Package() {

-		return (EReference)pluginEClass.getEStructuralFeatures().get(6);

+	public EReference getProject_Base_Package() {

+		return (EReference)projectEClass.getEStructuralFeatures().get(6);

 	}

 

 	/**

@@ -331,8 +349,8 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

-	public EClass getPluginDependency() {

-		return pluginDependencyEClass;

+	public EClass getProjectDependency() {

+		return projectDependencyEClass;

 	}

 

 	/**

@@ -340,8 +358,8 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

-	public EAttribute getPluginDependency_DeprecatedComment() {

-		return (EAttribute)pluginDependencyEClass.getEStructuralFeatures().get(0);

+	public EAttribute getProjectDependency_DeprecatedComment() {

+		return (EAttribute)projectDependencyEClass.getEStructuralFeatures().get(0);

 	}

 

 	/**

@@ -349,8 +367,8 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

-	public EAttribute getPluginDependency_IsDeprecated() {

-		return (EAttribute)pluginDependencyEClass.getEStructuralFeatures().get(1);

+	public EAttribute getProjectDependency_IsDeprecated() {

+		return (EAttribute)projectDependencyEClass.getEStructuralFeatures().get(1);

 	}

 

 	/**

@@ -358,8 +376,8 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

-	public EReference getPluginDependency_Base_Dependency() {

-		return (EReference)pluginDependencyEClass.getEStructuralFeatures().get(2);

+	public EReference getProjectDependency_Base_Dependency() {

+		return (EReference)projectDependencyEClass.getEStructuralFeatures().get(2);

 	}

 

 	/**

@@ -408,18 +426,20 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur
 		createEReference(layerDependencyEClass, LAYER_DEPENDENCY__BASE_DEPENDENCY);

 

 		pluginEClass = createEClass(PLUGIN);

-		createEAttribute(pluginEClass, PLUGIN__NAME);

-		createEAttribute(pluginEClass, PLUGIN__PARENT_FOLDER);

-		createEAttribute(pluginEClass, PLUGIN__ORIGINAL_PARENT_FOLDER);

-		createEAttribute(pluginEClass, PLUGIN__IS_DEPRECATED);

-		createEAttribute(pluginEClass, PLUGIN__DEPRECATED_COMMENT);

-		createEAttribute(pluginEClass, PLUGIN__REFERENT);

-		createEReference(pluginEClass, PLUGIN__BASE_PACKAGE);

 

-		pluginDependencyEClass = createEClass(PLUGIN_DEPENDENCY);

-		createEAttribute(pluginDependencyEClass, PLUGIN_DEPENDENCY__DEPRECATED_COMMENT);

-		createEAttribute(pluginDependencyEClass, PLUGIN_DEPENDENCY__IS_DEPRECATED);

-		createEReference(pluginDependencyEClass, PLUGIN_DEPENDENCY__BASE_DEPENDENCY);

+		projectEClass = createEClass(PROJECT);

+		createEAttribute(projectEClass, PROJECT__IS_DEPRECATED);

+		createEAttribute(projectEClass, PROJECT__DEPRECATED_COMMENT);

+		createEAttribute(projectEClass, PROJECT__NAME);

+		createEAttribute(projectEClass, PROJECT__REFERENT);

+		createEAttribute(projectEClass, PROJECT__PARENT_FOLDER);

+		createEAttribute(projectEClass, PROJECT__ORIGINAL_PARENT_FOLDER);

+		createEReference(projectEClass, PROJECT__BASE_PACKAGE);

+

+		projectDependencyEClass = createEClass(PROJECT_DEPENDENCY);

+		createEAttribute(projectDependencyEClass, PROJECT_DEPENDENCY__DEPRECATED_COMMENT);

+		createEAttribute(projectDependencyEClass, PROJECT_DEPENDENCY__IS_DEPRECATED);

+		createEReference(projectDependencyEClass, PROJECT_DEPENDENCY__BASE_DEPENDENCY);

 	}

 

 	/**

@@ -455,8 +475,10 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur
 		// Add supertypes to classes

 		layerEClass.getESuperTypes().add(this.getElement());

 		layerDependencyEClass.getESuperTypes().add(this.getElement());

+		pluginEClass.getESuperTypes().add(this.getProject());

 		pluginEClass.getESuperTypes().add(this.getElement());

-		pluginDependencyEClass.getESuperTypes().add(this.getElement());

+		projectEClass.getESuperTypes().add(this.getElement());

+		projectDependencyEClass.getESuperTypes().add(this.getElement());

 

 		// Initialize classes and features; add operations and parameters

 		initEClass(layerEClass, Layer.class, "Layer", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

@@ -477,18 +499,20 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur
 		initEReference(getLayerDependency_Base_Dependency(), theUMLPackage.getDependency(), null, "base_Dependency", null, 1, 1, LayerDependency.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

 

 		initEClass(pluginEClass, Plugin.class, "Plugin", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEAttribute(getPlugin_Name(), ecorePackage.getEString(), "name", null, 1, 1, Plugin.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

-		initEAttribute(getPlugin_ParentFolder(), ecorePackage.getEString(), "parentFolder", null, 1, 1, Plugin.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

-		initEAttribute(getPlugin_OriginalParentFolder(), ecorePackage.getEString(), "originalParentFolder", null, 1, 1, Plugin.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

-		initEAttribute(getPlugin_IsDeprecated(), ecorePackage.getEBoolean(), "isDeprecated", null, 1, 1, Plugin.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

-		initEAttribute(getPlugin_DeprecatedComment(), ecorePackage.getEString(), "deprecatedComment", null, 1, 1, Plugin.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

-		initEAttribute(getPlugin_Referent(), ecorePackage.getEString(), "referent", null, 1, 1, Plugin.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

-		initEReference(getPlugin_Base_Package(), theUMLPackage.getPackage(), null, "base_Package", null, 1, 1, Plugin.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

-

-		initEClass(pluginDependencyEClass, PluginDependency.class, "PluginDependency", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEAttribute(getPluginDependency_DeprecatedComment(), ecorePackage.getEString(), "deprecatedComment", null, 1, 1, PluginDependency.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

-		initEAttribute(getPluginDependency_IsDeprecated(), ecorePackage.getEBoolean(), "isDeprecated", null, 1, 1, PluginDependency.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

-		initEReference(getPluginDependency_Base_Dependency(), theUMLPackage.getDependency(), null, "base_Dependency", null, 1, 1, PluginDependency.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

+

+		initEClass(projectEClass, Project.class, "Project", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEAttribute(getProject_IsDeprecated(), ecorePackage.getEBoolean(), "isDeprecated", null, 1, 1, Project.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

+		initEAttribute(getProject_DeprecatedComment(), ecorePackage.getEString(), "deprecatedComment", null, 1, 1, Project.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

+		initEAttribute(getProject_Name(), ecorePackage.getEString(), "name", null, 1, 1, Project.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

+		initEAttribute(getProject_Referent(), ecorePackage.getEString(), "referent", null, 1, 1, Project.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

+		initEAttribute(getProject_ParentFolder(), ecorePackage.getEString(), "parentFolder", null, 1, 1, Project.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

+		initEAttribute(getProject_OriginalParentFolder(), ecorePackage.getEString(), "originalParentFolder", null, 1, 1, Project.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

+		initEReference(getProject_Base_Package(), theUMLPackage.getPackage(), null, "base_Package", null, 1, 1, Project.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

+

+		initEClass(projectDependencyEClass, ProjectDependency.class, "ProjectDependency", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEAttribute(getProjectDependency_DeprecatedComment(), ecorePackage.getEString(), "deprecatedComment", null, 1, 1, ProjectDependency.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

+		initEAttribute(getProjectDependency_IsDeprecated(), ecorePackage.getEBoolean(), "isDeprecated", null, 1, 1, ProjectDependency.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

+		initEReference(getProjectDependency_Base_Dependency(), theUMLPackage.getDependency(), null, "base_Dependency", null, 1, 1, ProjectDependency.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

 

 		// Create resource

 		createResource(eNS_URI);

diff --git a/extraplugins/design/org.eclipse.papyrus.design.profile.architecture/src/org/eclipse/papyrus/design/profile/architecture/impl/PluginImpl.java b/extraplugins/design/org.eclipse.papyrus.design.profile.architecture/src/org/eclipse/papyrus/design/profile/architecture/impl/PluginImpl.java
index 477c5d36373..d0892b1d3ad 100644
--- a/extraplugins/design/org.eclipse.papyrus.design.profile.architecture/src/org/eclipse/papyrus/design/profile/architecture/impl/PluginImpl.java
+++ b/extraplugins/design/org.eclipse.papyrus.design.profile.architecture/src/org/eclipse/papyrus/design/profile/architecture/impl/PluginImpl.java
@@ -21,151 +21,11 @@ import org.eclipse.papyrus.design.profile.architecture.Plugin;
  * An implementation of the model object '<em><b>Plugin</b></em>'.

  * <!-- end-user-doc -->

  * <p>

- * The following features are implemented:

- * <ul>

- *   <li>{@link org.eclipse.papyrus.design.profile.architecture.impl.PluginImpl#getName <em>Name</em>}</li>

- *   <li>{@link org.eclipse.papyrus.design.profile.architecture.impl.PluginImpl#getParentFolder <em>Parent Folder</em>}</li>

- *   <li>{@link org.eclipse.papyrus.design.profile.architecture.impl.PluginImpl#getOriginalParentFolder <em>Original Parent Folder</em>}</li>

- *   <li>{@link org.eclipse.papyrus.design.profile.architecture.impl.PluginImpl#isDeprecated <em>Is Deprecated</em>}</li>

- *   <li>{@link org.eclipse.papyrus.design.profile.architecture.impl.PluginImpl#getDeprecatedComment <em>Deprecated Comment</em>}</li>

- *   <li>{@link org.eclipse.papyrus.design.profile.architecture.impl.PluginImpl#getReferent <em>Referent</em>}</li>

- *   <li>{@link org.eclipse.papyrus.design.profile.architecture.impl.PluginImpl#getBase_Package <em>Base Package</em>}</li>

- * </ul>

  * </p>

  *

  * @generated

  */

-public class PluginImpl extends ElementImpl implements Plugin {

-	/**

-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getName()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String NAME_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getName()

-	 * @generated

-	 * @ordered

-	 */

-	protected String name = NAME_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #getParentFolder() <em>Parent Folder</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getParentFolder()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String PARENT_FOLDER_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getParentFolder() <em>Parent Folder</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getParentFolder()

-	 * @generated

-	 * @ordered

-	 */

-	protected String parentFolder = PARENT_FOLDER_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #getOriginalParentFolder() <em>Original Parent Folder</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getOriginalParentFolder()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String ORIGINAL_PARENT_FOLDER_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getOriginalParentFolder() <em>Original Parent Folder</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getOriginalParentFolder()

-	 * @generated

-	 * @ordered

-	 */

-	protected String originalParentFolder = ORIGINAL_PARENT_FOLDER_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #isDeprecated() <em>Is Deprecated</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isDeprecated()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final boolean IS_DEPRECATED_EDEFAULT = false;

-

-	/**

-	 * The cached value of the '{@link #isDeprecated() <em>Is Deprecated</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isDeprecated()

-	 * @generated

-	 * @ordered

-	 */

-	protected boolean isDeprecated = IS_DEPRECATED_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #getDeprecatedComment() <em>Deprecated Comment</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getDeprecatedComment()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String DEPRECATED_COMMENT_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getDeprecatedComment() <em>Deprecated Comment</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getDeprecatedComment()

-	 * @generated

-	 * @ordered

-	 */

-	protected String deprecatedComment = DEPRECATED_COMMENT_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #getReferent() <em>Referent</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getReferent()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String REFERENT_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getReferent() <em>Referent</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getReferent()

-	 * @generated

-	 * @ordered

-	 */

-	protected String referent = REFERENT_EDEFAULT;

-

-	/**

-	 * The cached value of the '{@link #getBase_Package() <em>Base Package</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getBase_Package()

-	 * @generated

-	 * @ordered

-	 */

-	protected org.eclipse.uml2.uml.Package base_Package;

-

+public class PluginImpl extends ProjectImpl implements Plugin {

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

@@ -185,313 +45,4 @@ public class PluginImpl extends ElementImpl implements Plugin {
 		return ArchitecturePackage.Literals.PLUGIN;

 	}

 

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public String getName() {

-		return name;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setName(String newName) {

-		String oldName = name;

-		name = newName;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, ArchitecturePackage.PLUGIN__NAME, oldName, name));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public String getParentFolder() {

-		return parentFolder;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setParentFolder(String newParentFolder) {

-		String oldParentFolder = parentFolder;

-		parentFolder = newParentFolder;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, ArchitecturePackage.PLUGIN__PARENT_FOLDER, oldParentFolder, parentFolder));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public String getOriginalParentFolder() {

-		return originalParentFolder;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setOriginalParentFolder(String newOriginalParentFolder) {

-		String oldOriginalParentFolder = originalParentFolder;

-		originalParentFolder = newOriginalParentFolder;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, ArchitecturePackage.PLUGIN__ORIGINAL_PARENT_FOLDER, oldOriginalParentFolder, originalParentFolder));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public boolean isDeprecated() {

-		return isDeprecated;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setIsDeprecated(boolean newIsDeprecated) {

-		boolean oldIsDeprecated = isDeprecated;

-		isDeprecated = newIsDeprecated;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, ArchitecturePackage.PLUGIN__IS_DEPRECATED, oldIsDeprecated, isDeprecated));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public String getDeprecatedComment() {

-		return deprecatedComment;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setDeprecatedComment(String newDeprecatedComment) {

-		String oldDeprecatedComment = deprecatedComment;

-		deprecatedComment = newDeprecatedComment;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, ArchitecturePackage.PLUGIN__DEPRECATED_COMMENT, oldDeprecatedComment, deprecatedComment));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public String getReferent() {

-		return referent;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setReferent(String newReferent) {

-		String oldReferent = referent;

-		referent = newReferent;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, ArchitecturePackage.PLUGIN__REFERENT, oldReferent, referent));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public org.eclipse.uml2.uml.Package getBase_Package() {

-		if (base_Package != null && base_Package.eIsProxy()) {

-			InternalEObject oldBase_Package = (InternalEObject)base_Package;

-			base_Package = (org.eclipse.uml2.uml.Package)eResolveProxy(oldBase_Package);

-			if (base_Package != oldBase_Package) {

-				if (eNotificationRequired())

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ArchitecturePackage.PLUGIN__BASE_PACKAGE, oldBase_Package, base_Package));

-			}

-		}

-		return base_Package;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public org.eclipse.uml2.uml.Package basicGetBase_Package() {

-		return base_Package;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setBase_Package(org.eclipse.uml2.uml.Package newBase_Package) {

-		org.eclipse.uml2.uml.Package oldBase_Package = base_Package;

-		base_Package = newBase_Package;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, ArchitecturePackage.PLUGIN__BASE_PACKAGE, oldBase_Package, base_Package));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case ArchitecturePackage.PLUGIN__NAME:

-				return getName();

-			case ArchitecturePackage.PLUGIN__PARENT_FOLDER:

-				return getParentFolder();

-			case ArchitecturePackage.PLUGIN__ORIGINAL_PARENT_FOLDER:

-				return getOriginalParentFolder();

-			case ArchitecturePackage.PLUGIN__IS_DEPRECATED:

-				return isDeprecated();

-			case ArchitecturePackage.PLUGIN__DEPRECATED_COMMENT:

-				return getDeprecatedComment();

-			case ArchitecturePackage.PLUGIN__REFERENT:

-				return getReferent();

-			case ArchitecturePackage.PLUGIN__BASE_PACKAGE:

-				if (resolve) return getBase_Package();

-				return basicGetBase_Package();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case ArchitecturePackage.PLUGIN__NAME:

-				setName((String)newValue);

-				return;

-			case ArchitecturePackage.PLUGIN__PARENT_FOLDER:

-				setParentFolder((String)newValue);

-				return;

-			case ArchitecturePackage.PLUGIN__ORIGINAL_PARENT_FOLDER:

-				setOriginalParentFolder((String)newValue);

-				return;

-			case ArchitecturePackage.PLUGIN__IS_DEPRECATED:

-				setIsDeprecated((Boolean)newValue);

-				return;

-			case ArchitecturePackage.PLUGIN__DEPRECATED_COMMENT:

-				setDeprecatedComment((String)newValue);

-				return;

-			case ArchitecturePackage.PLUGIN__REFERENT:

-				setReferent((String)newValue);

-				return;

-			case ArchitecturePackage.PLUGIN__BASE_PACKAGE:

-				setBase_Package((org.eclipse.uml2.uml.Package)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-			case ArchitecturePackage.PLUGIN__NAME:

-				setName(NAME_EDEFAULT);

-				return;

-			case ArchitecturePackage.PLUGIN__PARENT_FOLDER:

-				setParentFolder(PARENT_FOLDER_EDEFAULT);

-				return;

-			case ArchitecturePackage.PLUGIN__ORIGINAL_PARENT_FOLDER:

-				setOriginalParentFolder(ORIGINAL_PARENT_FOLDER_EDEFAULT);

-				return;

-			case ArchitecturePackage.PLUGIN__IS_DEPRECATED:

-				setIsDeprecated(IS_DEPRECATED_EDEFAULT);

-				return;

-			case ArchitecturePackage.PLUGIN__DEPRECATED_COMMENT:

-				setDeprecatedComment(DEPRECATED_COMMENT_EDEFAULT);

-				return;

-			case ArchitecturePackage.PLUGIN__REFERENT:

-				setReferent(REFERENT_EDEFAULT);

-				return;

-			case ArchitecturePackage.PLUGIN__BASE_PACKAGE:

-				setBase_Package((org.eclipse.uml2.uml.Package)null);

-				return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case ArchitecturePackage.PLUGIN__NAME:

-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);

-			case ArchitecturePackage.PLUGIN__PARENT_FOLDER:

-				return PARENT_FOLDER_EDEFAULT == null ? parentFolder != null : !PARENT_FOLDER_EDEFAULT.equals(parentFolder);

-			case ArchitecturePackage.PLUGIN__ORIGINAL_PARENT_FOLDER:

-				return ORIGINAL_PARENT_FOLDER_EDEFAULT == null ? originalParentFolder != null : !ORIGINAL_PARENT_FOLDER_EDEFAULT.equals(originalParentFolder);

-			case ArchitecturePackage.PLUGIN__IS_DEPRECATED:

-				return isDeprecated != IS_DEPRECATED_EDEFAULT;

-			case ArchitecturePackage.PLUGIN__DEPRECATED_COMMENT:

-				return DEPRECATED_COMMENT_EDEFAULT == null ? deprecatedComment != null : !DEPRECATED_COMMENT_EDEFAULT.equals(deprecatedComment);

-			case ArchitecturePackage.PLUGIN__REFERENT:

-				return REFERENT_EDEFAULT == null ? referent != null : !REFERENT_EDEFAULT.equals(referent);

-			case ArchitecturePackage.PLUGIN__BASE_PACKAGE:

-				return base_Package != null;

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) return super.toString();

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (name: ");

-		result.append(name);

-		result.append(", parentFolder: ");

-		result.append(parentFolder);

-		result.append(", originalParentFolder: ");

-		result.append(originalParentFolder);

-		result.append(", isDeprecated: ");

-		result.append(isDeprecated);

-		result.append(", deprecatedComment: ");

-		result.append(deprecatedComment);

-		result.append(", referent: ");

-		result.append(referent);

-		result.append(')');

-		return result.toString();

-	}

-

 } //PluginImpl

diff --git a/extraplugins/design/org.eclipse.papyrus.design.profile.architecture/src/org/eclipse/papyrus/design/profile/architecture/impl/PluginDependencyImpl.java b/extraplugins/design/org.eclipse.papyrus.design.profile.architecture/src/org/eclipse/papyrus/design/profile/architecture/impl/ProjectDependencyImpl.java
index aa863676d1d..5d777874546 100644
--- a/extraplugins/design/org.eclipse.papyrus.design.profile.architecture/src/org/eclipse/papyrus/design/profile/architecture/impl/PluginDependencyImpl.java
+++ b/extraplugins/design/org.eclipse.papyrus.design.profile.architecture/src/org/eclipse/papyrus/design/profile/architecture/impl/ProjectDependencyImpl.java
@@ -14,26 +14,26 @@ import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;

 

 import org.eclipse.papyrus.design.profile.architecture.ArchitecturePackage;

-import org.eclipse.papyrus.design.profile.architecture.PluginDependency;

+import org.eclipse.papyrus.design.profile.architecture.ProjectDependency;

 

 import org.eclipse.uml2.uml.Dependency;

 

 /**

  * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Plugin Dependency</b></em>'.

+ * An implementation of the model object '<em><b>Project Dependency</b></em>'.

  * <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

  * <ul>

- *   <li>{@link org.eclipse.papyrus.design.profile.architecture.impl.PluginDependencyImpl#getDeprecatedComment <em>Deprecated Comment</em>}</li>

- *   <li>{@link org.eclipse.papyrus.design.profile.architecture.impl.PluginDependencyImpl#isDeprecated <em>Is Deprecated</em>}</li>

- *   <li>{@link org.eclipse.papyrus.design.profile.architecture.impl.PluginDependencyImpl#getBase_Dependency <em>Base Dependency</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.design.profile.architecture.impl.ProjectDependencyImpl#getDeprecatedComment <em>Deprecated Comment</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.design.profile.architecture.impl.ProjectDependencyImpl#isDeprecated <em>Is Deprecated</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.design.profile.architecture.impl.ProjectDependencyImpl#getBase_Dependency <em>Base Dependency</em>}</li>

  * </ul>

  * </p>

  *

  * @generated

  */

-public class PluginDependencyImpl extends ElementImpl implements PluginDependency {

+public class ProjectDependencyImpl extends ElementImpl implements ProjectDependency {

 	/**

 	 * The default value of the '{@link #getDeprecatedComment() <em>Deprecated Comment</em>}' attribute.

 	 * <!-- begin-user-doc -->

@@ -89,7 +89,7 @@ public class PluginDependencyImpl extends ElementImpl implements PluginDependenc
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

-	protected PluginDependencyImpl() {

+	protected ProjectDependencyImpl() {

 		super();

 	}

 

@@ -100,7 +100,7 @@ public class PluginDependencyImpl extends ElementImpl implements PluginDependenc
 	 */

 	@Override

 	protected EClass eStaticClass() {

-		return ArchitecturePackage.Literals.PLUGIN_DEPENDENCY;

+		return ArchitecturePackage.Literals.PROJECT_DEPENDENCY;

 	}

 

 	/**

@@ -121,7 +121,7 @@ public class PluginDependencyImpl extends ElementImpl implements PluginDependenc
 		String oldDeprecatedComment = deprecatedComment;

 		deprecatedComment = newDeprecatedComment;

 		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, ArchitecturePackage.PLUGIN_DEPENDENCY__DEPRECATED_COMMENT, oldDeprecatedComment, deprecatedComment));

+			eNotify(new ENotificationImpl(this, Notification.SET, ArchitecturePackage.PROJECT_DEPENDENCY__DEPRECATED_COMMENT, oldDeprecatedComment, deprecatedComment));

 	}

 

 	/**

@@ -142,7 +142,7 @@ public class PluginDependencyImpl extends ElementImpl implements PluginDependenc
 		boolean oldIsDeprecated = isDeprecated;

 		isDeprecated = newIsDeprecated;

 		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, ArchitecturePackage.PLUGIN_DEPENDENCY__IS_DEPRECATED, oldIsDeprecated, isDeprecated));

+			eNotify(new ENotificationImpl(this, Notification.SET, ArchitecturePackage.PROJECT_DEPENDENCY__IS_DEPRECATED, oldIsDeprecated, isDeprecated));

 	}

 

 	/**

@@ -156,7 +156,7 @@ public class PluginDependencyImpl extends ElementImpl implements PluginDependenc
 			base_Dependency = (Dependency)eResolveProxy(oldBase_Dependency);

 			if (base_Dependency != oldBase_Dependency) {

 				if (eNotificationRequired())

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ArchitecturePackage.PLUGIN_DEPENDENCY__BASE_DEPENDENCY, oldBase_Dependency, base_Dependency));

+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ArchitecturePackage.PROJECT_DEPENDENCY__BASE_DEPENDENCY, oldBase_Dependency, base_Dependency));

 			}

 		}

 		return base_Dependency;

@@ -180,7 +180,7 @@ public class PluginDependencyImpl extends ElementImpl implements PluginDependenc
 		Dependency oldBase_Dependency = base_Dependency;

 		base_Dependency = newBase_Dependency;

 		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, ArchitecturePackage.PLUGIN_DEPENDENCY__BASE_DEPENDENCY, oldBase_Dependency, base_Dependency));

+			eNotify(new ENotificationImpl(this, Notification.SET, ArchitecturePackage.PROJECT_DEPENDENCY__BASE_DEPENDENCY, oldBase_Dependency, base_Dependency));

 	}

 

 	/**

@@ -191,11 +191,11 @@ public class PluginDependencyImpl extends ElementImpl implements PluginDependenc
 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

 		switch (featureID) {

-			case ArchitecturePackage.PLUGIN_DEPENDENCY__DEPRECATED_COMMENT:

+			case ArchitecturePackage.PROJECT_DEPENDENCY__DEPRECATED_COMMENT:

 				return getDeprecatedComment();

-			case ArchitecturePackage.PLUGIN_DEPENDENCY__IS_DEPRECATED:

+			case ArchitecturePackage.PROJECT_DEPENDENCY__IS_DEPRECATED:

 				return isDeprecated();

-			case ArchitecturePackage.PLUGIN_DEPENDENCY__BASE_DEPENDENCY:

+			case ArchitecturePackage.PROJECT_DEPENDENCY__BASE_DEPENDENCY:

 				if (resolve) return getBase_Dependency();

 				return basicGetBase_Dependency();

 		}

@@ -210,13 +210,13 @@ public class PluginDependencyImpl extends ElementImpl implements PluginDependenc
 	@Override

 	public void eSet(int featureID, Object newValue) {

 		switch (featureID) {

-			case ArchitecturePackage.PLUGIN_DEPENDENCY__DEPRECATED_COMMENT:

+			case ArchitecturePackage.PROJECT_DEPENDENCY__DEPRECATED_COMMENT:

 				setDeprecatedComment((String)newValue);

 				return;

-			case ArchitecturePackage.PLUGIN_DEPENDENCY__IS_DEPRECATED:

+			case ArchitecturePackage.PROJECT_DEPENDENCY__IS_DEPRECATED:

 				setIsDeprecated((Boolean)newValue);

 				return;

-			case ArchitecturePackage.PLUGIN_DEPENDENCY__BASE_DEPENDENCY:

+			case ArchitecturePackage.PROJECT_DEPENDENCY__BASE_DEPENDENCY:

 				setBase_Dependency((Dependency)newValue);

 				return;

 		}

@@ -231,13 +231,13 @@ public class PluginDependencyImpl extends ElementImpl implements PluginDependenc
 	@Override

 	public void eUnset(int featureID) {

 		switch (featureID) {

-			case ArchitecturePackage.PLUGIN_DEPENDENCY__DEPRECATED_COMMENT:

+			case ArchitecturePackage.PROJECT_DEPENDENCY__DEPRECATED_COMMENT:

 				setDeprecatedComment(DEPRECATED_COMMENT_EDEFAULT);

 				return;

-			case ArchitecturePackage.PLUGIN_DEPENDENCY__IS_DEPRECATED:

+			case ArchitecturePackage.PROJECT_DEPENDENCY__IS_DEPRECATED:

 				setIsDeprecated(IS_DEPRECATED_EDEFAULT);

 				return;

-			case ArchitecturePackage.PLUGIN_DEPENDENCY__BASE_DEPENDENCY:

+			case ArchitecturePackage.PROJECT_DEPENDENCY__BASE_DEPENDENCY:

 				setBase_Dependency((Dependency)null);

 				return;

 		}

@@ -252,11 +252,11 @@ public class PluginDependencyImpl extends ElementImpl implements PluginDependenc
 	@Override

 	public boolean eIsSet(int featureID) {

 		switch (featureID) {

-			case ArchitecturePackage.PLUGIN_DEPENDENCY__DEPRECATED_COMMENT:

+			case ArchitecturePackage.PROJECT_DEPENDENCY__DEPRECATED_COMMENT:

 				return DEPRECATED_COMMENT_EDEFAULT == null ? deprecatedComment != null : !DEPRECATED_COMMENT_EDEFAULT.equals(deprecatedComment);

-			case ArchitecturePackage.PLUGIN_DEPENDENCY__IS_DEPRECATED:

+			case ArchitecturePackage.PROJECT_DEPENDENCY__IS_DEPRECATED:

 				return isDeprecated != IS_DEPRECATED_EDEFAULT;

-			case ArchitecturePackage.PLUGIN_DEPENDENCY__BASE_DEPENDENCY:

+			case ArchitecturePackage.PROJECT_DEPENDENCY__BASE_DEPENDENCY:

 				return base_Dependency != null;

 		}

 		return super.eIsSet(featureID);

@@ -280,4 +280,4 @@ public class PluginDependencyImpl extends ElementImpl implements PluginDependenc
 		return result.toString();

 	}

 

-} //PluginDependencyImpl

+} //ProjectDependencyImpl

diff --git a/extraplugins/design/org.eclipse.papyrus.design.profile.architecture/src/org/eclipse/papyrus/design/profile/architecture/impl/ProjectImpl.java b/extraplugins/design/org.eclipse.papyrus.design.profile.architecture/src/org/eclipse/papyrus/design/profile/architecture/impl/ProjectImpl.java
new file mode 100644
index 00000000000..798833d1464
--- /dev/null
+++ b/extraplugins/design/org.eclipse.papyrus.design.profile.architecture/src/org/eclipse/papyrus/design/profile/architecture/impl/ProjectImpl.java
@@ -0,0 +1,497 @@
+/**

+ * <copyright>

+ * </copyright>

+ *

+ * $Id$

+ */

+package org.eclipse.papyrus.design.profile.architecture.impl;

+

+import org.eclipse.emf.common.notify.Notification;

+

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.InternalEObject;

+

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+

+import org.eclipse.papyrus.design.profile.architecture.ArchitecturePackage;

+import org.eclipse.papyrus.design.profile.architecture.Project;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>Project</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * The following features are implemented:

+ * <ul>

+ *   <li>{@link org.eclipse.papyrus.design.profile.architecture.impl.ProjectImpl#isDeprecated <em>Is Deprecated</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.design.profile.architecture.impl.ProjectImpl#getDeprecatedComment <em>Deprecated Comment</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.design.profile.architecture.impl.ProjectImpl#getName <em>Name</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.design.profile.architecture.impl.ProjectImpl#getReferent <em>Referent</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.design.profile.architecture.impl.ProjectImpl#getParentFolder <em>Parent Folder</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.design.profile.architecture.impl.ProjectImpl#getOriginalParentFolder <em>Original Parent Folder</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.design.profile.architecture.impl.ProjectImpl#getBase_Package <em>Base Package</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @generated

+ */

+public class ProjectImpl extends ElementImpl implements Project {

+	/**

+	 * The default value of the '{@link #isDeprecated() <em>Is Deprecated</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isDeprecated()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final boolean IS_DEPRECATED_EDEFAULT = false;

+

+	/**

+	 * The cached value of the '{@link #isDeprecated() <em>Is Deprecated</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isDeprecated()

+	 * @generated

+	 * @ordered

+	 */

+	protected boolean isDeprecated = IS_DEPRECATED_EDEFAULT;

+

+	/**

+	 * The default value of the '{@link #getDeprecatedComment() <em>Deprecated Comment</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getDeprecatedComment()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String DEPRECATED_COMMENT_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getDeprecatedComment() <em>Deprecated Comment</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getDeprecatedComment()

+	 * @generated

+	 * @ordered

+	 */

+	protected String deprecatedComment = DEPRECATED_COMMENT_EDEFAULT;

+

+	/**

+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getName()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String NAME_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getName()

+	 * @generated

+	 * @ordered

+	 */

+	protected String name = NAME_EDEFAULT;

+

+	/**

+	 * The default value of the '{@link #getReferent() <em>Referent</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getReferent()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String REFERENT_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getReferent() <em>Referent</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getReferent()

+	 * @generated

+	 * @ordered

+	 */

+	protected String referent = REFERENT_EDEFAULT;

+

+	/**

+	 * The default value of the '{@link #getParentFolder() <em>Parent Folder</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getParentFolder()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String PARENT_FOLDER_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getParentFolder() <em>Parent Folder</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getParentFolder()

+	 * @generated

+	 * @ordered

+	 */

+	protected String parentFolder = PARENT_FOLDER_EDEFAULT;

+

+	/**

+	 * The default value of the '{@link #getOriginalParentFolder() <em>Original Parent Folder</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getOriginalParentFolder()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String ORIGINAL_PARENT_FOLDER_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getOriginalParentFolder() <em>Original Parent Folder</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getOriginalParentFolder()

+	 * @generated

+	 * @ordered

+	 */

+	protected String originalParentFolder = ORIGINAL_PARENT_FOLDER_EDEFAULT;

+

+	/**

+	 * The cached value of the '{@link #getBase_Package() <em>Base Package</em>}' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getBase_Package()

+	 * @generated

+	 * @ordered

+	 */

+	protected org.eclipse.uml2.uml.Package base_Package;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected ProjectImpl() {

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass() {

+		return ArchitecturePackage.Literals.PROJECT;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public boolean isDeprecated() {

+		return isDeprecated;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void setIsDeprecated(boolean newIsDeprecated) {

+		boolean oldIsDeprecated = isDeprecated;

+		isDeprecated = newIsDeprecated;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, ArchitecturePackage.PROJECT__IS_DEPRECATED, oldIsDeprecated, isDeprecated));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public String getDeprecatedComment() {

+		return deprecatedComment;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void setDeprecatedComment(String newDeprecatedComment) {

+		String oldDeprecatedComment = deprecatedComment;

+		deprecatedComment = newDeprecatedComment;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, ArchitecturePackage.PROJECT__DEPRECATED_COMMENT, oldDeprecatedComment, deprecatedComment));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public String getName() {

+		return name;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void setName(String newName) {

+		String oldName = name;

+		name = newName;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, ArchitecturePackage.PROJECT__NAME, oldName, name));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public String getReferent() {

+		return referent;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void setReferent(String newReferent) {

+		String oldReferent = referent;

+		referent = newReferent;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, ArchitecturePackage.PROJECT__REFERENT, oldReferent, referent));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public String getParentFolder() {

+		return parentFolder;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void setParentFolder(String newParentFolder) {

+		String oldParentFolder = parentFolder;

+		parentFolder = newParentFolder;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, ArchitecturePackage.PROJECT__PARENT_FOLDER, oldParentFolder, parentFolder));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public String getOriginalParentFolder() {

+		return originalParentFolder;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void setOriginalParentFolder(String newOriginalParentFolder) {

+		String oldOriginalParentFolder = originalParentFolder;

+		originalParentFolder = newOriginalParentFolder;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, ArchitecturePackage.PROJECT__ORIGINAL_PARENT_FOLDER, oldOriginalParentFolder, originalParentFolder));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public org.eclipse.uml2.uml.Package getBase_Package() {

+		if (base_Package != null && base_Package.eIsProxy()) {

+			InternalEObject oldBase_Package = (InternalEObject)base_Package;

+			base_Package = (org.eclipse.uml2.uml.Package)eResolveProxy(oldBase_Package);

+			if (base_Package != oldBase_Package) {

+				if (eNotificationRequired())

+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ArchitecturePackage.PROJECT__BASE_PACKAGE, oldBase_Package, base_Package));

+			}

+		}

+		return base_Package;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public org.eclipse.uml2.uml.Package basicGetBase_Package() {

+		return base_Package;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void setBase_Package(org.eclipse.uml2.uml.Package newBase_Package) {

+		org.eclipse.uml2.uml.Package oldBase_Package = base_Package;

+		base_Package = newBase_Package;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, ArchitecturePackage.PROJECT__BASE_PACKAGE, oldBase_Package, base_Package));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType) {

+		switch (featureID) {

+			case ArchitecturePackage.PROJECT__IS_DEPRECATED:

+				return isDeprecated();

+			case ArchitecturePackage.PROJECT__DEPRECATED_COMMENT:

+				return getDeprecatedComment();

+			case ArchitecturePackage.PROJECT__NAME:

+				return getName();

+			case ArchitecturePackage.PROJECT__REFERENT:

+				return getReferent();

+			case ArchitecturePackage.PROJECT__PARENT_FOLDER:

+				return getParentFolder();

+			case ArchitecturePackage.PROJECT__ORIGINAL_PARENT_FOLDER:

+				return getOriginalParentFolder();

+			case ArchitecturePackage.PROJECT__BASE_PACKAGE:

+				if (resolve) return getBase_Package();

+				return basicGetBase_Package();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eSet(int featureID, Object newValue) {

+		switch (featureID) {

+			case ArchitecturePackage.PROJECT__IS_DEPRECATED:

+				setIsDeprecated((Boolean)newValue);

+				return;

+			case ArchitecturePackage.PROJECT__DEPRECATED_COMMENT:

+				setDeprecatedComment((String)newValue);

+				return;

+			case ArchitecturePackage.PROJECT__NAME:

+				setName((String)newValue);

+				return;

+			case ArchitecturePackage.PROJECT__REFERENT:

+				setReferent((String)newValue);

+				return;

+			case ArchitecturePackage.PROJECT__PARENT_FOLDER:

+				setParentFolder((String)newValue);

+				return;

+			case ArchitecturePackage.PROJECT__ORIGINAL_PARENT_FOLDER:

+				setOriginalParentFolder((String)newValue);

+				return;

+			case ArchitecturePackage.PROJECT__BASE_PACKAGE:

+				setBase_Package((org.eclipse.uml2.uml.Package)newValue);

+				return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID) {

+		switch (featureID) {

+			case ArchitecturePackage.PROJECT__IS_DEPRECATED:

+				setIsDeprecated(IS_DEPRECATED_EDEFAULT);

+				return;

+			case ArchitecturePackage.PROJECT__DEPRECATED_COMMENT:

+				setDeprecatedComment(DEPRECATED_COMMENT_EDEFAULT);

+				return;

+			case ArchitecturePackage.PROJECT__NAME:

+				setName(NAME_EDEFAULT);

+				return;

+			case ArchitecturePackage.PROJECT__REFERENT:

+				setReferent(REFERENT_EDEFAULT);

+				return;

+			case ArchitecturePackage.PROJECT__PARENT_FOLDER:

+				setParentFolder(PARENT_FOLDER_EDEFAULT);

+				return;

+			case ArchitecturePackage.PROJECT__ORIGINAL_PARENT_FOLDER:

+				setOriginalParentFolder(ORIGINAL_PARENT_FOLDER_EDEFAULT);

+				return;

+			case ArchitecturePackage.PROJECT__BASE_PACKAGE:

+				setBase_Package((org.eclipse.uml2.uml.Package)null);

+				return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID) {

+		switch (featureID) {

+			case ArchitecturePackage.PROJECT__IS_DEPRECATED:

+				return isDeprecated != IS_DEPRECATED_EDEFAULT;

+			case ArchitecturePackage.PROJECT__DEPRECATED_COMMENT:

+				return DEPRECATED_COMMENT_EDEFAULT == null ? deprecatedComment != null : !DEPRECATED_COMMENT_EDEFAULT.equals(deprecatedComment);

+			case ArchitecturePackage.PROJECT__NAME:

+				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);

+			case ArchitecturePackage.PROJECT__REFERENT:

+				return REFERENT_EDEFAULT == null ? referent != null : !REFERENT_EDEFAULT.equals(referent);

+			case ArchitecturePackage.PROJECT__PARENT_FOLDER:

+				return PARENT_FOLDER_EDEFAULT == null ? parentFolder != null : !PARENT_FOLDER_EDEFAULT.equals(parentFolder);

+			case ArchitecturePackage.PROJECT__ORIGINAL_PARENT_FOLDER:

+				return ORIGINAL_PARENT_FOLDER_EDEFAULT == null ? originalParentFolder != null : !ORIGINAL_PARENT_FOLDER_EDEFAULT.equals(originalParentFolder);

+			case ArchitecturePackage.PROJECT__BASE_PACKAGE:

+				return base_Package != null;

+		}

+		return super.eIsSet(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public String toString() {

+		if (eIsProxy()) return super.toString();

+

+		StringBuffer result = new StringBuffer(super.toString());

+		result.append(" (isDeprecated: ");

+		result.append(isDeprecated);

+		result.append(", deprecatedComment: ");

+		result.append(deprecatedComment);

+		result.append(", name: ");

+		result.append(name);

+		result.append(", referent: ");

+		result.append(referent);

+		result.append(", parentFolder: ");

+		result.append(parentFolder);

+		result.append(", originalParentFolder: ");

+		result.append(originalParentFolder);

+		result.append(')');

+		return result.toString();

+	}

+

+} //ProjectImpl

diff --git a/extraplugins/design/org.eclipse.papyrus.design.profile.architecture/src/org/eclipse/papyrus/design/profile/architecture/util/ArchitectureAdapterFactory.java b/extraplugins/design/org.eclipse.papyrus.design.profile.architecture/src/org/eclipse/papyrus/design/profile/architecture/util/ArchitectureAdapterFactory.java
index 03b4716a6de..37e6522239c 100644
--- a/extraplugins/design/org.eclipse.papyrus.design.profile.architecture/src/org/eclipse/papyrus/design/profile/architecture/util/ArchitectureAdapterFactory.java
+++ b/extraplugins/design/org.eclipse.papyrus.design.profile.architecture/src/org/eclipse/papyrus/design/profile/architecture/util/ArchitectureAdapterFactory.java
@@ -88,8 +88,12 @@ public class ArchitectureAdapterFactory extends AdapterFactoryImpl {
 				return createPluginAdapter();

 			}

 			@Override

-			public Adapter casePluginDependency(PluginDependency object) {

-				return createPluginDependencyAdapter();

+			public Adapter caseProject(Project object) {

+				return createProjectAdapter();

+			}

+			@Override

+			public Adapter caseProjectDependency(ProjectDependency object) {

+				return createProjectDependencyAdapter();

 			}

 			@Override

 			public Adapter defaultCase(EObject object) {

@@ -168,16 +172,30 @@ public class ArchitectureAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.design.profile.architecture.PluginDependency <em>Plugin Dependency</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.design.profile.architecture.Project <em>Project</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 * @return the new adapter.

+	 * @see org.eclipse.papyrus.design.profile.architecture.Project

+	 * @generated

+	 */

+	public Adapter createProjectAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.design.profile.architecture.ProjectDependency <em>Project Dependency</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

 	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.design.profile.architecture.PluginDependency

+	 * @see org.eclipse.papyrus.design.profile.architecture.ProjectDependency

 	 * @generated

 	 */

-	public Adapter createPluginDependencyAdapter() {

+	public Adapter createProjectDependencyAdapter() {

 		return null;

 	}

 

diff --git a/extraplugins/design/org.eclipse.papyrus.design.profile.architecture/src/org/eclipse/papyrus/design/profile/architecture/util/ArchitectureSwitch.java b/extraplugins/design/org.eclipse.papyrus.design.profile.architecture/src/org/eclipse/papyrus/design/profile/architecture/util/ArchitectureSwitch.java
index f29cc3fac4b..37c6d434fd5 100644
--- a/extraplugins/design/org.eclipse.papyrus.design.profile.architecture/src/org/eclipse/papyrus/design/profile/architecture/util/ArchitectureSwitch.java
+++ b/extraplugins/design/org.eclipse.papyrus.design.profile.architecture/src/org/eclipse/papyrus/design/profile/architecture/util/ArchitectureSwitch.java
@@ -93,14 +93,22 @@ public class ArchitectureSwitch<T> extends Switch<T> {
 			case ArchitecturePackage.PLUGIN: {

 				Plugin plugin = (Plugin)theEObject;

 				T result = casePlugin(plugin);

+				if (result == null) result = caseProject(plugin);

 				if (result == null) result = caseElement(plugin);

 				if (result == null) result = defaultCase(theEObject);

 				return result;

 			}

-			case ArchitecturePackage.PLUGIN_DEPENDENCY: {

-				PluginDependency pluginDependency = (PluginDependency)theEObject;

-				T result = casePluginDependency(pluginDependency);

-				if (result == null) result = caseElement(pluginDependency);

+			case ArchitecturePackage.PROJECT: {

+				Project project = (Project)theEObject;

+				T result = caseProject(project);

+				if (result == null) result = caseElement(project);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

+			}

+			case ArchitecturePackage.PROJECT_DEPENDENCY: {

+				ProjectDependency projectDependency = (ProjectDependency)theEObject;

+				T result = caseProjectDependency(projectDependency);

+				if (result == null) result = caseElement(projectDependency);

 				if (result == null) result = defaultCase(theEObject);

 				return result;

 			}

@@ -169,17 +177,32 @@ public class ArchitectureSwitch<T> extends Switch<T> {
 	}

 

 	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Plugin Dependency</em>'.

+	 * Returns the result of interpreting the object as an instance of '<em>Project</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 * @param object the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>Project</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseProject(Project object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>Project Dependency</em>'.

 	 * <!-- begin-user-doc -->

 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

 	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Plugin Dependency</em>'.

+	 * @return the result of interpreting the object as an instance of '<em>Project Dependency</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

 	 */

-	public T casePluginDependency(PluginDependency object) {

+	public T caseProjectDependency(ProjectDependency object) {

 		return null;

 	}

 

diff --git a/extraplugins/design/org.eclipse.papyrus.design.profile.updatesite/site.xml b/extraplugins/design/org.eclipse.papyrus.design.profile.updatesite/site.xml
index e0f4aad9e64..bd995cb649c 100644
--- a/extraplugins/design/org.eclipse.papyrus.design.profile.updatesite/site.xml
+++ b/extraplugins/design/org.eclipse.papyrus.design.profile.updatesite/site.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <site>

-   <feature url="features/org.eclipse.papyrus.design.profile.feature_0.9.0.201110191532.jar" id="org.eclipse.papyrus.design.profile.feature" version="0.9.0.201110191532">

+   <feature url="features/org.eclipse.papyrus.design.profile.feature_0.9.0.201110201522.jar" id="org.eclipse.papyrus.design.profile.feature" version="0.9.0.201110201522">

       <category name="org.eclipse.papyrus.design"/>

    </feature>

    <category-def name="org.eclipse.papyrus.design" label="Papyrus Design">