Bug 463290 - Papyrus diagram shall be expanded with new visual graphical

notation

Change-Id: I43787247e9d11ea861dbcc42fcdc37bff9efd6f5

12 files changed, 198 insertions, 4 deletions

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/AbstractRepresentation.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/AbstractRepresentation.java
index df410a16ba9..bc523da41a4 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/AbstractRepresentation.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/AbstractRepresentation.java
@@ -46,6 +46,9 @@ public interface AbstractRepresentation extends EObject {
 	 * there really should be more of a description here...

 	 * </p>

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

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

+	 * if the kind is filled, the editPartQualifiedName has to be filled. It references the controler see GEF framework

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

 	 * @return the value of the '<em>Edit Part Qualified Name</em>' attribute.

 	 * @see #setEditPartQualifiedName(String)

 	 * @see org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.ExpansionmodelPackage#getAbstractRepresentation_EditPartQualifiedName()

@@ -98,6 +101,9 @@ public interface AbstractRepresentation extends EObject {
 	 * there really should be more of a description here...

 	 * </p>

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

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

+	 * It is more like a comment, it is no used by interpretors.

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

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

 	 * @see #setName(String)

 	 * @see org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.ExpansionmodelPackage#getAbstractRepresentation_Name()

@@ -124,6 +130,9 @@ public interface AbstractRepresentation extends EObject {
 	 * there really should be more of a description here...

 	 * </p>

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

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

+	 * if the kind is filled, the view factory has to be filled. It references the factory of notation element see (model inside GEF framework)

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

 	 * @return the value of the '<em>View Factory</em>' attribute.

 	 * @see #setViewFactory(String)

 	 * @see org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.ExpansionmodelPackage#getAbstractRepresentation_ViewFactory()

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/DiagramExpansion.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/DiagramExpansion.java
index 6ce3605463b..b0eb1aaf9b4 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/DiagramExpansion.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/DiagramExpansion.java
@@ -27,6 +27,7 @@ import org.eclipse.emf.ecore.EObject;
  * <ul>

  *   <li>{@link org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.DiagramExpansion#getUsages <em>Usages</em>}</li>

  *   <li>{@link org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.DiagramExpansion#getLibraries <em>Libraries</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.DiagramExpansion#getID <em>ID</em>}</li>

  * </ul>

  *

  * @see org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.ExpansionmodelPackage#getDiagramExpansion()

@@ -66,4 +67,30 @@ public interface DiagramExpansion extends EObject {
 	 */

 	EList<GraphicalElementLibrary> getLibraries();

 

+	/**

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

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

+	 * <p>

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

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

+	 * </p>

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

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

+	 * @see #setID(String)

+	 * @see org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.ExpansionmodelPackage#getDiagramExpansion_ID()

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

+	 * @generated

+	 */

+	String getID();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.DiagramExpansion#getID <em>ID</em>}' attribute.

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

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

+	 * @param value the new value of the '<em>ID</em>' attribute.

+	 * @see #getID()

+	 * @generated

+	 */

+	void setID(String value);

+

 } // DiagramExpansion

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/ExpansionmodelPackage.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/ExpansionmodelPackage.java
index 1db1a32e578..7d6d08a7aea 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/ExpansionmodelPackage.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/ExpansionmodelPackage.java
@@ -643,13 +643,22 @@ public interface ExpansionmodelPackage extends EPackage {
 	int DIAGRAM_EXPANSION__LIBRARIES = 1;

 

 	/**

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

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

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

+	 * @generated

+	 * @ordered

+	 */

+	int DIAGRAM_EXPANSION__ID = 2;

+

+	/**

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

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

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

 	 * @generated

 	 * @ordered

 	 */

-	int DIAGRAM_EXPANSION_FEATURE_COUNT = 2;

+	int DIAGRAM_EXPANSION_FEATURE_COUNT = 3;

 

 	/**

 	 * The number of operations of the '<em>Diagram Expansion</em>' class.

@@ -994,6 +1003,17 @@ public interface ExpansionmodelPackage extends EPackage {
 	EReference getDiagramExpansion_Libraries();

 

 	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.DiagramExpansion#getID <em>ID</em>}'.

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

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

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

+	 * @see org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.DiagramExpansion#getID()

+	 * @see #getDiagramExpansion()

+	 * @generated

+	 */

+	EAttribute getDiagramExpansion_ID();

+

+	/**

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

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

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

@@ -1280,6 +1300,14 @@ public interface ExpansionmodelPackage extends EPackage {
 		 */

 		EReference DIAGRAM_EXPANSION__LIBRARIES = eINSTANCE.getDiagramExpansion_Libraries();

 

+		/**

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

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

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

+		 * @generated

+		 */

+		EAttribute DIAGRAM_EXPANSION__ID = eINSTANCE.getDiagramExpansion_ID();

+

 	}

 

 } //ExpansionmodelPackage

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/GMFT_BasedRepresentation.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/GMFT_BasedRepresentation.java
index ee2aa273bd0..75e2120f90f 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/GMFT_BasedRepresentation.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/GMFT_BasedRepresentation.java
@@ -38,6 +38,9 @@ public interface GMFT_BasedRepresentation extends Representation {
 	 * there really should be more of a description here...

 	 * </p>

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

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

+	 * In this case this is the visualID defined in gmf diagram

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

 	 * @return the value of the '<em>Reused ID</em>' attribute.

 	 * @see #setReusedID(String)

 	 * @see org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.ExpansionmodelPackage#getGMFT_BasedRepresentation_ReusedID()

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/GraphicalElementLibrary.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/GraphicalElementLibrary.java
index dd6ee569541..ca10c94ff8f 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/GraphicalElementLibrary.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/GraphicalElementLibrary.java
@@ -43,6 +43,9 @@ public interface GraphicalElementLibrary extends EObject {
 	 * there really should be more of a description here...

 	 * </p>

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

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

+	 * It is more like a comment, it is no used by interpretors.

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

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

 	 * @see #setName(String)

 	 * @see org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.ExpansionmodelPackage#getGraphicalElementLibrary_Name()

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/InducedRepresentation.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/InducedRepresentation.java
index 71302616aad..96b42156081 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/InducedRepresentation.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/InducedRepresentation.java
@@ -19,6 +19,10 @@ import org.eclipse.emf.common.util.EList;
  * A representation of the model object '<em><b>Induced Representation</b></em>'.

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

  *

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

+ * An Induced Representation is a representation that is automatically created by its parent representation (compartment, label of a shape, label of link, label or border item)

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

+ *

  * <p>

  * The following features are supported:

  * </p>

@@ -40,6 +44,12 @@ public interface InducedRepresentation extends AbstractRepresentation {
 	 * there really should be more of a description here...

 	 * </p>

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

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

+	 * This a id for a compartment of label for example:

+	 * "flow ports" for the name of flow port compartment,

+	 * "Operation BorderItem Label" to identifier the labler around a border item that is a operation.

+	 * If is used, the graphical element is null.

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

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

 	 * @see #setHint(String)

 	 * @see org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.ExpansionmodelPackage#getInducedRepresentation_Hint()

@@ -67,6 +77,9 @@ public interface InducedRepresentation extends AbstractRepresentation {
 	 * there really should be more of a description here...

 	 * </p>

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

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

+	 * There are representations that can be contained by this induced representation like  attribtutes inside attribute compartment.

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

 	 * @return the value of the '<em>Children</em>' reference list.

 	 * @see org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.ExpansionmodelPackage#getInducedRepresentation_Children()

 	 * @model ordered="false"

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/Representation.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/Representation.java
index 64aaf5bdbde..cc1ae3b019a 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/Representation.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/Representation.java
@@ -19,6 +19,10 @@ import org.eclipse.emf.common.util.EList;
  * A representation of the model object '<em><b>Representation</b></em>'.

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

  *

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

+ * A representation is en element that is displyed on a diagram it is attached to a controler (see editpart) and to a notation structure( build bt the viewFactory)

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

+ *

  * <p>

  * The following features are supported:

  * </p>

@@ -41,6 +45,11 @@ public interface Representation extends AbstractRepresentation {
 	 * there really should be more of a description here...

 	 * </p>

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

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

+	 * This the reference of a graphical element type, it can be null.

+	 * It is used to defined  a Flow_port_as_label for example.

+	 * If it is used the hint has to be null

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

 	 * @return the value of the '<em>Graphical Element Type</em>' attribute.

 	 * @see #setGraphicalElementType(String)

 	 * @see org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.ExpansionmodelPackage#getRepresentation_GraphicalElementType()

@@ -68,6 +77,9 @@ public interface Representation extends AbstractRepresentation {
 	 * there really should be more of a description here...

 	 * </p>

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

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

+	 * This reperesentation that musr be automatically created with this representation, for example compartment, labels

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

 	 * @return the value of the '<em>Induced Representations</em>' reference list.

 	 * @see org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.ExpansionmodelPackage#getRepresentation_InducedRepresentations()

 	 * @model ordered="false"

@@ -84,6 +96,9 @@ public interface Representation extends AbstractRepresentation {
 	 * there really should be more of a description here...

 	 * </p>

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

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

+	 * this is representation that can be directly create inside this representation for example  borderItems like ports

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

 	 * @return the value of the '<em>Sub Representations</em>' reference list.

 	 * @see org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.ExpansionmodelPackage#getRepresentation_SubRepresentations()

 	 * @model ordered="false"

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/RepresentationKind.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/RepresentationKind.java
index 21a5c1a0ebf..ff84d7bca67 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/RepresentationKind.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/RepresentationKind.java
@@ -41,6 +41,9 @@ public interface RepresentationKind extends EObject {
 	 * there really should be more of a description here...

 	 * </p>

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

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

+	 * It references the controler see GEF framework

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

 	 * @return the value of the '<em>Edit Part Qualified Name</em>' attribute.

 	 * @see #setEditPartQualifiedName(String)

 	 * @see org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.ExpansionmodelPackage#getRepresentationKind_EditPartQualifiedName()

@@ -67,6 +70,9 @@ public interface RepresentationKind extends EObject {
 	 * there really should be more of a description here...

 	 * </p>

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

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

+	 * It is more like a comment, it is no used by interpretors.

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

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

 	 * @see #setName(String)

 	 * @see org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.ExpansionmodelPackage#getRepresentationKind_Name()

@@ -93,6 +99,9 @@ public interface RepresentationKind extends EObject {
 	 * there really should be more of a description here...

 	 * </p>

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

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

+	 * It references the factory of notation element see (model inside GEF framework)

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

 	 * @return the value of the '<em>View Factory</em>' attribute.

 	 * @see #setViewFactory(String)

 	 * @see org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.ExpansionmodelPackage#getRepresentationKind_ViewFactory()

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/UseContext.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/UseContext.java
index f361c4a2c90..95e1b0c35b4 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/UseContext.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/UseContext.java
@@ -71,6 +71,9 @@ public interface UseContext extends EObject {
 	 * there really should be more of a description here...

 	 * </p>

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

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

+	 * This is all representation that the framework must have to extend or add.

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

 	 * @return the value of the '<em>Representations</em>' reference list.

 	 * @see org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.ExpansionmodelPackage#getUseContext_Representations()

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

@@ -86,6 +89,9 @@ public interface UseContext extends EObject {
 	 * there really should be more of a description here...

 	 * </p>

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

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

+	 * It is more like a comment, it is no used by interpretors.

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

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

 	 * @see #setName(String)

 	 * @see org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.ExpansionmodelPackage#getUseContext_Name()

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/impl/DiagramExpansionImpl.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/impl/DiagramExpansionImpl.java
index d4866a502c8..47da43b0a9d 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/impl/DiagramExpansionImpl.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/impl/DiagramExpansionImpl.java
@@ -14,6 +14,7 @@ package org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.impl;
 

 import java.util.Collection;

 

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

 import org.eclipse.emf.common.notify.NotificationChain;

 

 import org.eclipse.emf.common.util.EList;

@@ -21,6 +22,7 @@ import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.InternalEObject;

 

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

 

 import org.eclipse.emf.ecore.util.EObjectContainmentEList;

@@ -41,6 +43,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.UseContext;
  * <ul>

  *   <li>{@link org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.impl.DiagramExpansionImpl#getUsages <em>Usages</em>}</li>

  *   <li>{@link org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.impl.DiagramExpansionImpl#getLibraries <em>Libraries</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.impl.DiagramExpansionImpl#getID <em>ID</em>}</li>

  * </ul>

  *

  * @generated

@@ -67,6 +70,26 @@ public class DiagramExpansionImpl extends MinimalEObjectImpl.Container implement
 	protected EList<GraphicalElementLibrary> libraries;

 

 	/**

+	 * The default value of the '{@link #getID() <em>ID</em>}' attribute.

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

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

+	 * @see #getID()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String ID_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getID() <em>ID</em>}' attribute.

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

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

+	 * @see #getID()

+	 * @generated

+	 * @ordered

+	 */

+	protected String id = ID_EDEFAULT;

+

+	/**

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

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

 	 * @generated

@@ -114,6 +137,27 @@ public class DiagramExpansionImpl extends MinimalEObjectImpl.Container implement
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	public String getID() {

+		return id;

+	}

+

+	/**

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

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

+	 * @generated

+	 */

+	public void setID(String newID) {

+		String oldID = id;

+		id = newID;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, ExpansionmodelPackage.DIAGRAM_EXPANSION__ID, oldID, id));

+	}

+

+	/**

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

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

+	 * @generated

+	 */

 	@Override

 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

 		switch (featureID) {

@@ -137,6 +181,8 @@ public class DiagramExpansionImpl extends MinimalEObjectImpl.Container implement
 				return getUsages();

 			case ExpansionmodelPackage.DIAGRAM_EXPANSION__LIBRARIES:

 				return getLibraries();

+			case ExpansionmodelPackage.DIAGRAM_EXPANSION__ID:

+				return getID();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

@@ -158,6 +204,9 @@ public class DiagramExpansionImpl extends MinimalEObjectImpl.Container implement
 				getLibraries().clear();

 				getLibraries().addAll((Collection<? extends GraphicalElementLibrary>)newValue);

 				return;

+			case ExpansionmodelPackage.DIAGRAM_EXPANSION__ID:

+				setID((String)newValue);

+				return;

 		}

 		super.eSet(featureID, newValue);

 	}

@@ -176,6 +225,9 @@ public class DiagramExpansionImpl extends MinimalEObjectImpl.Container implement
 			case ExpansionmodelPackage.DIAGRAM_EXPANSION__LIBRARIES:

 				getLibraries().clear();

 				return;

+			case ExpansionmodelPackage.DIAGRAM_EXPANSION__ID:

+				setID(ID_EDEFAULT);

+				return;

 		}

 		super.eUnset(featureID);

 	}

@@ -192,8 +244,26 @@ public class DiagramExpansionImpl extends MinimalEObjectImpl.Container implement
 				return usages != null && !usages.isEmpty();

 			case ExpansionmodelPackage.DIAGRAM_EXPANSION__LIBRARIES:

 				return libraries != null && !libraries.isEmpty();

+			case ExpansionmodelPackage.DIAGRAM_EXPANSION__ID:

+				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);

 		}

 		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(" (ID: ");

+		result.append(id);

+		result.append(')');

+		return result.toString();

+	}

+

 } //DiagramExpansionImpl

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/impl/ExpansionmodelPackageImpl.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/impl/ExpansionmodelPackageImpl.java
index f54c78a50ff..ea9757d7928 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/impl/ExpansionmodelPackageImpl.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/impl/ExpansionmodelPackageImpl.java
@@ -451,6 +451,15 @@ public class ExpansionmodelPackageImpl extends EPackageImpl implements Expansion
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	public EAttribute getDiagramExpansion_ID() {

+		return (EAttribute)diagramExpansionEClass.getEStructuralFeatures().get(2);

+	}

+

+	/**

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

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

+	 * @generated

+	 */

 	public ExpansionmodelFactory getExpansionmodelFactory() {

 		return (ExpansionmodelFactory)getEFactoryInstance();

 	}

@@ -512,6 +521,7 @@ public class ExpansionmodelPackageImpl extends EPackageImpl implements Expansion
 		diagramExpansionEClass = createEClass(DIAGRAM_EXPANSION);

 		createEReference(diagramExpansionEClass, DIAGRAM_EXPANSION__USAGES);

 		createEReference(diagramExpansionEClass, DIAGRAM_EXPANSION__LIBRARIES);

+		createEAttribute(diagramExpansionEClass, DIAGRAM_EXPANSION__ID);

 	}

 

 	/**

@@ -577,10 +587,10 @@ public class ExpansionmodelPackageImpl extends EPackageImpl implements Expansion
 		initEReference(getGraphicalElementLibrary_Representations(), this.getAbstractRepresentation(), null, "representations", null, 0, -1, GraphicalElementLibrary.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

 

 		initEClass(useContextEClass, UseContext.class, "UseContext", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEAttribute(getUseContext_DiagramType(), ecorePackage.getEString(), "DiagramType", null, 1, 1, UseContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

+		initEAttribute(getUseContext_DiagramType(), ecorePackage.getEString(), "diagramType", null, 1, 1, UseContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

 		initEReference(getUseContext_Representations(), this.getRepresentation(), null, "representations", null, 1, -1, UseContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

 		initEAttribute(getUseContext_Name(), ecorePackage.getEString(), "name", null, 1, 1, UseContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

-		initEReference(getUseContext_GmftRepresentations(), this.getGMFT_BasedRepresentation(), null, "GmftRepresentations", null, 0, -1, UseContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

+		initEReference(getUseContext_GmftRepresentations(), this.getGMFT_BasedRepresentation(), null, "gmftRepresentations", null, 0, -1, UseContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

 

 		initEClass(gmfT_BasedRepresentationEClass, GMFT_BasedRepresentation.class, "GMFT_BasedRepresentation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

 		initEAttribute(getGMFT_BasedRepresentation_ReusedID(), ecorePackage.getEString(), "reusedID", null, 0, 1, GMFT_BasedRepresentation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

@@ -588,6 +598,7 @@ public class ExpansionmodelPackageImpl extends EPackageImpl implements Expansion
 		initEClass(diagramExpansionEClass, DiagramExpansion.class, "DiagramExpansion", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

 		initEReference(getDiagramExpansion_Usages(), this.getUseContext(), null, "usages", null, 0, -1, DiagramExpansion.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

 		initEReference(getDiagramExpansion_Libraries(), this.getGraphicalElementLibrary(), null, "libraries", null, 0, -1, DiagramExpansion.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

+		initEAttribute(getDiagramExpansion_ID(), ecorePackage.getEString(), "ID", null, 1, 1, DiagramExpansion.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

 

 		// Create resource

 		createResource(eNS_URI);

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/impl/UseContextImpl.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/impl/UseContextImpl.java
index 1d1b37b56ae..4273b6274e5 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/impl/UseContextImpl.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/impl/UseContextImpl.java
@@ -311,7 +311,7 @@ public class UseContextImpl extends MinimalEObjectImpl.Container implements UseC
 		if (eIsProxy()) return super.toString();

 

 		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (DiagramType: ");

+		result.append(" (diagramType: ");

 		result.append(diagramType);

 		result.append(", name: ");

 		result.append(name);